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

React to default hosting configuration changes

This commit is contained in:
John Luo 2016-04-26 18:16:12 -07:00
parent c7893f9f5a
commit e344edc2a3
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/IISSample/Startup.cs
View File

@ -75,7 +75,6 @@ namespace IISSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args)
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()
.UseStartup<Startup>() .UseStartup<Startup>()

6
src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs
View File

@ -29,9 +29,9 @@ namespace Microsoft.AspNetCore.Hosting
throw new ArgumentNullException(nameof(app)); throw new ArgumentNullException(nameof(app));
} }
var port = app.GetSetting(ServerPort); var port = app.GetSetting(ServerPort) ?? Environment.GetEnvironmentVariable($"ASPNETCORE_{ServerPort}");
var path = app.GetSetting(ServerPath); var path = app.GetSetting(ServerPath) ?? Environment.GetEnvironmentVariable($"ASPNETCORE_{ServerPath}");
var pairingToken = app.GetSetting(PairingToken); var pairingToken = app.GetSetting(PairingToken) ?? Environment.GetEnvironmentVariable($"ASPNETCORE_{PairingToken}");
if (!string.IsNullOrEmpty(port) && !string.IsNullOrEmpty(path) && !string.IsNullOrEmpty(pairingToken)) if (!string.IsNullOrEmpty(port) && !string.IsNullOrEmpty(path) && !string.IsNullOrEmpty(pairingToken))
{ {

1
test/TestSites.Portable/Program.cs
View File

@ -10,7 +10,6 @@ namespace TestSites.Portable
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseStartup("TestSites.Portable") .UseStartup("TestSites.Portable")
.UseKestrel() .UseKestrel()

1
test/TestSites/Program.cs
View File

@ -10,7 +10,6 @@ namespace TestSites
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseStartup("TestSites") .UseStartup("TestSites")
.UseKestrel() .UseKestrel()