[automated] Merge branch 'release/9.0.3xx' => 'main'

[github-actions]

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

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

• MiYanni
• marcpopMSFT
• v-wuzhai
• SimonZhao888
• dotnet-maestro[bot]
• dtivel
• ellahathaway
• vseanreesermsft
• dotnet-bot
• surayya-MS
• baronfel
• invalid-email-address
• mthalman
• ViktorHofer
• akoeplinger
• Winniexu01
• joeloff
• rainersigwald

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 main
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/sdk HEAD:merge/release/9.0.3xx-to-main

or if you are using SSH

git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.3xx-to-main

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

or if you are using SSH

git fetch
git checkout -b merge/release/9.0.3xx-to-main origin/main
git pull [email protected]:dotnet/sdk merge/release/9.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.3xx-to-main

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.

[surayya-MS]

For containers changes these two PRs are conflicting #44953 and #48987. We should take the latter

[AR-May]

I see that in this PR where the change of "Microsoft.NET.Test.Sdk" version was originated, the error for the missing version should be different. Not sure what is with this test - will need some more logs, preferably binlogs to look into it.

Ah, I looked again and found this new documentation page that states that the error message has been changed. It was the only confusing moment for me. Now I am sure that this is the same issue as this one. So, it seems to me as expected MSBuild behavior.

@MiYanni I suggest two options for fixing this test:

1. Revert the change in test\TestAssets\TestProjects\XUnitTestProject\XUnitTestProject.csproj file and use the fixed version of the package.
2. Alternatively, find out what changes were done in main to the testing infra that this test works in 9.0.3xx and does not in main.

[SimonZhao888]

@tmat, @MiYanni, could you please take a look at failure of Restore_FilesTest?
Expected string to be <null> or empty because Expected command to not output to stderr but it was not: File Name: /Users/runner/work/1/s/artifacts/bin/redist/Release/dotnet/dotnet Arguments: new TestAssets.PostActions.RestoreNuGet.Files_MatchSpecifiedFiles -n MyTool --debug:custom-hive /Users/runner/work/1/s/artifacts/tmp/Release/dotnet-new. IntegrationTests/Restore_FilesTest/Home/20250630104154789\n Exit Code: 0\nStdOut:\nThe template "TestAssets.PostActions.RestoreNuGet.Files_MatchSpecifiedFiles" was created successfully. Processing post-creation actions... Restoring /Users/runner/work/1/s/artifacts/tmp/Release/dotnet-new.IntegrationTests/Restore_FilesTest/20250630104154789/MyTool.Library/MyTool.Library.csproj: Determining projects to restore... Restored /Users/runner/work/1/s/artifacts/tmp/Release/dotnet-new. IntegrationTests/Restore_FilesTest/20250630104154789/MyTool.Library/MyTool.Library.csproj (in 295 ms).\nRestore succeeded. Restoring /Users/runner/work/1/s/artifacts/tmp/Release/dotnet-new.IntegrationTests/Restore_FilesTest/20250630104154789/MyTool.Test/MyTool.Test.csproj: Determining projects to restore... /Users/runner/work/1/s/artifacts/tmp/Release/dotnet-new.IntegrationTests/Restore_FilesTest/20250630104154789/MyTool.Test/MyTool.Test.csproj : error NU1015: The following PackageReference item(s) do not have a version specified: Microsoft.NET.Test.Sdk Failed to restore /Users/runner/work/1/s/artifacts/tmp/Release/dotnet-new.IntegrationTests/Restore_FilesTest/20250630104154789/MyTool.Test/MyTool.Test.csproj (in 7 ms). 1 of 2 projects are up-to-date for restore.\nStdErr:\nRestore failed. Post action failed.\nManual instructions: Run 'dotnet restore'\n, but found "Restore failed.\nPost action failed.\nManual instructions: Run 'dotnet restore'".

[SimonZhao888]

@nagilson, could you please help me to take a look at the test failure of Restore_FilesTest case?

[SimonZhao888]

@tmat, could you please help me to take a look at the test failure of Restore_FilesTest case?

[nagilson]

I agree with @AR-May's assessment of the issue with MicrosoftNETTestSdkPackageVersion. It was not specified in one of the projects, so I fixed that. (I wish I had read the comments a bit earlier so I didn't need to deduce this a 2nd time 😄 )

I also wonder if that doesn't fix it if, #49248 is related.

[SimonZhao888]

I agree with @AR-May's assessment of the issue with MicrosoftNETTestSdkPackageVersion. It was not specified in one of the projects, so I fixed that. (I wish I had read the comments a bit earlier so I didn't need to deduce this a 2nd time 😄 )

I also wonder if that doesn't fix it if, #49248 is related.

Uh, actually the fixed version of the package is the one I restored, because it triggers two other test case failures (the test case failure triggered by not being able to restore the package), and of course, thank you very much for reminding me that I'm missing a test asset project, so let's wait for the test results.
The fixed version numbers of all packages are consistent with the main branch.