Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[main] Source code updates from dotnet/msbuild - #6704

#6704
Merged
OvesN merged 2 commits into
maindotnet/dotnet:mainfrom
darc-main-ce291df5-2bf3-475b-8b59-9199230dbd0adotnet/dotnet:darc-main-ce291df5-2bf3-475b-8b59-9199230dbd0aCopy head branch name to clipboard
May 20, 2026
Merged

[main] Source code updates from dotnet/msbuild#6704
OvesN merged 2 commits into
maindotnet/dotnet:mainfrom
darc-main-ce291df5-2bf3-475b-8b59-9199230dbd0adotnet/dotnet:darc-main-ce291df5-2bf3-475b-8b59-9199230dbd0aCopy head branch name to clipboard

Conversation

@dotnet-maestro

Copy link
Copy Markdown
Contributor

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/msbuild

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/msbuild:911bea0b57d3613eb9c29f49ff9858d03884c397..https://github.com/dotnet/dotnet:darc-main-ce291df5-2bf3-475b-8b59-9199230dbd0a

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 314999 of https://github.com/dotnet/msbuild/tree/911bea0b57d3613eb9c29f49ff9858d03884c397.

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

ℹ️ To resolve the conflicts, 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
    (version 1.1.0-beta.26268.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 d1c6afb2-7bf1-43e4-8f2e-af7e0680b540 

    This should apply the build 314999 with sources from 911bea0

  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.

@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team May 20, 2026 08:03
@OvesN OvesN self-assigned this May 20, 2026
@OvesN
OvesN enabled auto-merge (squash) May 20, 2026 10:28
@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team May 20, 2026 10:30
@OvesN
OvesN merged commit 6761dbd into main May 20, 2026
15 of 16 checks passed
@OvesN
OvesN deleted the darc-main-ce291df5-2bf3-475b-8b59-9199230dbd0a branch May 20, 2026 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.