update with NLogBuilder

NLog · Oct 10, 2017 · eb5a1e2 · eb5a1e2
1 parent 6f861ea
commit eb5a1e2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj b/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
@@ -56,6 +56,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.0" />
+    <PackageReference Include="NLog" Version="4.5.0-beta04" />
 
   </ItemGroup>
   <ItemGroup>

diff --git a/NLog.Web.AspNetCore/NLogStart.cs → NLog.Web.AspNetCore/NLogBuilder.cs b/NLog.Web.AspNetCore/NLogStart.cs → NLog.Web.AspNetCore/NLogBuilder.cs
@@ -1,19 +1,25 @@
-using System;
+#if NETSTANDARD2_0
+
+
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using NLog.Common;
 using NLog.Config;
 
 namespace NLog.Web
 {
+
+
     /// <summary>
-    /// NLog start helper
+    /// NLog helper for ASP.NET Standard 2
     /// </summary>
-    public static class NLogStart
+    public static class NLogBuilder
     {
 
-        static NLogStart()
+        static NLogBuilder()
         {
+            //do actions before loading config
             try
             {
                 //register yourself, so <extension> isn't needed.
@@ -27,30 +33,25 @@ static NLogStart()
         }
 
         /// <summary>
-        /// Init the NLog
-        /// 
-        /// If this method is used, there is no need for ConfigureNLog
+        /// Configure NLog
         /// </summary>
         /// <param name="fileName">Path to NLog configuration file, e.g. nlog.config. </param>>
-        /// <returns>Logger to start logging</returns>
-        public static Logger InitLogger(string fileName)
+        /// <returns>LogFactory to get loggers, add events etc</returns>
+        public static LogFactory ConfigureNLog(string fileName)
         {
-            var configuration = new XmlLoggingConfiguration(fileName);
-            return InitLogger(configuration);
+            return ConfigureNLog(new XmlLoggingConfiguration(fileName));
         }
 
         /// <summary>
-        /// Init the NLog
-        /// 
-        /// If this method is used, there is no need for ConfigureNLog
+        /// Configure NLog
         /// </summary>
-        /// <param name="configuration">NLog config</param>>
-        /// <returns>Logger to start logging</returns>
-        public static Logger InitLogger(LoggingConfiguration configuration)
+        /// <param name="configuration"></param>
+        /// <returns>LogFactory to get loggers, add events etc</returns>
+        public static LogFactory ConfigureNLog(LoggingConfiguration configuration)
         {
             LogManager.Configuration = configuration;
-            var logger = LogManager.GetCurrentClassLogger();
-            return logger;
+            return LogManager.LogFactory;
         }
     }
 }
+#endif
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs
@@ -18,7 +18,7 @@ public class Program
         public static void Main(string[] args)
         {
             // NLog: setup the logger first to catch all errors
-            var logger = NLogStart.InitLogger("NLog.config");
+            var logger = NLogBuilder.ConfigureNLog("NLog.config").GetCurrentClassLogger();
             try
             {
                 logger.Debug("init main");