Skip to content

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 19, 2025

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 2 commits July 19, 2025 02:03
Updated Dependencies:
System.CommandLine (Version 2.0.0-beta7.25367.101 -> 2.0.0-beta7.25368.102)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25367.101 -> 0.11.5-alpha.25368.102)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.7.25367.101 -> 10.0.100-preview.7.25368.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.25367.101 -> 10.0.0-beta.25368.102)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25367.101 -> 2.9.3-beta.25368.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.25367.101 -> 10.0.0-preview.7.25368.102)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-2.25367.101 -> 5.0.0-2.25368.102)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25367.101 -> 10.0.0-preview.25368.102)
Updated Dependencies:
System.CommandLine (Version 2.0.0-beta7.25368.102 -> 2.0.0-beta7.25368.105)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25368.102 -> 0.11.5-alpha.25368.105)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.7.25368.102 -> 10.0.100-preview.7.25368.105)
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.25368.102 -> 10.0.0-beta.25368.105)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25368.102 -> 2.9.3-beta.25368.105)
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.25368.102 -> 10.0.0-preview.7.25368.105)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-2.25368.102 -> 5.0.0-2.25368.105)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25368.102 -> 10.0.0-preview.25368.105)
dotnet-maestro bot added 2 commits July 23, 2025 02:06
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25368.105 -> 5.0.0-2.25372.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25368.105 -> 10.0.0-preview.25372.103)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25368.105 -> 10.0.100-preview.7.25372.103)
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 10.0.0-beta.25368.105 -> 10.0.0-beta.25372.103)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25368.105 -> 0.11.5-alpha.25372.103)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25368.105 -> 2.9.3-beta.25372.103)
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 10.0.0-preview.7.25368.105 -> 10.0.0-preview.7.25372.103)
System.CommandLine (Version 2.0.0-beta7.25368.105 -> 2.0.0-beta7.25372.103)
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25372.103 -> 5.0.0-2.25373.104)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25372.103 -> 10.0.0-preview.25373.104)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25372.103 -> 10.0.100-preview.7.25373.104)
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 10.0.0-beta.25372.103 -> 10.0.0-beta.25373.104)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25372.103 -> 0.11.5-alpha.25373.104)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25372.103 -> 2.9.3-beta.25373.104)
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 10.0.0-preview.7.25372.103 -> 10.0.0-preview.7.25373.104)
System.CommandLine (Version 2.0.0-beta7.25372.103 -> 2.0.0-beta7.25373.104)
dotnet-maestro bot added 2 commits July 25, 2025 02:04
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25373.104 -> 5.0.0-2.25374.102)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25373.104 -> 10.0.0-preview.25374.102)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25373.104 -> 10.0.100-preview.7.25374.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 10.0.0-beta.25373.104 -> 10.0.0-beta.25374.102)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25373.104 -> 0.11.5-alpha.25374.102)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25373.104 -> 2.9.3-beta.25374.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 10.0.0-preview.7.25373.104 -> 10.0.0-preview.7.25374.102)
System.CommandLine (Version 2.0.0-beta7.25373.104 -> 2.0.0-beta7.25374.102)
dotnet-maestro bot added 2 commits July 26, 2025 02:04
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25374.102 -> 5.0.0-2.25375.106)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25374.102 -> 10.0.0-preview.25375.106)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25374.102 -> 10.0.100-preview.7.25375.106)
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 10.0.0-beta.25374.102 -> 10.0.0-beta.25375.106)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25374.102 -> 0.11.5-alpha.25375.106)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25374.102 -> 2.9.3-beta.25375.106)
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 10.0.0-preview.7.25374.102 -> 10.0.0-preview.7.25375.106)
System.CommandLine (Version 2.0.0-beta7.25374.102 -> 2.0.0-rc.1.25375.106)
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25375.106 -> 5.0.0-2.25375.119)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25375.106 -> 10.0.0-preview.25375.119)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25375.106 -> 10.0.100-preview.7.25375.119)
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 10.0.0-beta.25375.106 -> 10.0.0-beta.25375.119)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25375.106 -> 0.11.5-alpha.25375.119)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25375.106 -> 2.9.3-beta.25375.119)
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 10.0.0-preview.7.25375.106 -> 10.0.0-preview.7.25375.119)
System.CommandLine (Version 2.0.0-rc.1.25375.106 -> 2.0.0-rc.1.25375.119)
dotnet-maestro bot and others added 4 commits July 29, 2025 02:04
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25375.119 -> 5.0.0-2.25377.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25375.119 -> 10.0.0-preview.25377.103)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25375.119 -> 10.0.100-preview.7.25377.103)
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 10.0.0-beta.25375.119 -> 10.0.0-beta.25377.103)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25375.119 -> 0.11.5-alpha.25377.103)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25375.119 -> 2.9.3-beta.25377.103)
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 10.0.0-preview.7.25375.119 -> 10.0.0-preview.7.25377.103)
System.CommandLine (Version 2.0.0-rc.1.25375.119 -> 2.0.0-rc.1.25377.103)
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25377.103 -> 5.0.0-2.25401.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25377.103 -> 10.0.0-preview.25401.103)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25377.103 -> 10.0.100-rc.1.25401.103)
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 10.0.0-beta.25377.103 -> 10.0.0-beta.25401.103)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25377.103 -> 0.11.5-alpha.25401.103)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25377.103 -> 2.9.3-beta.25401.103)
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 10.0.0-preview.7.25377.103 -> 10.0.0-rc.1.25401.103)
System.CommandLine (Version 2.0.0-rc.1.25377.103 -> 2.0.0-rc.1.25401.103)
Copy link
Contributor Author

