Skip to content

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

Open
dotnet-maestro[bot] wants to merge 5 commits intomainfrom
darc-main-93e24796-a368-4f0f-af10-9464ea51d775
Open

[main] Source code updates from dotnet/dotnet#19659
dotnet-maestro[bot] wants to merge 5 commits intomainfrom
darc-main-93e24796-a368-4f0f-af10-9464ea51d775

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented Apr 29, 2026

@github-actions
Copy link
Copy Markdown
Contributor

✅ No release notes required

No dependency updates to commit
[[ commit created by automation ]]
No dependency updates to commit
[[ commit created by automation ]]
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented May 1, 2026

Caution

There was a conflict in Nuget.Config. Resolved by preferring the version from the repo. Please make sure to merge any necessary changes from the VMR's Nuget.Config if needed.

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

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented May 3, 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 33aad187-a5d7-4947-b09f-777f8ea29e81
    
  • 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 33aad187-a5d7-4947-b09f-777f8ea29e81 --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

Status: New

Development

Successfully merging this pull request may close these issues.

0 participants