[main] Source code updates from dotnet/dotnet

[dotnet-maestro]

Note

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

This pull request brings the following source code changes

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

• Subscription: b472297a-0d16-41ea-91af-ee5ed4325178
• Build: 20260415.21 (310648)
• Date Produced: April 16, 2026 8:21:55 AM UTC
• Commit: ab01524bbb2ef1eea0ffaef161b3ef5686e8f256
• Commit Diff: 0cf6b19...ab01524
• Branch: main

Associated changes in source repos

• 30f8bf5...1f7eece
• dotnet/aspnetcore@7cbda0e...bc03ef8
• dotnet/command-line-api@0b48ccb...d3de878
• dotnet/efcore@713aaf0...63572ec
• dotnet/fsharp@d507366...872352f
• dotnet/msbuild@8a330c4...12afa00
• NuGet/NuGet.Client@779eff1...06ee0a5
• dotnet/razor@e626c1b...5269ad3
• dotnet/roslyn@f839a71...2396c4d
• dotnet/runtime@1f4f1ff...cf7fcfa
• dotnet/sdk@1e5d8e3...2eac35a
• dotnet/source-build-assets@66ddf29...b1d5d43
• microsoft/vstest@5c5c4f1...4d9b368
• dotnet/winforms@b1bb375...c1aede2

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/dotnet:ab01524bbb2ef1eea0ffaef161b3ef5686e8f256..https://github.com/dotnet/arcade:darc-main-b46622d4-f860-4171-9113-5c232204d1f3

[dotnet-maestro]

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 311032 of https://github.com/dotnet/dotnet/tree/36afe73557f5f93cd7bc827cb644a3ff018eca0b.

The conflicts in the following files need to be manually resolved:

• src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
  🔍 View file in dotnet/arcade vs VMR

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

1. Clone the current repository

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

2. Make sure your darc is up-to-date
   (version 1.1.0-beta.26214.2 or higher)

   # Linux / MacOS
   ./eng/common/darc-init.sh
   # or on Windows
   .\eng\common\darc-init.ps1

3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

   darc vmr resolve-conflict --subscription b472297a-0d16-41ea-91af-ee5ed4325178

   This should apply the build 311032 with sources from 36afe73
4. Resolve the conflicts, 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.

[premun]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[ViktorHofer]

cc @joeloff for the last two commits that I pushed. Copilot found the hand and test failures and fixed them.

[ViktorHofer]

Yaaay, finally

[mmitche]

It looks like this messed up a bunch of the templates and broke the official build...it looks like it reverted the v4 publishing update reverting.

[premun]

@mmitche I think it's this: dotnet/arcade-services#6195

We will prioritize it