Skip to content

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

Merged
dotnet-maestro[bot] merged 26 commits intomainfrom
darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8
Dec 18, 2025
Merged

[main] Source code updates from dotnet/sdk#3754
dotnet-maestro[bot] merged 26 commits intomainfrom
darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Dec 9, 2025 •
edited
Loading

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

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

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 9, 2025

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:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. 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
  3. 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
  4. Commit & push the changes
  5. 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
Copy link
Contributor Author

dotnet-maestro bot commented Dec 9, 2025

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
[sdk] Source update e300dea → e300dea
4d0eb1c 
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
@dotnet-policy-service dotnet-policy-service bot requested a review from a team December 9, 2025 21:25
@ViktorHofer ViktorHofer mentioned this pull request Dec 9, 2025
Merged
@ViktorHofer ViktorHofer enabled auto-merge (squash) December 9, 2025 21:37
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 10, 2025

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
Copy link
Member

ViktorHofer commented Dec 10, 2025

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

@dotnet-policy-service dotnet-policy-service bot requested a review from a team December 10, 2025 09:39
@jjonescz jjonescz mentioned this pull request Dec 10, 2025
Closed
@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 10, 2025

@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()

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 12, 2025

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 ViktorHofer disabled auto-merge December 12, 2025 09:38
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 13, 2025

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 ellahathaway requested a review from a team as a code owner December 15, 2025 19:59
@ellahathaway
Copy link
Member

ellahathaway commented Dec 15, 2025

@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
Copy link
Member

ellahathaway commented Dec 15, 2025 

##[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
Copy link
Member

marcpopMSFT commented Dec 16, 2025

@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]

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 16, 2025

Note

PRs from original repository included in this codeflow update:

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

@T-Gro
Copy link
Member

T-Gro commented Dec 16, 2025

@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
Copy link
Member

ViktorHofer commented Dec 16, 2025 •
edited
Loading

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

@dotnet-policy-service dotnet-policy-service bot requested a review from a team December 16, 2025 13:45
@T-Gro
Copy link
Member

T-Gro commented Dec 16, 2025

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

@jonathanpeppers jonathanpeppers mentioned this pull request Dec 16, 2025
Closed
2 tasks
@mmitche
Copy link
Member

mmitche commented Dec 16, 2025 •
edited
Loading

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
Copy link
Member

joeloff commented Dec 17, 2025 •
edited
Loading

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.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 17, 2025

Note

PRs from original repository included in this codeflow update:

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

@mthalman mthalman mentioned this pull request Dec 17, 2025
Merged
@dotnet-maestro dotnet-maestro bot merged commit d646bc4 into main Dec 18, 2025
16 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-391511dd-ae8f-408a-b050-ded2a44c62c8 branch December 18, 2025 01:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ViktorHofer ViktorHofer ViktorHofer approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ViktorHofer @ellahathaway @marcpopMSFT @T-Gro @mmitche @joeloff @MichaelSimons @premun