Skip to content

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

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

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

wants to merge 10 commits into from

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jun 26, 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

Associated changes in source repos

dotnet-maestro bot added 3 commits June 26, 2025 11:39
@dotnet-maestro
[VMR] Codeflow 5392448-5392448
3547656 
[[ commit created by automation ]]
@dotnet-maestro
Merge main into darc-main-e5778859-7cb8-431e-bbf1-647588f28e66
dc5679b
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273094
46b7587 
Updated Dependencies:
System.CommandLine (Version 2.0.0-beta5.25311.107 -> 2.0.0-beta6.25325.106)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25311.107 -> 0.11.5-alpha.25325.106)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.6.25311.107 -> 10.0.100-preview.7.25325.106)
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.25311.107 -> 10.0.0-beta.25325.106)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.2-beta.25311.107 -> 2.9.2-beta.25325.106)
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.6.25311.107 -> 10.0.0-preview.7.25325.106)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25311.107 -> 5.0.0-1.25325.106)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25311.107 -> 10.0.0-preview.25325.106)
@github-actions github-actions bot added the area-codeflow for labeling automated codeflow label Jun 26, 2025
@akoeplinger
Copy link
Member

@stephentoub @steveberdy CA1861 complains about the code here now, looks related to dotnet/roslyn-analyzers#7381

runtime/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

Line 2315 in f77f791

PayloadNames = s_errorPayloadNames ??= new ReadOnlyCollection<string>(new string[] { "message" })

This was referenced Jun 26, 2025
Open
Open
Open
Open
dotnet-maestro bot added 3 commits June 27, 2025 02:03
@dotnet-maestro
[VMR] Codeflow c158ff4-c158ff4
d84f709 
[[ commit created by automation ]]
@dotnet-maestro
Merge main into darc-main-e5778859-7cb8-431e-bbf1-647588f28e66
34d32f1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273256
3c9fb03 
Updated Dependencies:
System.CommandLine (Version 2.0.0-beta6.25325.106 -> 2.0.0-beta6.25326.109)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25325.106 -> 0.11.5-alpha.25326.109)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.7.25325.106 -> 10.0.100-preview.7.25326.109)
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.25325.106 -> 10.0.0-beta.25326.109)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.2-beta.25325.106 -> 2.9.2-beta.25326.109)
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.7.25325.106 -> 10.0.0-preview.7.25326.109)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25325.106 -> 5.0.0-1.25326.109)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25325.106 -> 10.0.0-preview.25326.109)
@steveberdy
Copy link
Contributor

@akoeplinger it looks like a valid warning. Not sure why my latest change made it fire, but it's not a false positive.

@akoeplinger
Copy link
Member

akoeplinger commented Jun 27, 2025 •
edited
Loading

@steveberdy hm we talked about this case specifically in dotnet/roslyn-analyzers#6629 and there was also a test added that is basically a copy of that so I'm a bit confused why that doesn't trigger but triggers here: https://github.com/dotnet/roslyn-analyzers/blob/62b0e094420a1f93d32ecb338aff8ad498ec9cd5/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/AvoidConstArraysTests.cs#L787-L807

dotnet-maestro bot added 2 commits June 28, 2025 02:05
@dotnet-maestro
[VMR] Codeflow 50be35a-50be35a
44dca3a 
[[ commit created by automation ]]
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273347
f16a4c1 
Updated Dependencies:
System.CommandLine (Version 2.0.0-beta6.25326.109 -> 2.0.0-beta6.25327.102)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25326.109 -> 0.11.5-alpha.25327.102)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.7.25326.109 -> 10.0.100-preview.7.25327.102)
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.25326.109 -> 10.0.0-beta.25327.102)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.2-beta.25326.109 -> 2.9.2-beta.25327.102)
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.7.25326.109 -> 10.0.0-preview.7.25327.102)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25326.109 -> 5.0.0-1.25327.102)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25326.109 -> 10.0.0-preview.25327.102)
dotnet-maestro bot added 2 commits July 1, 2025 02:06
@dotnet-maestro
[VMR] Codeflow b97f98b-b97f98b
014b952 
[[ commit created by automation ]]
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273672
058edfc 
Updated Dependencies:
System.CommandLine (Version 2.0.0-beta6.25327.102 -> 2.0.0-beta6.25330.103)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25327.102 -> 0.11.5-alpha.25330.103)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.7.25327.102 -> 10.0.100-preview.7.25330.103)
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.25327.102 -> 10.0.0-beta.25330.103)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.2-beta.25327.102 -> 2.9.2-beta.25330.103)
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.7.25327.102 -> 10.0.0-preview.7.25330.103)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25327.102 -> 5.0.0-1.25330.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25327.102 -> 10.0.0-preview.25330.103)
@dotnet-maestro dotnet-maestro bot requested review from BrzVlad, janvorli and kg as code owners July 1, 2025 02:07
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jul 1, 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="2fd058a2011cf1842cb3a42531e34987e948602e" BarId="273672" />

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

@akoeplinger
Copy link
Member

akoeplinger commented Jul 3, 2025 •
edited
Loading

Closing this and trigger a new dependency flow: #117274

@akoeplinger akoeplinger closed this Jul 3, 2025
@akoeplinger akoeplinger deleted the darc-main-e5778859-7cb8-431e-bbf1-647588f28e66 branch July 3, 2025 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steveisok steveisok Awaiting requested review from steveisok steveisok is a code owner

@vitek-karas vitek-karas Awaiting requested review from vitek-karas vitek-karas is a code owner

@BrzVlad BrzVlad Awaiting requested review from BrzVlad BrzVlad is a code owner

@janvorli janvorli Awaiting requested review from janvorli janvorli is a code owner

@kg kg Awaiting requested review from kg kg is a code owner

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
@akoeplinger @steveberdy