dotnet-maestro bot commented Aug 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="8b29a1682219da555ee27e4fdda55dc3884b316f" BarId="277635" />

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

@jkoritzinsky
Copy link
Member

I'm looking into the NAOT failures. Looks like the runtime package isn't being discovered. Maybe some of the weird logic we have around restore for the test projects is causing an issue?

I'll investigate

@jkoritzinsky
Copy link
Member

I found the problem and added a workaround to our build.

I'll file an issue on the dotnet/sdk repo to improve the experience.

@jkoritzinsky
Copy link
Member

Filed dotnet/sdk#50093 for the underlying issue.

@tannergooding
Copy link
Member

Talked with @mmitche offline to confirm the fix for the Version.props/Version.Details.props conflict and have pushed that up

<!-- emscripten / Node
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport
-->
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.100-preview.7.25367.101</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
Copy link
Member

Choose a reason for hiding this comment

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

@akoeplinger Are the mono workload manifests still produced in runtime? I thought that got moved to sdk, but I see references in src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj

Copy link
Member

Choose a reason for hiding this comment

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

they're not, I need to clean them up

<!-- BrowserDebugProxy libs -->
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
<!-- sdk version, for testing workloads -->
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.25169.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<EmsdkPackageVersion>10.0.0-preview.7.25359.101</EmsdkPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

@akoeplinger Similar question here...this is an n-1 (or earlier) version but shows up in src/mono/mono.proj

Copy link
Member

Choose a reason for hiding this comment

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

same here

@tannergooding
Copy link
Member

@jkoritzinsky, @akoeplinger

Looks like some Mono failures felated to LibraryImport generator: LibraryImportGenerator.UnitTests.CustomMarshallerAttributeAnalyzerTests_StatelessLinearCollectionShapeValidation.CallerAllocatedBuffer_NoBufferSize_ReportsDiagnostic

https://dev.azure.com/dnceng-public/public/_build/results?buildId=1116065&view=ms.vss-test-web.build-test-results-tab&runId=30639944&resultId=134259&paneView=debug

Is someone available to take a look so we can get this unblocked?

@jkoritzinsky
Copy link
Member

@tannergooding I'll take a look at those

@tannergooding
Copy link
Member

@MichalStrehovsky does ILC try to trim out any embedded resources?

Seeing a few benchmark games tests fail and I logged #118475 for it.

There's other tests in the same general folder that use the same embedded resources and aren't failing, but nothing obvious from the direct the changes in this PR that might cause it.

@MichalStrehovsky
Copy link
Member

@MichalStrehovsky does ILC try to trim out any embedded resources?

It does not trim resources but the question is immaterial since the tests are neither AOT compiled nor trimmed in the failing legs.

My guess would be an SDK change caused it but since the SDK repo doesn't believe in squashing commits, it's hard to pinpoint what caused it. Nobody is going to dig through dozens of "PR feedback" and "feedback" commits.

@tannergooding
Copy link
Member

My guess would be an SDK change caused it but since the SDK repo doesn't believe in squashing commits, it's hard to pinpoint what caused it. Nobody is going to dig through dozens of "PR feedback" and "feedback" commits.

This shouldn’t matter? It’s fairly trivial to look at just the merge heads and ignore any child commits. I’ll take a look through these tomorrow and see if I can spot any obvious changes

Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25401.103 -> 5.0.0-2.25406.102)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25401.103 -> 10.0.0-preview.25406.102)
Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25401.103 -> 10.0.100-rc.1.25406.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 10.0.0-beta.25401.103 -> 10.0.0-beta.25406.102)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25401.103 -> 0.11.5-alpha.25406.102)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25401.103 -> 2.9.3-beta.25406.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 10.0.0-rc.1.25401.103 -> 10.0.0-rc.1.25406.102)
Nuget.Frameworks, Nuget.Packaging, Nuget.ProjectModel, Nuget.Versioning (Version 6.2.4 -> 7.0.0-preview.1.102)
System.CommandLine (Version 2.0.0-rc.1.25401.103 -> 2.0.0-rc.1.25406.102)
Copy link
Contributor Author

dotnet-maestro bot commented Aug 7, 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="30bc8f92be07c2c8c3a6addb946877260e042f63" BarId="278224" />

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

@tannergooding
Copy link
Member

Resolved conflicts which were from #118424 and #118356

@tannergooding
Copy link
Member

tannergooding commented Aug 7, 2025

It’s fairly trivial to look at just the merge heads and ignore any child commits.

For reference, one solution here is to use git log --first-parent --oneline 1414d33..5a41589, where the commit range is from the OG post above. This causes it to only list the first parent of a merge commit where relevant. The general issue is that GitHub UI only has support for showing the flattened view of commits, it doesn't support displaying or really filtering on the actual "tree" that exists. Working with the tree outside of GitHub tends to make this much easier, including for features like bisect, so squashing should never be required (and many of the .NET repos, and repos outside .NET, never squash accordingly).

I notably don't see anything obvious in this or the full set of source changes dotnet/sdk@1414d33...5a41589

The narrowed list of commits is (a narrower list can be gotten by using --merges as an additional arg):

