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

Fix deployer for Win7 and Win2008

This commit is contained in:
John Luo 2017-03-14 15:17:14 -07:00
parent 9228d18677
commit 9021999c32
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,23 +80,26 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
if (DeploymentParameters.ServerConfigTemplateContent.Contains("[ANCMPath]")) if (DeploymentParameters.ServerConfigTemplateContent.Contains("[ANCMPath]"))
{ {
string 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 ? "aspnetcore_x64.dll" : "aspnetcore_x86.dll";
if (!IsWin8OrLater) if (!IsWin8OrLater)
{ {
// The nupkg build of ANCM does not support Win7. https://github.com/aspnet/AspNetCoreModule/issues/40. // The nupkg build of ANCM does not support Win7. https://github.com/aspnet/AspNetCoreModule/issues/40.
ancmPath = @"%ProgramFiles%\IIS Express\aspnetcore.dll"; ancmPath = @"%ProgramFiles%\IIS Express\aspnetcore.dll";
} }
// Bin deployed by Microsoft.AspNetCore.AspNetCoreModule.nupkg
else if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr
&& DeploymentParameters.ApplicationType == ApplicationType.Portable)
{
ancmPath = Path.Combine(contentRoot, @"runtimes\win7\native\", ancmFile);
}
else else
{ {
ancmPath = Path.Combine(contentRoot, ancmFile); // 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)
{
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)))