AspNetUserClaimLayoutRenderer - Now supported for NLog.Web with NET46 (…

…NLog#792)
bakgerman · Jun 6, 2022 · 3c5e983 · 3c5e983
1 parent 0b1f2a8
commit 3c5e983
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/...enderers/AspNetUserClaimLayoutRenderer.cs → ...enderers/AspNetUserClaimLayoutRenderer.cs b/...enderers/AspNetUserClaimLayoutRenderer.cs → ...enderers/AspNetUserClaimLayoutRenderer.cs
@@ -1,4 +1,6 @@
-using System;
+#if ASP_NET_CORE || NET46_OR_GREATER
+
+using System;
 using System.Reflection;
 using System.Security.Claims;
 using System.Text;
@@ -60,10 +62,14 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
                 }
 
                 var claimsIdentity = claimsPrincipel.Identity as ClaimsIdentity;    // Prioritize primary identity
-                var claim = claimsIdentity?.FindFirst(ClaimType) ?? claimsPrincipel.FindFirst(ClaimType);
+                var claim = claimsIdentity?.FindFirst(ClaimType)
+#if ASP_NET_CORE
+                    ?? claimsPrincipel.FindFirst(ClaimType)
+#endif
+                    ;
                 if (claim != null)
                 {
-                    builder.Append(claim.Value);
+                    builder.Append(claim?.Value);
                 }
             }
             catch (ObjectDisposedException ex)
@@ -73,3 +79,5 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
         }
     }
 }
+
+#endif
diff --git a/...sts/AspNetUserClaimLayoutRendererTests.cs → ...ers/AspNetUserClaimLayoutRendererTests.cs b/...sts/AspNetUserClaimLayoutRendererTests.cs → ...ers/AspNetUserClaimLayoutRendererTests.cs
@@ -1,6 +1,10 @@
-using System.Security.Principal;
+#if ASP_NET_CORE || NET46_OR_GREATER
+
+using System.Security.Principal;
+#if ASP_NET_CORE
 using Microsoft.Extensions.Primitives;
 using HttpContextBase = Microsoft.AspNetCore.Http.HttpContext;
+#endif
 using NLog.Web.LayoutRenderers;
 using NSubstitute;
 using Xunit;
@@ -64,3 +68,5 @@ public void UserClaimTypeNameRendersValue()
         }
     }
 }
+
+#endif