Skip to content

[main] Source code updates from dotnet/dotnet#15379

Open
dotnet-maestro[bot] wants to merge 4 commits intomainfrom
darc-main-1ab148ba-86c8-4243-a00f-6cac24ae5894
Open

[main] Source code updates from dotnet/dotnet#15379
dotnet-maestro[bot] wants to merge 4 commits intomainfrom
darc-main-1ab148ba-86c8-4243-a00f-6cac24ae5894

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 30, 2026

Note

This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:fd46c9c9899610c1d999268dfb0382aa229222e1..https://github.com/microsoft/vstest:darc-main-1ab148ba-86c8-4243-a00f-6cac24ae5894

@dotnet-maestro
Copy link
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 299369 of https://github.com/dotnet/dotnet/tree/159b6d62add9dd2bbaaaaef8169f3d50f3cd711a.

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/microsoft/vstest
    cd vstest
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26078.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 resolve the conflict locally
    darc vmr resolve-conflict --subscription 6240778c-085c-4e63-ba23-e3ede3cbb6c8
    This should apply the build 299369 with sources from 159b6d6
  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.

@nohwnd
Copy link
Member

nohwnd commented Jan 30, 2026

Pushes us to newer versions of excluded assets, that don't support net8, possibly bug in maestro. Reported here:
dotnet/arcade-services#5874

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Feb 5, 2026

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id 6240778c-085c-4e63-ba23-e3ede3cbb6c8
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id 6240778c-085c-4e63-ba23-e3ede3cbb6c8 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

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.

1 participant