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.

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

[automated] Merge branch 'release/9.0-rc2' => 'release/9.0' #57975

Merged
merged 6 commits into from
Sep 24, 2024

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/9.0-rc2 branch which have not been merged yet to release/9.0. I'm a robot and am configured to help you automatically keep release/9.0 up to date, so I've opened this PR.

This PR merges commits made on release/9.0-rc2 by the following committers:

  • wtgodbe
  • dotnet-maestro[bot]

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.

merge button instructions

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.

git fetch
git checkout release/9.0-rc2
git pull --ff-only
git checkout release/9.0
git pull --ff-only
git merge --no-ff release/9.0-rc2

# 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/aspnetcore HEAD:merge/release/9.0-rc2-to-release/9.0
or if you are using SSH
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-rc2-to-release/9.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or 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-rc2-to-release/9.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0-rc2-to-release/9.0 release/9.0
git pull https://github.com/dotnet/aspnetcore merge/release/9.0-rc2-to-release/9.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/9.0-rc2-to-release/9.0
or if you are using SSH
git checkout -b merge/release/9.0-rc2-to-release/9.0 release/9.0
git pull [email protected]:dotnet/aspnetcore merge/release/9.0-rc2-to-release/9.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-rc2-to-release/9.0

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.

dotnet-maestro bot and others added 2 commits September 18, 2024 20:06
…916.2 (#57931)

[release/9.0-rc2] Update dependencies from dotnet/arcade
* Add registry search for upgrade policy keys

* SharedFx bundle too

* Add util extension

* Another fix
@github-actions github-actions bot requested review from wtgodbe and a team as code owners September 19, 2024 22:19
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 19, 2024
If no error code has been set, `IProtocolErrorFeature.Error` will be `-1`.  If we pass that through verbatim, it will be caught by validation in the setter (ironically, of the same property on the same feature object), resulting in an exception and a Critical (but apparently benign) log message.

Fixes #57933
…e `Blazor-Environment` header (#57974)

* Serve 'Blazor-Environment' header

* PR feedback

* Update src/Components/WebAssembly/DevServer/src/Server/Startup.cs

---------

Co-authored-by: Mackinnon Buck <[email protected]>
@github-actions github-actions bot requested a review from a team as a code owner September 20, 2024 19:15
BrennanConroy and others added 2 commits September 20, 2024 16:42
)

* Fix IAsyncEnumerable controller methods to allow setting headers

* name

* httpjson extensions too

* revert
* Add partitioned to cookie for SignalR browser testing

Looks like Chromium (not chrome) headless now requires 'partitioned' on the cookie when using `Secure` and `Same-Site=None`

* Apply suggestions from code review

Co-authored-by: Andrew Casey <[email protected]>

---------

Co-authored-by: Andrew Casey <[email protected]>
@github-actions github-actions bot requested review from a team and captainsafia as code owners September 20, 2024 23:43
@wtgodbe wtgodbe merged commit 3ec8cf7 into release/9.0 Sep 24, 2024
27 checks passed
@wtgodbe wtgodbe deleted the merge/release/9.0-rc2-to-release/9.0 branch September 24, 2024 16:26
@dotnet-policy-service dotnet-policy-service bot added this to the 9.0.0 milestone Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants