Skip to content

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

Merged
ViktorHofer merged 3 commits intomainfrom
darc-main-9469c981-ac6f-40e5-a327-79b2d9d631dc
Feb 4, 2026
Merged

[main] Source code updates from dotnet/sdk#4646
ViktorHofer merged 3 commits intomainfrom
darc-main-9469c981-ac6f-40e5-a327-79b2d9d631dc

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Feb 4, 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

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/sdk:323323ef802944b75bbd4b05605b5381bbb53647..https://github.com/dotnet/dotnet:darc-main-9469c981-ac6f-40e5-a327-79b2d9d631dc

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Feb 4, 2026

Caution

🚨 Action Required — Conflict detected

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

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

  • src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.BundledVersions.props
    🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.props
    🔍 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.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 b80ccdd7-504a-4efb-b58b-d6480d0a64d9
    This should apply the build 300159 with sources from 323323e
  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 4, 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/323323ef802944b75bbd4b05605b5381bbb53647..323323ef802944b75bbd4b05605b5381bbb53647

From: dotnet/sdk@323323e
To: dotnet/sdk@323323e

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

- src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.BundledVersions.props
- src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.props
@dotnet-policy-service dotnet-policy-service bot requested a review from a team February 4, 2026 08:25
@ViktorHofer ViktorHofer enabled auto-merge (squash) February 4, 2026 08:28
@ViktorHofer
Copy link
Member

@jonathanpeppers can you please approve? Thanks

@ViktorHofer ViktorHofer merged commit e28f4e1 into main Feb 4, 2026
15 of 16 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-9469c981-ac6f-40e5-a327-79b2d9d631dc branch February 4, 2026 16:53
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