Clean up test skip conditions (#17529)

Tratcher · web-flow · commit 5033efb3fe94 · 2019-12-05T04:42:39.000-08:00
diff --git a/src/Security/Security.sln b/src/Security/Security.sln
@@ -164,8 +164,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "..\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{D6C3C4A9-197B-47B5-8B72-35047CBC4F22}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{4BB8D7D7-E111-4A86-B6E5-C1201E0DA8CE}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using System.Linq;
 using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Security.Authentication;
@@ -20,12 +19,9 @@
 
 namespace Microsoft.AspNetCore.Server.HttpSys
 {
-    // Flaky doesn't support classes :(
-    // https://github.com/aspnet/Extensions/issues/1568
     public class HttpsTests
     {
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
         public async Task Https_200OK_Success()
         {
             using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>
@@ -39,7 +35,6 @@ public async Task Https_200OK_Success()
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
         public async Task Https_SendHelloWorld_Success()
         {
             using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>
@@ -55,7 +50,6 @@ public async Task Https_SendHelloWorld_Success()
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
         public async Task Https_EchoHelloWorld_Success()
         {
             using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
@@ -73,7 +67,6 @@ public async Task Https_EchoHelloWorld_Success()
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
         public async Task Https_ClientCertNotSent_ClientCertNotPresent()
         {
             using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
@@ -110,8 +103,7 @@ public async Task Https_ClientCertRequested_ClientCertPresent()
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
-        [OSDontSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
         public async Task Https_SkipsITlsHandshakeFeatureOnWin7()
         {
             using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
@@ -133,8 +125,7 @@ public async Task Https_SkipsITlsHandshakeFeatureOnWin7()
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task Https_SetsITlsHandshakeFeature()
         {
             using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
@@ -164,7 +155,7 @@ public async Task Https_SetsITlsHandshakeFeature()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task Https_ITlsHandshakeFeature_MatchesIHttpSysExtensionInfoFeature()
         {
             using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
diff --git a/src/Servers/HttpSys/test/FunctionalTests/OSDontSkipConditionAttribute.cs b/src/Servers/HttpSys/test/FunctionalTests/OSDontSkipConditionAttribute.cs
diff --git a/src/Servers/HttpSys/test/FunctionalTests/OpaqueUpgradeTests.cs b/src/Servers/HttpSys/test/FunctionalTests/OpaqueUpgradeTests.cs
@@ -6,7 +6,6 @@
 using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
@@ -18,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
     public class OpaqueUpgradeTests
     {
         [ConditionalFact]
-        [OSDontSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
         public async Task OpaqueUpgrade_DownLevel_FeatureIsAbsent()
         {
             using (Utilities.CreateHttpServer(out var address, httpContext =>
@@ -44,7 +43,7 @@ public async Task OpaqueUpgrade_DownLevel_FeatureIsAbsent()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task OpaqueUpgrade_SupportKeys_Present()
         {
             string address;
@@ -71,7 +70,7 @@ public async Task OpaqueUpgrade_SupportKeys_Present()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task OpaqueUpgrade_AfterHeadersSent_Throws()
         {
             bool? upgradeThrew = null;
@@ -101,7 +100,7 @@ public async Task OpaqueUpgrade_AfterHeadersSent_Throws()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task OpaqueUpgrade_GetUpgrade_Success()
         {
             var upgraded = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -123,7 +122,7 @@ public async Task OpaqueUpgrade_GetUpgrade_Success()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task OpaqueUpgrade_GetUpgrade_NotAffectedByMaxRequestBodyLimit()
         {
             var upgraded = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -155,7 +154,7 @@ public async Task OpaqueUpgrade_GetUpgrade_NotAffectedByMaxRequestBodyLimit()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task OpaqueUpgrade_WithOnStarting_CallbackCalled()
         {
             var callbackCalled = false;
@@ -184,7 +183,7 @@ public async Task OpaqueUpgrade_WithOnStarting_CallbackCalled()
         }
 
         [ConditionalTheory]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         // See HTTP_VERB for known verbs
         [InlineData("UNKNOWN", null)]
         [InlineData("INVALID", null)]
@@ -242,7 +241,7 @@ public async Task OpaqueUpgrade_VariousMethodsUpgradeSendAndReceive_Success(stri
         }
 
         [ConditionalTheory]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         // Http.Sys returns a 411 Length Required if PUT or POST does not specify content-length or chunked.
         [InlineData("POST", "Content-Length: 10")]
         [InlineData("POST", "Transfer-Encoding: chunked")]
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs
@@ -66,7 +66,7 @@ public async Task Caching_JustPublic_NotCached()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win2008R2, WindowsVersions.Win7, SkipReason = "Content type not required for caching on Win7 and Win2008R2.")]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "Content type not required for caching on Win7.")]
         public async Task Caching_WithoutContentType_NotCached()
         {
             var requestCount = 1;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
@@ -35,15 +35,15 @@ public static TestMatrix TestVariants
 
         [ConditionalTheory]
         [MemberData(nameof(TestVariants))]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public Task HttpsNoClientCert_NoClientCert(TestVariant variant)
         {
             return ClientCertTest(variant, sendClientCert: false);
         }
 
         [ConditionalTheory]
         [MemberData(nameof(TestVariants))]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public Task HttpsClientCert_GetCertInformation(TestVariant variant)
         {
             return ClientCertTest(variant, sendClientCert: true);
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
@@ -32,7 +32,7 @@ public static TestMatrix TestVariants
 
         [ConditionalTheory]
         [MemberData(nameof(TestVariants))]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]
         public async Task HttpsHelloWorld(TestVariant variant)
         {
             var port = TestPortHelper.GetNextSSLPort();
@@ -94,7 +94,7 @@ public async Task ServerAddressesIncludesBaseAddress()
 
         [ConditionalFact]
         [RequiresNewHandler]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win81)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
         public async Task CheckProtocolIsHttp2()
         {
             var port = TestPortHelper.GetNextSSLPort();
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
@@ -14,7 +14,7 @@
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     [SkipIfHostableWebCoreNotAvailable]
-    [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
     public class ClientDisconnectTests : StrictTestServerTests
     {
         [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     [SkipIfHostableWebCoreNotAvailable]
-    [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
     public class ConnectionIdFeatureTests : StrictTestServerTests
     {
         [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     [SkipIfHostableWebCoreNotAvailable]
-    [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
     public class HttpBodyControlFeatureTests : StrictTestServerTests
     {
         [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
@@ -15,7 +15,7 @@
 namespace IIS.Tests
 {
     [SkipIfHostableWebCoreNotAvailable]
-    [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
     public class MaxRequestBodySizeTests : LoggedTest
     {
         [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     [SkipIfHostableWebCoreNotAvailable]
-    [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
     public class ResponseAbortTests : StrictTestServerTests
     {
         [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     [SkipIfHostableWebCoreNotAvailable]
-    [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
     public class TestServerTest : StrictTestServerTests
     {
         [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No supported on this platform")]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
     public class WebSocketsTests
     {
         private readonly string _webSocketUri;
diff --git a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs
@@ -320,7 +320,7 @@ public void ConfigureEndpointDevelopmentCertificateGetsIgnoredIfPfxFileDoesNotEx
         // [InlineData("http2", HttpProtocols.Http2)] // Not supported due to missing ALPN support. https://github.com/dotnet/corefx/issues/33016
         [InlineData("http1AndHttp2", HttpProtocols.Http1AndHttp2)] // Gracefully falls back to HTTP/1
         [OSSkipCondition(OperatingSystems.Linux)]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
+        [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
         public void DefaultConfigSectionCanSetProtocols_MacAndWin7(string input, HttpProtocols expected)
             => DefaultConfigSectionCanSetProtocols(input, expected);
 
@@ -389,7 +389,7 @@ private void DefaultConfigSectionCanSetProtocols(string input, HttpProtocols exp
         // [InlineData("http2", HttpProtocols.Http2)] // Not supported due to missing ALPN support. https://github.com/dotnet/corefx/issues/33016
         [InlineData("http1AndHttp2", HttpProtocols.Http1AndHttp2)] // Gracefully falls back to HTTP/1
         [OSSkipCondition(OperatingSystems.Linux)]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
+        [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
         public void EndpointConfigSectionCanSetProtocols_MacAndWin7(string input, HttpProtocols expected) =>
             EndpointConfigSectionCanSetProtocols(input, expected);
 
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
@@ -58,7 +58,7 @@ public void TlsAndHttp2NotSupportedOnMac()
 
         [ConditionalFact]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
+        [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]
         // Win7 SslStream is missing ALPN support.
         public void TlsAndHttp2NotSupportedOnWin7()
         {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`using System;`
`5`	`5`	`using System.IO;`
`6`		`-using System.Linq;`
`7`	`6`	`using System.Net.Http;`
`8`	`7`	`using System.Runtime.InteropServices;`
`9`	`8`	`using System.Security.Authentication;`
`@@ -20,12 +19,9 @@`
`20`	`19`
`21`	`20`	`namespace Microsoft.AspNetCore.Server.HttpSys`
`22`	`21`	`{`
`23`		`- // Flaky doesn't support classes :(`
`24`		`- // https://github.com/aspnet/Extensions/issues/1568`
`25`	`22`	`public class HttpsTests`
`26`	`23`	`{`
`27`	`24`	`[ConditionalFact]`
`28`		`- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]`
`29`	`25`	`public async Task Https_200OK_Success()`
`30`	`26`	`{`
`31`	`27`	`using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>`
`@@ -39,7 +35,6 @@ public async Task Https_200OK_Success()`
`39`	`35`	`}`
`40`	`36`
`41`	`37`	`[ConditionalFact]`
`42`		`- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]`
`43`	`38`	`public async Task Https_SendHelloWorld_Success()`
`44`	`39`	`{`
`45`	`40`	`using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>`
`@@ -55,7 +50,6 @@ public async Task Https_SendHelloWorld_Success()`
`55`	`50`	`}`
`56`	`51`
`57`	`52`	`[ConditionalFact]`
`58`		`- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]`
`59`	`53`	`public async Task Https_EchoHelloWorld_Success()`
`60`	`54`	`{`
`61`	`55`	`using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>`
`@@ -73,7 +67,6 @@ public async Task Https_EchoHelloWorld_Success()`
`73`	`67`	`}`
`74`	`68`
`75`	`69`	`[ConditionalFact]`
`76`		`- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]`
`77`	`70`	`public async Task Https_ClientCertNotSent_ClientCertNotPresent()`
`78`	`71`	`{`
`79`	`72`	`using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>`
`@@ -110,8 +103,7 @@ public async Task Https_ClientCertRequested_ClientCertPresent()`
`110`	`103`	`}`
`111`	`104`
`112`	`105`	`[ConditionalFact]`
`113`		`- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]`
`114`		`- [OSDontSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`106`	`+ [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]`
`115`	`107`	`public async Task Https_SkipsITlsHandshakeFeatureOnWin7()`
`116`	`108`	`{`
`117`	`109`	`using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>`
`@@ -133,8 +125,7 @@ public async Task Https_SkipsITlsHandshakeFeatureOnWin7()`
`133`	`125`	`}`
`134`	`126`
`135`	`127`	`[ConditionalFact]`
`136`		`- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]`
`137`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`128`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`138`	`129`	`public async Task Https_SetsITlsHandshakeFeature()`
`139`	`130`	`{`
`140`	`131`	`using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>`
`@@ -164,7 +155,7 @@ public async Task Https_SetsITlsHandshakeFeature()`
`164`	`155`	`}`
`165`	`156`
`166`	`157`	`[ConditionalFact]`
`167`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`158`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`168`	`159`	`public async Task Https_ITlsHandshakeFeature_MatchesIHttpSysExtensionInfoFeature()`
`169`	`160`	`{`
`170`	`161`	`using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using System.Net.Http;`
`7`	`7`	`using System.Net.Sockets;`
`8`	`8`	`using System.Text;`
`9`		`-using System.Threading;`
`10`	`9`	`using System.Threading.Tasks;`
`11`	`10`	`using Microsoft.AspNetCore.Http;`
`12`	`11`	`using Microsoft.AspNetCore.Http.Features;`
`@@ -18,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys`
`18`	`17`	`public class OpaqueUpgradeTests`
`19`	`18`	`{`
`20`	`19`	`[ConditionalFact]`
`21`		`- [OSDontSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`20`	`+ [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win7)]`
`22`	`21`	`public async Task OpaqueUpgrade_DownLevel_FeatureIsAbsent()`
`23`	`22`	`{`
`24`	`23`	`using (Utilities.CreateHttpServer(out var address, httpContext =>`
`@@ -44,7 +43,7 @@ public async Task OpaqueUpgrade_DownLevel_FeatureIsAbsent()`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`[ConditionalFact]`
`47`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`46`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`48`	`47`	`public async Task OpaqueUpgrade_SupportKeys_Present()`
`49`	`48`	`{`
`50`	`49`	`string address;`
`@@ -71,7 +70,7 @@ public async Task OpaqueUpgrade_SupportKeys_Present()`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`[ConditionalFact]`
`74`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`73`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`75`	`74`	`public async Task OpaqueUpgrade_AfterHeadersSent_Throws()`
`76`	`75`	`{`
`77`	`76`	`bool? upgradeThrew = null;`
`@@ -101,7 +100,7 @@ public async Task OpaqueUpgrade_AfterHeadersSent_Throws()`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`[ConditionalFact]`
`104`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`103`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`105`	`104`	`public async Task OpaqueUpgrade_GetUpgrade_Success()`
`106`	`105`	`{`
`107`	`106`	`var upgraded = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);`
`@@ -123,7 +122,7 @@ public async Task OpaqueUpgrade_GetUpgrade_Success()`
`123`	`122`	`}`
`124`	`123`
`125`	`124`	`[ConditionalFact]`
`126`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`125`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`127`	`126`	`public async Task OpaqueUpgrade_GetUpgrade_NotAffectedByMaxRequestBodyLimit()`
`128`	`127`	`{`
`129`	`128`	`var upgraded = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);`
`@@ -155,7 +154,7 @@ public async Task OpaqueUpgrade_GetUpgrade_NotAffectedByMaxRequestBodyLimit()`
`155`	`154`	`}`
`156`	`155`
`157`	`156`	`[ConditionalFact]`
`158`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`157`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`159`	`158`	`public async Task OpaqueUpgrade_WithOnStarting_CallbackCalled()`
`160`	`159`	`{`
`161`	`160`	`var callbackCalled = false;`
`@@ -184,7 +183,7 @@ public async Task OpaqueUpgrade_WithOnStarting_CallbackCalled()`
`184`	`183`	`}`
`185`	`184`
`186`	`185`	`[ConditionalTheory]`
`187`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`186`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`188`	`187`	`// See HTTP_VERB for known verbs`
`189`	`188`	`[InlineData("UNKNOWN", null)]`
`190`	`189`	`[InlineData("INVALID", null)]`
`@@ -242,7 +241,7 @@ public async Task OpaqueUpgrade_VariousMethodsUpgradeSendAndReceive_Success(stri`
`242`	`241`	`}`
`243`	`242`
`244`	`243`	`[ConditionalTheory]`
`245`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`244`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`246`	`245`	`// Http.Sys returns a 411 Length Required if PUT or POST does not specify content-length or chunked.`
`247`	`246`	`[InlineData("POST", "Content-Length: 10")]`
`248`	`247`	`[InlineData("POST", "Transfer-Encoding: chunked")]`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public async Task Caching_JustPublic_NotCached()`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[ConditionalFact]`
`69`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win2008R2, WindowsVersions.Win7, SkipReason = "Content type not required for caching on Win7 and Win2008R2.")]`
	`69`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "Content type not required for caching on Win7.")]`
`70`	`70`	`public async Task Caching_WithoutContentType_NotCached()`
`71`	`71`	`{`
`72`	`72`	`var requestCount = 1;`
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,15 @@ public static TestMatrix TestVariants`
`35`	`35`
`36`	`36`	`[ConditionalTheory]`
`37`	`37`	`[MemberData(nameof(TestVariants))]`
`38`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`38`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`39`	`39`	`public Task HttpsNoClientCert_NoClientCert(TestVariant variant)`
`40`	`40`	`{`
`41`	`41`	`return ClientCertTest(variant, sendClientCert: false);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[ConditionalTheory]`
`45`	`45`	`[MemberData(nameof(TestVariants))]`
`46`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]`
	`46`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8)]`
`47`	`47`	`public Task HttpsClientCert_GetCertInformation(TestVariant variant)`
`48`	`48`	`{`
`49`	`49`	`return ClientCertTest(variant, sendClientCert: true);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests`
`15`	`15`	`{`
`16`	`16`	`[SkipIfHostableWebCoreNotAvailable]`
`17`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]`
	`17`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]`
`18`	`18`	`public class ClientDisconnectTests : StrictTestServerTests`
`19`	`19`	`{`
`20`	`20`	`[ConditionalFact]`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests`
`10`	`10`	`{`
`11`	`11`	`[SkipIfHostableWebCoreNotAvailable]`
`12`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]`
	`12`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]`
`13`	`13`	`public class ConnectionIdFeatureTests : StrictTestServerTests`
`14`	`14`	`{`
`15`	`15`	`[ConditionalFact]`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests`
`11`	`11`	`{`
`12`	`12`	`[SkipIfHostableWebCoreNotAvailable]`
`13`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]`
	`13`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]`
`14`	`14`	`public class HttpBodyControlFeatureTests : StrictTestServerTests`
`15`	`15`	`{`
`16`	`16`	`[ConditionalFact]`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`namespace IIS.Tests`
`16`	`16`	`{`
`17`	`17`	`[SkipIfHostableWebCoreNotAvailable]`
`18`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]`
	`18`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]`
`19`	`19`	`public class MaxRequestBodySizeTests : LoggedTest`
`20`	`20`	`{`
`21`	`21`	`[ConditionalFact]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests`
`13`	`13`	`{`
`14`	`14`	`[SkipIfHostableWebCoreNotAvailable]`
`15`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")]`
	`15`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]`
`16`	`16`	`public class ResponseAbortTests : StrictTestServerTests`
`17`	`17`	`{`
`18`	`18`	`[ConditionalFact]`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests`
`14`	`14`	`{`
`15`	`15`	`[Collection(IISTestSiteCollection.Name)]`
`16`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No supported on this platform")]`
	`16`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]`
`17`	`17`	`public class WebSocketsTests`
`18`	`18`	`{`
`19`	`19`	`private readonly string _webSocketUri;`