diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 0eb345b5755a..87efd43249d0 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -33,7 +33,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs index 3d5c59419f5e..8fb700d452da 100644 --- a/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs +++ b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs @@ -115,7 +115,7 @@ public void System_UsesProvidedDirectory_WithConfigurationCallback() [ConditionalFact] [X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720 and https://github.com/dotnet/aspnetcore/issues/26871", Queues = "All.OSX;Windows.10.Arm64.Open")] public void System_UsesProvidedDirectoryAndCertificate() { var filePath = Path.Combine(GetTestFilesPath(), "TestCert.pfx"); diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs index 1a1c8def5cce..87e22bde8a57 100644 --- a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs +++ b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs @@ -69,7 +69,7 @@ public async Task Anonymous_Challenge_401Negotiate_Win7() [ConditionalTheory] [MemberData(nameof(Http11And2))] - [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Windows only supports ALPN on 8.1 and later.")] + [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Windows only supports ALPN and required ciphers on 10 and later.")] public async Task Anonymous_NoChallenge_NoOps(Version version) { using var host = await CreateHostAsync(); @@ -84,7 +84,7 @@ public async Task Anonymous_NoChallenge_NoOps(Version version) [ConditionalTheory] [MemberData(nameof(Http11And2))] - [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Windows only supports ALPN on 8.1 and later.")] + [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Windows only supports ALPN and required ciphers on 10 and later.")] public async Task Anonymous_Challenge_401Negotiate(Version version) { using var host = await CreateHostAsync(); diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs index dba351a50645..a682908f06a6 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs @@ -666,6 +666,7 @@ await connection.Send( [ConditionalFact] [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")] + [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "NullReferenceException https://github.com/dotnet/aspnetcore/issues/26839")] public async Task ClientDisconnectStress() { var maxRequestSize = 1000; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs index 372362d720cd..9782539ba180 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs @@ -268,7 +268,8 @@ public async Task Http2_EmitsStartAndStopEventsWithActivityIds() Assert.Equal(eventIndex, events.Count); } - [Fact] + [ConditionalFact] + [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "SslStream.AuthenticateAsServerAsync() doesn't throw on Win 7 when the client tries SSL 2.0.")] public async Task TlsHandshakeFailure_EmitsStartAndStopEventsWithActivityIds() { int port; @@ -298,7 +299,7 @@ public async Task TlsHandshakeFailure_EmitsStartAndStopEventsWithActivityIds() { TargetHost = "localhost", - // Only enabling SslProtocols.Ssl2 should cause a handshake failure on all platforms. + // Only enabling SslProtocols.Ssl2 should cause a handshake failure on most platforms. #pragma warning disable CS0618 // Type or member is obsolete EnabledSslProtocols = SslProtocols.Ssl2, #pragma warning restore CS0618 // Type or member is obsolete