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

[dotnet-maestro-bot]

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

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

• HaoK
• wtgodbe
• JamesNK
• 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/7.0-rc1
git pull --ff-only
git checkout release/7.0
git pull --ff-only
git merge --no-ff release/7.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/AspNetCore HEAD:merge/release/7.0-rc1-to-release/7.0

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/7.0-rc1-to-release/7.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/7.0-rc1-to-release/7.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/7.0-rc1-to-release/7.0 release/7.0
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/7.0-rc1-to-release/7.0

or if you are using SSH

git checkout -b merge/release/7.0-rc1-to-release/7.0 release/7.0
git pull git@github.com:dotnet-maestro-bot/AspNetCore merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/7.0-rc1-to-release/7.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.

[ghost]

Thanks for your PR, @dotnet-maestro-bot. Someone from the team will get assigned to your PR shortly and we'll get it reviewed.

[dougbu]

@JamesNK @JamesNK @davidfowl @wtgodbe your changes all merged cleanly into release/7.0. Please sing out if something looks wrong.

[dougbu]

@wtgodbe, you or I will need to push this manually because the Code Check job will definitely fail

[captainsafia]

@wtgodbe @dougbu I think this can be merged. In addition to the OnAuthenticate_* test that's been failing, the StreamPool_StreamAbortedOnClientAndServer_NotPooled test is also failing but I think that can be quarantined separately. Thoughts?

[wtgodbe]

@captainsafia I'd prefer quarantining them in this PR (or directly in 7.0 first, then re-running CI here) - we should be extra careful in release branches, especially when mass-porting changes like this

[dougbu]

I backported @captainsafia quarantining to release/7.0 last night. Let's rerun this build.

[dougbu]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 2 pipeline(s).

[captainsafia]

@captainsafia I'd prefer quarantining them in this PR (or directly in 7.0 first, then re-running CI here) - we should be extra careful in release branches, especially when mass-porting changes like this

That's fair. Let's see how the re-run shakes out.

[captainsafia]

Looks like only the code check has failed so I'll go ahead and merge this in now.