Skip to content

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

Merged
ViktorHofer merged 2 commits into
mainfrom
darc-main-4c1b180b-4136-4bf2-a4e1-6dd83f19b5d9
Jan 14, 2026
Merged

[main] Source code updates from dotnet/runtime#4196
ViktorHofer merged 2 commits into
mainfrom
darc-main-4c1b180b-4136-4bf2-a4e1-6dd83f19b5d9

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

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/runtime:73294ebb8c1bf4724e8c785e599e5ac71e06bec3..https://github.com/dotnet/dotnet:darc-main-4c1b180b-4136-4bf2-a4e1-6dd83f19b5d9
@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 297233 of https://github.com/dotnet/runtime/tree/73294ebb8c1bf4724e8c785e599e5ac71e06bec3.

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

  • src/tasks/installer.tasks/installer.tasks.csproj
    🔍 View file in dotnet/runtime 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.26062.6 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 297233 with sources from 73294eb
  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
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.

Diff: https://github.com/dotnet/runtime/compare/73294ebb8c1bf4724e8c785e599e5ac71e06bec3..73294ebb8c1bf4724e8c785e599e5ac71e06bec3

From: dotnet/runtime@73294eb
To: dotnet/runtime@73294eb

The following files had conflicts that were resolved by a user:

- src/runtime/src/tasks/installer.tasks/installer.tasks.csproj
@akoeplinger akoeplinger requested review from a team as code owners January 14, 2026 09:37
@dotnet-policy-service dotnet-policy-service Bot requested a review from a team January 14, 2026 09:37
@ViktorHofer ViktorHofer merged commit 9ac1950 into main Jan 14, 2026
15 of 16 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-4c1b180b-4136-4bf2-a4e1-6dd83f19b5d9 branch January 14, 2026 11:51
@ericstj

ericstj commented Jan 14, 2026

Copy link
Copy Markdown
Member
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants