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

Pointing to wwwroot for NtlmAuth test

This commit is contained in:
Praburaj 2015-01-20 16:42:10 -08:00
parent c3a6095bf1
commit c8bbfb15e8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/E2ETests/Common/DeploymentUtility.cs
View File

@ -220,7 +220,7 @@ namespace E2ETests
if (!string.IsNullOrWhiteSpace(startParameters.ApplicationHostConfigTemplateContent)) if (!string.IsNullOrWhiteSpace(startParameters.ApplicationHostConfigTemplateContent))
{ {
startParameters.ApplicationHostConfigTemplateContent = startParameters.ApplicationHostConfigTemplateContent =
startParameters.ApplicationHostConfigTemplateContent.Replace("[ApplicationPhysicalPath]", startParameters.ApplicationPath); startParameters.ApplicationHostConfigTemplateContent.Replace("[ApplicationPhysicalPath]", Path.Combine(startParameters.ApplicationPath, "wwwroot"));
} }
CopyAspNetLoader(startParameters.ApplicationPath); CopyAspNetLoader(startParameters.ApplicationPath);
@ -235,8 +235,14 @@ namespace E2ETests
startParameters.ApplicationHostConfigLocation = tempApplicationHostConfig; startParameters.ApplicationHostConfigLocation = tempApplicationHostConfig;
} }
var webroot = startParameters.ApplicationPath;
if (!webroot.EndsWith("wwwroot"))
{
webroot = Path.Combine(webroot, "wwwroot");
}
var parameters = string.IsNullOrWhiteSpace(startParameters.ApplicationHostConfigLocation) ? var parameters = string.IsNullOrWhiteSpace(startParameters.ApplicationHostConfigLocation) ?
string.Format("/port:5001 /path:{0}", Path.Combine(startParameters.ApplicationPath, "wwwroot")) : string.Format("/port:5001 /path:{0}", webroot) :
string.Format("/site:{0} /config:{1}", startParameters.SiteName, startParameters.ApplicationHostConfigLocation); string.Format("/site:{0} /config:{1}", startParameters.SiteName, startParameters.ApplicationHostConfigLocation);
var iisExpressPath = GetIISExpressPath(startParameters.DotnetArchitecture); var iisExpressPath = GetIISExpressPath(startParameters.DotnetArchitecture);