Skip to content

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

Merged
akoeplinger merged 1 commit intomainfrom
darc-main-c8a306a5-8372-4f6c-a45a-ea4aa6d2ee26
Mar 6, 2026
Merged

[main] Source code updates from dotnet/dotnet#1590
akoeplinger merged 1 commit intomainfrom
darc-main-c8a306a5-8372-4f6c-a45a-ea4aa6d2ee26

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Mar 5, 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:15ac4103422d47f7c8f14fa98e813f315432d03b..https://github.com/dotnet/source-build-reference-packages:darc-main-c8a306a5-8372-4f6c-a45a-ea4aa6d2ee26

Updated Dependencies:
Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.6.0-preview-26153-109 -> 18.6.0-preview-26153-117)
Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.26153.109 -> 11.0.0-beta.26153.117)
Microsoft.DotNet.GenAPI.Task (Version 11.0.100-preview.3.26153.109 -> 11.0.100-preview.3.26153.117)
Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 11.0.0-preview.3.26153.109 -> 11.0.0-preview.3.26153.117)
[[ commit created by automation ]]
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner March 5, 2026 02:04
@am11
Copy link
Member

am11 commented Mar 5, 2026

@jkoritzinsky, @akoeplinger, re-running DAC pull will capture antlr4 cloaking change for #1585.

@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 5b5a9fe8-a4ac-4d0b-8c03-25fb72afa733
    
  • 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 5b5a9fe8-a4ac-4d0b-8c03-25fb72afa733 --force
    

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

@am11
Copy link
Member

am11 commented Mar 6, 2026

We can merge this and new one will get the antlr4 change.

@akoeplinger akoeplinger merged commit c2b75e4 into main Mar 6, 2026
10 checks passed
@akoeplinger akoeplinger deleted the darc-main-c8a306a5-8372-4f6c-a45a-ea4aa6d2ee26 branch March 6, 2026 10:06
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