Upgrade to ASP.NET Core, including sessionId

NLog · May 23, 2016 · e8c50d0 · e8c50d0
1 parent 5206477
commit e8c50d0
Show file tree

Hide file tree

Showing 25 changed files with 90 additions and 402 deletions.
diff --git a/.gitignore b/.gitignore
@@ -181,3 +181,6 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
+
+#VS folder
+.vs
diff --git a/.vs/restore.dg b/.vs/restore.dg
@@ -1 +1 @@
-#:X:\Github-nlog-production\NLog.Web\NLog.Web.AspNet.Core\NLog.Web.AspNet.Core.xproj
+#:X:\Github-nlog-production\NLog.Web\NLog.Web.AspNetCore\NLog.Web.AspNetCore.xproj
diff --git a/NLog.Web.AspNetCore/DefaultHttpContextAccessor.cs b/NLog.Web.AspNetCore/DefaultHttpContextAccessor.cs
@@ -1,16 +1,14 @@
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web;
 #else
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
 
 #endif
 
 
 
 namespace NLog.Web
 {
-#if !DNX
+#if !NETSTANDARD_1plus
     /// <summary>
     /// Provides the HttpContext associated with the current request.
     /// </summary>

diff --git a/NLog.Web.AspNetCore/IHttpContextAccessor.cs b/NLog.Web.AspNetCore/IHttpContextAccessor.cs
@@ -1,4 +1,4 @@
-#if !DNX
+#if !NETSTANDARD_1plus
 
 using System;
 using System.Web;

diff --git a/NLog.Web.AspNetCore/Internal/PropertyReader.cs b/NLog.Web.AspNetCore/Internal/PropertyReader.cs
@@ -43,7 +43,7 @@ public static object GetValue(string key, Func<string, object> getVal, bool eval
 
         private static PropertyInfo GetPropertyInfo(object value, string propertyName)
         {
-#if !DNX
+#if !NETSTANDARD_1plus
             return value.GetType().GetProperty(propertyName);
 #else
             return value.GetType().GetTypeInfo().GetDeclaredProperty(propertyName);

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetApplicationValueLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetApplicationValueLayoutRenderer.cs
@@ -1,4 +1,4 @@
-#if !DNX
+#if !NETSTANDARD_1plus
 
 using System;
 using System.Globalization;

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetItemValueLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetItemValueLayoutRenderer.cs
@@ -2,11 +2,9 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web;
 #else
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
 #endif
 using NLog.Config;
 using NLog.LayoutRenderers;

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetLayoutRendererBase.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetLayoutRendererBase.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Text;
 using NLog.LayoutRenderers;
-#if DNX
+#if NETSTANDARD_1plus
 using NLog.Web.Internal;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 #endif
 
@@ -20,13 +19,13 @@ public abstract class AspNetLayoutRendererBase : LayoutRenderer
         /// </summary>
         protected AspNetLayoutRendererBase()
         {
-#if !DNX
+#if !NETSTANDARD_1plus
             HttpContextAccessor = new DefaultHttpContextAccessor();
 #endif
         }
 
 
-#if DNX
+#if NETSTANDARD_1plus
 
         /// <summary>
         /// Context for DI

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestValueLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestValueLayoutRenderer.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Text;
+#if !NETSTANDARD_1plus
 using NLog.Common;
-#if !DNX
 using System.Web;
 #else
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 #endif
 using NLog.Config;
 using NLog.LayoutRenderers;
@@ -85,7 +84,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
 
             if (this.QueryString != null)
             {
-#if !DNX
+#if !NETSTANDARD_1plus
                 builder.Append(httpRequest.QueryString[this.QueryString]);
 #else
                 builder.Append(httpRequest.Query[this.QueryString]);
@@ -97,7 +96,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             }
             else if (this.Cookie != null)
             {
-#if !DNX
+#if !NETSTANDARD_1plus
                 var cookie = httpRequest.Cookies[this.Cookie];
 
                 if (cookie != null)
@@ -112,7 +111,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             }
             else if (this.ServerVariable != null)
             {
-#if !DNX
+#if !NETSTANDARD_1plus
                 builder.Append(httpRequest.ServerVariables[this.ServerVariable]);
 #else
 
@@ -130,7 +129,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             }
             else if (this.Item != null)
             {
-#if !DNX
+#if !NETSTANDARD_1plus
                 builder.Append(httpRequest[this.Item]);
 #else
                 builder.Append(httpRequest.HttpContext.Items[this.Item]);
@@ -141,7 +140,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
 
     internal static class RequestAccessor
     {
-#if !DNX
+#if !NETSTANDARD_1plus
         internal static HttpRequestBase TryGetRequest(this HttpContextBase context)
         {
             try

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionIDLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionIDLayoutRenderer.cs
@@ -1,13 +1,11 @@
 using System.Text;
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web;
 #else
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+
 #endif
 using NLog.LayoutRenderers;
 
-#if !DNX
 namespace NLog.Web.LayoutRenderers
 {
     /// <summary>
@@ -16,14 +14,6 @@ namespace NLog.Web.LayoutRenderers
     [LayoutRenderer("aspnet-sessionid")]
     public class AspNetSessionIDLayoutRenderer : AspNetLayoutRendererBase
     {
-#if DNX
-        /// <summary>
-        /// Initializes the <see cref="AspNetSessionIDLayoutRenderer"/> with the <see cref="IHttpContextAccessor"/>.
-        /// </summary>
-        public AspNetSessionIDLayoutRenderer(IHttpContextAccessor accessor) : base(accessor)
-        {
-        }
-#endif
         /// <summary>
         /// Renders the ASP.NET Session ID appends it to the specified <see cref="StringBuilder" />.
         /// </summary>
@@ -37,9 +27,11 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             {
                 return;
             }
-
+#if !NETSTANDARD_1plus
             builder.Append(context.Session.SessionID);
+#else
+            builder.Append(context.Session.Id);
+#endif
         }
     }
 }
-#endif
diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs
@@ -2,13 +2,12 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using NLog.Common;
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web;
 #else
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http;
 #endif
 using NLog.Config;
 using NLog.LayoutRenderers;
@@ -76,7 +75,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             {
                 return;
             }
-#if !DNX
+#if !NETSTANDARD_1plus
             var value = PropertyReader.GetValue(Variable, k => context.Session[k], EvaluateAsNestedProperties);
 #else
             if (context.Items == null)
@@ -96,7 +95,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
                 //prevent stackoverflow
                 return;
             }
-            
+
             context.Items[NLogRetrievingSessionValue] = true;
             object value;
             try
@@ -105,8 +104,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             }
             catch (Exception ex)
             {
-                //TODO change this call for NLog 4.3
-                InternalLogger.Warn("Retrieving session value failed. "  + ex);
+                InternalLogger.Warn(ex, "Retrieving session value failed. ");
                 return;
             }
             finally

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetUserAuthTypeLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetUserAuthTypeLayoutRenderer.cs
@@ -1,9 +1,7 @@
 using System.Text;
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web;
 #else
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
 #endif
 using NLog.LayoutRenderers;
 

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetUserIdentityLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetUserIdentityLayoutRenderer.cs
@@ -1,9 +1,7 @@
 using System.Text;
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web;
 #else
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
 #endif
 using NLog.LayoutRenderers;
 

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/IISInstanceNameLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/IISInstanceNameLayoutRenderer.cs
@@ -1,26 +1,30 @@
 using System;
 using System.Text;
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web.Hosting;
 #else
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 #endif
 using NLog.LayoutRenderers;
 using NLog.Web.Internal;
 
 namespace NLog.Web.LayoutRenderers
 {
+
+#if NETSTANDARD_1plus
+    /// <summary>
+    /// Rendering site name in IIS. <see cref="IHostingEnvironment"/>
+    /// </summary>
+#else
     /// <summary>
-    /// IIS site name - printing <see cref="HostingEnvironment.SiteName"/>
+    /// Rendering site name in IIS. <see cref="HostingEnvironment.SiteName"/>
     /// </summary>
+ #endif
     [LayoutRenderer("iis-site-name")]
     // ReSharper disable once InconsistentNaming
     public class IISInstanceNameLayoutRenderer : LayoutRenderer
     {
-
-
         /// <summary>
         /// Append to target
         /// </summary>
@@ -30,7 +34,7 @@ protected override void Append(StringBuilder builder, LogEventInfo logEvent)
         {
 
 
-#if DNX
+#if NETSTANDARD_1plus
             var env = ServiceLocator.ServiceProvider?.GetService<IHostingEnvironment>();
             builder.Append(env?.EnvironmentName);
 

diff --git a/NLog.Web.AspNetCore/NLogHttpModule.cs b/NLog.Web.AspNetCore/NLogHttpModule.cs
@@ -1,4 +1,4 @@
-#if !DNX
+#if !NETSTANDARD_1plus
 using System;
 using System.Web;
 

diff --git a/NLog.Web.AspNetCore/Targets/AspNetTrace.cs b/NLog.Web.AspNetCore/Targets/AspNetTrace.cs
@@ -1,5 +1,5 @@
 
-#if !DNX
+#if !NETSTANDARD_1plus
 using System.Web;
 using NLog.Targets;
 

diff --git a/NLog.Web.AspNetCore/Targets/Wrappers/AspNetBufferingTargetWrapper.cs b/NLog.Web.AspNetCore/Targets/Wrappers/AspNetBufferingTargetWrapper.cs
@@ -1,4 +1,4 @@
-#if !DNX
+#if !NETSTANDARD_1plus
 using System;
 using System.ComponentModel;
 using System.Web;

diff --git a/NLog.Web.AspNetCore/project.json b/NLog.Web.AspNetCore/project.json
@@ -21,16 +21,18 @@
     "frameworks": {
 
         "netstandard1.3": {
-            "buildOptions": { "define": [ "DOTNET5_4", "DNX451", "DNX" ] },
+            "buildOptions": { "define": [ "NETSTANDARD_1plus" ] },
             "dependencies": {
-                "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-final",
+                "Microsoft.AspNetCore.Http.Extensions": "1.0.0-rc2-final",
+                "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-rc2-final",
                 "NLog": "4.4.0-beta8"
             }
         }
 
 
     },
     "buildOptions": {
-        "keyFile": "NLog.snk"
+        "keyFile": "NLog.snk",
+        "xmlDoc": true
     }
 }