Skip to content

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

Open
dotnet-maestro[bot] wants to merge 1 commit intomainfrom
darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b
Open

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

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

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/sdk:2bbd50d58b9410d7808520fe986f79041952f04f..https://github.com/dotnet/dotnet:darc-main-51bf30b5-745f-4eb5-bdaf-473df0dfb56b

@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 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:

  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.26227.1 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 b80ccdd7-504a-4efb-b58b-d6480d0a64d9 
    This should apply the build 312427 with sources from 2bbd50d
  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-maestro
Copy link
Copy Markdown
Contributor Author

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-policy-service dotnet-policy-service Bot requested a review from a team April 30, 2026 02:15
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.

0 participants