You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by da...@apache.org on 2020/10/18 15:25:48 UTC
[logging-log4net] branch master updated (141b00b -> 47aaf46)
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git.
from 141b00b :tada: build-xplatform works; now to get tests running...
new e137855 :bug: should fall back on Environment.UserName if !win32
new bf81ef2 :bookmark: update versioning to 2.0.12.0
new 47aaf46 :bookmark: bump version to 2.0.12, fixes LOG4NET-(652|653)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
package.json | 2 +-
src/log4net/AssemblyInfo.cs | 46 +++++++++++++++++++-------------------
src/log4net/AssemblyVersionInfo.cs | 4 ++--
src/log4net/Core/LoggingEvent.cs | 16 +++++++------
src/log4net/log4net.csproj | 2 +-
5 files changed, 36 insertions(+), 34 deletions(-)
[logging-log4net] 02/03: :bookmark: update versioning to 2.0.12.0
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit bf81ef2a3746585efa30582fe784a513c678e91a
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Sun Oct 18 17:21:12 2020 +0200
:bookmark: update versioning to 2.0.12.0
---
src/log4net/AssemblyInfo.cs | 46 +++++++++++++++++++-------------------
src/log4net/AssemblyVersionInfo.cs | 4 ++--
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs
index 5264ed2..9539a78 100644
--- a/src/log4net/AssemblyInfo.cs
+++ b/src/log4net/AssemblyInfo.cs
@@ -54,77 +54,77 @@ using System.Runtime.CompilerServices;
//
#if (CLI_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.CLI 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.CLI 1.0")]
[assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")]
#elif (NET_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 1.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")]
#elif (NET_1_1)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 1.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 1.1")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")]
#elif (NET_4_5)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 4.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.5")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")]
#elif (NET_4_0)
#if CLIENT_PROFILE
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 4.0 CP")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.0 CP")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")]
#else
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 4.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")]
#endif // Client Profile
#elif (NET_3_5)
#if CLIENT_PROFILE
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 3.5 CP")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 3.5 CP")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")]
#else
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 3.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 3.5")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5")]
#endif // Client Profile
#elif (NET_2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")]
#elif (NETCF_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NETCF 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF 1.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")]
#elif (NETCF_2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NETCF 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")]
#elif (MONO_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 1.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 1.0")]
#elif (MONO_2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 2.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 2.0")]
#elif (MONO_3_5)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 3.5")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 3.5")]
[assembly: AssemblyTitle("Apache log4net for Mono 3.5")]
#elif (MONO_4_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 4.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 4.0")]
[assembly: AssemblyTitle("Apache log4net for Mono 4.0")]
#elif (SSCLI_1_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-SSCLI 1.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-SSCLI 1.0")]
[assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")]
#elif (NET)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET")]
[assembly: AssemblyTitle("Apache log4net for .NET Framework")]
#elif (NETSTANDARD1_3)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET Standard 1.3")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET Standard 1.3")]
[assembly: AssemblyTitle("Apache log4net for .NET Standard 1.3")]
#elif (NETSTANDARD2_0)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET Standard 2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET Standard 2.0")]
[assembly: AssemblyTitle("Apache log4net for .NET Standard 2.0")]
#elif (NETCF)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NETCF")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF")]
[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")]
#elif (MONO)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono")]
[assembly: AssemblyTitle("Apache log4net for Mono")]
#elif (SSCLI)
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-SSCLI")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-SSCLI")]
[assembly: AssemblyTitle("Apache log4net for Shared Source CLI")]
#else
-[assembly: AssemblyInformationalVersionAttribute("2.0.11.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.12.0")]
[assembly: AssemblyTitle("Apache log4net")]
#endif
diff --git a/src/log4net/AssemblyVersionInfo.cs b/src/log4net/AssemblyVersionInfo.cs
index 0b62aa9..1bde467 100644
--- a/src/log4net/AssemblyVersionInfo.cs
+++ b/src/log4net/AssemblyVersionInfo.cs
@@ -28,11 +28,11 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: System.Reflection.AssemblyVersion("2.0.11.0")]
+[assembly: System.Reflection.AssemblyVersion("2.0.12.0")]
#if !NETCF
#if !SSCLI
-[assembly: System.Reflection.AssemblyFileVersion("2.0.11.0")]
+[assembly: System.Reflection.AssemblyFileVersion("2.0.12.0")]
#endif
#endif
[logging-log4net] 03/03: :bookmark: bump version to 2.0.12,
fixes LOG4NET-(652|653)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 47aaf46d5f031ea29d781bac4617bd1bb9446215
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Sun Oct 18 17:23:48 2020 +0200
:bookmark: bump version to 2.0.12, fixes LOG4NET-(652|653)
---
package.json | 2 +-
src/log4net/Core/LoggingEvent.cs | 4 ++--
src/log4net/log4net.csproj | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 0997123..26b60cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "log4net",
- "version": "2.0.9",
+ "version": "2.0.12",
"description": "Log4Net is a logging framework for .NET",
"scripts": {
"test": "cross-env NUNIT_PROCESS=Single MAX_CONCURRENCY=1 run-s clean-build \"zarro test-dotnet\" run-dotnet-core-tests",
diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs
index 02eed28..878fbf7 100644
--- a/src/log4net/Core/LoggingEvent.cs
+++ b/src/log4net/Core/LoggingEvent.cs
@@ -937,9 +937,9 @@ namespace log4net.Core
// some undefined set of SecurityPermission flags.
LogLog.Debug(
declaringType,
- "Security exception while trying to get current windows identity. Error Ignored. Empty user name."
+ "Security exception while trying to get current windows identity. Error Ignored."
);
- return null;
+ return Environment.UserName;
}
catch
{
diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj
index 0063fce..263ed65 100644
--- a/src/log4net/log4net.csproj
+++ b/src/log4net/log4net.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>log4net</PackageId>
- <Version>2.0.11</Version>
+ <Version>2.0.12</Version>
<Title>Apache log4net</Title>
<Product>Apache log4net</Product>
<Description>
[logging-log4net] 01/03: :bug: should fall back on
Environment.UserName if !win32
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit e137855bdca5ed1a361c361846381607a5568d60
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Sun Oct 18 17:19:10 2020 +0200
:bug: should fall back on Environment.UserName if !win32
---
src/log4net/Core/LoggingEvent.cs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs
index 665700e..02eed28 100644
--- a/src/log4net/Core/LoggingEvent.cs
+++ b/src/log4net/Core/LoggingEvent.cs
@@ -914,7 +914,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
public string UserName =>
- m_data.UserName ??= TryGetCurrentUserName();
+ m_data.UserName ??= TryGetCurrentUserName() ?? SystemInfo.NotAvailableText;
private static string TryGetCurrentUserName()
{
@@ -929,8 +929,7 @@ namespace log4net.Core
}
catch (PlatformNotSupportedException)
{
- // TODO: on a platform which supports it, invoke `whoami`
- return SystemInfo.NotAvailableText;
+ return Environment.UserName;
}
catch (SecurityException)
{
@@ -940,12 +939,15 @@ namespace log4net.Core
declaringType,
"Security exception while trying to get current windows identity. Error Ignored. Empty user name."
);
-
- return SystemInfo.NotAvailableText;
+ return null;
+ }
+ catch
+ {
+ return null;
}
#endif
}
-
+
/// <summary>
/// Gets the identity of the current thread principal.
/// </summary>