Merge branch 'rel/2.0.0-preview1' into dev

samples/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs

@@ -110,10 +110,8 @@ namespace MusicStore
             });
         }
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
-
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
             // Display custom error page in production when error occurs

samples/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs

@@ -159,10 +159,8 @@ namespace MusicStore
 
         }
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
-
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
             // Error page middleware displays a nice formatted HTML page for any unhandled exceptions in the request pipeline.

samples/MusicStore/Program.cs

@@ -3,6 +3,7 @@ using System.IO;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.HttpSys;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 
 namespace MusicStore
 {
@@ -24,11 +25,11 @@ namespace MusicStore
                     options.ValidateScopes = true;
                 });
 
-            if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.HttpSys", System.StringComparison.Ordinal))
+            var environment = builder.GetSetting("environment") ??
-            {
-                var environment = builder.GetSetting("environment") ??
                     Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
 
+            if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.HttpSys", System.StringComparison.Ordinal))
+            {
                 if (string.Equals(environment, "NtlmAuthentication", System.StringComparison.Ordinal))
                 {
                     // Set up NTLM authentication for WebListener like below.
@@ -50,6 +51,15 @@ namespace MusicStore
                 builder.UseKestrel();
             }
 
+            builder.ConfigureLogging(factory =>
+            {
+                factory.AddConsole();
+
+                var logLevel = string.Equals(environment, "Development", StringComparison.Ordinal) ? LogLevel.Information : LogLevel.Warning;
+
+                factory.AddFilter("Console", level => level >= logLevel);
+            });
+
             var host = builder.Build();
 
             host.Run();

samples/MusicStore/Startup.cs

@@ -131,10 +131,8 @@ namespace MusicStore
 
         //This method is invoked when ASPNETCORE_ENVIRONMENT is 'Development' or is not defined
         //The allowed values are Development,Staging and Production
-        public void ConfigureDevelopment(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void ConfigureDevelopment(IApplicationBuilder app)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Information);
-
             // StatusCode pages to gracefully handle status codes 400-599.
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
@@ -149,10 +147,8 @@ namespace MusicStore
 
         //This method is invoked when ASPNETCORE_ENVIRONMENT is 'Staging'
         //The allowed values are Development,Staging and Production
-        public void ConfigureStaging(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void ConfigureStaging(IApplicationBuilder app)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
-
             // StatusCode pages to gracefully handle status codes 400-599.
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
@@ -163,10 +159,8 @@ namespace MusicStore
 
         //This method is invoked when ASPNETCORE_ENVIRONMENT is 'Production'
         //The allowed values are Development,Staging and Production
-        public void ConfigureProduction(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void ConfigureProduction(IApplicationBuilder app)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
-
             // StatusCode pages to gracefully handle status codes 400-599.
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 

samples/MusicStore/StartupNtlmAuthentication.cs

@@ -92,10 +92,8 @@ namespace MusicStore
             });
         }
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
-
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
             // Error page middleware displays a nice formatted HTML page for any unhandled exceptions in the

samples/MusicStore/StartupOpenIdConnect.cs

@@ -111,10 +111,8 @@ namespace MusicStore
             });
         }
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
-
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
             // Display custom error page in production when error occurs