Merge branch 'release' into dev

2016-04-28 10:06:13 -07:00 · 2016-04-28 10:06:13 -07:00 · d5b1df13cf
parent 9479f0910a 289b3f58d0
commit d5b1df13cf
1 changed files with 1 additions and 1 deletions
--- a/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
            
            hostingEnvironment.EnvironmentName =
                options.Environment ??
-                Environment.GetEnvironmentVariable($"ASPNETCORE_{WebHostDefaults.EnvironmentKey}") ??
+                Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ??
                hostingEnvironment.EnvironmentName;
        }
    }