From c8788799962c556966c9ea81a34673ffbed5f1b9 Mon Sep 17 00:00:00 2001
From: Rolf Kristensen <sweaty1@hotmail.com>
Date: Sun, 12 Jun 2022 19:54:24 +0200
Subject: [PATCH] Added AddNLog-extension-method with custom options and
 serviceprovider-functor

---
 .../Extensions/ConfigureExtensions.cs         | 29 ++++++++++++++++---
 .../Logging/NLogProviderOptions.cs            |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs b/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs
index 4679d06f..27a37150 100644
--- a/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs
+++ b/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs
@@ -34,7 +34,7 @@ public static ILoggerFactory AddNLog(this ILoggerFactory factory)
         /// Enable NLog as logging provider for Microsoft Extension Logging
         /// </summary>
         /// <param name="factory"></param>
-        /// <param name="options">NLog options</param>
+        /// <param name="options">NLog Logging Provider options</param>
         /// <returns>ILoggerFactory for chaining</returns>
 #if !NETCORE1_0
         [Obsolete("Instead use ILoggingBuilder.AddNLog() or IHostBuilder.UseNLog()")]
@@ -89,7 +89,7 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfigurati
         /// </summary>
         /// <param name="factory"></param>
         /// <param name="configuration">Configuration</param>
-        /// <param name="options">NLog options</param>
+        /// <param name="options">NLog Logging Provider options</param>
         /// <returns>ILoggingBuilder for chaining</returns>
         public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfiguration configuration, NLogProviderOptions options)
         {
@@ -101,7 +101,7 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfigurati
         /// Enable NLog as logging provider for Microsoft Extension Logging
         /// </summary>
         /// <param name="factory"></param>
-        /// <param name="options">NLog options</param>
+        /// <param name="options">NLog Logging Provider options</param>
         /// <returns>ILoggingBuilder for chaining</returns>
         public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, NLogProviderOptions options)
         {
@@ -125,7 +125,7 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, LoggingConfi
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="configuration">New NLog config.</param>
-        /// <param name="options">NLog options</param>
+        /// <param name="options">NLog Logging Provider options</param>
         /// <returns>ILoggingBuilder for chaining</returns>
         public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, LoggingConfiguration configuration, NLogProviderOptions options)
         {
@@ -158,6 +158,27 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, string confi
             return builder;
         }
 
+        /// <summary>
+        /// Enable NLog as logging provider for Microsoft Extension Logging
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options">NLog Logging Provider options</param>
+        /// <param name="factoryBuilder">Initialize NLog LogFactory with NLog LoggingConfiguration.</param>
+        /// <returns>ILoggingBuilder for chaining</returns>
+        public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, NLogProviderOptions options, Func<IServiceProvider, LogFactory> factoryBuilder)
+        {
+            AddNLogLoggerProvider(builder, null, options, (serviceProvider, config, options) =>
+            {
+                serviceProvider.SetupNLogConfigSettings(config);
+
+                // Delay initialization of targets until we have loaded config-settings
+                var logFactory = factoryBuilder(serviceProvider);
+                var provider = CreateNLogLoggerProvider(serviceProvider, config, options, logFactory);
+                return provider;
+            });
+            return builder;
+        }
+
         /// <summary>
         /// Enable NLog as logging provider for Microsoft Extension Logging
         /// </summary>
diff --git a/src/NLog.Extensions.Logging/Logging/NLogProviderOptions.cs b/src/NLog.Extensions.Logging/Logging/NLogProviderOptions.cs
index d2069ddd..704677e3 100644
--- a/src/NLog.Extensions.Logging/Logging/NLogProviderOptions.cs
+++ b/src/NLog.Extensions.Logging/Logging/NLogProviderOptions.cs
@@ -3,7 +3,7 @@
 namespace NLog.Extensions.Logging
 {
     /// <summary>
-    /// Options for logging to NLog with 
+    /// Configuration options for the NLog Logging Provider with Microsoft Extension Logging
     /// </summary>
     public class NLogProviderOptions
     {