[main] Source code updates from dotnet/sdk by dotnet-maestro[bot] · Pull Request #6389 · dotnet/dotnet

dotnet-maestro · 2026-04-30T02:15:24Z

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: 20260504.2 (312955)
Date Produced: May 4, 2026 8:27:14 PM UTC
Commit: 7bfcbfa069151ac1f7b602fd4cad874f99fb2c1d
Commit Diff: 5004443...7bfcbfa
Branch: main

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/sdk:7bfcbfa069151ac1f7b602fd4cad874f99fb2c1d..https://github.com/dotnet/dotnet:darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b

dotnet-maestro · 2026-04-30T02:15:31Z

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 312427 of https://github.com/dotnet/sdk/tree/2bbd50d58b9410d7808520fe986f79041952f04f.

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

src/BuiltInTools/Watch/Process/ProcessLaunchResult.cs
🔍 View file in dotnet/sdk vs VMR
src/Cli/dotnet/Installer/Windows/InstallMessageBase.cs
🔍 View file in dotnet/sdk vs VMR
src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs
🔍 View file in dotnet/sdk vs VMR
src/Cli/dotnet/Installer/Windows/InstallResponseMessage.cs
🔍 View file in dotnet/sdk vs VMR
src/Cli/dotnet/Installer/Windows/MsiPayload.cs
🔍 View file in dotnet/sdk vs VMR
src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj
🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, 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
(version 1.1.0-beta.26227.1 or higher)

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

Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
```
darc vmr resolve-conflict --subscription b80ccdd7-504a-4efb-b58b-d6480d0a64d9 
```
This should apply the build 312427 with sources from 2bbd50d
Resolve the conflicts, 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 · 2026-04-30T02:15:32Z

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/2bbd50d58b9410d7808520fe986f79041952f04f..2bbd50d58b9410d7808520fe986f79041952f04f From: dotnet/sdk@2bbd50d To: dotnet/sdk@2bbd50d The following files had conflicts that were resolved by a user: - src/efcore/.agents/skills/ci-analysis/references/helix-artifacts.md - src/efcore/.agents/skills/ci-analysis/scripts/Get-CIStatus.ps1 - src/razor/.github/skills/ci-analysis/SKILL.md - src/razor/.github/skills/ci-analysis/references/azdo-helix-reference.md - src/razor/.github/skills/ci-analysis/references/azure-cli.md - src/razor/.github/skills/ci-analysis/references/binlog-comparison.md - src/razor/.github/skills/ci-analysis/references/build-progression-analysis.md - src/razor/.github/skills/ci-analysis/references/delegation-patterns.md - src/razor/.github/skills/ci-analysis/references/manual-investigation.md - src/razor/.github/skills/ci-analysis/references/sql-tracking.md - src/sdk/src/BuiltInTools/Watch/Process/ProcessLaunchResult.cs - src/sdk/src/Cli/dotnet/Installer/Windows/InstallMessageBase.cs - src/sdk/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs - src/sdk/src/Cli/dotnet/Installer/Windows/InstallResponseMessage.cs - src/sdk/src/Cli/dotnet/Installer/Windows/MsiPayload.cs - src/sdk/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj # Conflicts: # src/efcore/.agents/skills/ci-analysis/references/helix-artifacts.md # src/efcore/.agents/skills/ci-analysis/scripts/Get-CIStatus.ps1 # src/razor/.github/skills/ci-analysis/SKILL.md # src/razor/.github/skills/ci-analysis/references/azdo-helix-reference.md # src/razor/.github/skills/ci-analysis/references/azure-cli.md # src/razor/.github/skills/ci-analysis/references/binlog-comparison.md # src/razor/.github/skills/ci-analysis/references/build-progression-analysis.md # src/razor/.github/skills/ci-analysis/references/delegation-patterns.md # src/razor/.github/skills/ci-analysis/references/manual-investigation.md # src/razor/.github/skills/ci-analysis/references/sql-tracking.md # src/sdk/.claude/settings.json # src/sdk/.github/copilot/settings.json # src/sdk/documentation/general/dotnet-run-file.md # src/sdk/eng/Signing.props # src/sdk/eng/Versions.props # src/sdk/eng/common/tools.ps1 # src/sdk/eng/common/tools.sh # src/sdk/src/BuiltInTools/Watch/Process/ProcessLaunchResult.cs # src/sdk/src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs # src/sdk/src/Cli/Microsoft.DotNet.FileBasedPrograms/InternalAPI.Unshipped.txt # src/sdk/src/Cli/Microsoft.TemplateEngine.Cli/JExtensions.cs # src/sdk/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliHostSearchCacheData.cs # src/sdk/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandSpecMaker.cs # src/sdk/src/Cli/dotnet/Commands/CliCommandStrings.resx # src/sdk/src/Cli/dotnet/Commands/DotNetCommandFactory.cs # src/sdk/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs # src/sdk/src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommand.cs # src/sdk/src/Cli/dotnet/Commands/Run/Api/RunApiCommand.cs # src/sdk/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs # src/sdk/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf # src/sdk/src/Cli/dotnet/Installer/Windows/InstallMessageBase.cs # src/sdk/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs # src/sdk/src/Cli/dotnet/Installer/Windows/InstallResponseMessage.cs # src/sdk/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs # src/sdk/src/Cli/dotnet/Installer/Windows/MsiPayload.cs # src/sdk/src/Cli/dotnet/ParserOptionActions.cs # src/sdk/src/Common/EnvironmentVariableNames.cs # src/sdk/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj # src/sdk/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs # src/sdk/src/Containers/packaging/build/Microsoft.NET.Build.Containers.props # src/sdk/src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs # src/sdk/src/Dotnet.Watch/HotReloadAgent.Host/WebSocketTransport.cs # src/sdk/src/Dotnet.Watch/HotReloadClient/Logging/LogEvents.cs # src/sdk/src/Dotnet.Watch/HotReloadClient/Web/WebAssemblyHotReloadClient.cs # src/sdk/src/Dotnet.Watch/HotReloadClient/WebSocketClientTransport.cs # src/sdk/src/Dotnet.Watch/Watch.Aspire/Server/AspireWatcherLauncher.cs # src/sdk/src/Dotnet.Watch/Watch/AppModels/HotReloadAppModel.cs # src/sdk/src/Dotnet.Watch/Watch/Build/EvaluationResult.cs # src/sdk/src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs # src/sdk/src/Dotnet.Watch/Watch/Build/ProjectGraphFactory.cs # src/sdk/src/Dotnet.Watch/Watch/Context/ProjectOptions.cs # src/sdk/src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs # src/sdk/src/Dotnet.Watch/Watch/Process/ProcessRunner.cs # src/sdk/src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs # src/sdk/src/Dotnet.Watch/Watch/UI/IReporter.cs # src/sdk/src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs # src/sdk/src/Dotnet.Watch/Watch/UI/TargetFrameworkSelectionPrompt.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/CommandLine/CommandLineOptions.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/CommandLine/DotnetWatchCommandDefinition.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Program.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Resources.resx # src/sdk/src/Dotnet.Watch/dotnet-watch/UI/SpectreTargetFrameworkSelectionPrompt.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Watch/BuildEvaluator.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Watch/MsBuildFileSetFactory.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.cs.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.de.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.es.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.fr.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.it.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ja.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ko.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.pl.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.pt-BR.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ru.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.tr.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hans.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hant.xlf # src/sdk/src/Microsoft.DotNet.ProjectTools/PublicAPI.Unshipped.txt # src/sdk/src/Microsoft.DotNet.ProjectTools/VirtualProjectBuilder.cs # src/sdk/src/Tasks/sdk-tasks/sdk-tasks.InTree.targets # src/sdk/src/TemplateEngine/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.csproj # src/sdk/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj # src/sdk/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj # src/sdk/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireLauncherTests.cs # src/sdk/test/Microsoft.TemplateEngine.Cli.UnitTests/TemplateSearchCoordinatorTests.cs # src/sdk/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/Instructions/Basic/Class1.cs # src/sdk/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/Instructions/Basic/Class1.cs # src/sdk/test/dotnet-watch.Tests/Browser/BrowserTests.cs # src/sdk/test/dotnet-watch.Tests/Build/EvaluationTests.cs # src/sdk/test/dotnet-watch.Tests/Build/ProjectGraphFactoryTests.cs # src/sdk/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs # src/sdk/test/dotnet-watch.Tests/CommandLine/ProgramTests.GetProjectOptions.cs # src/sdk/test/dotnet-watch.Tests/HotReload/BuildProjectsTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/MauiHotReloadTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/MobileHotReloadTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/RazorHotReloadTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/SourceFileUpdateTests.HotReloadNotSupported.cs # src/sdk/test/dotnet-watch.Tests/HotReload/TargetFrameworkSelectionPromptTests.cs # src/sdk/test/dotnet-watch.Tests/TestUtilities/DotNetWatchTestBase.cs # src/sdk/test/dotnet-watch.Tests/TestUtilities/MockFileSetFactory.cs # src/sdk/test/dotnet-watch.Tests/TestUtilities/TestOptions.cs # src/sdk/test/dotnet-watch.Tests/Watch/FileUpdateTests.cs # src/sdk/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTestBase.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_BuildCommands.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_BuildOptions.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_CscOnlyAndApi.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_Directives.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_General.cs # src/source-manifest.json

