Skip to content

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

Open
dotnet-maestro[bot] wants to merge 3 commits intomainfrom
darc-main-133a43d7-f0c5-4919-9db5-833e7a8f9a37
Open

[main] Source code updates from dotnet/dotnet#16707
dotnet-maestro[bot] wants to merge 3 commits intomainfrom
darc-main-133a43d7-f0c5-4919-9db5-833e7a8f9a37

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

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:5bed4499b04cbbaec57ac4209ae993acca3648cc..https://github.com/dotnet/arcade:darc-main-133a43d7-f0c5-4919-9db5-833e7a8f9a37

@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.

@akoeplinger akoeplinger requested a review from a team as a code owner April 11, 2026 11:34
- ${{ step }}

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is reverting changes from #16649, /cc @dotnet/prodconsvcs

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