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

dotnet-maestro · Mar 11, 2026

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: 20260312.8 (305985)
Date Produced: March 12, 2026 11:40:19 PM UTC
Commit: fa5d8d28a5f206401cb45a60669cdc8fc9d433ba
Commit Diff: 5bb7e31...fa5d8d2
Branch: main

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/sdk:fa5d8d28a5f206401cb45a60669cdc8fc9d433ba..https://github.com/dotnet/dotnet:darc-main-931b7b2e-5e89-4b09-979a-16ed33fa65ea

dotnet-maestro · Mar 11, 2026

Caution

🚨 Action Required — Conflict detected

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

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

src/Dotnet.Watch/HotReloadClient/DefaultHotReloadClient.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/HotReloadClient/HotReloadClients.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/HotReloadClient/Web/AbstractBrowserRefreshServer.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/Watch/Build/BuildNames.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
🔍 View file in dotnet/sdk vs VMR
src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
🔍 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.26161.2 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 305729 with sources from 7f7422e
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 · Mar 11, 2026

Caution

Detected incorrect content in the target repo for src/sdk/src/Dotnet.Watch/Watch/Build/EvaluationResult.cs that could not be auto-resolved. Please review and correct this file manually.

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

dotnet-maestro · Mar 11, 2026

Note

PRs from original repository included in this codeflow update:

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

Accept SDK source versions for Dotnet.Watch files and fix duplicate Debug.Assert in EvaluationResult.cs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

The BOM was introduced during conflict resolution and causes MSBuild parse failures on Linux (MSB4025: Data at the root level is invalid). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Diff: https://github.com/dotnet/sdk/compare/7f7422e3e5dbe5b349c440e601dbf18b50f358e0..f3f14eda3806962e5e562333835a91f9804c47f9 From: dotnet/sdk@7f7422e To: dotnet/sdk@f3f14ed [[ commit created by automation ]]

dotnet-maestro · Mar 12, 2026

Note

PRs from original repository included in this codeflow update:

