Skip to content

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

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
wants to merge 2 commits into from
Closed

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

wants to merge 2 commits into from

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jun 5, 2025 •
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

dotnet-maestro bot added 2 commits June 5, 2025 02:04
@dotnet-maestro
[VMR] Codeflow a2c9e7b-a2c9e7b
dbdfa26 
[[ commit created by automation ]]
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 270603
a0d7b34 
Updated Dependencies:
System.CommandLine (Version 2.0.0-beta5.25279.2 -> 2.0.0-beta5.25304.104)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25260.104 -> 0.11.5-alpha.25304.104)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.5.25260.104 -> 10.0.100-preview.6.25304.104)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.XUnitExtensions, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.PackageTesting (Version 10.0.0-beta.25260.104 -> 10.0.0-beta.25304.104)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.2-beta.25260.104 -> 2.9.2-beta.25304.104)
Microsoft.NETCore.App.Ref, runtime.native.System.IO.Ports, Microsoft.NETCore.ILAsm, Microsoft.NET.Sdk.IL, System.Text.Json, System.Reflection.Metadata, System.Reflection.MetadataLoadContext (Version 10.0.0-preview.5.25260.104 -> 10.0.0-preview.6.25304.104)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25260.104 -> 5.0.0-1.25304.104)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25260.104 -> 10.0.0-preview.25304.104)
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jun 5, 2025

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="62e9d324a3c6678a0415b12af92354b6b03677c8" BarId="270603" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@github-actions github-actions bot added the area-codeflow for labeling automated codeflow label Jun 5, 2025
@ViktorHofer
Copy link
Member

cc @premun (intentional?)

@premun
Copy link
Member

premun commented Jun 5, 2025

@ViktorHofer there is one last source of conflicts right now, causing all of the conflicts we see.
It's not a bug, just a scenario we need to support that is connected to in which order files get changed and how the last flows happened (which order and when they got merged).

I am working on improving the algorithm to take these into account but until then, the workaround for now is:

  • Wait for the flow going to the other side to merge
  • Reopen a PR that has a conflict

@premun premun mentioned this pull request Jun 5, 2025
Open
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jun 6, 2025

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="7e27ec4c314eb774eae2c54ce4682c98973c7c60" BarId="270662" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@dotnet dotnet deleted a comment from dotnet-maestro bot Jun 10, 2025
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="604a6612d130bc042dc973aba84889f529f9cb69" BarId="271181" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="20fdc50b34ee89e7c54eef0a193c30ed4816597a" BarId="271343" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@premun premun closed this Jun 12, 2025
@dotnet-maestro dotnet-maestro bot deleted the darc-main-8fcb7c39-30cc-409a-a99e-90b8230050dd branch June 12, 2025 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steveisok steveisok

@vitek-karas vitek-karas

Assignees
No one assigned
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ViktorHofer @premun