Skip to content

Commit

Permalink
[release/6.0] Fix WinHttp StreamingTest backward compat version (#104838
Browse files Browse the repository at this point in the history
)

* Disable Bidirection tests on WS2022

* Add missing helper method

* Update BidirectionStreamingTest.cs
  • Loading branch information
liveans authored Jul 16, 2024
1 parent 50f436d commit b23dd72
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static partial class PlatformDetection
public static bool IsWindows8x => IsWindows && GetWindowsVersion() == 6 && (GetWindowsMinorVersion() == 2 || GetWindowsMinorVersion() == 3);
public static bool IsWindows8xOrLater => IsWindowsVersionOrLater(6, 2);
public static bool IsWindows10OrLater => IsWindowsVersionOrLater(10, 0);
public static bool IsWindowsServer2022 => IsWindows && IsNotWindowsNanoServer && GetWindowsVersion() == 10 && GetWindowsMinorVersion() == 0 && GetWindowsBuildVersion() == 20348;
public static bool IsWindowsNanoServer => IsWindows && (IsNotWindowsIoTCore && GetWindowsInstallationType().Equals("Nano Server", StringComparison.OrdinalIgnoreCase));
public static bool IsWindowsServerCore => IsWindows && GetWindowsInstallationType().Equals("Server Core", StringComparison.OrdinalIgnoreCase);
public static int WindowsVersion => IsWindows ? (int)GetWindowsVersion() : -1;
Expand Down Expand Up @@ -170,6 +171,7 @@ internal static Version GetWindowsVersionObject()

internal static uint GetWindowsVersion() => (uint)GetWindowsVersionObject().Major;
internal static uint GetWindowsMinorVersion() => (uint)GetWindowsVersionObject().Minor;
internal static uint GetWindowsBuildVersion() => (uint)GetWindowsVersionObject().Build;

internal static bool IsWindowsVersionOrLater(int major, int minor, int build = -1)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public BidirectionStreamingTest(ITestOutputHelper output) : base(output)

// Build number suggested by the WinHttp team.
// It can be reduced if bidirectional streaming is backported.
public static bool OsSupportsWinHttpBidirectionalStreaming => Environment.OSVersion.Version >= new Version(10, 0, 22357, 0);
public static bool OsSupportsWinHttpBidirectionalStreaming => Environment.OSVersion.Version >= new Version(10, 0, 22357, 0) || PlatformDetection.IsWindowsServer2022;

public static bool TestsEnabled => OsSupportsWinHttpBidirectionalStreaming && PlatformDetection.SupportsAlpn;
public static bool TestsEnabled => OsSupportsWinHttpBidirectionalStreaming && PlatformDetection.SupportsAlpn && !PlatformDetection.IsWindowsServer2022;

public static bool TestsBackwardsCompatibilityEnabled => !OsSupportsWinHttpBidirectionalStreaming && PlatformDetection.SupportsAlpn;

Expand Down

0 comments on commit b23dd72

Please sign in to comment.