[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'

[dotnet-maestro-bot]

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

This PR merges commits made on release/8.0-rc1 by the following committers:

• 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/8.0-rc1
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc1

# 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-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.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/8.0-rc1-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

or if you are using SSH

git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull [email protected]:dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

[carlossanlop]

@jeffschwMSFT @mmitche , the change we merged to release/8.0-rc1 is flowing automatically as expected. I want to make sure we do want this flowing to release/8.0. If yes, then keep in mind we do not have this change in the rc2 branch so we might need an extra backport.

If we don't want it in release/8.0, please close this.

[jeffschwMSFT]

the change has been in rc2 since Aug 19. if the only change is related to the rc1 fix, then this is not needed.

[mmitche]

@jeffschwMSFT If this has been in rc2 since Aug 19 (release/8.0 at that time), what are the diffs from?

[jeffschwMSFT]

@AaronRobinsonMSFT

[AaronRobinsonMSFT]

@jeffschwMSFT If this has been in rc2 since Aug 19 (release/8.0 at that time), what are the diffs from?

@mmitche I've no idea how this process works or when release/8.0 means what, but these changes were merged into release/8.0 when I had assumed it was rc2 - #90826.

[mmitche]

I think this is a UX issue and there actually is no diff. release/8.0 already has these changes.

PS C:\r\runtime> git diff release/8.0 -- merge/release/8.0-rc1-to-release/8.0

Yields no diffs.