Skip to content

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

Closed
dotnet-maestro[bot] wants to merge 1 commit into
mainfrom
darc-main-fac2bbe8-a5e9-40b9-a45f-f0df60c95b2e
Closed

[main] Source code updates from dotnet/dotnet#133246
dotnet-maestro[bot] wants to merge 1 commit into
mainfrom
darc-main-fac2bbe8-a5e9-40b9-a45f-f0df60c95b2e

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Sep 4, 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.26453.118
    • Microsoft.CodeAnalysis
    • Microsoft.CodeAnalysis.Analyzers
    • Microsoft.CodeAnalysis.BannedApiAnalyzers
    • Microsoft.CodeAnalysis.CSharp
    • Microsoft.Net.Compilers.Toolset
  • From 11.0.100-rc.1.26431.109 to 11.0.100-rc.1.26453.118
    • Microsoft.CodeAnalysis.NetAnalyzers
    • Microsoft.DotNet.ApiCompat.Task
  • From 11.0.0-beta.26431.109 to 11.0.0-beta.26453.118
    • 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.26453.118
    • 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.26453.118
    • Microsoft.DotNet.XUnitConsoleRunner
  • From 11.0.0-rc.1.26431.109 to 11.0.0-rc.1.26453.118
    • 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.45418
    • NuGet.Frameworks
    • NuGet.Packaging
    • NuGet.ProjectModel
    • NuGet.Versioning
  • From 3.0.0-rc.1.26431.109 to 3.0.0-rc.1.26453.118
    • System.CommandLine

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:3c8d132bfb012af4bbba80de22149a9f58e737f0..https://github.com/dotnet/runtime:darc-main-fac2bbe8-a5e9-40b9-a45f-f0df60c95b2e

@dotnet-maestro

dotnet-maestro Bot commented Sep 4, 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 330470 of https://github.com/dotnet/dotnet/tree/3c8d132bfb012af4bbba80de22149a9f58e737f0.

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 330470 with sources from 3c8d132

  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.

@github-actions github-actions Bot added the area-codeflow for labeling automated codeflow label Sep 4, 2026
@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.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-fac2bbe8-a5e9-40b9-a45f-f0df60c95b2e branch from c1b9940 to 64c4e62 Compare September 6, 2026 02:03
@dotnet-maestro

dotnet-maestro Bot commented Sep 6, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

1 similar comment
@dotnet-maestro

dotnet-maestro Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@akoeplinger akoeplinger closed this Sep 7, 2026
@dotnet-maestro
dotnet-maestro Bot deleted the darc-main-fac2bbe8-a5e9-40b9-a45f-f0df60c95b2e branch September 7, 2026 09:37
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.

1 participant