From 2f02fc6091fcac25ffe0f2bc4f50cdc25f72ffd8 Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Fri, 21 Nov 2014 15:01:52 -0800
Subject: [PATCH] Fix SelfHost to default to config environment

Fixes MusicStore
---
 src/Microsoft.AspNet.Hosting/Program.cs     | 4 ++++
 src/Microsoft.AspNet.TestHost/TestServer.cs | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.AspNet.Hosting/Program.cs b/src/Microsoft.AspNet.Hosting/Program.cs
index b8bd4a2d7f..ba69bab638 100644
--- a/src/Microsoft.AspNet.Hosting/Program.cs
+++ b/src/Microsoft.AspNet.Hosting/Program.cs
@@ -38,6 +38,10 @@ namespace Microsoft.AspNet.Hosting
             config.AddCommandLine(args);
 
             var serviceCollection = HostingServices.Create(_serviceProvider, config);
+            serviceCollection.AddInstance<IConfigureHostingEnvironment>(new ConfigureHostingEnvironment(env =>
+            {
+                env.EnvironmentName = config.Get(EnvironmentKey) ?? DefaultEnvironmentName;
+            }));
             var services = serviceCollection.BuildServiceProvider();
 
             var appEnv = services.GetRequiredService<IApplicationEnvironment>();
diff --git a/src/Microsoft.AspNet.TestHost/TestServer.cs b/src/Microsoft.AspNet.TestHost/TestServer.cs
index 17a8dde680..9e88b16b58 100644
--- a/src/Microsoft.AspNet.TestHost/TestServer.cs
+++ b/src/Microsoft.AspNet.TestHost/TestServer.cs
@@ -57,7 +57,6 @@ namespace Microsoft.AspNet.TestHost
             var services = HostingServices.Create(serviceProvider);
             services.AddSingleton<IConfigureHostingEnvironment, ConfigureTestHostingEnvironment>();
 
-            //var appServices = BuildFallbackServiceProvider(services, serviceProvider);
             var appServices = services.BuildServiceProvider();
             var config = new Configuration();
             return new TestServer(config, appServices, app);