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

Updates ANCM path to look in content files (#1268)

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

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

@ -108,20 +108,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
if (serverConfig.Contains("[ANCMPath]"))
{
string ancmPath;
// We need to pick the bitness based the OS / IIS Express, not the application.
// 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
if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr
&& DeploymentParameters.ApplicationType == ApplicationType.Portable)
{
ancmPath = Path.Combine(contentRoot, @"runtimes\win7\native\", ancmFile);
}
else
{
ancmPath = Path.Combine(contentRoot, ancmFile);
}
var ancmPath = Path.Combine(contentRoot, @"contentFiles\any\any\", ancmFile);
if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmPath)))
{