Skip to content

[release/10.0.4xx] Source code updates from dotnet/dotnet - #10576

Open
dotnet-maestro[bot] wants to merge 3 commits into
release/10.0.4xxfrom
darc-release/10.0.4xx-4a07047f-3c08-46ca-8ba2-4cd9cc757163
Open

dotnet-maestro[bot] wants to merge 3 commits into
release/10.0.4xxfrom
darc-release/10.0.4xx-4a07047f-3c08-46ca-8ba2-4cd9cc757163

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Nov 12, 2026 •

Copy link
Copy Markdown

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

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:d2b8c5ed199ecb1f3bec494b5d1b7ee84789ec38..https://github.com/dotnet/templating:darc-release/10.0.4xx-4a07047f-3c08-46ca-8ba2-4cd9cc757163

@dotnet-maestro

Copy link
Copy Markdown
Author

Caution

🚨 Action Required — Conflict detected

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

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

  • src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NugetApiPackageManager.cs
    🔍 View file in dotnet/templating vs VMR
  • test/Microsoft.TemplateEngine.Edge.UnitTests/Mocks/MockPackageManager.cs
    🔍 View file in dotnet/templating vs VMR
  • test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetApiPackageManagerTests.cs
    🔍 View file in dotnet/templating vs VMR

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

  1. Clone the current repository

    git clone https://github.com/dotnet/templating
    cd templating
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26559.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 53f926d5-114f-4300-b3eb-624c3952b12f 

    This should apply the build 341057 with sources from cb20369

  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.

@dotnet-maestro

Copy link
Copy Markdown
Author

Note

VMR PRs included in this codeflow update:

Other PRs in the commit range

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

@joeloff
joeloff requested a review from a team as a code owner November 13, 2026 18:12
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26561.109 -> 10.0.0-beta.26563.104)
[[ commit created by automation ]]
@dotnet-maestro

Copy link
Copy Markdown
Author

Note

Other PRs in the commit range

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant