[github-actions]

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

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

• nagilson
• mthalman
• vseanreesermsft
• dotnet-maestro[bot]
• Copilot
• 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/9.0.3xx
git pull --ff-only
git checkout release/10.0.1xx
git pull --ff-only
git merge --no-ff release/9.0.3xx

# 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/9.0.3xx-to-release/10.0.1xx

or if you are using SSH

git push git@github.com:dotnet/templating HEAD:merge/release/9.0.3xx-to-release/10.0.1xx

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/9.0.3xx-to-release/10.0.1xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

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

or if you are using SSH

git fetch
git checkout -b merge/release/9.0.3xx-to-release/10.0.1xx origin/release/10.0.1xx
git pull git@github.com:dotnet/templating merge/release/9.0.3xx-to-release/10.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/templating HEAD:merge/release/9.0.3xx-to-release/10.0.1xx

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.

[nagilson]

@copilot can you fix the merge conflicts please

[Copilot]

@copilot can you fix the merge conflicts please

Resolved and pushed the two-parent merge commit 5d78cd4.

[marcpopMSFT]

@dsplaisted I think GH is stuck and we may need to jit and force merge. We had this happen before but not sure why it happened.