From 94bf7bf2d5646f85b9bf6748e8c814106d3781e4 Mon Sep 17 00:00:00 2001 From: Chris R Date: Mon, 21 Dec 2015 10:17:50 -0800 Subject: [PATCH] Dont select an architecture specific version of IIS Express. --- .../Deployers/IISExpressDeployer.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/IISExpressDeployer.cs b/src/Microsoft.AspNet.Server.Testing/Deployers/IISExpressDeployer.cs index 96f69b2b7f..c60bf11b37 100644 --- a/src/Microsoft.AspNet.Server.Testing/Deployers/IISExpressDeployer.cs +++ b/src/Microsoft.AspNet.Server.Testing/Deployers/IISExpressDeployer.cs @@ -126,20 +126,11 @@ namespace Microsoft.AspNet.Server.Testing private string GetIISExpressPath() { // Get path to program files - var iisExpressPath = Path.Combine(Environment.GetEnvironmentVariable("ProgramFiles(x86)"), "IIS Express", "iisexpress.exe"); - - // Get path to 64 bit of IIS Express - if (DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64) - { - iisExpressPath = Path.Combine(Environment.GetEnvironmentVariable("ProgramFiles"), "IIS Express", "iisexpress.exe"); - - // If process is 32 bit, the path points to x86. Replace path to point to x64 - iisExpressPath = IntPtr.Size == 8 ? iisExpressPath : iisExpressPath.Replace(" (x86)", ""); - } + var iisExpressPath = Path.Combine(Environment.GetEnvironmentVariable("SystemDrive") + "\\", "Program Files", "IIS Express", "iisexpress.exe"); if (!File.Exists(iisExpressPath)) { - throw new Exception("Unable to find IISExpress on the machine"); + throw new Exception("Unable to find IISExpress on the machine: " + iisExpressPath); } return iisExpressPath;