[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx'

[github-actions]

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

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

• ellahathaway

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/8.0.1xx
git pull --ff-only
git checkout release/8.0.4xx
git pull --ff-only
git merge --no-ff release/8.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/installer HEAD:merge/release/8.0.1xx-to-release/8.0.4xx

or if you are using SSH

git push git@github.com:dotnet/installer HEAD:merge/release/8.0.1xx-to-release/8.0.4xx

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/8.0.1xx-to-release/8.0.4xx'. 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/8.0.1xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull https://github.com/dotnet/installer merge/release/8.0.1xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/installer HEAD:merge/release/8.0.1xx-to-release/8.0.4xx

or if you are using SSH

git fetch
git checkout -b merge/release/8.0.1xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull git@github.com:dotnet/installer merge/release/8.0.1xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/installer HEAD:merge/release/8.0.1xx-to-release/8.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.

[SimonZhao888]

@copilot resolve the merge conflicts in this pull request

[Copilot]

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict in eng/pipelines/vmr-build-pr.yml — the file was intentionally deleted in release/8.0.4xx (source-build PR/CI was disabled for non-1xx branches), so I kept the deletion. The merge commit 4a159c46 combines release/8.0.4xx (360defaf1) and release/8.0.1xx (35e4ab679) with conflicts resolved.

[SimonZhao888]

@copilot resolve the merge conflicts in this pull request

[SimonZhao888]

@copilot resolve the merge conflicts in this pull request

[Copilot]

@copilot resolve the merge conflicts in this pull request

The merge conflicts were already resolved in commit 4a159c4. The PR branch is up to date — it includes all commits from both release/8.0.1xx (35e4ab679) and release/8.0.4xx (360defaf1) with no outstanding conflicts.

[SimonZhao888]

@copilot resolve the merge conflicts in this pull request

[Copilot]

@copilot resolve the merge conflicts in this pull request

The merge conflicts are already resolved in commit 4a159c4. The PR branch contains only a clean addition to src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml with no conflict markers.

The GitHub UI shows dirty because commit 2da26b7 (from release/8.0.1xx) modifies eng/pipelines/vmr-build-pr.yml, which was intentionally deleted in release/8.0.4xx. Our merge commit resolves this by keeping the deletion. Running git merge --no-ff locally confirms the merge into release/8.0.4xx completes with no conflicts.