Replace NLog methods that are now obsoletes (#13824)

OrchardCMS · Jun 8, 2023 · d0f9707 · d0f9707
1 parent efc8121
commit d0f9707
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 33 deletions.
diff --git a/src/OrchardCore/OrchardCore.Logging.NLog/HostBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Logging.NLog/HostBuilderExtensions.cs
@@ -1,7 +1,5 @@
-using System.IO;
 using Microsoft.Extensions.Hosting;
 using NLog;
-using NLog.LayoutRenderers;
 using NLog.Web;
 
 namespace OrchardCore.Logging;
@@ -10,15 +8,15 @@ public static class HostBuilderExtensions
 {
     public static IHostBuilder UseNLogHost(this IHostBuilder builder)
     {
-        LayoutRenderer.Register<TenantLayoutRenderer>(TenantLayoutRenderer.LayoutRendererName);
-        builder.UseNLog();
-        builder.ConfigureAppConfiguration((context, _) =>
-        {
-            var environment = context.HostingEnvironment;
-            environment.ConfigureNLog($"{environment.ContentRootPath}{Path.DirectorySeparatorChar}NLog.config");
-            LogManager.Configuration.Variables["configDir"] = environment.ContentRootPath;
-        });
+        LogManager.Setup().SetupExtensions(ext =>
+            ext.RegisterLayoutRenderer<TenantLayoutRenderer>(TenantLayoutRenderer.LayoutRendererName));
 
-        return builder;
+        return builder
+            .UseNLog()
+            .ConfigureAppConfiguration((context, _) =>
+            {
+                var environment = context.HostingEnvironment;
+                LogManager.Configuration.Variables["configDir"] = environment.ContentRootPath;
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Logging.NLog/WebHostBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Logging.NLog/WebHostBuilderExtensions.cs
@@ -1,40 +1,44 @@
 using System.IO;
-using System.Reflection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using NLog;
 using NLog.Config;
-using NLog.LayoutRenderers;
 using NLog.Web;
 
-namespace OrchardCore.Logging
+namespace OrchardCore.Logging;
+
+public static class WebHostBuilderExtensions
 {
-    public static class WebHostBuilderExtensions
+    public static IWebHostBuilder UseNLogWeb(this IWebHostBuilder builder)
     {
-        public static IWebHostBuilder UseNLogWeb(this IWebHostBuilder builder)
-        {
-            LayoutRenderer.Register<TenantLayoutRenderer>(TenantLayoutRenderer.LayoutRendererName);
-            builder.UseNLog();
-            builder.ConfigureAppConfiguration((context, _) =>
+        LogManager.Setup().SetupExtensions(ext =>
+            ext.RegisterLayoutRenderer<TenantLayoutRenderer>(TenantLayoutRenderer.LayoutRendererName));
+
+        return builder
+            .UseNLog()
+            .ConfigureAppConfiguration((context, _) =>
             {
                 var environment = context.HostingEnvironment;
-                environment.ConfigureNLog($"{environment.ContentRootPath}{Path.DirectorySeparatorChar}NLog.config");
                 LogManager.Configuration.Variables["configDir"] = environment.ContentRootPath;
             });
-
-            return builder;
-        }
     }
+}
 
-    internal static class AspNetExtensions
+internal static class AspNetExtensions
+{
+    public static LoggingConfiguration ConfigureNLog(this IHostEnvironment env, string configFileRelativePath)
     {
-        public static LoggingConfiguration ConfigureNLog(this IHostEnvironment env, string configFileRelativePath)
-        {
-            ConfigurationItemFactory.Default.RegisterItemsFromAssembly(typeof(AspNetExtensions).GetTypeInfo().Assembly);
-            LogManager.AddHiddenAssembly(typeof(AspNetExtensions).GetTypeInfo().Assembly);
-            var fileName = Path.Combine(env.ContentRootPath, configFileRelativePath);
-            LogManager.LoadConfiguration(fileName);
-            return LogManager.Configuration;
-        }
+        var fileName = Path.Combine(env.ContentRootPath, configFileRelativePath);
+
+        LogManager.Setup()
+            .SetupLogFactory(factory => factory.AddCallSiteHiddenAssembly(typeof(AspNetExtensions).GetType().Assembly))
+            .SetupExtensions(ext =>
+            {
+                ext.RegisterLayoutRenderer<TenantLayoutRenderer>(TenantLayoutRenderer.LayoutRendererName);
+                ext.RegisterNLogWeb();
+            })
+            .LoadConfigurationFromFile(fileName);
+
+        return LogManager.Configuration;
     }
 }