Skip to content

[release/10.0] Source code updates from dotnet/dotnet#16556

Merged
premun merged 4 commits intorelease/10.0from
darc-release/10.0-fffd3336-820b-4d26-b824-3b8c4f5baed8
Mar 9, 2026
Merged

[release/10.0] Source code updates from dotnet/dotnet#16556
premun merged 4 commits intorelease/10.0from
darc-release/10.0-fffd3336-820b-4d26-b824-3b8c4f5baed8

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Mar 2, 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

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:5e82863e3383c65ebd0ca09ae0c05a6645753e00..https://github.com/dotnet/arcade:darc-release/10.0-fffd3336-820b-4d26-b824-3b8c4f5baed8

dotnet-maestro bot and others added 3 commits March 2, 2026 18:15
No dependency updates to commit
[[ commit created by automation ]]
@akoeplinger akoeplinger requested a review from mthalman March 2, 2026 18:31
@akoeplinger akoeplinger enabled auto-merge (squash) March 2, 2026 18:32
@akoeplinger akoeplinger disabled auto-merge March 5, 2026 17:39
@akoeplinger
Copy link
Member

@premun is the Maestro auto-merge - Codeflow verification correct here? if yes, we might want to make it a required check

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Mar 6, 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 ae335f24-dfec-40d5-b2c8-4b68b21b0af0
    
  • 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 ae335f24-dfec-40d5-b2c8-4b68b21b0af0 --force
    

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

@premun
Copy link
Member

premun commented Mar 9, 2026

@adamzip @dkurepa can you check the logs for this subscription to see if it failed to push a change? Seems like Maestro thinks the code should have an update

@dkurepa
Copy link
Member

dkurepa commented Mar 9, 2026

The service correctly merged the PR head branch into the target branch, and we can see that commit in the PR. But the commit with the codeflow changes isn't here, will look into it more

@dkurepa
Copy link
Member

dkurepa commented Mar 9, 2026

Ah I see it There are no new changes for VMR between 709d43145cfab0eda75bd2ccbf7723e998c78d4f and 5e82863e3383c65ebd0ca09ae0c05a6645753e00 we probably don't handle this case well.
I'll create an issue for it

@dkurepa
Copy link
Member

dkurepa commented Mar 9, 2026

we should force merge this PR for now

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.

3 participants