[automated] Merge branch 'release/6.0-rc2' => 'release/6.0'

[dotnet-maestro-bot]

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

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

• halter73
• 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.

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/6.0-rc2
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.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-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc2-to-release/6.0

or if you are using SSH

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

or if you are using SSH

git checkout -b merge/release/6.0-rc2-to-release/6.0 release/6.0
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/6.0-rc2-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc2-to-release/6.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.

[ghost]

Auto-approving branch merge.

[SteveSandersonMS]

@halter73 Your most recent commit dd92f78 seems to be where the build for this PR starts failing with this:

2021-09-21T04:53:59.0748769Z error : Detected modification to baseline API files. PublicAPI.Shipped.txt files should only be updated after a major release. See /docs/APIBaselines.md for more information.
2021-09-21T04:53:59.0752463Z error : Modified API baseline files:
2021-09-21T04:53:59.0756322Z error : src/Http/Routing/src/PublicAPI.Unshipped.txt

It is a bit strange that it says the problem is with PublicAPI.Shipped.txt changing, but then it says the only baseline that was changed was an unshipped one (src/Http/Routing/src/PublicAPI.Unshipped.txt). It's annoying that it doesn't say which PublicAPI.Shipped.txt file allegedly changed. Maybe this is a bug in the API baselines tool.

I notice in this PR, all the package dependencies' branding changes from rc2 to rtm. Might there be something special about RTM branding specifically that changes how API baselines are evaluated? Though still I don't know why a change to our dependencies would change anything about our own output branding.

@dougbu Do you have any knowledge of why the API baselines would be complaining even though it doesn't seem like we did change a PublicAPI.Shipped.txt file in this commit?

[dougbu]

1. 'release/6.0' is open for PublicAPI.Unshipped.txt file changes even though CodeCheck.ps1 thinks it isn't. We decided not to add a special case for this branch because we're too likely to forget to remove it once RC2 is done.
2. The error message CodeCheck.ps1 emits is historical and confusing. At some point soon, we should make the logic more complicated -- enough to describe what's actually failing.
3. As we've been doing w/ all PublicAPI.Unshipped.txt changes in this branch, I'm merging because the only problem is the one over-zealous check. (Not a big burden since admins have to do these merges anyhow 😸)