Merge branch 'rel/2.0.0-preview1' into dev

src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs

@@ -334,7 +334,7 @@ namespace Microsoft.AspNetCore.Hosting
             _context.Configuration = configuration;
 
             // The configured ILoggerFactory is added as a singleton here. AddLogging below will not add an additional one.
-            var loggerFactory = _createLoggerFactoryDelegate?.Invoke(_context) ?? new LoggerFactory(configuration.GetSection("Logging"));
+            var loggerFactory = _createLoggerFactoryDelegate?.Invoke(_context) ?? new LoggerFactory();
             services.AddSingleton(loggerFactory);
             _context.LoggerFactory = loggerFactory;
 

test/Microsoft.AspNetCore.Hosting.TestSites/Program.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 
 namespace ServerComparison.TestSites
 {
@@ -21,6 +22,11 @@ namespace ServerComparison.TestSites
             var builder = new WebHostBuilder()
                 .UseServer(new NoopServer())
                 .UseConfiguration(config)
+                .ConfigureLogging((_, factory) =>
+                {
+                    factory.AddConsole();
+                    factory.AddFilter("Console", level => level >= LogLevel.Warning);
+                })
                 .UseStartup("Microsoft.AspNetCore.Hosting.TestSites");
 
             var host = builder.Build();

test/Microsoft.AspNetCore.Hosting.TestSites/StartupShutdown.cs

@@ -25,9 +25,6 @@ namespace Microsoft.AspNetCore.Hosting.TestSites
                 Console.WriteLine("Stopped end");
             });
 
-
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
-
             app.Run(context =>
             {
                 return context.Response.WriteAsync("Hello World");

test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs

@@ -992,7 +992,7 @@ namespace Microsoft.AspNetCore.Hosting
         {
             var provider = new TestLoggerProvider();
             var builder = CreateWebHostBuilder()
-                .ConfigureLogging(factory =>
+                .ConfigureLogging((_, factory) =>
                 {
                     factory.AddProvider(provider);
                 })
@@ -1104,7 +1104,7 @@ namespace Microsoft.AspNetCore.Hosting
                        .UseSetting("testhostingstartup_chain", builder.GetSetting("testhostingstartup_chain") + "0")
                        .ConfigureServices(services => services.AddSingleton<ServiceA>())
                        .ConfigureServices(services => services.AddSingleton<ITestSink>(loggerProvider.Sink))
-                       .ConfigureLogging(lf => lf.AddProvider(loggerProvider))
+                       .ConfigureLogging((_, lf) => lf.AddProvider(loggerProvider))
                        .ConfigureAppConfiguration((context, configurationBuilder) => configurationBuilder.AddInMemoryCollection(
                            new []
                            {

test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs

@@ -815,10 +815,13 @@ namespace Microsoft.AspNetCore.Hosting
         {
             var builder = CreateBuilder()
                 .UseFakeServer()
+                .ConfigureLogging((_, factory) =>
+                {
+                    factory.AddProvider(new AllMessagesAreNeeded());
+                })
                 .Configure(
                     appBuilder =>
                     {
-                        appBuilder.ApplicationServices.GetRequiredService<ILoggerFactory>().AddProvider(new AllMessagesAreNeeded());
                         appBuilder.Run(requestDelegate);
                     });
             return builder.Build();