[MTP dotnet test]: Allow specifying project, solution, directory, or test modules as positional argument sdk#52449
[release/10.0.2xx] Update dependencies from microsoft/testfx sdk#53185
[release/10.0.2xx] Update dependencies from microsoft/testfx sdk#53220
Use FrameworkList.xml instead of hard-coding references and analyzers in optimized CSC-only file-based app builds sdk#53205
Add --delete-source option and interactive prompt to project convert sdk#52802
[MTP dotnet test]: Allow specifying project, solution, directory, or test modules as positional argument sdk#53004
[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx' sdk#53223
[dotnet run/watch] gracefully handle Ctrl+C for Windows (WinForms, WPF, MAUI) sdk#53127
[release/10.0.3xx] Fix dotnet test hang when the test app process exits but a child process of it remains alive sdk#53321
Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2921244 sdk#53323
Automatically generate embedded file contents for optimized run-file path sdk#53086
Support UTF-16 BOM in global.json sdk#53141
[automated] Merge branch 'release/10.0.3xx' => 'main' sdk#53332

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

marcpopMSFT · Mar 12, 2026

Two failures:

##[error]src/sdk/source-build.slnf(1,1): error MSB4025: (NETCORE_ENGINEERING_TELEMETRY=Restore) The project file could not be loaded. Data at the root level is invalid. Line 1, position 1. <-- lewing fixed this above so not sure why it's still showing up. Pinged him.
/__w/1/s/.dotnet/sdk/11.0.100-preview.3.26128.104/Microsoft.Common.CurrentVersion.targets(5094,5): error MSB3026: Could not copy "/__w/1/s/src/razor/artifacts/bin/Microsoft.CodeAnalysis.Razor.Workspaces/Release/net10.0/ko/Microsoft.CodeAnalysis.Razor.Workspaces.resources.dll" to "/__w/1/s/src/razor/artifacts/bin/Microsoft.CodeAnalysis.Remote.Razor/Release/net10.0/ko/Microsoft.CodeAnalysis.Razor.Workspaces.resources.dll". Beginning retry 1 in 1000ms. The process cannot access the file '/__w/1/s/src/razor/artifacts/bin/Microsoft.CodeAnalysis.Remote.Razor/Release/net10.0/ko/Microsoft.CodeAnalysis.Razor.Workspaces.resources.dll' because it is being used by another process. [/__w/1/s/src/razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj::TargetFramework=net10.0]
/__w/1/s/.dotnet/sdk/11.0.100-preview.3.26128.104/Microsoft.Common.CurrentVersion.targets(5094,5): error MSB3026: Could not copy "/__w/1/s/src/razor/artifacts/bin/Microsoft.AspNetCore.Razor.Utilities.Shared/Release/net10.0/de/Microsoft.AspNetCore.Razor.Utilities.Shared.resources.dll" to "/__w/1/s/src/razor/artifacts/bin/Microsoft.CodeAnalysis.Remote.Razor/Release/net10.0/de/Microsoft.AspNetCore.Razor.Utilities.Shared.resources.dll". Beginning retry 1 in 1000ms. The process cannot access the file '/__w/1/s/src/razor/artifacts/bin/Microsoft.CodeAnalysis.Remote.Razor/Release/net10.0/de/Microsoft.AspNetCore.Razor.Utilities.Shared.resources.dll' because it is being used by another process. [/__w/1/s/src/razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj::TargetFramework=net10.0]

Looks like a build flakiness issue.

marcpopMSFT · Mar 12, 2026

@dbreshears the second issue above looks like instability in the razor build: #5402 (comment)

I asked copilot and it suggested adding the following to the top of repo-projects/razor.proj. Not knowing enough about the razor build, I didn't include that in the PR but thought I'd share in case that's something that would be worth having.

$(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)pack
$(BuildActions) $(FlagParameterPrefix)sign

Diff: https://github.com/dotnet/sdk/compare/f3f14eda3806962e5e562333835a91f9804c47f9..fa5d8d28a5f206401cb45a60669cdc8fc9d433ba From: dotnet/sdk@f3f14ed To: dotnet/sdk@fa5d8d2 [[ commit created by automation ]]

[[ commit created by automation ]]

dotnet-maestro · Mar 13, 2026

Note

PRs from original repository included in this codeflow update:

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

akoeplinger · Mar 13, 2026

There was a missing path in the .slnf, filed dotnet/msbuild#13379 for getting a better error message

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

fda7da7

dotnet-policy-service Bot requested a review from a team March 11, 2026 20:54

Resolve codeflow conflicts for SDK forward flow

c534e1e

Accept SDK source versions for Dotnet.Watch files and fix duplicate Debug.Assert in EvaluationResult.cs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

lewing requested a review from a team March 11, 2026 21:29

lewing and others added 3 commits March 11, 2026 20:22

Remove UTF-8 BOM from source-build.slnf

76a17ec

The BOM was introduced during conflict resolution and causes MSBuild parse failures on Linux (MSB4025: Data at the root level is invalid). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

[sdk] Source update 7f7422e → f3f14ed

cb4f096

Diff: https://github.com/dotnet/sdk/compare/7f7422e3e5dbe5b349c440e601dbf18b50f358e0..f3f14eda3806962e5e562333835a91f9804c47f9 From: dotnet/sdk@7f7422e To: dotnet/sdk@f3f14ed [[ commit created by automation ]]

Merge main into darc-main-931b7b2e-5e89-4b09-979a-16ed33fa65ea

6e25f63

Update source-build.slnf

6af71f2

dotnet-maestro Bot added 3 commits March 13, 2026 02:07

[sdk] Source update f3f14ed → fa5d8d2

335dee9

Diff: https://github.com/dotnet/sdk/compare/f3f14eda3806962e5e562333835a91f9804c47f9..fa5d8d28a5f206401cb45a60669cdc8fc9d433ba From: dotnet/sdk@f3f14ed To: dotnet/sdk@fa5d8d2 [[ commit created by automation ]]

Merge main into darc-main-931b7b2e-5e89-4b09-979a-16ed33fa65ea

c0c58f8

Update dependencies from build 305985

4caab7d

[[ commit created by automation ]]

Fix wrong path in .slnf

9b511c6

akoeplinger mentioned this pull request Mar 13, 2026

Non-existing path in .slnf results in misleading error message when built through MSBuild task dotnet/msbuild#13379

Open

marcpopMSFT approved these changes Mar 13, 2026

View reviewed changes

dotnet-maestro Bot merged commit 08e21da into main Mar 13, 2026
16 checks passed

dotnet-maestro Bot deleted the darc-main-931b7b2e-5e89-4b09-979a-16ed33fa65ea branch March 13, 2026 16:32

dotnet-policy-service Bot requested a review from a team March 13, 2026 16:33

Copilot AI mentioned this pull request Mar 19, 2026

Fix misleading error when building .slnf with invalid paths via MSBuild task dotnet/msbuild#13418

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[main] Source code updates from dotnet/sdk - #5402

[main] Source code updates from dotnet/sdk#5402
dotnet-maestro[bot] merged 10 commits into
maindotnet/dotnet:mainfrom
darc-main-931b7b2e-5e89-4b09-979a-16ed33fa65eadotnet/dotnet:darc-main-931b7b2e-5e89-4b09-979a-16ed33fa65eaCopy head branch name to clipboard

dotnet-maestro Bot commented Mar 11, 2026 •

edited

Loading

Uh oh!

dotnet-maestro Bot commented Mar 11, 2026

🚨 Action Required — Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Mar 11, 2026

Uh oh!

dotnet-maestro Bot commented Mar 11, 2026

Uh oh!

dotnet-maestro Bot commented Mar 12, 2026

Uh oh!

marcpopMSFT commented Mar 12, 2026

Uh oh!

marcpopMSFT commented Mar 12, 2026

Uh oh!

dotnet-maestro Bot commented Mar 13, 2026

Uh oh!

akoeplinger commented Mar 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Search code, repositories, users, issues, pull requests...

Uh oh!

Conversation

dotnet-maestro Bot commented Mar 11, 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 Mar 11, 2026

🚨 Action Required — Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Mar 11, 2026

Uh oh!

dotnet-maestro Bot commented Mar 11, 2026

Uh oh!

dotnet-maestro Bot commented Mar 12, 2026

Uh oh!

marcpopMSFT commented Mar 12, 2026

Uh oh!

marcpopMSFT commented Mar 12, 2026

Uh oh!

dotnet-maestro Bot commented Mar 13, 2026

Uh oh!

akoeplinger commented Mar 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dotnet-maestro Bot commented Mar 11, 2026 •

edited

Loading