Skip to content

[main] Source code updates from dotnet/runtime#4680

Merged
ViktorHofer merged 5 commits intomainfrom
darc-main-b7d9c4b7-8651-4bb0-9291-b7b20eb7e1bb
Feb 6, 2026
Merged

[main] Source code updates from dotnet/runtime#4680
ViktorHofer merged 5 commits intomainfrom
darc-main-b7d9c4b7-8651-4bb0-9291-b7b20eb7e1bb

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Feb 5, 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/runtime

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/runtime:a1bbba5d0ad98e82596ac3469e4534ae7966ed6f..https://github.com/dotnet/dotnet:darc-main-b7d9c4b7-8651-4bb0-9291-b7b20eb7e1bb

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Feb 5, 2026

Caution

🚨 Action Required — Conflict detected

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

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.26102.3 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 resolve the conflict locally
    darc vmr resolve-conflict --subscription 6458ae35-db00-43d0-af59-e57a01ca3120
    This should apply the build 300335 with sources from 2e76447
  4. 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
Contributor Author

dotnet-maestro bot commented Feb 5, 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-policy-service dotnet-policy-service bot requested a review from a team February 5, 2026 02:10
@dkurepa
Copy link
Member

dkurepa commented Feb 5, 2026

I'll handle this one, got some UX improvements I'd like to test

@ViktorHofer ViktorHofer merged commit 28d07f8 into main Feb 6, 2026
16 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-b7d9c4b7-8651-4bb0-9291-b7b20eb7e1bb branch February 6, 2026 13:21
@dkurepa dkurepa restored the darc-main-b7d9c4b7-8651-4bb0-9291-b7b20eb7e1bb branch February 13, 2026 15:29
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