[automated] Merge branch 'release/2.1' => 'release/2.2'

[dotnet-maestro-bot]

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

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

• @dougbu

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/2.1
git pull --ff-only
git checkout release/2.2
git pull --ff-only
git merge --no-ff release/2.1

# 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/2.1-to-release/2.2

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2

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/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2

or if you are using SSH

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

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.

[dotnet-maestro-bot]

This pull request has been updated.

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

• @anurse
• @dougbu

[Tratcher]

I have questions... all of these samesite changes should already be in 2.2. Maybe it will diff better after the PatchConfig.props conflict resolution?

[dougbu]

@aspnet/efteam looks like the 2.1.14 change was a no-op merge into EntityFrameworkCore's 'release/2.2' branch. But, should EFCore be rebranded to 2.2.8 anyhow (with the latest then referenced from this repo)?

[dougbu]

Not clear which tool is correct here: Either the merge is currently a no-op or 15 files are changing even though a duplicate fix was merged into 'release/2.2'. Will merge this if validations succeed. But, would appreciate your thoughts @Tratcher if you have a look before then.

[Tratcher]

Something's wrong with the diff (or the merge?) See:
https://github.com/aspnet/AspNetCore/pull/14708/files#diff-06d4a0dc83460db209b6faeb59878af9R28
That line is already the same in both branches

2.1
https://github.com/aspnet/AspNetCore/blob/f198e559f87d113b99a0f693dffc1baaab1b782c/src/Http/Headers/src/SetCookieHeaderValue.cs#L28
2.2:
https://github.com/aspnet/AspNetCore/blob/bae8fe9399c5bc1110638743816f27f055be3385/src/Http/Headers/src/SetCookieHeaderValue.cs#L28

[dougbu]

Think it's just GitHub messing up the diff. Merging…

[Tratcher]

Yeah, the merge commit shows no changes 7ab32c8