Skip to content

[main] Source code updates from dotnet/runtime #4125

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 7 commits into from
Closed

[main] Source code updates from dotnet/runtime #4125

dotnet-maestro wants to merge 7 commits into from

Conversation

@dotnet-maestro
Copy link
Contributor

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

Note

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

This pull request brings the following source code changes

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

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/runtime:3211693c5d1875116571962d5d0e3cf401148660..https://github.com/dotnet/dotnet:darc-main-d609092d-d3df-4ff6-a764-7047bb00a26e

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 9, 2026

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 296596 of https://github.com/dotnet/runtime/tree/ee0d069f937b187c1e79b958536c80dfb1f9ad6b.

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/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26058.6 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 6458ae35-db00-43d0-af59-e57a01ca3120
    This should apply the build 296596 with sources from ee0d069
  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 9, 2026

Note

PRs from original repository included in this codeflow update:

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

@sbomer sbomer mentioned this pull request Jan 9, 2026
Merged
@ViktorHofer
[runtime] Source update ee0d069 → ee0d069
f7e83c1 
Diff: https://github.com/dotnet/runtime/compare/ee0d069f937b187c1e79b958536c80dfb1f9ad6b..ee0d069f937b187c1e79b958536c80dfb1f9ad6b

From: dotnet/runtime@ee0d069
To: dotnet/runtime@ee0d069

The following files had conflicts that were resolved by a user:

- src/runtime/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj
- src/runtime/src/tasks/installer.tasks/installer.tasks.csproj
- src/runtime/src/tasks/tasks.proj
@ViktorHofer ViktorHofer requested review from a team as code owners January 9, 2026 17:40
@dotnet-policy-service dotnet-policy-service bot requested a review from a team January 9, 2026 17:41
@ViktorHofer ViktorHofer enabled auto-merge (squash) January 9, 2026 17:41
@lewing
Copy link
Member

lewing commented Jan 9, 2026

Package pruning failures here too. cc @ericstj

@ericstj
Copy link
Member

ericstj commented Jan 9, 2026

Yeah, already on it. Something brought back the workaround I deleted.

@ericstj
Copy link
Member

ericstj commented Jan 9, 2026

I don't trust the content of this PR. It looks to be making changes that aren't part of the commit range dotnet/runtime@891c183...ee0d069 and those undo changes in #3873

@ViktorHofer ViktorHofer disabled auto-merge January 9, 2026 20:44
@ViktorHofer ViktorHofer added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Jan 9, 2026
ViktorHofer
ViktorHofer requested changes Jan 9, 2026
View reviewed changes
Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these changes are wrong as they are bringing back files that we deleted recently in the VMR. I.e. pruning.targets.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 10, 2026

Note

PRs from original repository included in this codeflow update:

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

@ericstj
Copy link
Member

ericstj commented Jan 12, 2026

@mmitche @premun this is still adding files where were not part of the commit range for this codeflow. What should we do with this PR?

@mmitche
Copy link
Member

mmitche commented Jan 12, 2026

@premun PTAL. Service issue possibly.

@mmitche mmitche mentioned this pull request Jan 12, 2026
Open
@mmitche
Copy link
Member

mmitche commented Jan 12, 2026

dotnet/arcade-services#5766

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 13, 2026

Note

PRs from original repository included in this codeflow update:

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

@premun
Copy link
Member

premun commented Jan 13, 2026

Something is up with the runtime codeflow (both ways), looking into it

@wtgodbe
Copy link
Member

wtgodbe commented Jan 13, 2026

Would be nice to get this in as it might have a fix for what's causing the hang in dotnet/aspnetcore#65006

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 14, 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 6458ae35-db00-43d0-af59-e57a01ca3120
  • 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 6458ae35-db00-43d0-af59-e57a01ca3120 --force

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

@premun
Copy link
Member

premun commented Jan 14, 2026

Might be better to reboot this PR as we had issues in the backflow and here. A new PR will clear the problems.

@dotnet-maestro dotnet-maestro bot deleted the darc-main-d609092d-d3df-4ff6-a764-7047bb00a26e branch January 14, 2026 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ViktorHofer ViktorHofer ViktorHofer requested changes

Assignees

No one assigned

Labels

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.

8 participants

@lewing @ericstj @mmitche @premun @wtgodbe @ViktorHofer @akoeplinger