[main] Source code updates from dotnet/sdk #3754

dotnet-maestro · 2025-12-09T19:41:25Z

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/sdk

Subscription: b80ccdd7-504a-4efb-b58b-d6480d0a64d9
Build: 20251216.1 (294897)
Date Produced: December 16, 2025 6:50:11 PM UTC
Commit: 2b7468dad75a2c8dc419cd30da4443ac6d699aa6
Commit Diff: 6a6992f...2b7468d
Branch: main

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/sdk:2b7468dad75a2c8dc419cd30da4443ac6d699aa6..https://github.com/dotnet/dotnet:darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

…/ build 293587

dotnet-maestro · 2025-12-09T19:41:31Z

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/sdk/tree/e300dea82e0248b0801f706914c96073c1bd5350.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

eng/Signing.props
🔍 View file in dotnet/sdk vs VMR
eng/Versions.props
🔍 View file in dotnet/sdk vs VMR
src/Layout/redist/targets/BundledTemplates.targets
🔍 View file in dotnet/sdk vs VMR
src/Layout/redist/targets/GeneratePackagePruneData.targets
🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflict, please follow these steps:

Clone the current repository

git clone https://github.com/dotnet/dotnet
cd dotnet

~~Make sure your darc is up-to-date and run~~
⚠️ Temporarily please install and use the following darc version:

# Linux / MacOS
./eng/common/darc-init.sh --darcversion 1.1.0-beta.25609.2
# or on Windows
.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25609.2

Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally
```
darc vmr resolve-conflict --subscription b80ccdd7-504a-4efb-b58b-d6480d0a64d9
```
This should apply the build 293587 with sources from e300dea
Commit & push the changes
Once pushed, the Codeflow verification check will turn green.
If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

dotnet-maestro · 2025-12-09T19:41:31Z

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Diff: https://github.com/dotnet/sdk/compare/e300dea82e0248b0801f706914c96073c1bd5350..e300dea82e0248b0801f706914c96073c1bd5350 From: dotnet/sdk@e300dea To: dotnet/sdk@e300dea The following files had conflicts that were resolved by a user: - src/sdk/eng/Signing.props - src/sdk/eng/Versions.props - src/sdk/src/Layout/redist/targets/BundledTemplates.targets - src/sdk/src/Layout/redist/targets/GeneratePackagePruneData.targets

Diff: https://github.com/dotnet/sdk/compare/e300dea82e0248b0801f706914c96073c1bd5350..adbbd101b5d3a2241412402839a5f54b2a2a6726 From: dotnet/sdk@e300dea To: dotnet/sdk@adbbd10 [[ commit created by automation ]]

dotnet-maestro · 2025-12-10T02:18:12Z

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

ViktorHofer · 2025-12-10T08:35:48Z

@marcpopMSFT in case you haven't noticed this PR. This brings in all the remaining sdk changes since November 3rd.

Missed version update in dotnet/source-build-reference-packages#1482

ViktorHofer · 2025-12-10T10:42:17Z

@dotnet/source-build do we need to temporarily disable the dotnet watch test?

dotnet/test/Microsoft.DotNet.SourceBuild.Tests/DotNetWatchTests.cs

Line 16 in 30547fe

public void WatchTests()

Diff: https://github.com/dotnet/sdk/compare/adbbd101b5d3a2241412402839a5f54b2a2a6726..49c0d73c0bfa9eb2870827828354d5c96ed786f0 From: dotnet/sdk@adbbd10 To: dotnet/sdk@49c0d73 [[ commit created by automation ]]

dotnet-maestro · 2025-12-12T02:12:26Z

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Diff: https://github.com/dotnet/sdk/compare/49c0d73c0bfa9eb2870827828354d5c96ed786f0..27832aadb728931e5ffd7c8f7f27d1644bfc8b76 From: dotnet/sdk@49c0d73 To: dotnet/sdk@27832aa [[ commit created by automation ]]

dotnet-maestro · 2025-12-13T02:17:55Z

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

ellahathaway · 2025-12-15T19:59:41Z

@dotnet/source-build do we need to temporarily disable the dotnet watch test?

dotnet/test/Microsoft.DotNet.SourceBuild.Tests/DotNetWatchTests.cs

Line 16 in 30547fe

public void WatchTests()

The tests needed the changes from 56c050c. 4ca3434 should fix the issue.

ellahathaway · 2025-12-15T21:43:32Z

