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

Merge branch 'release' into dev

This commit is contained in:
Chris R 2016-05-03 09:05:55 -07:00
parent 7b5d7f7883 642cdc0437
commit 4cad0a2f01
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
View File

@ -63,7 +63,6 @@ namespace Microsoft.AspNetCore.Hosting.Internal
hostingEnvironment.EnvironmentName = hostingEnvironment.EnvironmentName =
options.Environment ?? options.Environment ??
Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ??
hostingEnvironment.EnvironmentName; hostingEnvironment.EnvironmentName;
} }
} }

15
src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
View File

@ -40,6 +40,21 @@ namespace Microsoft.AspNetCore.Hosting
_hostingEnvironment = new HostingEnvironment(); _hostingEnvironment = new HostingEnvironment();
_configureServicesDelegates = new List<Action<IServiceCollection>>(); _configureServicesDelegates = new List<Action<IServiceCollection>>();
_configureLoggingDelegates = new List<Action<ILoggerFactory>>(); _configureLoggingDelegates = new List<Action<ILoggerFactory>>();
// This may end up storing null, but that's indistinguishable from not adding it.
UseSetting(WebHostDefaults.EnvironmentKey, Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")
// Legacy keys, never remove these.
?? Environment.GetEnvironmentVariable("Hosting:Environment")
?? Environment.GetEnvironmentVariable("ASPNET_ENV"));
if (Environment.GetEnvironmentVariable("Hosting:Environment") != null)
{
Console.WriteLine("The environment variable 'Hosting:Environment' is obsolete and has been replaced with 'ASPNETCORE_ENVIRONMENT'");
}
if (Environment.GetEnvironmentVariable("ASPNET_ENV") != null)
{
Console.WriteLine("The environment variable 'ASPNET_ENV' is obsolete and has been replaced with 'ASPNETCORE_ENVIRONMENT'");
}
} }
/// <summary> /// <summary>