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 2015-10-29 08:24:24 -07:00
parent f3384d97cb 995f0ca92f
commit 54451cb6fa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Hosting/WebApplication.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Hosting
{ {
public class WebApplication public class WebApplication
{ {
private const string HostingJsonFile = "Microsoft.AspNet.Hosting.json"; private const string HostingJsonFile = "hosting.json";
private const string ConfigFileKey = "config"; private const string ConfigFileKey = "config";
public static void Run(string[] args) public static void Run(string[] args)

6
src/Microsoft.AspNet.Server.Testing/Deployers/IISDeployer.cs
View File

@ -66,9 +66,9 @@ namespace Microsoft.AspNet.Server.Testing
private void SetAspEnvironmentWithJson() private void SetAspEnvironmentWithJson()
{ {
// Drop a Microsoft.AspNet.Hosting.json with Hosting:Environment information. // Drop a hosting.json with Hosting:Environment information.
Logger.LogInformation("Creating Microsoft.AspNet.Hosting.json file with Hosting:Environment."); Logger.LogInformation("Creating hosting.json file with Hosting:Environment.");
var jsonFile = Path.Combine(DeploymentParameters.ApplicationPath, "Microsoft.AspNet.Hosting.json"); var jsonFile = Path.Combine(DeploymentParameters.ApplicationPath, "hosting.json");
File.WriteAllText(jsonFile, string.Format("{ \"Hosting:Environment\":\"{0}\" }", DeploymentParameters.EnvironmentName)); File.WriteAllText(jsonFile, string.Format("{ \"Hosting:Environment\":\"{0}\" }", DeploymentParameters.EnvironmentName));
} }