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

dotnet-maestro · Jun 14, 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: 20260618.13 (319316)
Date Produced: June 18, 2026 7:48:58 PM UTC
Commit: 29c3e4ddc924b84fc031f8f1a419ff8c81129b6c
Commit Diff: 5e1a9ca...29c3e4d
Branch: main

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/sdk:29c3e4ddc924b84fc031f8f1a419ff8c81129b6c..https://github.com/dotnet/dotnet:darc-main-022481a8-90ca-4685-962e-9c1b89fc3010

Diff: https://github.com/dotnet/sdk/compare/5e1a9ca950a41d5ffbf7134be90b8363537cddce..bcdeca991f9686de1c28411d1b5f381640602172 From: dotnet/sdk@5e1a9ca To: dotnet/sdk@bcdeca9 [[ commit created by automation ]]

dotnet-maestro · Jun 14, 2026

Note

PRs from original repository included in this codeflow update:

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

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

akoeplinger · Jun 14, 2026

+  "tools": {
+    "microsoft.dotnet.helix.jobmonitor": {
+      "version": "11.0.0-beta.26311.113"
+    }


@premun @dkurepa any idea why this removed isRoot/version and the command from the .json? https://github.com/dotnet/sdk/blob/main/.config/dotnet-tools.json

We will check. I know that Michal Simons created the file in root and then moved it to .config/ later (because Maestro doesn't update the root one). So this file was moving around.

FWIW, I added the jobmonitor tool, it already existed at the root, but yes I did move it because of a DARC limitation w/updating it.

nagilson · Jun 15, 2026

Note

This comment was generated by Copilot.

/azp run dotnet-unified-build

Retrying: VMR build failure (dotnet tool restore exit code 1) matches the same pattern seen on dotnet/sdk main-targeting PRs — likely infrastructure/transient.

Diff: https://github.com/dotnet/sdk/compare/bcdeca991f9686de1c28411d1b5f381640602172..db0a641af6a5581c4cd6725c78c43ccf85284190 From: dotnet/sdk@bcdeca9 To: dotnet/sdk@db0a641 [[ commit created by automation ]]

dotnet-maestro · Jun 16, 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.

ViktorHofer · Jun 16, 2026

@premun / @dkurepa should we close this PR and expect the next flow to auto heal or fix those sync regressions?

Diff: https://github.com/dotnet/sdk/compare/db0a641af6a5581c4cd6725c78c43ccf85284190..369107d983d4c848f96e119c9359063aac7a68f0 From: dotnet/sdk@db0a641 To: dotnet/sdk@369107d [[ commit created by automation ]]

dotnet-maestro · Jun 17, 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.

Diff: https://github.com/dotnet/sdk/compare/369107d983d4c848f96e119c9359063aac7a68f0..d56cc317e44f9bb4679e22a4eaf6360104df078e From: dotnet/sdk@369107d To: dotnet/sdk@d56cc31 [[ commit created by automation ]]

[[ commit created by automation ]]

dotnet-maestro · Jun 18, 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.

dotnet-maestro · Jun 19, 2026

Caution

🛑 Codeflow Paused — Conflict detected

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

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

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

src/Cli/dotnet/CommandFactory/CommandResolution/DotnetToolsCommandResolver.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.26316.3 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 319316 with sources from 29c3e4d
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 · Jun 19, 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.

OvesN · Jun 22, 2026

@akoeplinger
Could this flow be merged soon? We'd like to see the changes made by the MSBuild team in the SDK reflected in the VMR. Thank you!

[sdk] Source update 5e1a9ca → bcdeca9

9590960

Diff: https://github.com/dotnet/sdk/compare/5e1a9ca950a41d5ffbf7134be90b8363537cddce..bcdeca991f9686de1c28411d1b5f381640602172 From: dotnet/sdk@5e1a9ca To: dotnet/sdk@bcdeca9 [[ commit created by automation ]]

dotnet-policy-service Bot requested a review from a team June 14, 2026 02:08

akoeplinger reviewed Jun 14, 2026

View reviewed changes

dotnet-maestro Bot added 2 commits June 16, 2026 02:09

[sdk] Source update bcdeca9 → db0a641

489e6a5

Diff: https://github.com/dotnet/sdk/compare/bcdeca991f9686de1c28411d1b5f381640602172..db0a641af6a5581c4cd6725c78c43ccf85284190 From: dotnet/sdk@bcdeca9 To: dotnet/sdk@db0a641 [[ commit created by automation ]]

Merge main into darc-main-022481a8-90ca-4685-962e-9c1b89fc3010

fa47614

dotnet-maestro Bot added 2 commits June 17, 2026 02:19

[sdk] Source update db0a641 → 369107d

6dd3905

Diff: https://github.com/dotnet/sdk/compare/db0a641af6a5581c4cd6725c78c43ccf85284190..369107d983d4c848f96e119c9359063aac7a68f0 From: dotnet/sdk@db0a641 To: dotnet/sdk@369107d [[ commit created by automation ]]

Merge main into darc-main-022481a8-90ca-4685-962e-9c1b89fc3010

99125c3

dotnet-maestro Bot added 3 commits June 18, 2026 02:12

[sdk] Source update 369107d → d56cc31

baeeabd

Diff: https://github.com/dotnet/sdk/compare/369107d983d4c848f96e119c9359063aac7a68f0..d56cc317e44f9bb4679e22a4eaf6360104df078e From: dotnet/sdk@369107d To: dotnet/sdk@d56cc31 [[ commit created by automation ]]

Merge main into darc-main-022481a8-90ca-4685-962e-9c1b89fc3010

bdded16

Update dependencies from build 319138

6a15af4

[[ commit created by automation ]]

lewing closed this Jun 22, 2026

dotnet-maestro Bot deleted the darc-main-022481a8-90ca-4685-962e-9c1b89fc3010 branch June 22, 2026 15:43

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

Uh oh!

Conversation

dotnet-maestro Bot commented Jun 14, 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 Jun 14, 2026

Uh oh!

akoeplinger Jun 14, 2026

Choose a reason for hiding this comment

Uh oh!

premun Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MichaelSimons Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

nagilson commented Jun 15, 2026

Uh oh!

dotnet-maestro Bot commented Jun 16, 2026

Uh oh!

ViktorHofer commented Jun 16, 2026

Uh oh!

dotnet-maestro Bot commented Jun 17, 2026

Uh oh!

dotnet-maestro Bot commented Jun 18, 2026

Uh oh!

dotnet-maestro Bot commented Jun 19, 2026

🛑 Codeflow Paused — Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Jun 19, 2026

Uh oh!

OvesN commented Jun 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

dotnet-maestro Bot commented Jun 14, 2026 •

edited

Loading

premun Jun 15, 2026 •

edited

Loading