Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

Merged
akoeplinger merged 6 commits into
mainfrom
darc-main-24a52584-ccc1-4f89-a078-d15bd714b8dc
Oct 21, 2025
Merged

[main] Source code updates from dotnet/dotnet#120932
akoeplinger merged 6 commits into
mainfrom
darc-main-24a52584-ccc1-4f89-a078-d15bd714b8dc

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Oct 21, 2025

Copy link
Copy Markdown
Contributor

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

  • From 5.3.0-1.25511.101 to 5.3.0-1.25520.104
    • Microsoft.CodeAnalysis
    • Microsoft.CodeAnalysis.Analyzers
    • Microsoft.CodeAnalysis.CSharp
    • Microsoft.Net.Compilers.Toolset
  • From 10.0.100-rc.2.25511.101 to 10.0.100-rc.2.25520.104
    • Microsoft.CodeAnalysis.NetAnalyzers
    • Microsoft.DotNet.ApiCompat.Task
    • Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport
  • From 11.0.0-beta.25511.101 to 11.0.0-beta.25520.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
  • From 0.11.5-alpha.25511.101 to 0.11.5-alpha.25520.104
    • Microsoft.DotNet.Cecil
  • From 2.9.3-beta.25511.101 to 2.9.3-beta.25520.104
    • Microsoft.DotNet.XUnitAssert
    • Microsoft.DotNet.XUnitConsoleRunner
  • From 10.0.0-rc.1.25511.101 to 10.0.0-rc.1.25520.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
  • From 7.0.0-preview.1.1201 to 7.0.0-preview.1.2104
    • NuGet.Frameworks
    • NuGet.Packaging
    • NuGet.ProjectModel
    • NuGet.Versioning
  • From 2.0.0-rc.1.25511.101 to 2.0.0-rc.1.25520.104
    • System.CommandLine
  • From 10.0.0-prerelease.25475.1 to 10.0.0-prerelease.25506.2
    • Microsoft.DotNet.XHarness.CLI
    • Microsoft.DotNet.XHarness.TestRunners.Common
    • Microsoft.DotNet.XHarness.TestRunners.Xunit
  • From 19.1.0-alpha.1.25466.1 to 19.1.0-alpha.1.25513.1
    • runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang
    • runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
    • runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
    • runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang
    • runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
    • runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
    • runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang
    • runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
    • runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
    • runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang
    • runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
    • runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
    • runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang
    • runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
    • runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
    • runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang
    • runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
    • runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
    • runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools
    • runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang
    • runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk
    • runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools

Associated changes in source repos

@dotnet-maestro
Backflow from https://github.com/dotnet/dotnet / 1bdc5cd build 287856
b8b34d0 
[[ commit created by automation ]]
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 287856
20cdc02 
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25511.101 -> 5.3.0-1.25520.104)
Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.2.25511.101 -> 10.0.100-rc.2.25520.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 11.0.0-beta.25511.101 -> 11.0.0-beta.25520.104)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25511.101 -> 0.11.5-alpha.25520.104)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25511.101 -> 2.9.3-beta.25520.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-rc.1.25511.101 -> 10.0.0-rc.1.25520.104)
NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-preview.1.1201 -> 7.0.0-preview.1.2104)
System.CommandLine (Version 2.0.0-rc.1.25511.101 -> 2.0.0-rc.1.25520.104)
Microsoft.DotNet.XHarness.TestRunners.Common, Microsoft.DotNet.XHarness.TestRunners.Xunit, Microsoft.DotNet.XHarness.CLI (Version 10.0.0-prerelease.25475.1 -> 10.0.0-prerelease.25506.2)
runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools, runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools, runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang, runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk, runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools (Version 19.1.0-alpha.1.25466.1 -> 19.1.0-alpha.1.25513.1)
@dotnet-maestro

dotnet-maestro Bot commented Oct 21, 2025

Copy link
Copy Markdown
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="1bdc5cdcf4cf408e00aa3c60f58520083bf2474f" BarId="287856" />

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 Oct 21, 2025
@premun

premun commented Oct 21, 2025

Copy link
Copy Markdown
Member

@kotlarmilos can you help resolve this conflict?

@akoeplinger

akoeplinger commented Oct 21, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

took care of the conflicts and the reverts issue

@am11

am11 commented Oct 21, 2025

Copy link
Copy Markdown
Member

@akoeplinger, is the reverse codeflow (runtime->vmr) blocked? 👀

Asking since there hasn't been a PR since dotnet/dotnet#2885.

@akoeplinger

akoeplinger commented Oct 21, 2025

Copy link
Copy Markdown
Member

yes, we think once this PR goes in it should be unblocked again

@akoeplinger

akoeplinger commented Oct 21, 2025

Copy link
Copy Markdown
Member

Same failure across multiple jobs:

    Could not open mcc_i06.il ../common/common.il
    
    ***** FAILURE ***** 
/__w/1/s/.packages/microsoft.net.sdk.il/10.0.0-rc.1.25520.104/targets/Microsoft.NET.Sdk.IL.targets(139,5): error MSB3073: The command ""/__w/1/s/.packages/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-rc.1.25520.104/runtimes/linux-x64/native/ilasm" -QUIET -NOLOGO -ANAME=mcc_i06 -DEBUG=OPT -OPTIMIZE -DLL  -OUTPUT="/__w/1/s/artifacts/tests/coreclr/obj/AnyOS.x64.Checked/Managed/JIT/jit64/mcc/interop/mcc_i06/mcc_i06.dll"  "mcc_i06.il ../common/common.il"" exited with code 1. [/__w/1/s/src/tests/JIT/jit64/mcc/interop/mcc_i06.ilproj] [/__w/1/s/src/tests/build.proj]
##[error].packages/microsoft.net.sdk.il/10.0.0-rc.1.25520.104/targets/Microsoft.NET.Sdk.IL.targets(139,5): error MSB3073: The command ""/__w/1/s/.packages/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-rc.1.25520.104/runtimes/linux-x64/native/ilasm" -QUIET -NOLOGO -ANAME=mcc_i06 -DEBUG=OPT -OPTIMIZE -DLL  -OUTPUT="/__w/1/s/artifacts/tests/coreclr/obj/AnyOS.x64.Checked/Managed/JIT/jit64/mcc/interop/mcc_i06/mcc_i06.dll"  "mcc_i06.il ../common/common.il"" exited with code 1. [/__w/1/s/src/tests/JIT/jit64/mcc/interop/mcc_i06.ilproj]

It looks like it passes the files "mcc_i06.il ../common/common.il" as a single argument...

@akoeplinger

akoeplinger commented Oct 21, 2025

Copy link
Copy Markdown
Member

oh:

runtime/src/tests/JIT/jit64/mcc/interop/mcc_i06.ilproj

Line 7 in 9bb1d21

<Compile Include="mcc_i06.il ..\common\common.il" />

@premun premun mentioned this pull request Oct 21, 2025
Closed
Copilot AI mentioned this pull request Oct 21, 2025
Merged
@akoeplinger

akoeplinger commented Oct 21, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

this "regressed" with #120146 but it should've never worked. Fixed the broken .ilproj's

@akoeplinger

akoeplinger commented Oct 21, 2025

Copy link
Copy Markdown
Member

/ba-g all known build errors, the one unknown in Microsoft.Extensions.Caching.Memory.Tests was an unrelated infrastructure issue

@akoeplinger akoeplinger merged commit 9d68bce into main Oct 21, 2025
163 of 169 checks passed
@akoeplinger akoeplinger deleted the darc-main-24a52584-ccc1-4f89-a078-d15bd714b8dc branch October 21, 2025 16:19
This was referenced Oct 21, 2025
Open
Open
Closed
@dotnet-maestro dotnet-maestro Bot mentioned this pull request Oct 21, 2025
Merged
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 21, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@akoeplinger akoeplinger akoeplinger approved these changes

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.

3 participants

@premun @akoeplinger @am11