[automated] Merge branch 'release/9.0' => 'main'

[github-actions]

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

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

• dotnet-maestro[bot]
• wtgodbe
• github-actions[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.

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
git pull --ff-only
git checkout main
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/aspnetcore HEAD:merge/release/9.0-to-main

or if you are using SSH

git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-to-main

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-to-main'. 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-to-main main
git pull https://github.com/dotnet/aspnetcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/9.0-to-main

or if you are using SSH

git checkout -b merge/release/9.0-to-main main
git pull [email protected]:dotnet/aspnetcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-to-main

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.

[eerhardt]

@javiercn - it looks like most of this is coming from #57863 and #57864.

What should we do with this PR?

[javiercn]

@eerhardt what have we done in other cases?

This was merged into main, and backported into 9.0, do we skip the commit during the merge?

[eerhardt]

what have we done in other cases?

I'm not sure. @wtgodbe?

[wtgodbe]

Good to go now. When there are merge conflicts in a couple files, github often shows big diffs in other files that don't reflect what the diff will actually be when the conflicts are resolved. In this case I resolved conflicts in 3 version files & it reduced the "files changed" count from around 330 to 2.

[wtgodbe]

Failure unrelated