[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:

• @anurse

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

@anurse your comments in the 2.2 commit indicate this fix is already in 'master'. So, why did the merge change anything?

[dougbu]

Bump @anurse

[analogrelay]

I couldn't say. Looking at the file in master, the change is indeed present, though on a different line: https://github.com/aspnet/AspNetCore/blob/master/src/Hosting/Server.IntegrationTesting/src/Deployers/ApplicationDeployer.cs#L91

Seems like a git diff quirk to me.

[dougbu]

/azp run AspNetCore-ci

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[dougbu]

/azp run AspNetCore-helix-test

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[dotnet-maestro-bot]

This pull request has been updated.

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

• @anurse

[analogrelay]

@jkotalik can you take a look at the conflicts when you have a few minutes? I'm not terribly surprised to see conflicts here

[dotnet-maestro-bot]

This pull request has been updated.

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

• @JunTaoLuo
• @anurse

[jkotalik]

These instructions for merging don't work... Apologies to everyone who got added for no reason.

[jkotalik]

There we go. That last line should definitely be a force push. IIRC I tried to make a fix for this in arcade but no one reviewed it so I closed it.

git push -f https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.2-to-master

[JunTaoLuo]

Huh? I have been able to update these types of PRs without push -f. Why do you think that is required?

[JunTaoLuo]

The changes are what I expect (for my change in 2.1 merging forward at least) though I'm curious why you had to force push.

[halter73]

Huh? I have been able to update these types of PRs without push -f. Why do you think that is required?

It avoids a double merge, right?

[jkotalik]

Yeah I believe @halter73 is correct. I've never had these instructions work for me on the first try.