##[error]artifacts/obj/extracted-dotnet-sdk/sdk/11.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(684,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) No metadata 'SourceId' was present for item 'wwwroot/css/site.css' and no default value was provided. [/__w/1/s/src/scenario-tests/artifacts/obj/generatedtests/SdkTemplateTest_Razor_CSharp/SdkTemplateTest_Razor_CSharp.csproj]

@javiercn - can you please take a look at this failure?

marcpopMSFT · 2025-12-16T00:08:35Z

@dotnet/fsharp for artifacts/obj/extracted-dotnet-sdk/sdk/11.0.100-ci/FSharp/Microsoft.FSharp.NetSdk.targets(73,77): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Build) The target "_GetFrameworkAssemblyReferences" does not exist in the project. [/__w/1/s/src/scenario-tests/artifacts/obj/generatedtests/SdkTemplateTestsComplex_Console_FSharp/SdkTemplateTestsComplex_Console_FSharp.fsproj] [/__w/1/s/src/scenario-tests/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/Microsoft.DotNet.ScenarioTests.SdkTemplateTests.csproj]

Diff: https://github.com/dotnet/sdk/compare/27832aadb728931e5ffd7c8f7f27d1644bfc8b76..b300744fb898a955917527d0347b11e47b06e05b From: dotnet/sdk@27832aa To: dotnet/sdk@b300744 [[ commit created by automation ]]

dotnet-maestro · 2025-12-16T02:12:33Z

Note

PRs from original repository included in this codeflow update:

Preserve file encoding in file-based app source files sdk#52055

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

T-Gro · 2025-12-16T09:40:51Z

@dotnet/fsharp for artifacts/obj/extracted-dotnet-sdk/sdk/11.0.100-ci/FSharp/Microsoft.FSharp.NetSdk.targets(73,77): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Build) The target "_GetFrameworkAssemblyReferences" does not exist in the project. [/__w/1/s/src/scenario-tests/artifacts/obj/generatedtests/SdkTemplateTestsComplex_Console_FSharp/SdkTemplateTestsComplex_Console_FSharp.fsproj] [/__w/1/s/src/scenario-tests/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/Microsoft.DotNet.ScenarioTests.SdkTemplateTests.csproj]

Is this PR the first ever scenario run on SDK=11 ?
I am trying to figure out the material change causing it.

ViktorHofer · 2025-12-16T10:48:49Z

Yes. This is the PR that brings in the branding updates to 11.0.100 in SDK.

T-Gro · 2025-12-16T13:49:26Z

OK, that might explain it. F# historically depends on a private (= was wrong for F# to do it) target from nuget.client's Nuget.Build.Tasks.Pack.targets which might be optimized away (for good reasons) depending on the scenario.

Did a change to verify it here in this PR

mmitche · 2025-12-16T17:27:07Z

For the record on the NuGet issues in scenario tests:

The change to a new layout for the pack targets was made into the 10.0.1xx VMR in September
This backflowed into SDK into 1xx
This then made its way into the 2xx branch of SDk via branching
This then attempted to merge forward into main via inter-branch merge. The inter-branch merge did not bring in a new version of NuGet in the process (due to conflict resolution practices). However, to fix failures, the NuGet verison in SDK was manually updated.
When this forward flowed back into the VMR, the NuGet version in the VMR did not have the version of NuGet with the breaking change, so the PR breaks.

joeloff · 2025-12-17T00:38:56Z

Hmm, the LayoutTemplatesForMSI target should have placed the files in the folder for HEAT to harvest, but seems to be going to the wrong directory.

It's copying to D:\a\_work\1\s\src\sdk\artifacts\obj\redist\Release\net10.0\templates-10.0, but then harvesting from D:\a\_work\1\s\src\sdk\artifacts\obj\redist\Release\net10.0\templates-11.0

As a rule of thumb we should be harvesting only the 11 templates and not the 10 templates. We used to do some of the downlevel templates back in 8 or 9, but we stopped doing that.

Diff: https://github.com/dotnet/sdk/compare/b300744fb898a955917527d0347b11e47b06e05b..2b7468dad75a2c8dc419cd30da4443ac6d699aa6 From: dotnet/sdk@b300744 To: dotnet/sdk@2b7468d [[ commit created by automation ]]

dotnet-maestro · 2025-12-17T02:17:03Z

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Initial commit for subscription b80ccdd7-504a-4efb-b58b-d6480d0a64d9 …

