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

[dotnet-maestro-bot]

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

This PR merges commits made on release/2.2 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.2
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/2.2

# 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.2-to-master

or if you are using SSH

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

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

or if you are using SSH

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

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.

[dougbu]

Waiting for the other submodule update from 'release/2.1'

[dotnet-maestro-bot]

This pull request has been updated.

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

• @JunTaoLuo
• @dougbu

[JunTaoLuo]

In that case I'll leave this open for now then.

[dotnet-maestro-bot]

This pull request has been updated.

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

• @dougbu
• @JunTaoLuo

[dougbu]

Looking better but waiting for #10064 and then I'll do the needful

[dotnet-maestro-bot]

This pull request has been updated.

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

• @dougbu
• @JunTaoLuo

[dougbu]

@JunTaoLuo any ideas about the following template error?

F:\workspace\_work\1\s\src\ProjectTemplates\test\bin\Release\netcoreapp3.0\TestTemplates\AspNet.grpc.29b5ea\AspNet.grpc.29b5ea.csproj : error NU1102: Unable to find package Grpc.AspNetCore.Server with version (>= 0.1.21-dev201905010701)

[BrennanConroy]

These PRs always look wrong, are they supposed to contain commits already in master?

[dougbu]

are they supposed to contain commits already in master?

No, they shouldn't. I'll redo my local merge after grabbing the latest from 'master' and force-push the branch. But, first, I need to understand the gPRC errors.

[dougbu]

That looks better 😺