Skip to content

Skip IIS Express on Windows 7 #8330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 11, 2019
Merged

Skip IIS Express on Windows 7 #8330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c322096
Skip IIS Express on Windows 7
pakrym Mar 8, 2019
60dd39e
More
pakrym Mar 8, 2019
590611c
;
pakrym Mar 8, 2019
3345044
HostingModel.OutOfProcess
pakrym Mar 8, 2019
8025153
Avoid no-data
pakrym Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,15 @@ private void VaryByAncmHostingModel(IList<TestVariant> variants, ServerType serv
}
}

// https://github.com/aspnet/AspNetCore/issues/8329
if (hostingModel == HostingModel.OutOfProcess &&
server == ServerType.IISExpress &&
Environment.OSVersion.Version.Major == 6 &&
Environment.OSVersion.Version.Minor == 1)
{
continue;
}

variants.Add(new TestVariant()
{
Server = server,
Expand Down
6 changes: 3 additions & 3 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static IEnumerable<object[]> InvalidTestVariants
from s in new string[] { (_minPort - 1).ToString(), (_maxPort + 1).ToString(), "noninteger" }
select new object[] { v, s };

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

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

[ConditionalTheory]
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
[MemberData(nameof(InvalidTestVariants))]
public async Task EnvVarInWebConfig_Invalid(TestVariant variant, string port)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static TestMatrix TestVariants
.WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes();

[ConditionalTheory]
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
[MemberData(nameof(TestVariants))]
public async Task HelloWorld(TestVariant variant)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static TestMatrix TestVariants
=> TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.NetCoreApp30);

[ConditionalTheory]
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")]
[RequiresIIS(IISCapability.WindowsAuthentication)]
[MemberData(nameof(TestVariants))]
public async Task NtlmAuthentication(TestVariant variant)
Expand Down
17 changes: 13 additions & 4 deletions src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
public sealed class RequiresIISAttribute : Attribute, ITestCondition
{
public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting;
public bool IsMet { get ; } = IISExpressAncmSchema.SupportsInProcessHosting;

public string SkipReason => IISExpressAncmSchema.SkipReason;
public string SkipReason { get; } = IISExpressAncmSchema.SkipReason;

public RequiresIISAttribute() { }
public RequiresIISAttribute()
{
// https://github.com/aspnet/AspNetCore/issues/8329
if (Environment.OSVersion.Version.Major == 6 &&
Environment.OSVersion.Version.Minor == 1)
{
IsMet = false;
SkipReason = "Skipped on Windows 7";
}
}

public RequiresIISAttribute(IISCapability capabilities)
public RequiresIISAttribute(IISCapability capabilities) : this()
{
// IISCapabilities aren't pertinent to IISExpress
}
Expand Down