5a41589bb7 [watch] Fix /bl option parsing, use it for build logging (#50002)
83b21d6ae1 [main] Update dependencies from microsoft/testfx (#50045)
f0b40be70f Remove MSBuild hacks for virtual project building (#49745)
9d737ea4bd Unskip test case (#50031)
0caf101205 Re-enable DotNet.Watcher.Tests (#49642)
41135e05a8 Handle escaping of command-line arguments in dotnet test (#50026)
62a31fc061 Add Android NativeAOT runtime packs to the list for .NET 10 (#50032)
5f0b2cea7c [main] Update dependencies from microsoft/testfx (#50028)
9a70195abb Remove promote-nuget-client.yml from .vsts-ci.yml (#50030)
a23f97a248 Stop promoting nuget-client via sdk (#50021)
af6e3c4136 [main] Update dependencies from nuget/nuget.client (#50025)
a3a5f9354b add System.Net.Http.WasmEnableStreamingResponse to RuntimeHostConfigurationOption (#50000)
5983ab9405 [main] Update dependencies from microsoft/testfx (#50019)
0f2195ae61 [main] Update dependencies from dotnet/arcade-services (#50016)
3bd238ab92 [automated] Update man pages (#50007)
7d67415498 (origin/locfiles/036dd01a-a5af-4d1a-add5-421e4d85d42b) Crossgen NetAnalyzers and Razor generators (#50003)
84fe422b48 [main] Update dependencies from microsoft/testfx (#50004)
e8908279db [main] Source code updates from dotnet/dotnet (#49947)
fc80484505 Send Ctrl+C to launched process before killing it on Windows (#49847)
88d3439159 Fix --no-build flag error message inconsistency for non-existent project files (#49544)
145f3c34af [main] Update dependencies from nuget/nuget.client (#49996)
70c66f7505 allow reading uid from ContainerUser to set the Tar entry uid (#49770)
cf73f8a94c Update xlf copilot instructions (#49780)
a6d225e28d NuGet's dotnet cli commands should use common interactive option (#49944)
b78f6ef94b (origin/locfiles/b5c84fc6-9079-4aa9-9d23-6f85057f8571) make dicts in NamedPipeBase strong typed (#49984)
289afafebe Update MSTest in test templates (template_feed directory) to 3.10.0 (#49987)
fdaff828f7 [main] Update dependencies from microsoft/testfx (#49990)
7d093038eb [main] Update dependencies from dotnet/arcade-services (#49979)
1b4646d224 Fix forwarding DOTNET_ROOT (#49634)
2117439ef1 [main] Update dependencies from microsoft/testfx (#49976)
c3a489526f Avoid double disposal of terminal logger (#49969)
35c030427b Remove Idle target workaround (#49964)
1ed2f8e975 Unskip razor tests (#49966)
56b2f6c712 Use project directory as a working directory for Aspire processes (#49901)
682707de57 Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2759525 (#49959)
4f506a73e2 Update named pipe for dotnet test (#49936)
fc81ab9acc Cleanup dead code in dotnet test (#49952)
966172f4f4 Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2759362 (#49949)
e91d8c9914 [main] Update dependencies from microsoft/testfx (#49945)
40c1356f8f [WiX 5] Migrate SDK from v3 to v5 (#48699)
35ad03198a (origin/locfiles/51ff2f49-ed4e-4ebe-afd3-5f94b7dee407) Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2758277 (#49937)
4e77fb9b5b Add Bypass to VS shortcut (#49940)
b30f1ee0f7 [main] Update dependencies from nuget/nuget.client (#49854)
653cbc5eb6 [main] Source code updates from dotnet/dotnet (#49932)
3b15dbb24a Add a details section for the dotnet info output (#49929)
d7acdf1e30 Make it so the artifacts folders register files for cleanup (#49595)
ee6cd03789 Add a series of changes to make devcontainer experiences nicer for this repo (#49867)
2819cf0742 Revert "Make GenerateDepsFile and GenerateRuntimeConfigurationFiles tasks internally-incremental" (#49938)
836489f903 Skip MSBuild and call only CSC for simple file-based apps (#49528)
d4e9bbcbe1 Fix dotnet/sdk#49921 by making the dgspec inner build silent (#49927)
2a4b33ef6c Add support for flat launch settings (#49769)
86e7689b68 [main] Update dependencies from dotnet/arcade-services (#49922)
37015b5027 [main] Update dependencies from microsoft/testfx (#49931)
b3a01af0b2 [main] Source code updates from dotnet/dotnet (#49740)
c7aed556c1 Update version branding to rc1 (#49919)
99c8904a43 Fix recognizing `dotnet ./file.cs` with special arguments (#49909)
17c6e86d8b [main] Update dependencies from microsoft/testfx (#49920)
6d04734f4e Fix dotnet new "Add project to solution" postAction to find .slnx files (#49541)
72226a6c6f Show deprecation warning for OpenAPI analyzers (#49915)
fd9271fc9a Fix merge to use new name (#49916)
be1e743284 Allow skipping project fallback with file-based run (#49808)
4a41c86d05 Add Version.Details.props (#49911)
90971f39cd Implement `#:package` manipulation for file-based apps (#49635)
331313dccf [main] Update dependencies from microsoft/testfx (#49906)
049672a7df Remove unneccessary crypto using (#49864)
91ab4c1057 Update implicit version with the June version for main (#49883)
7cef973182 Update copilot-setup-steps.yml (#49848)
a1c0274a93 Fix code owners for NuGet code (#49902)
ab9e137c47 Handle versioned `#:sdk` being first (#49807)
8e70150d40 Override default properties with custom file-level directives (#49767)
1ec32f4b25 Update maintenance-packages pruning versions (#49092)
08fc4401b9 Minimal work to make System.Diagnostics.Activity usable by the dotnet CLI application and codebase (#49749)
6f7ba0f05b Add property FileBasedProgram (#49861)
451316d6e4 [main] Update dependencies from microsoft/testfx (#49887)
2f666ecda0 Account for framework packages that have been removed (#49882)
d3d494e642 Fix tool projects so they don't remove apphosts when publishing (not packing) (#49818)
e9fb1d82bd (origin/locfiles/75c72a51-1a87-4249-ab83-f8e52e89404c) Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2754845 (#49878)
133487b7e6 Update .NET 10 Preview 6 MAUI baseline manifests (#49879)
a154acd726 Cherry-pick @nagilson's containers test skips because of backport issues (#49870)
28ea70a603 Cleanup usages of IsTestProject (#49838)
0237e40852 Test args after `dotnet file.cs` (#49875)
5c29a42420 Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2754541 (#49872)
c997920f11 Ensure all evaluation data are in binlogs from file-based apps (#49841)
5a679abbcc [main] Update dependencies from microsoft/testfx (#49869)
7a9c0011d5 Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2752984 (#49850)
b64c645566 Use NormalizeDirectory instead of Path.Combine for PackagedShimOutputDirectory (#49858)
45a7a38f94 [wasm] General HotReload agent for WebAssembly in browser (#49800)
42ec2db6be Fix outdated info about EnableDefaultItems in file-based apps doc (#49842)
536311b0eb [main] Update dependencies from microsoft/testfx (#49798)
e761e9c47e Limit the expected search location for the dotnet muxer from the sdk resolver result (#49824)
e83454226e Various SDK build fixes within VS (#49748)
3e208f937c Don't put testing global.json in artifacts dir directly (#49819)
7c9015bf7d set env var to rollback revocation check change in .NET 10 previews (#49814)
2a5ac74712 Create .vsconfig (#49746)
5b7b6d8c37 Disable the container job and allow jobs to disable themselves (#49849)
a1a9559e49 [main] Update dependencies from dotnet/arcade-services (#49802)
ea7c246d30 Automatically cleanup old artifacts of file-based apps (#49666)
af1585c81f Show skip/fail reason in dotnet test (#49806)
f96ff83eb8 [automated] Merge branch 'release/9.0.3xx' => 'main' (#49389)
80b4384fcc [main] Update dependencies from microsoft/vstest (#49809)
892a25fb35 Add flag and tests for codesigning single-file bundles targeting MacOS (#49697)
d4014b8abe Re-add Version.Details.xml props for win* repos. (#49821)
9f994f0426 Prevent double-building of Microsoft.DotNet.Cli.Utils.csproj by excluding PublishDir from global properties (#49090)
46538f9886 Cleanup PipeNameDescription (#49756)
b9b384c00a Remove extra newline from APIDiff TOC (#49794)
cf32126c22 Normalize shim output directory in publish scenario (#49801)
43c449f9d1 make SdkResolver try to locate the dotnet host closest to the resolved SDK (#49772)
766a80ab33 [main] Update dependencies from microsoft/vstest (#49803)
806e6504e0 ensure that Content items are available during restore to un-break Razor (#49783)
1177acc9c3 push improved MSBuildLogger to a separate project in case we want to spin it off (#49751)
85ed77f6c7 Add copyright headers to dnx script files (#49791)
681138b2d3 Make `dotnet project convert` interactive (#49660)
ad9e0a7751 [main] Update dependencies from microsoft/testfx (#49737)
a426f3e611 make containers net472 target resilient to incorrectly-determined DOTNET_HOST_PATH values (#49736)
bf31345fa8 Fix indentation in NamedPipeServer.cs (#49755)
00c5d9fb26 Delete unused `MSBuildBuildAndRestoreSettings` (#49757)
caa9a32686 Remove empty `#if` (#49758)
5a684aa889 Cleanup dotnet test (#49734)
d77a1ee746 Cleanup dead module message serializer (#49759)
f9748c8c3a Remove interactive special case for logger verbosity in `dotnet run` (#47389)
460bff1c9e push version and info command activation into the Option definitions (#49664)
a0b8769440 Update developer-guide.md
a631dd38ec Eliminate windowsdesktop, wpf, and winforms version elements (#49722)
0edc35b843 [main] Update dependencies from nuget/nuget.client (#49726)

@tannergooding tannergooding merged commit eace168 into main Aug 7, 2025
158 checks passed
@tannergooding tannergooding deleted the darc-main-a84b32bc-80aa-4cef-9a5c-884491b7a75d branch August 7, 2025 17:14
Comment on lines +74 to +77
<NuGetFrameworksPackageVersion>7.0.0-preview.1.102</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>7.0.0-preview.1.102</NuGetPackagingPackageVersion>
<NuGetProjectModelPackageVersion>7.0.0-preview.1.102</NuGetProjectModelPackageVersion>
<NuGetVersioningPackageVersion>7.0.0-preview.1.102</NuGetVersioningPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

This PR updated the NuGet package versions from 6.2.4 to the 7.0.0 versions. That's because the VMR now produces those packages. We should double check whether the version bump is OK. If not, then we should revert this version update (and the Version.Details.xml update) and update the VMR -> runtime subscription's excludeAssets metadata to include "NuGet.*".

Copy link
Member

Choose a reason for hiding this comment

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

GH search tells me that the only shipping component that uses these is

<PackageDownloadAndReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Folder="lib/netstandard2.0" />
<PackageDownloadAndReference Include="NuGet.Frameworks" Version="$(NugetFrameworksVersion)" Folder="lib/netstandard2.0" />
<PackageDownloadAndReference Include="NuGet.Packaging" Version="$(NugetPackagingVersion)" Folder="lib/netstandard2.0" />
<PackageDownloadAndReference Include="NuGet.ProjectModel" Version="$(NugetProjectModelVersion)" Folder="lib/netstandard2.0" />
<PackageDownloadAndReference Include="NuGet.Versioning" Version="$(NugetVersioningVersion)" Folder="lib/netstandard2.0" />
and that one only uses them as references and aligning them with the VMR versions (what ships inside the SDK) sounds like the right thing to do, anyways.

@github-actions github-actions bot locked and limited conversation to collaborators Sep 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow linkable-framework Issues associated with delivering a linker friendly framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants