From e6bddd4131e72ae268b301d96b201bd986812289 Mon Sep 17 00:00:00 2001
From: Chris R <Tratcher@outlook.com>
Date: Thu, 28 Apr 2016 15:11:43 -0700
Subject: [PATCH] Prepopulate the environment rather than fall back to it.

---
 .../Internal/HostingEnvironmentExtensions.cs                   | 1 -
 src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs             | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
index b38f997cac..50be22800b 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
@@ -63,7 +63,6 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             
             hostingEnvironment.EnvironmentName =
                 options.Environment ??
-                Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ??
                 hostingEnvironment.EnvironmentName;
         }
     }
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
index 88cd1c76fb..ef8589c572 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
@@ -45,6 +45,9 @@ namespace Microsoft.AspNetCore.Hosting
             _hostingEnvironment = new HostingEnvironment();
             _configureServicesDelegates = new List<Action<IServiceCollection>>();
             _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"));
         }
 
         /// <summary>