Skip to content

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

Open
dotnet-maestro[bot] wants to merge 1 commit into
mainfrom
darc-main-0605c349-2fd1-4e9b-b8b1-79d41fea86cd
Open

[main] Source code updates from dotnet/dotnet#129454
dotnet-maestro[bot] wants to merge 1 commit into
mainfrom
darc-main-0605c349-2fd1-4e9b-b8b1-79d41fea86cd

Conversation

@dotnet-maestro

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.9.0-1.26302.118 to 5.9.0-1.26315.110
    • Microsoft.CodeAnalysis
    • Microsoft.CodeAnalysis.Analyzers
    • Microsoft.CodeAnalysis.BannedApiAnalyzers
    • Microsoft.CodeAnalysis.CSharp
    • Microsoft.Net.Compilers.Toolset
  • From 11.0.100-preview.6.26302.118 to 11.0.100-preview.6.26315.110
    • Microsoft.CodeAnalysis.NetAnalyzers
    • Microsoft.DotNet.ApiCompat.Task
    • Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport
  • From 11.0.0-beta.26302.118 to 11.0.0-beta.26315.110
    • 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-preview.26302.118 to 0.11.5-preview.26315.110
    • Microsoft.DotNet.Cecil
  • From 2.9.3-beta.26302.118 to 2.9.3-beta.26315.110
    • Microsoft.DotNet.XUnitConsoleRunner
  • From 11.0.0-preview.6.26302.118 to 11.0.0-preview.6.26315.110
    • 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.9.0-rc.30318 to 7.9.0-rc.31610
    • NuGet.Frameworks
    • NuGet.Packaging
    • NuGet.ProjectModel
    • NuGet.Versioning
  • From 3.0.0-preview.6.26302.118 to 3.0.0-preview.6.26315.110
    • System.CommandLine
  • From 11.0.0-alpha.1.26279.1 to 11.0.0-alpha.1.26303.1
    • runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
    • runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
    • runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
    • runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
    • runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
    • runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
    • runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport
    • runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:370cd7b60d2dd85838d34e7e43a4622f3681d9a7..https://github.com/dotnet/runtime:darc-main-0605c349-2fd1-4e9b-b8b1-79d41fea86cd

@dotnet-maestro

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 318763 of https://github.com/dotnet/dotnet/tree/370cd7b60d2dd85838d34e7e43a4622f3681d9a7.

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

ℹ️ 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.26309.4 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 318763 with sources from 370cd7b

  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 Jun 16, 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.

0 participants