React to hosting changes

samples/SampleApp/Program.cs

@@ -7,18 +7,10 @@ namespace SampleApp
 {
     public class Program
     {
-        private IServiceProvider _services;
+        public static void Main(string[] args)
-
-        public Program(IServiceProvider services)
         {
-            _services = services;
+            var mergedArgs = new[] { "--server", "Microsoft.AspNet.Server.Kestrel" }.Concat(args).ToArray();
-        }
+            Microsoft.AspNet.Hosting.Program.Main(mergedArgs);
-
-        public void Main(string[] args)
-        {
-            new Microsoft.AspNet.Hosting.Program(_services).Main(new[] {
-                "--server", "Microsoft.AspNet.Server.Kestrel"
-            });
         }
     }
 }

src/Microsoft.AspNet.Server.Kestrel/Program.cs

@@ -8,18 +8,10 @@ namespace Microsoft.AspNet.Server.Kestrel
 {
     public class Program
     {
-        private readonly IServiceProvider _serviceProvider;
+        public static void Main(string[] args)
-
-        public Program(IServiceProvider serviceProvider)
         {
-            _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);
         }
     }
 }

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);            
 

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 =>
             {

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 =>
             {

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 =>
             {