huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to hosting changes

This commit is contained in:
Pavel Krymets 2015-10-21 10:15:11 -07:00
parent 8f0d1179ab
commit f8fd2f9ac9
6 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
samples/SampleApp/Program.cs
View File

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

12
src/Microsoft.AspNet.Server.Kestrel/Program.cs
View File

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

2
test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
View File

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

2
test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/RequestTests.cs
View File

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

2
test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ResponseTests.cs
View File

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

2
test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ThreadCountTests.cs
View File

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