Reacting to new Hosting API

samples/DatabaseErrorPageSample/Startup.cs

@@ -1,9 +1,9 @@
-using System;
-using Microsoft.AspNet.Builder;
-using Microsoft.Data.Entity;
 using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
+using Microsoft.Data.Entity;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DatabaseErrorPageSample
 {
@@ -26,6 +26,16 @@ namespace DatabaseErrorPageSample
                 return Task.FromResult(0);
             });
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 
     public class MyContext : DbContext

samples/DatabaseErrorPageSample/hosting.json

@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}

samples/DatabaseErrorPageSample/project.json

@@ -1,15 +1,15 @@
 {
-  "webroot": "wwwroot",
   "dependencies": {
     "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
     "EntityFramework.MicrosoftSqlServer": "7.0.0-*",
     "EntityFramework.Commands": "7.0.0-*",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
     "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
   },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
   "commands": {
-    "ef": "EntityFramework.Commands",
+    "web": "DatabaseErrorPageSample"
-    "web": "Microsoft.AspNet.Server.Kestrel"
   },
     "frameworks": {
       "dnx451": { },

samples/DeveloperExceptionPageSample/Startup.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 
 namespace DeveloperExceptionPageSample
 {
@@ -17,5 +18,15 @@ namespace DeveloperExceptionPageSample
                     "New Line 3"));
             });
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 }

samples/DeveloperExceptionPageSample/hosting.json

@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}

samples/DeveloperExceptionPageSample/project.json

@@ -1,11 +1,14 @@
 {
-  "webroot" : "wwwroot",
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
-    "Microsoft.AspNet.Server.IIS": "1.0.0-*"
+  },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+  "commands": {
+    "web": "DeveloperExceptionPageSample" 
   },
-  "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
   "frameworks": {
     "dnx451": {},
     "dnxcore50": {}

samples/DeveloperExceptionPageSample/wwwroot/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
+  </system.webServer>
+</configuration>

samples/ElmPageSample/Startup.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -27,5 +28,15 @@ namespace ElmPageSample
 
             app.UseMiddleware<HelloWorldMiddleware>();
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 }

samples/ElmPageSample/hosting.json

@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}

samples/ElmPageSample/project.json

@@ -1,13 +1,14 @@
 {
-    "webroot": "wwwroot",
   "exclude": "wwwroot/**/*.*",
   "dependencies": {
     "Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
+  },
+  "compilationOptions": {
+    "emitEntryPoint": true
   },
   "commands": {
-        "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000"
+    "web": "ElmPageSample"
   },
   "frameworks": {
     "dnx451": { },

samples/ElmPageSample/wwwroot/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
+  </system.webServer>
+</configuration>

samples/ExceptionHandlerSample/Startup.cs

@@ -2,6 +2,7 @@ using System;
 using System.Text.Encodings.Web;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 
@@ -54,5 +55,15 @@ namespace ExceptionHandlerSample
                 await context.Response.WriteAsync("</body></html>\r\n");
             });
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 }

samples/ExceptionHandlerSample/hosting.json

@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}

samples/ExceptionHandlerSample/project.json

@@ -1,14 +1,15 @@
 {
-    "webroot": "wwwroot",
   "exclude": "wwwroot/**/*.*",
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
     "Microsoft.AspNet.StaticFiles": "1.0.0-*"
   },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
   "commands": {
-        "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000"
+    "web": "ExceptionHandlerSample"
   },
   "frameworks": {
     "dnx451": { },

samples/ExceptionHandlerSample/wwwroot/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
+  </system.webServer>
+</configuration>

samples/MiddlewareAnalysisSample/Startup.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DiagnosticAdapter;
@@ -82,6 +83,16 @@ namespace MiddlewareAnaysisSample
             // Note there's always a default 404 middleware at the end of the pipeline.
         }
 
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
+
         public class TestDiagnosticListener
         {
             [DiagnosticName("Microsoft.AspNet.MiddlewareAnalysis.MiddlewareStarting")]

samples/MiddlewareAnalysisSample/hosting.json

@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}

samples/MiddlewareAnalysisSample/project.json

@@ -4,13 +4,14 @@
     "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
     "Microsoft.AspNet.MiddlewareAnalysis": "1.0.0-*",
     "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
     "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel",
+    "web": "MiddlewareAnalysisSample"
-    "weblistener": "Microsoft.AspNet.Server.WebListener"
   },
   "frameworks": {
     "dnx451": { },

samples/MiddlewareAnalysisSample/wwwroot/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
+  </system.webServer>
+</configuration>

samples/RuntimeInfoPageSample/Startup.cs

@@ -1,8 +1,6 @@
-using System;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Diagnostics;
+using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
 
 namespace RuntimeInfoPageSample
 {
@@ -20,5 +18,15 @@ namespace RuntimeInfoPageSample
                 return Task.FromResult(0);
             });
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 }

