Skip to content

Commit 8b536b0

Browse files
authored
Revert "Skip IIS Express on Windows 7 (#8330)" (#9490)
This reverts commit b2a58ab.
1 parent f95960d commit 8b536b0

File tree

5 files changed

+9
-27
lines changed

5 files changed

+9
-27
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,6 @@ 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-
301292
variants.Add(new TestVariant()
302293
{
303294
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
@@ -37,7 +37,7 @@ public static IEnumerable<object[]> InvalidTestVariants
3737
from s in new string[] { (_minPort - 1).ToString(), (_maxPort + 1).ToString(), "noninteger" }
3838
select new object[] { v, s };
3939

40-
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
40+
[ConditionalTheory]
4141
[MemberData(nameof(TestVariants))]
4242
public async Task EnvVarInWebConfig_Valid(TestVariant variant)
4343
{
@@ -53,7 +53,7 @@ public async Task EnvVarInWebConfig_Valid(TestVariant variant)
5353
Assert.Equal(port, new Uri(responseText).Port);
5454
}
5555

56-
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
56+
[ConditionalTheory]
5757
[MemberData(nameof(TestVariants))]
5858
public async Task EnvVarInWebConfig_Empty(TestVariant variant)
5959
{
@@ -69,7 +69,7 @@ public async Task EnvVarInWebConfig_Empty(TestVariant variant)
6969
Assert.InRange(new Uri(responseText).Port, _minPort, _maxPort);
7070
}
7171

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static TestMatrix TestVariants
2626
.WithTfms(Tfm.NetCoreApp30)
2727
.WithAllApplicationTypes();
2828

29-
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
29+
[ConditionalTheory]
3030
[MemberData(nameof(TestVariants))]
3131
public async Task HelloWorld(TestVariant variant)
3232
{

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

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

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

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,13 @@ 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 { get ; } = IISExpressAncmSchema.SupportsInProcessHosting;
13+
public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting;
1414

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

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-
}
17+
public RequiresIISAttribute() { }
2718

28-
public RequiresIISAttribute(IISCapability capabilities) : this()
19+
public RequiresIISAttribute(IISCapability capabilities)
2920
{
3021
// IISCapabilities aren't pertinent to IISExpress
3122
}

0 commit comments

Comments
 (0)