[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx'

[github-actions[bot]]

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

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

• marcpopMSFT
• joeloff
• vseanreesermsft
• mmitche
• f-alizada
• dotnet-maestro[bot]
• dotnet-bot
• MiYanni
• v-wuzhai
• JL03-Yue
• MilenaHristova
• invalid-email-address
• dkurepa
• wtgodbe
• YuliiaKovalova
• vlada-shubina
• JanKrivanek
• DavidKarlas
• bekir-ozturk

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/6.0.1xx
git pull --ff-only
git checkout release/6.0.4xx
git pull --ff-only
git merge --no-ff release/6.0.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/templating HEAD:merge/release/6.0.1xx-to-release/6.0.4xx

or if you are using SSH

git push [email protected]:dotnet/templating HEAD:merge/release/6.0.1xx-to-release/6.0.4xx

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

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

git checkout -b merge/release/6.0.1xx-to-release/6.0.4xx release/6.0.4xx
git pull https://github.com/dotnet/templating merge/release/6.0.1xx-to-release/6.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/templating HEAD:merge/release/6.0.1xx-to-release/6.0.4xx

or if you are using SSH

git checkout -b merge/release/6.0.1xx-to-release/6.0.4xx release/6.0.4xx
git pull [email protected]:dotnet/templating merge/release/6.0.1xx-to-release/6.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/templating HEAD:merge/release/6.0.1xx-to-release/6.0.4xx

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

[marcpopMSFT]

@v-wuzhai I noticed that the merge from 1xx to 4xx here hasn't been done in a long time. Is that because something happened between those two and the merge should no longer happen automatically (did templating move into the sdk in one of those releases)? If we shouldn't take these, we should probably remove it from the config and manually port the one file for the interbranch merges that we want.

CC @joeloff @baronfel