Skip to content

Commit e0e484c

Browse files
github-actions[bot]wfurtJan Jahoda
authored
[release/6.0] fix TLS 1.3 in WinHttpHandler (#59159)
* add W11 test queue * move to release config * move to x66 * fix tls13 detection * disable failing EventLog tests * Remove WIndows 11 from CI matrix Co-authored-by: wfurt <[email protected]> Co-authored-by: Jan Jahoda <[email protected]>
1 parent b5e15dc commit e0e484c

4 files changed

Lines changed: 9 additions & 2 deletions

File tree

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ public static partial class PlatformDetection
5757

5858
public static bool IsWindows10Version2004Build19573OrGreater => IsWindowsVersionOrLater(10, 0, 19573);
5959

60+
// Windows 11 aka 21H2
61+
public static bool IsWindows10Version22000OrGreater => IsWindowsVersionOrLater(10, 0, 22000);
62+
6063
public static bool IsWindowsIoTCore
6164
{
6265
get

src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/EventLogRecordTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ public void ToXml()
9090
[ConditionalFact(typeof(Helpers), nameof(Helpers.SupportsEventLogs))]
9191
public void ExceptionOnce()
9292
{
93-
if (PlatformDetection.IsWindows7) // Null events in PowerShell log
93+
if (PlatformDetection.IsWindows7 || // Null events in PowerShell log
94+
PlatformDetection.IsWindows10Version22000OrGreater) // ActiveIssue("https://github.com/dotnet/runtime/issues/58829")
9495
return;
9596
var query = new EventLogQuery("Application", PathType.LogName, "*[System]") { ReverseDirection = true };
9697
var eventLog = new EventLogReader(query, Helpers.GetBookmark("Application", PathType.LogName));

src/libraries/System.Diagnostics.EventLog/tests/System/Diagnostics/Reader/ProviderMetadataTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public void SourceDoesNotExist_Throws()
2323
[InlineData(false)]
2424
public void ProviderNameTests(bool noProviderName)
2525
{
26+
if (PlatformDetection.IsWindows10Version22000OrGreater) // ActiveIssue("https://github.com/dotnet/runtime/issues/58829")
27+
return;
28+
2629
string log = "Application";
2730
string source = "Source_" + nameof(ProviderNameTests);
2831
using (var session = new EventLogSession())

src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class WinHttpHandler : HttpMessageHandler
4444

4545
private static readonly StringWithQualityHeaderValue s_gzipHeaderValue = new StringWithQualityHeaderValue("gzip");
4646
private static readonly StringWithQualityHeaderValue s_deflateHeaderValue = new StringWithQualityHeaderValue("deflate");
47-
private static readonly Lazy<bool> s_supportsTls13 = new Lazy<bool>(CheckTls13Support());
47+
private static readonly Lazy<bool> s_supportsTls13 = new Lazy<bool>(() => CheckTls13Support());
4848

4949
[ThreadStatic]
5050
private static StringBuilder? t_requestHeadersBuilder;

0 commit comments

Comments
 (0)