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

Remove check for using ANCM with Win7. (#1235)

This commit is contained in:
Justin Kotalik 2017-10-03 16:43:12 -07:00 committed by GitHub
parent a63932a492
commit 36bede16e9
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,26 +109,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
if (serverConfig.Contains("[ANCMPath]")) if (serverConfig.Contains("[ANCMPath]"))
{ {
string ancmPath; string ancmPath;
if (!IsWin8OrLater) // 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 ? "aspnetcore_x64.dll" : "aspnetcore_x86.dll";
// Bin deployed by Microsoft.AspNetCore.AspNetCoreModule.nupkg
if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr
&& DeploymentParameters.ApplicationType == ApplicationType.Portable)
{ {
// The nupkg build of ANCM does not support Win7. https://github.com/aspnet/AspNetCoreModule/issues/40. ancmPath = Path.Combine(contentRoot, @"runtimes\win7\native\", ancmFile);
ancmPath = @"%ProgramFiles%\IIS Express\aspnetcore.dll";
} }
else else
{ {
// We need to pick the bitness based the OS / IIS Express, not the application. ancmPath = Path.Combine(contentRoot, ancmFile);
// We'll eventually add support for choosing which IIS Express bitness to run: https://github.com/aspnet/Hosting/issues/880
var ancmFile = Is64BitHost ? "aspnetcore_x64.dll" : "aspnetcore_x86.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);
}
} }
if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmPath))) if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmPath)))