You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/08/18 08:43:57 UTC
[09/13] logging-log4net git commit: handle
PlatformNotSupportedExceptions in UserNamePatternConverter
handle PlatformNotSupportedExceptions in UserNamePatternConverter
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b30a7098
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b30a7098
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b30a7098
Branch: refs/heads/feature/netstandard-2.0
Commit: b30a7098c915041d52a9d206d697dafb0c611f4b
Parents: 4f8ce10
Author: Charles Lowell <ch...@microsoft.com>
Authored: Wed Aug 16 09:44:52 2017 -0700
Committer: Charles Lowell <ch...@microsoft.com>
Committed: Wed Aug 16 09:52:15 2017 -0700
----------------------------------------------------------------------
src/Util/PatternStringConverters/UserNamePatternConverter.cs | 8 +++++++-
src/log4net.csproj | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b30a7098/src/Util/PatternStringConverters/UserNamePatternConverter.cs
----------------------------------------------------------------------
diff --git a/src/Util/PatternStringConverters/UserNamePatternConverter.cs b/src/Util/PatternStringConverters/UserNamePatternConverter.cs
index 43e3472..cca3504 100644
--- a/src/Util/PatternStringConverters/UserNamePatternConverter.cs
+++ b/src/Util/PatternStringConverters/UserNamePatternConverter.cs
@@ -48,7 +48,7 @@ namespace log4net.Util.PatternStringConverters
/// </remarks>
override protected void Convert(TextWriter writer, object state)
{
-#if (NETCF || SSCLI || NETSTANDARD1_3 || NETSTANDARD2_0)
+#if (NETCF || SSCLI || NETSTANDARD1_3)
// On compact framework there's no notion of current Windows user
writer.Write( SystemInfo.NotAvailableText );
#else
@@ -69,6 +69,12 @@ namespace log4net.Util.PatternStringConverters
writer.Write( SystemInfo.NotAvailableText );
}
+#if NETSTANDARD2_0
+ catch(PlatformNotSupportedException)
+ {
+ writer.Write("WindowsIdentity is not available on this platform");
+ }
+#endif
#endif
}
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b30a7098/src/log4net.csproj
----------------------------------------------------------------------
diff --git a/src/log4net.csproj b/src/log4net.csproj
index cf0f3f1..94375a5 100644
--- a/src/log4net.csproj
+++ b/src/log4net.csproj
@@ -111,6 +111,7 @@
<Compile Remove="Appender\EventLogAppender.cs;Appender\RemotingAppender.cs;**\AspNet*.cs;Util\WindowsSecurityContext.cs;Plugin\RemoteLoggingServerPlugin.cs" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+ <PackageReference Include="System.Security.Principal.Windows" Version="4.4.0" />
</ItemGroup>
</Project>