From f8fd2f9ac9be11e68ac29693166cf4dee0c459b8 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Wed, 21 Oct 2015 10:15:11 -0700
Subject: [PATCH] React to hosting changes

---
 samples/SampleApp/Program.cs                       | 14 +++-----------
 src/Microsoft.AspNet.Server.Kestrel/Program.cs     | 12 ++----------
 .../AddressRegistrationTests.cs                    |  2 +-
 .../RequestTests.cs                                |  2 +-
 .../ResponseTests.cs                               |  2 +-
 .../ThreadCountTests.cs                            |  2 +-
 6 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/samples/SampleApp/Program.cs b/samples/SampleApp/Program.cs
index acf7f214c8..06205db078 100644
--- a/samples/SampleApp/Program.cs
+++ b/samples/SampleApp/Program.cs
@@ -7,18 +7,10 @@ namespace SampleApp
 {
     public class Program
     {
-        private IServiceProvider _services;
-
-        public Program(IServiceProvider services)
+        public static void Main(string[] args)
         {
-            _services = services;
-        }
-
-        public void Main(string[] args)
-        {
-            new Microsoft.AspNet.Hosting.Program(_services).Main(new[] {
-                "--server", "Microsoft.AspNet.Server.Kestrel"
-            });
+            var mergedArgs = new[] { "--server", "Microsoft.AspNet.Server.Kestrel" }.Concat(args).ToArray();
+            Microsoft.AspNet.Hosting.Program.Main(mergedArgs);
         }
     }
 }
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Program.cs b/src/Microsoft.AspNet.Server.Kestrel/Program.cs
index ba7e264f8f..b0f18d7c30 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Program.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Program.cs
@@ -8,18 +8,10 @@ namespace Microsoft.AspNet.Server.Kestrel
 {
     public class Program
     {
-        private readonly IServiceProvider _serviceProvider;
-
-        public Program(IServiceProvider serviceProvider)
+        public static void Main(string[] args)
         {
-            _serviceProvider = serviceProvider;
-        }
-
-        public void Main(string[] args)
-        {
-            var program = new Microsoft.AspNet.Hosting.Program(_serviceProvider);
             var mergedArgs = new[] { "--server", "Microsoft.AspNet.Server.Kestrel" }.Concat(args).ToArray();
-            program.Main(mergedArgs);
+            Microsoft.AspNet.Hosting.Program.Main(mergedArgs);
         }
     }
 }
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
index b7b7b03877..cdc09c4c8b 100644
--- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
+++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests
                 })
                 .Build();
 
-            var hostBuilder = new WebHostBuilder(CallContextServiceLocator.Locator.ServiceProvider, config);
+            var hostBuilder = new WebHostBuilder(config);
             hostBuilder.UseServer("Microsoft.AspNet.Server.Kestrel");
             hostBuilder.UseStartup(ConfigureEchoAddress);            
 
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs
index a9996ecb9a..6d8b13bfb6 100644
--- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs
+++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests
                 })
                 .Build();
 
-            var hostBuilder = new WebHostBuilder(CallContextServiceLocator.Locator.ServiceProvider, config);
+            var hostBuilder = new WebHostBuilder(config);
             hostBuilder.UseServer("Microsoft.AspNet.Server.Kestrel");
             hostBuilder.UseStartup(app =>
             {
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs
index a31c2374fa..75506aa39f 100644
--- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs
+++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests
                 })
                 .Build();
 
-            var hostBuilder = new WebHostBuilder(CallContextServiceLocator.Locator.ServiceProvider, config);
+            var hostBuilder = new WebHostBuilder(config);
             hostBuilder.UseServer("Microsoft.AspNet.Server.Kestrel");
             hostBuilder.UseStartup(app =>
             {
diff --git a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs
index d47679f540..b928d19075 100644
--- a/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs
+++ b/test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests
                 })
                 .Build();
 
-            var hostBuilder = new WebHostBuilder(CallContextServiceLocator.Locator.ServiceProvider, config);
+            var hostBuilder = new WebHostBuilder(config);
             hostBuilder.UseServer("Microsoft.AspNet.Server.Kestrel");
             hostBuilder.UseStartup(app =>
             {