Use MinimumOSVersion in Kestrel (#15228)

Tratcher · web-flow · commit f90c9ac20cbc · 2019-10-21T12:45:27.000-07:00
diff --git a/src/Servers/Kestrel/Core/test/AddressBinderTests.cs b/src/Servers/Kestrel/Core/test/AddressBinderTests.cs
@@ -76,8 +76,8 @@ public void ParseAddressLocalhost()
             Assert.False(https);
         }
 
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win8, WindowsVersions.Win81, WindowsVersions.Win2008R2, SkipReason = "UnixDomainSocketEndPoint is not supported on older versions of Windows")]
         [ConditionalFact]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_RS4)]
         public void ParseAddressUnixPipe()
         {
             var listenOptions = AddressBinder.ParseAddress("http://unix:/tmp/kestrel-test.sock", out var https);
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.Win8, WindowsVersions.Win81)]
+        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
         public void DefaultConfigSectionCanSetProtocols_MacAndWin7(string input, HttpProtocols expected)
             => DefaultConfigSectionCanSetProtocols(input, expected);
 
@@ -329,7 +329,7 @@ public void DefaultConfigSectionCanSetProtocols_MacAndWin7(string input, HttpPro
         [InlineData("http2", HttpProtocols.Http2)]
         [InlineData("http1AndHttp2", HttpProtocols.Http1AndHttp2)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
         public void DefaultConfigSectionCanSetProtocols_NonMacAndWin7(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.Win8, WindowsVersions.Win81)]
+        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
         public void EndpointConfigSectionCanSetProtocols_MacAndWin7(string input, HttpProtocols expected) =>
             EndpointConfigSectionCanSetProtocols(input, expected);
 
@@ -398,7 +398,7 @@ public void EndpointConfigSectionCanSetProtocols_MacAndWin7(string input, HttpPr
         [InlineData("http2", HttpProtocols.Http2)]
         [InlineData("http1AndHttp2", HttpProtocols.Http1AndHttp2)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7)]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
         public void EndpointConfigSectionCanSetProtocols_NonMacAndWin7(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.Win8, WindowsVersions.Win81)]
+        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]
         // Win7 SslStream is missing ALPN support.
         public void TlsAndHttp2NotSupportedOnWin7()
         {
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
@@ -44,7 +44,7 @@ public ShutdownTests()
 
         [CollectDump]
         [ConditionalFact]
-        [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/9985", Queues = "Fedora.28.Amd64.Open")] // https://github.com/aspnet/AspNetCore/issues/9985
+        [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/9985", Queues = "Fedora.28.Amd64.Open")]
         [Flaky("https://github.com/aspnet/AspNetCore/issues/9985", FlakyOn.All)]
         public async Task GracefulShutdownWaitsForRequestsToFinish()
         {
diff --git a/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs b/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs
@@ -24,7 +24,7 @@ public class UnixDomainSocketsTest : TestApplicationErrorLoggerLoggedTest
 #if LIBUV
         [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Libuv does not support unix domain sockets on Windows.")]
 #else
-        [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win8, WindowsVersions.Win81, WindowsVersions.Win2008R2, SkipReason = "UnixDomainSocketEndPoint is not supported on older versions of Windows")]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_RS4)]
 #endif
         [ConditionalFact]
         [CollectDump]

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ public void ParseAddressLocalhost()`
`76`	`76`	`Assert.False(https);`
`77`	`77`	`}`
`78`	`78`
`79`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win8, WindowsVersions.Win81, WindowsVersions.Win2008R2, SkipReason = "UnixDomainSocketEndPoint is not supported on older versions of Windows")]`
`80`	`79`	`[ConditionalFact]`
	`80`	`+ [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_RS4)]`
`81`	`81`	`public void ParseAddressUnixPipe()`
`82`	`82`	`{`
`83`	`83`	`var listenOptions = AddressBinder.ParseAddress("http://unix:/tmp/kestrel-test.sock", out var https);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void TlsAndHttp2NotSupportedOnMac()`
`58`	`58`
`59`	`59`	`[ConditionalFact]`
`60`	`60`	`[OSSkipCondition(OperatingSystems.Linux \| OperatingSystems.MacOSX)]`
`61`		`- [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win8, WindowsVersions.Win81)]`
	`61`	`+ [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win10, WindowsVersions.Win81)]`
`62`	`62`	`// Win7 SslStream is missing ALPN support.`
`63`	`63`	`public void TlsAndHttp2NotSupportedOnWin7()`
`64`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ShutdownTests()`
`44`	`44`
`45`	`45`	`[CollectDump]`
`46`	`46`	`[ConditionalFact]`
`47`		`- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/9985", Queues = "Fedora.28.Amd64.Open")] // https://github.com/aspnet/AspNetCore/issues/9985`
	`47`	`+ [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/9985", Queues = "Fedora.28.Amd64.Open")]`
`48`	`48`	`[Flaky("https://github.com/aspnet/AspNetCore/issues/9985", FlakyOn.All)]`
`49`	`49`	`public async Task GracefulShutdownWaitsForRequestsToFinish()`
`50`	`50`	`{`