samples/RuntimeInfoPageSample/hosting.json

@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}

samples/RuntimeInfoPageSample/project.json

@@ -1,9 +1,14 @@
 {
-    "webroot" : "wwwroot",
   "exclude": "wwwroot/**/*.*",
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-*"
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
+  },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+  "commands": {
+    "web": "RuntimeInfoPageSample"
   },
   "frameworks": {
     "dnx451": { },

samples/StatusCodePagesSample/Startup.cs

@@ -8,6 +8,7 @@ using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 
@@ -100,5 +101,15 @@ namespace StatusCodePagesSample
                 await context.Response.WriteAsync(builder.ToString());
             });
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 }

samples/StatusCodePagesSample/hosting.json

@@ -0,0 +1,4 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel",
+  "server.urls": "http://localhost:5001/base"
+}

samples/StatusCodePagesSample/project.json

@@ -1,5 +1,4 @@
 {
-    "webroot": "wwwroot",
   "version": "1.0.0-*",
   "exclude": [
     "wwwroot"
@@ -11,11 +10,13 @@
     "**.user",
     "**.vspscc"
   ],
-    "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001/base" },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+  "commands": { "web": "StatusCodePagesSample" },
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": { },

samples/StatusCodePagesSample/wwwroot/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
+  </system.webServer>
+</configuration>

samples/WelcomePageSample/Startup.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNet;
+using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 
 namespace WelcomePageSample
 {
@@ -9,5 +9,15 @@ namespace WelcomePageSample
         {
             app.UseWelcomePage();
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 }

samples/WelcomePageSample/hosting.json

@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}

samples/WelcomePageSample/project.json

@@ -1,11 +1,12 @@
 {
-    "webroot": "wwwroot",
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "",
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
-        "Microsoft.AspNet.Server.IIS": "1.0.0-*"
   },
-    "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+  "commands": { "web": "WelcomePageSample" },
   "frameworks": {
     "dnx451": { },
     "dnxcore50": { }

samples/WelcomePageSample/wwwroot/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
+  </system.webServer>
+</configuration>

test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs

@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Helpers;
 using Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.TestHost;
 using Microsoft.AspNet.Testing.xunit;
@@ -28,9 +29,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Successful_requests_pass_thru()
         {
-            TestServer server = TestServer.Create(app => app
+            var builder = new WebApplicationBuilder().Configure(app => app
                 .UseDatabaseErrorPage()
                 .UseMiddleware<SuccessMiddleware>());
+            var server = new TestServer(builder);
 
             HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/");
 
@@ -53,9 +55,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Non_database_exceptions_pass_thru()
         {
-            TestServer server = TestServer.Create(app => app
+            var builder = new WebApplicationBuilder().Configure(app => app
                 .UseDatabaseErrorPage()
                 .UseMiddleware<ExceptionMiddleware>());
+            var server = new TestServer(builder);
 
             var ex = await Assert.ThrowsAsync<InvalidOperationException>(async () =>
                 await server.CreateClient().GetAsync("http://localhost/"));
@@ -252,7 +255,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                var server = TestServer.Create(app =>
+                var builder = new WebApplicationBuilder()
+                    .Configure(app =>
                     {
                         app.UseDatabaseErrorPage(options =>
                         {
@@ -261,8 +265,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         });
 
                         app.UseMiddleware<PendingMigrationsMiddleware>();
-                },
+                    })
-                services =>
+                    .ConfigureServices(services =>
                     {
                         services.AddEntityFramework().AddSqlServer();
                         services.AddScoped<BloggingContextWithMigrations>();
@@ -271,6 +275,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         optionsBuilder.UseSqlServer(database.ConnectionString);
                         services.AddSingleton<DbContextOptions>(optionsBuilder.Options);
                     });
+                var server = new TestServer(builder);
 
                 HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/");
 
@@ -289,12 +294,14 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
             {
                 var logProvider = new TestLoggerProvider();
 
-                var server = TestServer.Create(app =>
+                var builder = new WebApplicationBuilder()
+                    .Configure(app =>
                     {
                         app.UseDatabaseErrorPage();
                         app.UseMiddleware<ContextNotRegisteredInServicesMiddleware>();
                         app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider);
-                },
+                    })
+                    .ConfigureServices(
                     services =>
                     {
                         services.AddEntityFramework().AddSqlServer();
@@ -309,6 +316,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         }
                         services.AddSingleton<DbContextOptions>(optionsBuilder.Options);
                     });
+                var server = new TestServer(builder);
 
                 var ex = await Assert.ThrowsAsync<SqlException>(async () =>
                     await server.CreateClient().GetAsync("http://localhost/"));
@@ -404,7 +412,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         {
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                return TestServer.Create(app =>
+                var builder = new WebApplicationBuilder()
+                    .Configure(app =>
                     {
                         app.UseDatabaseErrorPage();
 
@@ -414,8 +423,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         {
                             app.ApplicationServices.GetService<ILoggerFactory>().AddProvider(logProvider);
                         }
-                },
+                    })
-                services =>
+                    .ConfigureServices(services =>
                     {
                         services.AddEntityFramework()
                             .AddSqlServer();
@@ -433,6 +442,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         }
                         services.AddSingleton(optionsBuilder.Options);
                     });
+                return new TestServer(builder);
             }
         }
 

test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs

@@ -9,6 +9,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.TestHost;
 using Microsoft.AspNet.Testing.xunit;
@@ -26,9 +27,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Non_migration_requests_pass_thru()
         {
-            TestServer server = TestServer.Create(app => app
+            var builder = new WebApplicationBuilder().Configure(app => app
                 .UseMigrationsEndPoint()
                 .UseMiddleware<SuccessMiddleware>());
+            var server = new TestServer(builder);
 
             HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/");
 
@@ -71,7 +73,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
                 var path = useCustomPath ? new PathString("/EndPoints/ApplyMyMigrations") : MigrationsEndPointOptions.DefaultPath;
 
-                TestServer server = TestServer.Create(app =>
+                var builder = new WebApplicationBuilder()
+                    .Configure(app =>
                     {
                         if (useCustomPath)
                         {
@@ -81,13 +84,14 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                         {
                             app.UseMigrationsEndPoint();
                         }
-                },
+                    })
-                services =>
+                    .ConfigureServices(services =>
                     {
                         services.AddEntityFramework().AddSqlServer();
                         services.AddScoped<BloggingContextWithMigrations>();
                         services.AddSingleton(optionsBuilder.Options);
                     });
+                var server = new TestServer(builder);
 
                 using (var db = BloggingContextWithMigrations.CreateWithoutExternalServiceProvider(optionsBuilder.Options))
                 {
@@ -118,10 +122,12 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Context_type_not_specified()
         {
-            var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     app.UseMigrationsEndPoint();
                 });
+            var server = new TestServer(builder);
 
             var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>());
 
@@ -136,10 +142,12 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Invalid_context_type_specified()
         {
-            var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     app.UseMigrationsEndPoint();
                 });
+            var server = new TestServer(builder);
 
             var typeName = "You won't find this type ;)";
             var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>
@@ -158,9 +166,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Context_not_registered_in_services()
         {
-            var server = TestServer.Create(
+            var builder = new WebApplicationBuilder()
-                app => app.UseMigrationsEndPoint(),
+                .Configure(app => app.UseMigrationsEndPoint())
-                services => services.AddEntityFramework().AddSqlServer());
+                .ConfigureServices(services => services.AddEntityFramework().AddSqlServer());
+            var server = new TestServer(builder);
 
             var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>
                 {
@@ -184,14 +193,15 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                 var optionsBuilder = new DbContextOptionsBuilder();
                 optionsBuilder.UseSqlServer(database.ConnectionString);
 
-                TestServer server = TestServer.Create(
+                var builder = new WebApplicationBuilder()
-                    app => app.UseMigrationsEndPoint(),
+                    .Configure(app => app.UseMigrationsEndPoint())
-                    services =>
+                    .ConfigureServices(services =>
                     {
                         services.AddEntityFramework().AddSqlServer();
                         services.AddScoped<BloggingContextWithSnapshotThatThrows>();
                         services.AddSingleton(optionsBuilder.Options);
                     });
+                var server = new TestServer(builder);
 
                 var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>
                     {

test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs

@@ -13,6 +13,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileProviders;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.TestHost;
 using Microsoft.AspNet.Testing;
 using Microsoft.Extensions.PlatformAbstractions;
@@ -485,7 +486,8 @@ namespace Microsoft.AspNet.Diagnostics
         {
             // Arrange
             DiagnosticListener diagnosticListener = null;
-            var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
                     app.UseDeveloperExceptionPage();
@@ -494,6 +496,7 @@ namespace Microsoft.AspNet.Diagnostics
                         throw new Exception("Test exception");
                     });
                 });
+            var server = new TestServer(builder);
             var listener = new TestDiagnosticListener();
             diagnosticListener.SubscribeWithAdapter(listener);
 

test/Microsoft.AspNet.Diagnostics.Tests/ExceptionHandlerTest.cs

@@ -10,6 +10,7 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.TestHost;
 using Microsoft.Extensions.DependencyInjection;
@@ -25,7 +26,8 @@ namespace Microsoft.AspNet.Diagnostics
         [InlineData(HttpStatusCode.InternalServerError)]
         public async Task OnlyHandles_UnhandledExceptions(HttpStatusCode expectedStatusCode)
         {
-            using (var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     app.UseExceptionHandler("/handle-errors");
 
@@ -43,7 +45,9 @@ namespace Microsoft.AspNet.Diagnostics
                         context.Response.ContentType = "text/plain; charset=utf-8";
                         await context.Response.WriteAsync("An error occurred while adding a product");
                     }));
-            }))
+                });
+
+            using (var server = new TestServer(builder))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync(string.Empty);
@@ -55,7 +59,8 @@ namespace Microsoft.AspNet.Diagnostics
         [Fact]
         public async Task DoesNotHandle_UnhandledExceptions_WhenResponseAlreadyStarted()
         {
-            using (var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     app.Use(async (httpContext, next) =>
                     {
@@ -88,7 +93,9 @@ namespace Microsoft.AspNet.Diagnostics
                         await httpContext.Response.WriteAsync("Hello");
                         throw new InvalidOperationException("Something bad happened");
                     });
-            }))
+                });
+
+            using (var server = new TestServer(builder))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync(string.Empty);
@@ -101,7 +108,8 @@ namespace Microsoft.AspNet.Diagnostics
         public async Task ClearsResponseBuffer_BeforeRequestIsReexecuted()
         {
             var expectedResponseBody = "New response body";
-            using (var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     // add response buffering
                     app.Use(async (httpContext, next) =>
@@ -145,7 +153,9 @@ namespace Microsoft.AspNet.Diagnostics
 
                         throw new InvalidOperationException("Invalid input provided.");
                     });
-            }))
+                });
+
+            using (var server = new TestServer(builder))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync(string.Empty);
@@ -170,7 +180,8 @@ namespace Microsoft.AspNet.Diagnostics
         {
             var expiresTime = DateTime.UtcNow.AddDays(5).ToString("R");
             var expectedResponseBody = "Handled error in a custom way.";
-            using (var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     app.UseExceptionHandler("/handle-errors");
 
@@ -192,7 +203,9 @@ namespace Microsoft.AspNet.Diagnostics
                     {
                         throw new InvalidOperationException("Invalid input provided.");
                     });
-            }))
+                });
+
+            using (var server = new TestServer(builder))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync(string.Empty);
@@ -217,7 +230,8 @@ namespace Microsoft.AspNet.Diagnostics
         {
             var expiresTime = DateTime.UtcNow.AddDays(10).ToString("R");
             var expectedResponseBody = "Hello world!";
-            using (var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     app.UseExceptionHandler("/handle-errors");
 
@@ -238,7 +252,9 @@ namespace Microsoft.AspNet.Diagnostics
 
                         await httpContext.Response.WriteAsync(expectedResponseBody);
                     });
