Skip to content

[main] Source code updates from dotnet/dotnet - #133344

Merged
akoeplinger merged 7 commits into
mainfrom
darc-main-73df62bc-bbf5-460f-a81c-a919ec410c67
Sep 9, 2026
Merged

[main] Source code updates from dotnet/dotnet#133344
akoeplinger merged 7 commits into
mainfrom
darc-main-73df62bc-bbf5-460f-a81c-a919ec410c67

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Sep 7, 2026

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

New Dependencies

Removed Dependencies

  • Removed 11.0.100-rc.1.26431.109
    • Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport

Updated Dependencies

  • From 5.12.0-1.26431.109 to 5.12.0-1.26458.102
    • Microsoft.CodeAnalysis
    • Microsoft.CodeAnalysis.Analyzers
    • Microsoft.CodeAnalysis.BannedApiAnalyzers
    • Microsoft.CodeAnalysis.CSharp
    • Microsoft.Net.Compilers.Toolset
  • From 11.0.100-rc.1.26431.109 to 12.0.100-alpha.1.26458.102
    • Microsoft.CodeAnalysis.NetAnalyzers
    • Microsoft.DotNet.ApiCompat.Task
  • From 11.0.0-beta.26431.109 to 11.0.0-beta.26458.102
    • Microsoft.DotNet.Arcade.Sdk
    • Microsoft.DotNet.Build.Tasks.Archives
    • Microsoft.DotNet.Build.Tasks.Feed
    • Microsoft.DotNet.Build.Tasks.FileCatalog
    • Microsoft.DotNet.Build.Tasks.Installers
    • Microsoft.DotNet.Build.Tasks.Packaging
    • Microsoft.DotNet.Build.Tasks.TargetFramework
    • Microsoft.DotNet.Build.Tasks.Templating
    • Microsoft.DotNet.CodeAnalysis
    • Microsoft.DotNet.GenAPI
    • Microsoft.DotNet.GenFacades
    • Microsoft.DotNet.Helix.JobMonitor
    • Microsoft.DotNet.Helix.Sdk
    • Microsoft.DotNet.PackageTesting
    • Microsoft.DotNet.RemoteExecutor
    • Microsoft.DotNet.SharedFramework.Sdk
    • Microsoft.DotNet.XliffTasks
    • Microsoft.DotNet.XUnitExtensions
  • From 0.11.5-preview.26431.109 to 0.11.5-preview.26458.102
    • Microsoft.DotNet.Cecil
  • From 23.1.0-alpha.1.26420.1 to 23.1.0-alpha.1.26451.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
  • From 2.9.3-beta.26431.109 to 2.9.3-beta.26458.102
    • Microsoft.DotNet.XUnitConsoleRunner
  • From 11.0.0-rc.1.26431.109 to 12.0.0-alpha.1.26458.102
    • Microsoft.NET.Runtime.Emscripten.Internal
    • 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.11.0-rc.43209 to 7.12.0-rc.45902
    • NuGet.Frameworks
    • NuGet.Packaging
    • NuGet.ProjectModel
    • NuGet.Versioning
  • From 3.0.0-rc.1.26431.109 to 4.0.0-alpha.1.26458.102
    • System.CommandLine

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:73ec55960bb496e6b2541b2fcf0a59576d1f8cd3..https://github.com/dotnet/runtime:darc-main-73df62bc-bbf5-460f-a81c-a919ec410c67

@dotnet-maestro

dotnet-maestro Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 330732 of https://github.com/dotnet/dotnet/tree/6d12eaff065a8a79e10851022b22a2079da6fe44.

The conflicts in the following files need to be manually resolved:

  • src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props
    🔍 View file in dotnet/runtime vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/runtime
    cd runtime
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26451.2 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 stage the conflict locally

    darc vmr resolve-conflict --subscription f7901f87-9f24-40d6-9bc1-564863937237 

    This should apply the build 330732 with sources from 6d12eaf

  4. Resolve the conflicts, 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.

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
16 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

@github-actions github-actions Bot added the area-codeflow for labeling automated codeflow label Sep 7, 2026
# Conflicts:
#	src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props
Preserve SDK-selected shared-framework versions for hosted Blazor servers while using locally built packs for the current browser target framework.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8e60636-6546-4220-ba80-6c8465d1cf99
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.12.0-1.26456.103 -> 5.12.0-1.26458.102)
Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.DotNet.GenAPI.Task (Version 12.0.100-alpha.1.26456.103 -> 12.0.100-alpha.1.26458.102)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.FileCatalog, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.JobMonitor, 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.26456.103 -> 11.0.0-beta.26458.102)
Microsoft.DotNet.Cecil (Version 0.11.5-preview.26456.103 -> 0.11.5-preview.26458.102)
Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26456.103 -> 2.9.3-beta.26458.102)
Microsoft.NET.Runtime.Emscripten.Internal, 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 12.0.0-alpha.1.26456.103 -> 12.0.0-alpha.1.26458.102)
NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.12.0-rc.45703 -> 7.12.0-rc.45902)
System.CommandLine (Version 4.0.0-alpha.1.26456.103 -> 4.0.0-alpha.1.26458.102)
[[ commit created by automation ]]
@akoeplinger
akoeplinger merged commit dfcb726 into main Sep 9, 2026
202 of 208 checks passed
@akoeplinger
akoeplinger deleted the darc-main-73df62bc-bbf5-460f-a81c-a919ec410c67 branch September 9, 2026 07:21
@dotnet-milestone-bot dotnet-milestone-bot Bot added this to the 12.0-preview1 milestone Sep 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-codeflow for labeling automated codeflow

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants