Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
dotnet-maestro wants to merge 4 commits into from
Closed

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

dotnet-maestro wants to merge 4 commits into from

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 6, 2026 •
edited
Loading

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:896160ec9eb0fdb1c019f698b39fa0923c9a316c..https://github.com/dotnet/runtime:darc-main-ac7abba5-2c5b-4783-a978-a8633d909aa2

@dotnet-maestro
Backflow from https://github.com/dotnet/dotnet / fb2e783 build 296040
db853a4 
[[ commit created by automation ]]
@dotnet-maestro
Merge main into darc-main-ac7abba5-2c5b-4783-a978-a8633d909aa2
4242d22
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 296040
16d22ef 
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25619.109 -> 5.3.0-2.26055.102)
Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-alpha.1.25619.109 -> 11.0.100-alpha.1.26055.102)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25619.109 -> 11.0.0-beta.26055.102)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25619.109 -> 0.11.5-alpha.26055.102)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25619.109 -> 2.9.3-beta.26055.102)
Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 11.0.0-alpha.1.25619.109 -> 11.0.0-alpha.1.26055.102)
NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.3.0-preview.1.12009 -> 7.3.0-preview.1.5602)
System.CommandLine (Version 3.0.0-alpha.1.25619.109 -> 3.0.0-alpha.1.26055.102)
@github-actions github-actions bot added the area-codeflow for labeling automated codeflow label Jan 6, 2026
@build-analysis build-analysis bot mentioned this pull request Jan 6, 2026
Open
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 7, 2026

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/67ecf9e85940271afc2728753b09789c64bfecf2.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

ℹ️ To resolve the conflict, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/runtime
cd runtime
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.25619.4 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 f7901f87-9f24-40d6-9bc1-564863937237
    This should apply the build 296137 with sources from 67ecf9e
  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 Jan 8, 2026

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/896160ec9eb0fdb1c019f698b39fa0923c9a316c.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

ℹ️ To resolve the conflict, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/runtime
cd runtime
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.25619.4 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 f7901f87-9f24-40d6-9bc1-564863937237
    This should apply the build 296315 with sources from 896160e
  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.

@lewing lewing requested review from ViktorHofer and ericstj January 9, 2026 18:56
@lewing
Copy link
Member

lewing commented Jan 9, 2026

I resolved the conflict but the package pruning error from before the error is still there

@ViktorHofer
Copy link
Member

ViktorHofer commented Jan 9, 2026 •
edited
Loading

Changes LGTM. That error might be due to @ericstj's package pruning workaround that he put into runtime.

@build-analysis build-analysis bot mentioned this pull request Jan 9, 2026
Open
@ericstj
Copy link
Member

ericstj commented Jan 9, 2026 •
edited
Loading

This is bringing in the SDK with KnownFrameworkReference items for .NET 11. That means a number of workarounds put in place for retargeting can be removed. The pruning one is just the very first we hit (since it happens in restore).

I think all that work happened in VMR for the last runtime flow. I recommend we wait for backflow rather than re-implementing here.

@ViktorHofer / @lewing -- do you agree?

@ericstj ericstj added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Jan 9, 2026
@ericstj
Copy link
Member

ericstj commented Jan 9, 2026

Let's wait for backflow of dotnet/dotnet@4522825

@lewing
Copy link
Member

lewing commented Jan 9, 2026

Let's wait for backflow of dotnet/dotnet@4522825

it won't backflow automatically since there was a conflict

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 11, 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 f7901f87-9f24-40d6-9bc1-564863937237
  • 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 f7901f87-9f24-40d6-9bc1-564863937237 --force

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

@agocke
Copy link
Member

agocke commented Jan 12, 2026

@ericstj @lewing is someone resolving this manually?

@jkoritzinsky
Copy link
Member

jkoritzinsky commented Jan 12, 2026

This is blocking #123045

@jkoritzinsky jkoritzinsky added the blocking Marks issues that we want to fast track in order to unblock other important work label Jan 12, 2026
@ericstj ericstj closed this Jan 12, 2026
@dotnet-maestro dotnet-maestro bot deleted the darc-main-ac7abba5-2c5b-4783-a978-a8633d909aa2 branch January 12, 2026 20:51
@ericstj
Copy link
Member

ericstj commented Jan 12, 2026

#123100 replaces this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ViktorHofer ViktorHofer ViktorHofer approved these changes

@ericstj ericstj Awaiting requested review from ericstj

Assignees

@dotnet-maestro dotnet-maestro[bot]

Labels

area-codeflow for labeling automated codeflow blocking Marks issues that we want to fast track in order to unblock other important work NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@lewing @ViktorHofer @ericstj @agocke @jkoritzinsky