Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WinHttp StreamingTest backward compat Version #104722

Merged
merged 4 commits into from
Jul 12, 2024
+4 −2
Merged

Fix WinHttp StreamingTest backward compat Version #104722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3025c18
Add WS2022 to OsSupport check for Bidirectional Streaming
liveans Jul 12, 2024
202690d
Enable the disabled test
liveans Jul 12, 2024
561ae63
Add helper property to PlatformDetection.Windows for WS2022
liveans Jul 12, 2024
2d3389c
Use helper property for WS2022
liveans Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public static partial class PlatformDetection
public static bool IsWindows8xOrLater => IsWindowsVersionOrLater(6, 2);
public static bool IsWindows10OrLater => IsWindowsVersionOrLater(10, 0);
public static bool IsWindowsServer2019 => IsWindows && IsNotWindowsNanoServer && GetWindowsVersion() == 10 && GetWindowsMinorVersion() == 0 && GetWindowsBuildVersion() == 17763;
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
5 changes: 3 additions & 2 deletions ...ibraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/BidirectionStreamingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +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; // This is required
// because WINHTTP_FLAG_AUTOMATIC_CHUNKING is backported to WS2022.

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

Expand Down Expand Up @@ -324,7 +326,6 @@ async Task RunServer()
}

[ConditionalFact(nameof(TestsBackwardsCompatibilityEnabled))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/103754")]
public async Task BackwardsCompatibility_DowngradeToHttp11()
{
TaskCompletionSource<object> completeStreamTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
Expand Down
Loading