[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'

[dotnet-maestro-bot]

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

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

• wtgodbe
• dsplaisted
• dotnet-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/3.1.1xx
git pull --ff-only
git checkout release/3.1.2xx
git pull --ff-only
git merge --no-ff release/3.1.1xx

# 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/core-sdk HEAD:merge/release/3.1.1xx-to-release/3.1.2xx

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.1xx-to-release/3.1.2xx

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

git checkout -b merge/release/3.1.1xx-to-release/3.1.2xx release/3.1.2xx
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/3.1.1xx-to-release/3.1.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.1xx-to-release/3.1.2xx

or if you are using SSH

git checkout -b merge/release/3.1.1xx-to-release/3.1.2xx release/3.1.2xx
git pull git@github.com:dotnet-maestro-bot/core-sdk merge/release/3.1.1xx-to-release/3.1.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.1xx-to-release/3.1.2xx

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.

[v-qizh10]

@wli3 I resolve the conflicts to follow the instruction in the PR description. Could you help to review it at your convenience?

[sfoslund]

There are no real changes here (See the Files changed tab is empty), which means you resolved the conflicts correctly but there was no real code change. In the future, if all the changes are in the eng/ folder you can skip performing the merge, as the resulting change will be empty like this.