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

IIS ANCM support in test matrix (#1509)

This commit is contained in:
Justin Kotalik 2018-07-27 11:48:57 -07:00 committed by GitHub
parent fed2eb1cdf
commit 6efdf78fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.IntegrationTesting/TestMatrix.cs
View File

@ -252,7 +252,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
} }
var archSkip = skip ?? SkipIfArchitectureNotSupportedOnCurrentSystem(arch); var archSkip = skip ?? SkipIfArchitectureNotSupportedOnCurrentSystem(arch);
if (server == ServerType.IISExpress) if (server == ServerType.IISExpress || server == ServerType.IIS)
{ {
VaryByAncmVersion(variants, server, tfm, type, arch, archSkip); VaryByAncmVersion(variants, server, tfm, type, arch, archSkip);
} }

2
src/Microsoft.AspNetCore.Server.IntegrationTesting/TestVariant.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
{ {
// For debug and test explorer view // For debug and test explorer view
var description = $"Server: {Server}, TFM: {Tfm}, Type: {ApplicationType}, Arch: {Architecture}"; var description = $"Server: {Server}, TFM: {Tfm}, Type: {ApplicationType}, Arch: {Architecture}";
if (Server == ServerType.IISExpress) if (Server == ServerType.IISExpress || Server == ServerType.IIS)
{ {
var version = AncmVersion == AncmVersion.AspNetCoreModule ? "V1" : "V2"; var version = AncmVersion == AncmVersion.AspNetCoreModule ? "V1" : "V2";
description += $", ANCM: {version}, Host: {HostingModel}"; description += $", ANCM: {version}, Host: {HostingModel}";