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

github-actions · 2025-06-13T16:09:03Z

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.

…07.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25175.5 -> To Version 7.0.0-preview.25257.2

…0250507.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.6

…0250507.13 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.13

…darc-release/8.0.1xx-4411553c-e2f4-492e-a41b-4826f3608411

…darc-release/8.0.3xx-adf0bb12-6d0f-4331-a2cb-ad080befdbac

…darc-release/8.0.3xx-149877b8-af60-435b-86af-70fc2a2d23da

…darc-release/8.0.1xx-30e75f85-4fe7-4641-841c-7a9905271d99

…merge/release/8.0.3xx-to-release/8.0.4xx

…0250508.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.312-servicing.25215.1 -> To Version 8.0.313-servicing.25258.1

…merge/release/8.0.1xx-to-release/8.0.3xx

…-merge-8.0.4xx-2025-05-13-1456

…-merge-8.0.3xx-2025-05-13-1500

…-merge-8.0.1xx-2025-05-13-1500

…513.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25230.1 -> To Version 8.0.0-beta.25263.1

… Build ID 2729690

… Build ID 2729774 (#49393)

# Conflicts: # .github/workflows/remove-lockdown-label.yml # NuGet.config # eng/Version.Details.xml # eng/Versions.props # eng/install-scancode.sh # eng/pipelines/templates/stages/vmr-build.yml # eng/pipelines/vmr-build-pr-internal.yml # eng/pipelines/vmr-build-pr.yml # src/Containers/Microsoft.NET.Build.Containers/Exceptions/UnableToDownloadFromRepositoryException.cs # src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs # src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs # src/SourceBuild/content/eng/Versions.props # src/SourceBuild/content/eng/pipelines/sb-ci.yml # src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml # src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml # test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

…se/9.0.3xx-to-main

# Conflicts: # src/Layout/pkg/osx/resources/cs.lproj/conclusion.html # src/Layout/pkg/osx/resources/de.lproj/conclusion.html # src/Layout/pkg/osx/resources/es.lproj/conclusion.html # src/Layout/pkg/osx/resources/fr.lproj/conclusion.html # src/Layout/pkg/osx/resources/it.lproj/conclusion.html # src/Layout/pkg/osx/resources/ja.lproj/conclusion.html # src/Layout/pkg/osx/resources/ko.lproj/conclusion.html # src/Layout/pkg/osx/resources/pl.lproj/conclusion.html # src/Layout/pkg/osx/resources/pt-br.lproj/conclusion.html # src/Layout/pkg/osx/resources/ru.lproj/conclusion.html # src/Layout/pkg/osx/resources/zh-hans.lproj/conclusion.html # src/Layout/pkg/osx/resources/zh-hant.lproj/conclusion.html

MiYanni · 2025-06-19T18:13:39Z

@dotnet/kitten Looks like a test failure in Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAUnitTestProject:

C:\h\w\A325094E\t\dotnetSdkTests\ypudv5cg.ewm\It_generates_---051AC46A\XUnitTestProject.csproj : error NU1015: The following PackageReference item(s) do not have a version specified: Microsoft.NET.Test.Sdk

The test project is Microsoft.NET.Build.Tests, so I'm assuming those are MSBuild related.

…se/9.0.3xx-to-main

AR-May · 2025-06-20T16:05:38Z

From the first glance, it looks to me as if the change in test/TestAssets/TestProjects/XUnitTestProject/XUnitTestProject.csproj causes the test failure. It says the version is not specified, my guess it might be because the $(MicrosoftNETTestSdkPackageVersion) is empty - as if the versions from Versions file are not applied to the tests` assets (it is the only place where I see it is defined). Could it be?

In the same file though the $(CurrentTargetFramework) seem to be used without issues. And in another test asset there is a comment stating that some tricky replacing happens in the test infra. I am not knowledgeable about the test infra in this repo, so I am not sure where it happens.

AR-May · 2025-06-20T16:31:45Z

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.

surayya-MS · 2025-06-24T13:11:17Z

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

AR-May · 2025-06-27T14:10:24Z

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:

Revert the change in test\TestAssets\TestProjects\XUnitTestProject\XUnitTestProject.csproj file and use the fixed version of the package.
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.

…nitTestProject.csproj file and use the fixed version of the package.

SimonZhao888 · 2025-07-01T02:22:03Z

@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'".

v-wuzhai and others added 30 commits May 7, 2025 18:58

Update queue to ubuntu 2204

aacc619

Update queue to ubuntu 2204

ec7c6c3

Merge commit '094b13b936f6ba3c4048444295fdc963c46817cb'

47341c9

Update dependencies from https://github.com/dotnet/templating build 2…

29b1d64

…0250507.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.6

Update dependencies from https://github.com/dotnet/templating build 2…

4daa391

…0250507.13 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.13

Update branding to 8.0.313 (#48848)

b4f58f2

Update branding to 8.0.117 (#48847)

6fee1c2

[release/8.0.3xx] Update dependencies from dotnet/arcade (#48733)

9b83f3a

[release/8.0.1xx] Update dependencies from dotnet/arcade (#48732)

b2dd68a

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

bf9db70

…darc-release/8.0.1xx-4411553c-e2f4-492e-a41b-4826f3608411

Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …

0054771

…darc-release/8.0.3xx-adf0bb12-6d0f-4331-a2cb-ad080befdbac

Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …

1e4987a

…darc-release/8.0.3xx-149877b8-af60-435b-86af-70fc2a2d23da

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

99e7c7c

…darc-release/8.0.1xx-30e75f85-4fe7-4641-841c-7a9905271d99

Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …

60cd23d

…merge/release/8.0.3xx-to-release/8.0.4xx

[release/8.0.3xx] Update dependencies from dotnet/templating (#48506)

9cc4dba

[release/8.0.1xx] Update dependencies from dotnet/templating (#48861)

d1064ab

[release/8.0.1xx] Update dependencies from dotnet/razor (#48730)

d03550c

Update dependencies from https://github.com/dotnet/templating build 2…

d1d63bf

…0250508.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.312-servicing.25215.1 -> To Version 8.0.313-servicing.25258.1

[release/8.0.3xx] Update dependencies from dotnet/razor (#48854)

f039fcd

[release/8.0.3xx] Update dependencies from dotnet/templating (#48884)

0a812d0

Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …

2afa4c2

…merge/release/8.0.1xx-to-release/8.0.3xx

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#48881)

593cc79

Merge commit 'cf4be5430e0194ba8a10a7493f4e46da9b7515f8' into internal…

53e5036

…-merge-8.0.4xx-2025-05-13-1456

Merge commit '6475dafd23d18add12328da1638a03d3eea9a526' into internal…

23a7d2c

…-merge-8.0.3xx-2025-05-13-1500

Merge commit 'cf8e4fd152a012b213a7f76353abc3a36c73d407' into internal…

1952ab7

…-merge-8.0.1xx-2025-05-13-1500

Respond to PR feedback

539fc44

Update dependencies from https://github.com/dotnet/arcade build 20250…

8f990d5

…513.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25230.1 -> To Version 8.0.0-beta.25263.1

Update dependencies from https://github.com/dotnet/arcade build 20250…

a40022f

…513.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25230.1 -> To Version 8.0.0-beta.25263.1

[release/8.0.1xx] Update dependencies from dotnet/arcade (#48932)

14403b9

github-actions bot requested a review from a team as a code owner June 13, 2025 16:09

dotnet-bot and others added 6 commits June 13, 2025 09:55

Localized file check-in by OneLocBuild Task: Build definition ID 140:…

e2c141e

… Build ID 2729690

Update to the latest STJ for the pinned versions (#49305)

db5ee7b

Localized file check-in by OneLocBuild Task: Build definition ID 140:…

0dda9fb

… Build ID 2729774 (#49393)

Remove duplicate resx string.

e28062e

Update xlf files to match resx fix.

cfb6806

Simon Zhao (BEYONDSOFT CONSULTING INC) and others added 2 commits June 17, 2025 15:08

Merge branch 'main' of https://github.com/dotnet/SDK into merge/relea…

ecf7b63

…se/9.0.3xx-to-main

build-analysis bot mentioned this pull request Jun 19, 2025

The active test run was aborted. Reason: Test host process crashed dotnet/dnceng#451

Open

3 tasks

Merge branch 'main' of https://github.com/dotnet/SDK into merge/relea…

6b8e66a

…se/9.0.3xx-to-main

surayya-MS self-assigned this Jun 23, 2025

surayya-MS assigned AR-May Jun 24, 2025

prefer changes from pr #48987 over #44953

d403680

surayya-MS force-pushed the merge/release/9.0.3xx-to-main branch from 8083ca4 to d403680 Compare June 24, 2025 13:47

surayya-MS approved these changes Jun 24, 2025

View reviewed changes

build-analysis bot mentioned this pull request Jun 25, 2025

Containers integration tests are flaky when the network fails to load the registry #49502

Open

AR-May removed their assignment Jun 27, 2025

surayya-MS removed their assignment Jun 27, 2025

Revert the change in test\TestAssets\TestProjects\XUnitTestProject\XU…

d8bf135

…nitTestProject.csproj file and use the fixed version of the package.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

github-actions bot commented Jun 13, 2025

Uh oh!

MiYanni commented Jun 19, 2025

Uh oh!

AR-May commented Jun 20, 2025

Uh oh!

AR-May commented Jun 20, 2025 •

edited

Loading

Uh oh!

surayya-MS commented Jun 24, 2025

Uh oh!

AR-May commented Jun 27, 2025

Uh oh!

SimonZhao888 commented Jul 1, 2025 •

edited

Loading

Uh oh!

Uh oh!

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

Are you sure you want to change the base?

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

Uh oh!

Conversation

github-actions bot commented Jun 13, 2025

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

MiYanni commented Jun 19, 2025

Uh oh!

AR-May commented Jun 20, 2025

Uh oh!

AR-May commented Jun 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

surayya-MS commented Jun 24, 2025

Uh oh!

AR-May commented Jun 27, 2025

Uh oh!

SimonZhao888 commented Jul 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

AR-May commented Jun 20, 2025 •

edited

Loading

SimonZhao888 commented Jul 1, 2025 •

edited

Loading