diff --git a/testapps/ApplicationWithConfigureMvc/Startup.cs b/testapps/ApplicationWithConfigureMvc/Startup.cs
index bad4439448146c0297c91cae031f34c1bcb70d05..9c44e7a17dc9d227cf62b8d4a4df7b669ec6b40e 100644
--- a/testapps/ApplicationWithConfigureMvc/Startup.cs
+++ b/testapps/ApplicationWithConfigureMvc/Startup.cs
@@ -9,6 +9,7 @@ namespace ApplicationWithConfigureStartup
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             var builder = services.AddMvc();
             ConfigureMvc(builder);
@@ -16,7 +17,6 @@ namespace ApplicationWithConfigureStartup
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
diff --git a/testapps/ApplicationWithCustomInputFiles/Startup.cs b/testapps/ApplicationWithCustomInputFiles/Startup.cs
index d42b8dfad9057ac81536003a269f4c6cd73c3612..203395ded92738ea569b7953a655abde4d4678ce 100644
--- a/testapps/ApplicationWithCustomInputFiles/Startup.cs
+++ b/testapps/ApplicationWithCustomInputFiles/Startup.cs
@@ -8,13 +8,13 @@ namespace ApplicationWithCustomInputFiles
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
diff --git a/testapps/ApplicationWithParseErrors/Startup.cs b/testapps/ApplicationWithParseErrors/Startup.cs
index b573e39a8c814d9943870e24df38f1079076b67b..8e2df21cc86230792f9f4e10e581390cc4aa039a 100644
--- a/testapps/ApplicationWithParseErrors/Startup.cs
+++ b/testapps/ApplicationWithParseErrors/Startup.cs
@@ -8,12 +8,12 @@ namespace ApplicationWithParseErrors
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }
diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs b/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs
index 4b06309f6dc747e1e6be56a40fdd049ac913c7d3..c7068b7faa15218ddf451f274476fd5def5ee707 100644
--- a/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs
+++ b/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs
@@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkNeitherUsed
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }
diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs b/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs
index 16c835e52da5cd2e154c0b95dcc2010ccd0a160d..d168b9394c68583e0ed2dc0f0269abb630fe0177 100644
--- a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs
+++ b/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs
@@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkPrecompilationUsed
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }
diff --git a/testapps/ApplicationWithRazorSdkUsed/Startup.cs b/testapps/ApplicationWithRazorSdkUsed/Startup.cs
index 8c6e88ed124822fcd4ce99b0e9258dd90fd620fd..49a97f8e40bd9efe743cc8cece29cd8c42672195 100644
--- a/testapps/ApplicationWithRazorSdkUsed/Startup.cs
+++ b/testapps/ApplicationWithRazorSdkUsed/Startup.cs
@@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkUsed
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }
diff --git a/testapps/ApplicationWithTagHelpers/Startup.cs b/testapps/ApplicationWithTagHelpers/Startup.cs
index 00a0fb6df939d2934205b885ac3f8bc67af5a2e5..48babe25f2ea1fdbc129b868bec8691c4f2e7d25 100644
--- a/testapps/ApplicationWithTagHelpers/Startup.cs
+++ b/testapps/ApplicationWithTagHelpers/Startup.cs
@@ -8,13 +8,13 @@ namespace ApplicationWithTagHelpers
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
diff --git a/testapps/PublishWithEmbedViewSources/Startup.cs b/testapps/PublishWithEmbedViewSources/Startup.cs
index c1e951b5949023366cda29016caa21d4e48cbc52..d7dee03fffe4113ab8d5051f0d765a8682fb3f41 100644
--- a/testapps/PublishWithEmbedViewSources/Startup.cs
+++ b/testapps/PublishWithEmbedViewSources/Startup.cs
@@ -8,13 +8,13 @@ namespace PublishWithEmbedViewSources
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
diff --git a/testapps/RazorPagesApp/Startup.cs b/testapps/RazorPagesApp/Startup.cs
index 33964de1da13c02d1991aad1aa445f29802106a2..c90ccba90619904de3669bf92992ba7a60039341 100644
--- a/testapps/RazorPagesApp/Startup.cs
+++ b/testapps/RazorPagesApp/Startup.cs
@@ -10,6 +10,7 @@ namespace RazorPagesApp
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             var builder = services.AddMvc();
             services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => options.LoginPath = "/Login");
             ConfigureMvc(builder);
@@ -17,7 +18,6 @@ namespace RazorPagesApp
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseAuthentication();
             app.UseMvc();
         }
diff --git a/testapps/SimpleApp/Startup.cs b/testapps/SimpleApp/Startup.cs
index 461873a890920fa40d10877d351bc8cd3a227011..abf9ec6423aa447d82a1bdc8eff6c7fca2d4744c 100644
--- a/testapps/SimpleApp/Startup.cs
+++ b/testapps/SimpleApp/Startup.cs
@@ -8,13 +8,13 @@ namespace SimpleApp
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
diff --git a/testapps/SimpleAppWithAssemblyRename/Startup.cs b/testapps/SimpleAppWithAssemblyRename/Startup.cs
index fa29d5b735a28d374efee1914dcd0e3c80f1d1ea..4492a3912b1322868d06bbe572fa848e304c9527 100644
--- a/testapps/SimpleAppWithAssemblyRename/Startup.cs
+++ b/testapps/SimpleAppWithAssemblyRename/Startup.cs
@@ -8,13 +8,13 @@ namespace SimpleAppWithAssemblyRename
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvcWithDefaultRoute();
         }
     }
diff --git a/testapps/StrongNamedApp/Startup.cs b/testapps/StrongNamedApp/Startup.cs
index a75f45084653e9f2b049e237618efee18446133f..f5dc4b4640d5fcfaeaba9286d06c8929f38a97e8 100644
--- a/testapps/StrongNamedApp/Startup.cs
+++ b/testapps/StrongNamedApp/Startup.cs
@@ -8,13 +8,13 @@ namespace StrongNamedApp
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
             // Add framework services.
             services.AddMvc();
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole();
             app.UseMvc(routes =>
             {
                 routes.MapRoute(