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

Files put in contentFiles are not actually in contentFiles (#1269)

This commit is contained in:
Justin Kotalik 2017-11-14 15:00:26 -08:00 committed by GitHub
parent f27a5a674e
commit afb36d9667
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISExpressDeployer.cs
View File

@ -112,16 +112,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
// We'll eventually add support for choosing which IIS Express bitness to run: https://github.com/aspnet/Hosting/issues/880
var ancmFile = Is64BitHost ? @"x64\aspnetcore.dll" : @"x86\aspnetcore.dll";
// Bin deployed by Microsoft.AspNetCore.AspNetCoreModule.nupkg
var ancmPath = Path.Combine(contentRoot, @"contentFiles\any\any\", ancmFile);
if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmPath)))
if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile)))
{
throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmPath);
throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile);
}
Logger.LogDebug("Writing ANCMPath '{ancmPath}' to config", ancmPath);
Logger.LogDebug("Writing ANCMPath '{ancmPath}' to config", ancmFile);
serverConfig =
serverConfig.Replace("[ANCMPath]", ancmPath);
serverConfig.Replace("[ANCMPath]", ancmFile);
}
Logger.LogDebug("Writing ApplicationPhysicalPath '{applicationPhysicalPath}' to config", contentRoot);