Skip to content

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

Closed
dotnet-maestro[bot] wants to merge 1 commit intomainfrom
darc-main-a2de1e6a-87f5-430b-a566-a43bda0193fd
Closed

[main] Source code updates from dotnet/dotnet#16713
dotnet-maestro[bot] wants to merge 1 commit intomainfrom
darc-main-a2de1e6a-87f5-430b-a566-a43bda0193fd

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented Apr 14, 2026

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

Removed Dependencies

  • Removed 10.0.3
    • Microsoft.Extensions.DependencyInjection.Abstractions

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:b61c1c319cf700db4bd4c7bbe9b2156c5383dd18..https://github.com/dotnet/arcade:darc-main-a2de1e6a-87f5-430b-a566-a43bda0193fd

@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 309919 of https://github.com/dotnet/dotnet/tree/5bed4499b04cbbaec57ac4209ae993acca3648cc.

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

  • src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
    🔍 View file in dotnet/arcade vs VMR

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

  1. Clone the current repository
    git clone https://github.com/dotnet/arcade
    cd arcade
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26202.1 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 b472297a-0d16-41ea-91af-ee5ed4325178
    This should apply the build 309919 with sources from 5bed449
  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 dotnet-maestro Bot force-pushed the darc-main-a2de1e6a-87f5-430b-a566-a43bda0193fd branch from 37b37fe to fd13c2b Compare April 15, 2026 02:19
@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 310323 of https://github.com/dotnet/dotnet/tree/b94d039caa166db357a3b806a4ec698e429f0cae.

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

  • src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
    🔍 View file in dotnet/arcade vs VMR

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

  1. Clone the current repository
    git clone https://github.com/dotnet/arcade
    cd arcade
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26214.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 b472297a-0d16-41ea-91af-ee5ed4325178
    This should apply the build 310323 with sources from b94d039
  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 dotnet-maestro Bot force-pushed the darc-main-a2de1e6a-87f5-430b-a566-a43bda0193fd branch from fd13c2b to 8152c71 Compare April 16, 2026 02:12
@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 310568 of https://github.com/dotnet/dotnet/tree/b61c1c319cf700db4bd4c7bbe9b2156c5383dd18.

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

  • src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
    🔍 View file in dotnet/arcade vs VMR

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

  1. Clone the current repository
    git clone https://github.com/dotnet/arcade
    cd arcade
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26214.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 b472297a-0d16-41ea-91af-ee5ed4325178
    This should apply the build 310568 with sources from b61c1c3
  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
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 b472297a-0d16-41ea-91af-ee5ed4325178
    
  • 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 b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

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

@ViktorHofer ViktorHofer deleted the darc-main-a2de1e6a-87f5-430b-a566-a43bda0193fd branch April 20, 2026 09:04
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