Skip to content

[release/6.0] Backport 48892 to 6.0#48914

Merged
wtgodbe merged 3 commits intodotnet:release/6.0from
mitchdenny:backport-48892-to-6.0
Jul 6, 2023
Merged

[release/6.0] Backport 48892 to 6.0#48914
wtgodbe merged 3 commits intodotnet:release/6.0from
mitchdenny:backport-48892-to-6.0

Conversation

@mitchdenny
Copy link
Copy Markdown
Member

@mitchdenny mitchdenny commented Jun 20, 2023

Backports #48892

@ghost ghost added the area-runtime label Jun 20, 2023
@ghost ghost added this to the 6.0.x milestone Jun 20, 2023
@ghost
Copy link
Copy Markdown

ghost commented Jun 20, 2023

Hi @mitchdenny. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the servicing process document.
Otherwise, please add tell-mode label.

@mitchdenny mitchdenny requested a review from mgravell June 20, 2023 06:34
@mitchdenny mitchdenny self-assigned this Jun 20, 2023
@mitchdenny mitchdenny added the Servicing-consider Shiproom approval is required for the issue label Jun 20, 2023
@ghost
Copy link
Copy Markdown

ghost commented Jun 20, 2023

Hi @mitchdenny. Please make sure you've updated the PR description to use the Shiproom Template. Also, make sure this PR is not marked as a draft and is ready-to-merge.

To learn more about how to prepare a servicing PR click here.

@mitchdenny mitchdenny changed the title Backport 48892 to 6.0 [release/6.0] Backport 48892 to 6.0 Jun 20, 2023
amcasey
amcasey reviewed Jun 20, 2023
View reviewed changes
Comment thread src/Middleware/WebSockets/src/ServerWebSocket.cs Outdated
@danmoseley
Copy link
Copy Markdown
Member

danmoseley commented Jun 22, 2023

approved by tactics

@danmoseley danmoseley added the Servicing-approved Shiproom has approved the issue label Jun 22, 2023
@ghost ghost removed the Servicing-consider Shiproom approval is required for the issue label Jun 22, 2023
@ghost
Copy link
Copy Markdown

ghost commented Jun 22, 2023

Hi @mitchdenny. This PR was just approved to be included in the upcoming servicing release. Somebody from the @dotnet/aspnet-build team will get it merged when the branches are open. Until then, please make sure all the CI checks pass and the PR is reviewed.

@mitchdenny
Copy link
Copy Markdown
Member Author

mitchdenny commented Jun 22, 2023 •
edited
Loading

Latest commit was to fix up a test case that was flakey (we picked up on main so have applied it to the backport as well so we don't make the servicing branch flakey.

@ghost
Copy link
Copy Markdown

ghost commented Jun 30, 2023

Looks like this PR hasn't been active for some time and the codebase could have been changed in the meantime.
To make sure no breaking changes are introduced, please leave an /azp run comment here to rerun the CI pipeline and confirm success before merging the change.

@ghost ghost added the pending-ci-rerun When assigned to a PR indicates that the CI checks should be rerun label Jun 30, 2023
@mitchdenny
Copy link
Copy Markdown
Member Author

mitchdenny commented Jun 30, 2023

/azp run

@ghost ghost removed the pending-ci-rerun When assigned to a PR indicates that the CI checks should be rerun label Jun 30, 2023
@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Jun 30, 2023

Azure Pipelines successfully started running 2 pipeline(s).

@wtgodbe wtgodbe merged commit b5bccf6 into dotnet:release/6.0 Jul 6, 2023
@ghost ghost modified the milestones: 6.0.x, 6.0.21 Jul 6, 2023
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jul 6, 2023
@amcasey amcasey added area-networking Includes servers, yarp, json patch, bedrock, websockets, http client factory, and http abstractions and removed area-runtime labels Aug 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@amcasey amcasey amcasey left review comments

@halter73 halter73 halter73 approved these changes

@wtgodbe wtgodbe wtgodbe approved these changes

@Tratcher Tratcher Awaiting requested review from Tratcher

@BrennanConroy BrennanConroy Awaiting requested review from BrennanConroy

@mgravell mgravell Awaiting requested review from mgravell

Assignees

@mitchdenny mitchdenny

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework area-networking Includes servers, yarp, json patch, bedrock, websockets, http client factory, and http abstractions Servicing-approved Shiproom has approved the issue

Projects

None yet

Milestone

6.0.21

Development

Successfully merging this pull request may close these issues.

5 participants

@mitchdenny @danmoseley @halter73 @amcasey @wtgodbe