[automated] Merge branch 'release/10.0.3xx' => 'release/10.0.4xx'

[github-actions]

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

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

• DonnaChen888
• Evangelink
• github-actions[bot]
• akoeplinger
• dotnet-maestro[bot]
• dkurepa
• marcpopMSFT
• nagilson
• vseanreesermsft
• NikolaMilosavljevic
• MiYanni

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/10.0.3xx
git pull --ff-only
git checkout release/10.0.4xx
git pull --ff-only
git merge --no-ff release/10.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/sdk HEAD:merge/release/10.0.3xx-to-release/10.0.4xx

or if you are using SSH

git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.3xx-to-release/10.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/10.0.3xx-to-release/10.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/10.0.3xx-to-release/10.0.4xx origin/release/10.0.4xx
git pull https://github.com/dotnet/sdk merge/release/10.0.3xx-to-release/10.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.3xx-to-release/10.0.4xx

or if you are using SSH

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

[dsplaisted]

Failing due to cross-codeflow issue that should be fixed once #54505 merges.

[marcpopMSFT]

@copilot resolve the merge conflicts in this pull request

[Copilot]

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in commit 7c09ce4:

1. MissingShebangInFileBasedProgramTests.cs (content conflict): Kept the release/10.0.4xx version using CS9378 (the newer compiler error "'#!' must be the first characters on the first line of the file"), as this matches the updated compiler from the dotnet/dotnet source code update in PR [release/10.0.4xx] Source code updates from dotnet/dotnet #54505.

2. RunFileTests.cs (modify/delete conflict): Deleted the file, keeping the release/10.0.4xx behavior where this file was split into multiple files (e.g., RunFileTests_BuildOptions.cs). The release/10.0.3xx changes to this file were already incorporated into the split files in release/10.0.4xx.

[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

Resolved the merge conflicts in commit d9bb0ac:

BootJsonData.cs (content conflict from merging latest release/10.0.4xx): Added integrity property to asset classes (WasmAsset, GeneralAsset, VfsAsset) and updated all hash lookups to use a.hash ?? a.integrity. This addresses the Assert.StartsWith() Failure: String start does not match / String: null / Expected start: "sha256-" issue — the new dotnet/dotnet source uses SRI integrity values (sha256-...) instead of hash in boot manifests.

[Copilot]

@copilot resolve the merge conflicts in this pull request

The branch is already up to date with both release/10.0.3xx and release/10.0.4xx — all merge conflicts were resolved in previous commits (7c09ce4 and d9bb0ac). No further action needed.