From c0dae2c5cd37853f2cc16c28ba29d33982e306e6 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 12 Aug 2024 11:35:33 +0200 Subject: [PATCH 1/2] Bump requirement for async cert validation to 2.4.1 --- .../System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs | 2 +- .../System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs index 28c326b7b65fb..f7ba61757fc6e 100644 --- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs +++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs @@ -62,7 +62,7 @@ private MsQuicApi(QUIC_API_TABLE* apiTable) internal static string? NotSupportedReason { get; } // workaround for https://github.com/microsoft/msquic/issues/4132 - internal static bool SupportsAsyncCertValidation => Version >= new Version(2, 3, 5); + internal static bool SupportsAsyncCertValidation => Version >= new Version(2, 4, 1); internal static bool UsesSChannelBackend { get; } diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs index 2bcdad52c83ee..5e3b440377814 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs @@ -52,7 +52,6 @@ public class MsQuicTests : QuicTestBase, IClassFixture { private static byte[] s_data = "Hello world!"u8.ToArray(); readonly CertificateSetup _certificates; - static bool DoesNotSupportAsyncCertValidation => QuicTestCollection.MsQuicVersion < new Version(2, 4); public MsQuicTests(ITestOutputHelper output, CertificateSetup setup) : base(output) { @@ -354,7 +353,6 @@ public async Task UntrustedClientCertificateFails() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/99074", typeof(MsQuicTests), nameof(DoesNotSupportAsyncCertValidation))] public async Task CertificateCallbackThrowPropagates() { using CancellationTokenSource cts = new CancellationTokenSource(PassingTestTimeout); From 58399246556a9291c4112b6a8602ab0bd9b5d713 Mon Sep 17 00:00:00 2001 From: Radek Zikmund <32671551+rzikm@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:29:28 +0200 Subject: [PATCH 2/2] Update MsQuicApi.cs --- .../System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs index f7ba61757fc6e..253f617892f8f 100644 --- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs +++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs @@ -62,7 +62,7 @@ private MsQuicApi(QUIC_API_TABLE* apiTable) internal static string? NotSupportedReason { get; } // workaround for https://github.com/microsoft/msquic/issues/4132 - internal static bool SupportsAsyncCertValidation => Version >= new Version(2, 4, 1); + internal static bool SupportsAsyncCertValidation => Version >= new Version(2, 4); internal static bool UsesSChannelBackend { get; }