-            }))
+                });
+
+            using (var server = new TestServer(builder))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync(string.Empty);
@@ -264,7 +280,8 @@ namespace Microsoft.AspNet.Diagnostics
         public async Task DoesNotClearCacheHeaders_WhenResponseHasAlreadyStarted()
         {
             var expiresTime = DateTime.UtcNow.AddDays(10).ToString("R");
-            using (var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     app.Use(async (httpContext, next) =>
                     {
@@ -303,7 +320,9 @@ namespace Microsoft.AspNet.Diagnostics
 
                         throw new InvalidOperationException("Something bad happened");
                     });
-            }))
+                });
+
+            using (var server = new TestServer(builder))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync(string.Empty);
@@ -331,7 +350,8 @@ namespace Microsoft.AspNet.Diagnostics
             // Arrange
             DiagnosticListener diagnosticListener = null;
 
-            var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
 
@@ -348,6 +368,7 @@ namespace Microsoft.AspNet.Diagnostics
                         throw new Exception("Test exception");
                     });
                 });
+            var server = new TestServer(builder);
 
             var listener = new TestDiagnosticListener();
             diagnosticListener.SubscribeWithAdapter(listener);

test/Microsoft.AspNet.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs

@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
@@ -18,7 +19,8 @@ namespace Microsoft.AspNet.MiddlewareAnalysis
         {
             DiagnosticListener diagnosticListener = null;
 
-            var server = TestServer.Create(app =>
+            var builder = new WebApplicationBuilder()
+                .Configure(app =>
                 {
                     diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
 
@@ -27,7 +29,9 @@ namespace Microsoft.AspNet.MiddlewareAnalysis
                     {
                         throw new Exception("Test exception");
                     });
-            }, services => services.AddMiddlewareAnalysis());
+                })
+                .ConfigureServices(services => services.AddMiddlewareAnalysis());
+            var server = new TestServer(builder);
 
             var listener = new TestDiagnosticListener();
             diagnosticListener.SubscribeWithAdapter(listener);