Skip to content

Commit b2a58ab

Browse files
authored
Skip IIS Express on Windows 7 (#8330)
#8329
1 parent 17344cd commit b2a58ab

File tree

5 files changed

+27
-9
lines changed

5 files changed

+27
-9
lines changed

src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,15 @@ private void VaryByAncmHostingModel(IList<TestVariant> variants, ServerType serv
289289
}
290290
}
291291

292+
// https://github.com/aspnet/AspNetCore/issues/8329
293+
if (hostingModel == HostingModel.OutOfProcess &&
294+
server == ServerType.IISExpress &&
295+
Environment.OSVersion.Version.Major == 6 &&
296+
Environment.OSVersion.Version.Minor == 1)
297+
{
298+
continue;
299+
}
300+
292301
variants.Add(new TestVariant()
293302
{
294303
Server = server,

src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static IEnumerable<object[]> InvalidTestVariants
4040
from s in new string[] { (_minPort - 1).ToString(), (_maxPort + 1).ToString(), "noninteger" }
4141
select new object[] { v, s };
4242

43-
[ConditionalTheory]
43+
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
4444
[MemberData(nameof(TestVariants))]
4545
public async Task EnvVarInWebConfig_Valid(TestVariant variant)
4646
{
@@ -56,7 +56,7 @@ public async Task EnvVarInWebConfig_Valid(TestVariant variant)
5656
Assert.Equal(port, new Uri(responseText).Port);
5757
}
5858

59-
[ConditionalTheory]
59+
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
6060
[MemberData(nameof(TestVariants))]
6161
public async Task EnvVarInWebConfig_Empty(TestVariant variant)
6262
{
@@ -72,7 +72,7 @@ public async Task EnvVarInWebConfig_Empty(TestVariant variant)
7272
Assert.InRange(new Uri(responseText).Port, _minPort, _maxPort);
7373
}
7474

75-
[ConditionalTheory]
75+
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
7676
[MemberData(nameof(InvalidTestVariants))]
7777
public async Task EnvVarInWebConfig_Invalid(TestVariant variant, string port)
7878
{

src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static TestMatrix TestVariants
2929
.WithTfms(Tfm.NetCoreApp30)
3030
.WithAllApplicationTypes();
3131

32-
[ConditionalTheory]
32+
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
3333
[MemberData(nameof(TestVariants))]
3434
public async Task HelloWorld(TestVariant variant)
3535
{

src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static TestMatrix TestVariants
3232
=> TestMatrix.ForServers(DeployerSelector.ServerType)
3333
.WithTfms(Tfm.NetCoreApp30);
3434

35-
[ConditionalTheory]
35+
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
3636
[RequiresIIS(IISCapability.WindowsAuthentication)]
3737
[MemberData(nameof(TestVariants))]
3838
public async Task NtlmAuthentication(TestVariant variant)

src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
1010
[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
1111
public sealed class RequiresIISAttribute : Attribute, ITestCondition
1212
{
13-
public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting;
13+
public bool IsMet { get ; } = IISExpressAncmSchema.SupportsInProcessHosting;
1414

15-
public string SkipReason => IISExpressAncmSchema.SkipReason;
15+
public string SkipReason { get; } = IISExpressAncmSchema.SkipReason;
1616

17-
public RequiresIISAttribute() { }
17+
public RequiresIISAttribute()
18+
{
19+
// https://github.com/aspnet/AspNetCore/issues/8329
20+
if (Environment.OSVersion.Version.Major == 6 &&
21+
Environment.OSVersion.Version.Minor == 1)
22+
{
23+
IsMet = false;
24+
SkipReason = "Skipped on Windows 7";
25+
}
26+
}
1827

19-
public RequiresIISAttribute(IISCapability capabilities)
28+
public RequiresIISAttribute(IISCapability capabilities) : this()
2029
{
2130
// IISCapabilities aren't pertinent to IISExpress
2231
}

0 commit comments

Comments
 (0)