Add UseNLog for ASP.NET Core 2

NLog.Web.AspNetCore.Tests/AspNetCoreTests.cs

@@ -0,0 +1,72 @@
+#if NETCOREAPP2_0
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Castle.Core.Logging;
+using Xunit;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NLog.Config;
+using NLog.Targets;
+using NLog.Web.Tests.LayoutRenderers;
+
+
+namespace NLog.Web.AspNetCore.Tests
+{
+    public class AspNetCoreTests : TestBase, IDisposable
+    {
+        #region IDisposable
+
+        /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
+        public void Dispose()
+        {
+            LogManager.Configuration = null;
+        }
+
+        #endregion
+
+        [Fact]
+        public void UseNLogShouldLogTest()
+        {
+            var webhost =
+                Microsoft.AspNetCore.WebHost.CreateDefaultBuilder()
+                .Configure(c => c.New()) //.New needed, otherwise:
+                                         // Unhandled Exception: System.ArgumentException: A valid non-empty application name must be provided.
+                                         // Parameter name: applicationName
+                    .UseNLog() //use NLog for ILoggers and pass httpcontext
+                    .Build();
+
+
+            var loggerFact = webhost.Services.GetService<Microsoft.Extensions.Logging.ILoggerFactory>();
+
+            Assert.NotNull(loggerFact);
+
+            var configuration = new LoggingConfiguration();
+            var target = new MemoryTarget("target1");
+            target.Layout = "${logger}|${message}";
+
+            configuration.AddRuleForAllLevels(target);
+
+            LogManager.Configuration = configuration;
+
+            var logger = loggerFact.CreateLogger("logger1");
+
+            logger.LogError("error1");
+
+            var logged = target.Logs;
+
+            Assert.Single(logged);
+            Assert.Equal("logger1|error1", logged.First());
+
+
+        }
+
+    }
+}
+
+#endif

NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj

@@ -1,17 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net461</TargetFrameworks>
     <DefineConstants>$(DefineConstants);ASP_NET_CORE</DefineConstants>
     <AssemblyName>NLog.Web.AspNetCore.Tests</AssemblyName>
     <AssemblyVersion>1.2.3.0</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\NLog.Web.AspNetCore\NLog.Web.AspNetCore.csproj" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
+    <PackageReference Include="Castle.Core" Version="4.2.0" />
+    <!-- Castle.Core upgrade for  NSubstitute-->
+
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-*" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-*" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-*" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+      <!--
+    icrosoft.NET.Test.Sdk needed for xunit.runner.visualstudio
+    -->
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0' ">
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
@@ -20,10 +27,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="1.1.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

NLog.Web.AspNetCore/AspNetExtensions.cs

@@ -3,12 +3,17 @@
 using System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+
 using Microsoft.Extensions.Logging;
 using NLog.Config;
 using NLog.Web.Internal;
 using NLog.Extensions.Logging;
 
 
+#if NETSTANDARD2_0
+using Microsoft.Extensions.DependencyInjection;
+#endif
+
 namespace NLog.Web
 {
     /// <summary>
@@ -22,7 +27,9 @@ public static class AspNetExtensions
         /// Enable NLog Web for ASP.NET Core.
         /// </summary>
         /// <param name="app"></param>
-
+#if NETSTANDARD2_0
+        [Obsolete("Use UseNLog() on IWebHostBuilder")]
+#endif
         public static void AddNLogWeb(this IApplicationBuilder app)
         {
             ServiceLocator.ServiceProvider = app.ApplicationServices;
@@ -53,5 +60,39 @@ private static LoggingConfiguration ConfigureNLog(string fileName)
         }
 
 
+#if NETSTANDARD2_0
+
+
+        /// <summary>
+        /// Use NLog for Dependency Injected loggers. 
+        /// </summary>
+        public static IWebHostBuilder UseNLog(this IWebHostBuilder builder)
+        {
+            return UseNLog(builder, null);
+        }
+
+        /// <summary>
+        /// Use NLog for Dependency Injected loggers. 
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options">Options for logging to NLog with Dependency Injected loggers</param>
+        /// <returns></returns>
+        public static IWebHostBuilder UseNLog(this IWebHostBuilder builder, NLogProviderOptions options)
+        {
+            if (builder == null) throw new ArgumentNullException(nameof(builder));
+            builder.ConfigureServices(services =>
+                services.AddSingleton<ILoggerFactory>(serviceProvider =>
+                {
+                    ServiceLocator.ServiceProvider = serviceProvider;
+                    ServiceLocator.Services = services;
+
+                    return new NLogLoggerFactory();
+                })
+            );
+            return builder;
+        }
+#endif
+
+
     }
 }

NLog.Web.AspNetCore/Internal/ServiceLocator.cs

@@ -1,18 +1,26 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace NLog.Web.Internal
 {
     /// <summary>
     /// Service provider
     /// </summary>
+    /// <remarks>
+    /// This is a anti-pattern, but it works well with NLog
+    /// </remarks>
     internal static class ServiceLocator
     {
         /// <summary>
-        /// The current service provider for reading ASP.NET 5 session, request etc.
+        /// The current service provider for reading ASP.NET Core session, request etc.
         /// </summary>
-        /// <remarks>This is a anti-pattern, but for now there is not other solution to fix this.</remarks>
         public static IServiceProvider ServiceProvider { get; set; }
+
+        /// <summary>
+        /// Registering needed services
+        /// </summary>
+        public static IServiceCollection Services { get; set; }
     }
 }

NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj

@@ -35,7 +35,7 @@
 
 
 
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-beta6" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-beta7" />
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>