Diff: https://github.com/dotnet/sdk/compare/2bbd50d58b9410d7808520fe986f79041952f04f..91e8ea261c78c0207f42135478cdb4d21fac0748 From: dotnet/sdk@2bbd50d To: dotnet/sdk@91e8ea2 [[ commit created by automation ]]

dotnet-maestro · 2026-05-01T02:12:54Z

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/91e8ea261c78c0207f42135478cdb4d21fac0748..0b462a74c4be9cd621da9ad5f38f301d2bee5286 From: dotnet/sdk@91e8ea2 To: dotnet/sdk@0b462a7 [[ commit created by automation ]]

dotnet-maestro · 2026-05-02T02:08:15Z

Note

PRs from original repository included in this codeflow update:

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

Resolve unmerged conflict in InstallRequestMessage.cs and MsiPayload.cs by keeping both System.Diagnostics.CodeAnalysis (needed for UnconditionalSuppressMessage attributes) and System.Text.Json (the actual serialization library), dropping the obsolete Newtonsoft.Json using directive. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Diff: https://github.com/dotnet/sdk/compare/0b462a74c4be9cd621da9ad5f38f301d2bee5286..7bfcbfa069151ac1f7b602fd4cad874f99fb2c1d From: dotnet/sdk@0b462a7 To: dotnet/sdk@7bfcbfa [[ commit created by automation ]]

