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

Merge branch 'release' into dev

This commit is contained in:
BrennanConroy 2016-04-28 10:06:13 -07:00
parent 9479f0910a 289b3f58d0
commit d5b1df13cf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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