From 3c358e90283d509c42d21434c0324e4f0cceee27 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Sat, 22 Apr 2017 22:17:28 -0700
Subject: [PATCH] Replace ConfigureLogging(Action<ILoggerFactory>) with
 ConfigureLogging(Action<LoggerFactory>) extension

---
 .../IWebHostBuilder.cs                           |  7 -------
 .../breakingchanges.netcore.json                 |  5 +++++
 .../WebHostBuilder.cs                            | 16 ----------------
 .../WebHostBuilderExtensions.cs                  | 11 +++++++++++
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs
index ae5dd39745..f380488cf5 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs
@@ -29,13 +29,6 @@ namespace Microsoft.AspNetCore.Hosting
         /// </remarks>
         IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate);
 
-        /// <summary>
-        /// Adds a delegate for configuring the provided <see cref="ILoggerFactory"/>. This may be called multiple times.
-        /// </summary>
-        /// <param name="configureLogging">The delegate that configures the <see cref="ILoggerFactory"/>.</param>
-        /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
-        IWebHostBuilder ConfigureLogging(Action<ILoggerFactory> configureLogging);
-
         /// <summary>
         /// Adds a delegate for configuring the provided <see cref="ILoggerFactory"/>. This may be called multiple times.
         /// </summary>
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Hosting.Abstractions/breakingchanges.netcore.json
index 98f79f9f67..4df8dcfa04 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/breakingchanges.netcore.json
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/breakingchanges.netcore.json
@@ -33,5 +33,10 @@
     "TypeId": "public interface Microsoft.AspNetCore.Hosting.IWebHost : System.IDisposable",
     "MemberId": "System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken)",
     "Kind": "Addition"
+  },
+  {
+    "TypeId": "public interface Microsoft.AspNetCore.Hosting.IWebHostBuilder",
+    "MemberId": "Microsoft.AspNetCore.Hosting.IWebHostBuilder ConfigureLogging(System.Action<Microsoft.Extensions.Logging.ILoggerFactory> configureLogging)",
+    "Kind": "Removal"
   }
 ]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
index 368fdc9d7c..93f09b6c5b 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
@@ -157,22 +157,6 @@ namespace Microsoft.AspNetCore.Hosting
             return this;
         }
 
-        /// <summary>
-        /// Adds a delegate for configuring the provided <see cref="ILoggerFactory"/>. This may be called multiple times.
-        /// </summary>
-        /// <param name="configureLogging">The delegate that configures the <see cref="ILoggerFactory"/>.</param>
-        /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
-        public IWebHostBuilder ConfigureLogging(Action<ILoggerFactory> configureLogging)
-        {
-            if (configureLogging == null)
-            {
-                throw new ArgumentNullException(nameof(configureLogging));
-            }
-
-            _configureLoggingDelegates.Add((_, factory) => configureLogging(factory));
-            return this;
-        }
-
         /// <summary>
         /// Adds a delegate for configuring the provided <see cref="ILoggerFactory"/>. This may be called multiple times.
         /// </summary>
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
index fa857c897e..f425d59269 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
@@ -107,6 +107,17 @@ namespace Microsoft.AspNetCore.Hosting
             });
         }
 
+        /// <summary>
+        /// Adds a delegate for configuring the provided <see cref="ILoggerFactory"/>. This may be called multiple times.
+        /// </summary>
+        /// <param name="hostBuilder">The <see cref="IWebHostBuilder" /> to configure.</param>
+        /// <param name="configureLogging">The delegate that configures the <see cref="ILoggerFactory"/>.</param>
+        /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
+        public static IWebHostBuilder ConfigureLogging(this IWebHostBuilder hostBuilder, Action<LoggerFactory> configureLogging)
+        {
+            return hostBuilder.ConfigureLogging<LoggerFactory>((_, loggerFactory) => configureLogging(loggerFactory));
+        }
+
         /// <summary>
         /// Adds a delegate for configuring the provided <see cref="ILoggerFactory"/>. This may be called multiple times.
         /// </summary>