dotnet-maestro · 2026-05-05T02:07:27Z

Note

PRs from original repository included in this codeflow update:

Enable Control Flow Guard for dotnet-aot project sdk#54171

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

nagilson · 2026-05-05T17:54:57Z

Note

This retry was triggered by Copilot based on CI analysis. The F# project.assets.json already exists error is a known NuGet parallel-restore race condition (not caused by this PR which changes zero F# files). 1/8 jobs affected.

/azp run

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

8507882

dotnet-policy-service Bot requested a review from a team April 30, 2026 02:15

dotnet-policy-service Bot requested review from a team April 30, 2026 23:43

wtgodbe approved these changes Apr 30, 2026

View reviewed changes

wtgodbe enabled auto-merge (squash) April 30, 2026 23:45

dotnet-policy-service Bot requested a review from a team April 30, 2026 23:47

dotnet-maestro Bot added 2 commits May 1, 2026 02:12

[sdk] Source update 2bbd50d → 91e8ea2

2fa8ee3

Diff: https://github.com/dotnet/sdk/compare/2bbd50d58b9410d7808520fe986f79041952f04f..91e8ea261c78c0207f42135478cdb4d21fac0748 From: dotnet/sdk@2bbd50d To: dotnet/sdk@91e8ea2 [[ commit created by automation ]]

Merge main into darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b

ce39c80

wtgodbe approved these changes May 1, 2026

View reviewed changes

Remove Microsoft.Extensions.Logging.Abstractions reference

c25ce3f

wtgodbe approved these changes May 1, 2026

View reviewed changes

dotnet-policy-service Bot requested a review from a team May 1, 2026 22:28

dotnet-maestro Bot added 2 commits May 2, 2026 02:08

[sdk] Source update 91e8ea2 → 0b462a7

211e832

Diff: https://github.com/dotnet/sdk/compare/91e8ea261c78c0207f42135478cdb4d21fac0748..0b462a74c4be9cd621da9ad5f38f301d2bee5286 From: dotnet/sdk@91e8ea2 To: dotnet/sdk@0b462a7 [[ commit created by automation ]]

Merge main into darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b

fb2e285

marcpopMSFT and others added 3 commits May 4, 2026 16:19

[sdk] Source update 0b462a7 → 7bfcbfa

95ad4fa

Diff: https://github.com/dotnet/sdk/compare/0b462a74c4be9cd621da9ad5f38f301d2bee5286..7bfcbfa069151ac1f7b602fd4cad874f99fb2c1d From: dotnet/sdk@0b462a7 To: dotnet/sdk@7bfcbfa [[ commit created by automation ]]

Merge main into darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b

9c4b89a

Merge branch 'main' into darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b

7a4a2cb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

[main] Source code updates from dotnet/sdk#6389
dotnet-maestro[bot] wants to merge 11 commits intomainfrom
darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b

dotnet-maestro Bot commented Apr 30, 2026 •

edited

Loading

Uh oh!

dotnet-maestro Bot commented Apr 30, 2026

🚨 Action Required — Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Apr 30, 2026

Uh oh!

dotnet-maestro Bot commented May 1, 2026

Uh oh!

dotnet-maestro Bot commented May 2, 2026

Uh oh!

dotnet-maestro Bot commented May 5, 2026

Uh oh!

nagilson commented May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

dotnet-maestro Bot commented Apr 30, 2026 • 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 Apr 30, 2026

🚨 Action Required — Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Apr 30, 2026

Uh oh!

dotnet-maestro Bot commented May 1, 2026

Uh oh!

dotnet-maestro Bot commented May 2, 2026

Uh oh!

dotnet-maestro Bot commented May 5, 2026

Uh oh!

nagilson commented May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dotnet-maestro Bot commented Apr 30, 2026 •

edited

Loading