1cd7d5e

…/ build 293587

dotnet-policy-service bot requested a review from a team December 9, 2025 21:25

ViktorHofer mentioned this pull request Dec 9, 2025

[main] Source code updates from nuget/nuget.client #3463

Merged

ViktorHofer approved these changes Dec 9, 2025

View reviewed changes

ViktorHofer enabled auto-merge (squash) December 9, 2025 21:37

Fix NetAnalyzers sarif version

b95c891

Update SpectreConsoleReleaseVersion to 0.54.0

30547fe

Missed version update in dotnet/source-build-reference-packages#1482

dotnet-policy-service bot requested a review from a team December 10, 2025 09:39

jjonescz mentioned this pull request Dec 10, 2025

[main] Source code updates from dotnet/roslyn #3147

Closed

ViktorHofer and others added 5 commits December 10, 2025 12:39

Fix template msi in sdk

43d57cd

Cleanup in BundledTemplates.targets

77eeef7

Fix typo in PropertyGroup closing tag

122fdba

Merge main into darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

19bb729

ViktorHofer disabled auto-merge December 12, 2025 09:38

ViktorHofer and others added 3 commits December 12, 2025 10:38

Merge branch 'main' into darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

6ba0a07

Merge main into darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

f1b5c79

Update dotnet watch test

4ca3434

ellahathaway requested a review from a team as a code owner December 15, 2025 19:59

dotnet-maestro bot added 2 commits December 16, 2025 02:12

Merge main into darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

c907eb9

Fix F# error with missing _GetFrameworkAssemblyReferences

12c3743

dotnet-policy-service bot requested a review from a team December 16, 2025 13:45

jonathanpeppers mentioned this pull request Dec 16, 2025

Enable MAUI samples when TargetFramework=net11.0 becomes available dotnet/performance#5055

Open

2 tasks

mmitche added 2 commits December 16, 2025 08:23

Revert back to correctly generated template msi name

65681b4

Revert back to old NuGet pack tools version

6007daf

ViktorHofer and others added 2 commits December 16, 2025 21:17

Merge branch 'main' into darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

6341318

Revert back to correct template selection

0cdf5a5

dotnet-maestro bot added 2 commits December 17, 2025 02:16

Merge main into darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

2f7e7b9

mthalman mentioned this pull request Dec 17, 2025

Support maui/android/ios workload manifests for source build #3897

Merged

mmitche added 3 commits December 17, 2025 06:46

Revert back to correct template selection

97ff06e

Do not set the template framework version to 10.0

74b2268

Revert remaining bundled template changes

779f7a0

dotnet-maestro bot merged commit d646bc4 into main Dec 18, 2025
16 checks passed

dotnet-maestro bot deleted the darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8 branch December 18, 2025 01:12

[main] Source code updates from dotnet/sdk #3754

[main] Source code updates from dotnet/sdk #3754

Uh oh!

Conversation

dotnet-maestro bot commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

From https://github.com/dotnet/sdk

Uh oh!

dotnet-maestro bot commented Dec 9, 2025

🛑 Conflict detected

ℹ️ To resolve the conflict, please follow these steps:

Uh oh!

dotnet-maestro bot commented Dec 9, 2025

Uh oh!

dotnet-maestro bot commented Dec 10, 2025

Uh oh!

ViktorHofer commented Dec 10, 2025

Uh oh!

ViktorHofer commented Dec 10, 2025

Uh oh!

dotnet-maestro bot commented Dec 12, 2025

Uh oh!

dotnet-maestro bot commented Dec 13, 2025

Uh oh!

ellahathaway commented Dec 15, 2025

Uh oh!

ellahathaway commented Dec 15, 2025

Uh oh!

marcpopMSFT commented Dec 16, 2025

Uh oh!

dotnet-maestro bot commented Dec 16, 2025

Uh oh!

T-Gro commented Dec 16, 2025

Uh oh!

ViktorHofer commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

T-Gro commented Dec 16, 2025

Uh oh!

mmitche commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joeloff commented Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dotnet-maestro bot commented Dec 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

dotnet-maestro bot commented Dec 9, 2025 •

edited

Loading

ViktorHofer commented Dec 16, 2025 •

edited

Loading

mmitche commented Dec 16, 2025 •

edited

Loading

joeloff commented Dec 17, 2025 •

edited

Loading