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

Merge branch 'release' into dev

This commit is contained in:
John Luo 2016-04-11 09:47:28 -07:00
parent ed3b3044d1 816b5df9cd
commit 12fff1833f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
View File

@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Server.Testing
DeploymentParameters.ApplicationPath = DeploymentParameters.ApplicationPath =
(DeploymentParameters.ServerType == ServerType.IISExpress || (DeploymentParameters.ServerType == ServerType.IISExpress ||
DeploymentParameters.ServerType == ServerType.IIS) ? DeploymentParameters.ServerType == ServerType.IIS) ?
Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "wwwroot") : DeploymentParameters.PublishedApplicationRootPath :
DeploymentParameters.ApplicationPath; DeploymentParameters.ApplicationPath;
Logger.LogInformation($"{DotnetCommandName} publish finished with exit code : {hostProcess.ExitCode}"); Logger.LogInformation($"{DotnetCommandName} publish finished with exit code : {hostProcess.ExitCode}");

8
src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
View File

@ -65,14 +65,8 @@ namespace Microsoft.AspNetCore.Server.Testing
File.WriteAllText(DeploymentParameters.ServerConfigLocation, DeploymentParameters.ServerConfigTemplateContent); File.WriteAllText(DeploymentParameters.ServerConfigLocation, DeploymentParameters.ServerConfigTemplateContent);
} }
var webroot = DeploymentParameters.ApplicationPath;
if (!webroot.EndsWith("wwwroot"))
{
webroot = Path.Combine(webroot, "wwwroot");
}
var parameters = string.IsNullOrWhiteSpace(DeploymentParameters.ServerConfigLocation) ? var parameters = string.IsNullOrWhiteSpace(DeploymentParameters.ServerConfigLocation) ?
string.Format("/port:{0} /path:\"{1}\" /trace:error", uri.Port, webroot) : string.Format("/port:{0} /path:\"{1}\" /trace:error", uri.Port, DeploymentParameters.ApplicationPath) :
string.Format("/site:{0} /config:{1} /trace:error", DeploymentParameters.SiteName, DeploymentParameters.ServerConfigLocation); string.Format("/site:{0} /config:{1} /trace:error", DeploymentParameters.SiteName, DeploymentParameters.ServerConfigLocation);
var iisExpressPath = GetIISExpressPath(); var iisExpressPath = GetIISExpressPath();