From 816b5df9cdccc9aa8ff98e3916afe3b42d57c773 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 6 Apr 2016 16:03:17 -0700 Subject: [PATCH] React to moving web.config --- .../Deployers/ApplicationDeployer.cs | 2 +- .../Deployers/IISExpressDeployer.cs | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs index 315fe078c7..5c3c710c03 100644 --- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs @@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Server.Testing DeploymentParameters.ApplicationPath = (DeploymentParameters.ServerType == ServerType.IISExpress || DeploymentParameters.ServerType == ServerType.IIS) ? - Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "wwwroot") : + DeploymentParameters.PublishedApplicationRootPath : DeploymentParameters.ApplicationPath; Logger.LogInformation($"{DotnetCommandName} publish finished with exit code : {hostProcess.ExitCode}"); diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs index d0c1b4033d..a77a42c2eb 100644 --- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs @@ -65,14 +65,8 @@ namespace Microsoft.AspNetCore.Server.Testing 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) ? - 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); var iisExpressPath = GetIISExpressPath();