Merge release/9.0 staging into release/9#125832
Merged
steveisok merged 5 commits intorelease/9.0from Apr 14, 2026
Merged
Conversation
#123661) Backport of #123485 to release/9.0-staging /cc @liveans Increasing RFC compliance for WebSocket ## Customer Impact RFC compliance ## Regression No ## Testing Manual verification + automated tests ## Risk Low, the change only affects non‑compliant WebSocket clients sending unmasked frames, which is explicitly disallowed by RFC 6455. No behavior change is expected for compliant clients. --------- Co-authored-by: Ahmet İbrahim Aksoy <aaksoy@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This pull request updates the following dependencies [marker]: <> (Begin:077f423f-1332-4108-a2ea-08dcc66548e6) ## From https://github.com/dotnet/xharness - **Subscription**: [077f423f-1332-4108-a2ea-08dcc66548e6](https://maestro.dot.net/subscriptions?search=077f423f-1332-4108-a2ea-08dcc66548e6) - **Build**: [20260318.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2929517) ([306735](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/306735)) - **Date Produced**: March 18, 2026 9:51:17 AM UTC - **Commit**: [607b3de9cf2dbfec6734e686e68d2813b40b2b51](dotnet/xharness@607b3de) - **Branch**: [main](https://github.com/dotnet/xharness/tree/main) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [11.0.0-prerelease.26117.1 to 11.0.0-prerelease.26168.1][3] - Microsoft.DotNet.XHarness.CLI - Microsoft.DotNet.XHarness.TestRunners.Common - Microsoft.DotNet.XHarness.TestRunners.Xunit [3]: dotnet/xharness@0eeaa60...607b3de [DependencyUpdate]: <> (End) [marker]: <> (End:077f423f-1332-4108-a2ea-08dcc66548e6) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Backport of #125544 to release/9.0-staging /cc @akoeplinger @wfurt --------- Co-authored-by: wfurt <tweinfurt@yahoo.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Marie Píchová <11718369+ManickaP@users.noreply.github.com>
Member
Author
|
Motivated by the AZL3 change. We need to make sure that gets through |
Contributor
|
Tagging subscribers to this area: @karelz, @dotnet/ncl |
akoeplinger
approved these changes
Mar 20, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Merges release/9.0 staging into release/9, bringing in runtime/library fixes plus CI and dependency updates relevant to the 9.0 release branch.
Changes:
- System.Net.WebSockets: treat unmasked frames received by a server as a protocol error, with a new regression test and resource string.
- System.Net.Quic tests: add an Azure Linux 3 VM exclusion condition to multiple functional test classes.
- Engineering: update Linux build pool image demands to Azure Linux 3 and bump XHarness tool/dependency versions; remove an obsolete NuGet package source entry.
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/libraries/System.Net.WebSockets/tests/WebSocketTests.cs | Adds test validating server-side handling of unmasked client frames. |
| src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs | Adds protocol validation for server receiving unmasked frames. |
| src/libraries/System.Net.WebSockets/src/Resources/Strings.resx | Adds localized error string for the new validation path. |
| src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs | Introduces IsNotAzureLinux3VM condition (with a commented ActiveIssue line). |
| src/libraries/System.Net.Quic/tests/FunctionalTests/*.cs | Applies IsNotAzureLinux3VM to QUIC functional test classes via ConditionalClass. |
| eng/pipelines/common/xplat-setup.yml | Switches Linux pool image demands to Azure Linux 3. |
| eng/Versions.props | Updates XHarness versions. |
| eng/Version.Details.xml | Updates XHarness dependency versions and SHAs. |
| NuGet.config | Removes a managed package source entry for dotnet-emsdk. |
| .config/dotnet-tools.json | Updates local XHarness tool version. |
wfurt
approved these changes
Mar 20, 2026
Member
|
there's a conflict in nuget.config |
) I detected changes in the release/9.0 branch which have not been merged yet to release/9.0-staging. I'm a robot and am configured to help you automatically keep release/9.0-staging up to date, so I've opened this PR. This PR merges commits made on release/9.0 by the following committers: * vseanreesermsft * Copilot * hoyosjs * rbhanda * jozkee * dotnet-maestro[bot] * wfurt * bartonjs ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout release/9.0 git pull --ff-only git checkout release/9.0-staging git pull --ff-only git merge --no-ff release/9.0 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0-to-release/9.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging git pull https://github.com/dotnet/runtime merge/release/9.0-to-release/9.0-staging (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging git pull git@github.com:dotnet/runtime merge/release/9.0-to-release/9.0-staging (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
akoeplinger
approved these changes
Mar 24, 2026
Member
|
@steveisok any plans with this PR? |
Member
|
@steveisok ping? |
Member
Author
Sorry, didn't see your previous comment. I think we should merge it. |
Member
Author
|
/ba-g Large share of known issues. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.