Skip to content

[main] Source code updates from dotnet/arcade#6060

Merged
wtgodbe merged 3 commits intomainfrom
darc-main-bd00d4d5-f997-4c77-afdc-6d0506cfa88e
Apr 22, 2026
Merged

[main] Source code updates from dotnet/arcade#6060
wtgodbe merged 3 commits intomainfrom
darc-main-bd00d4d5-f997-4c77-afdc-6d0506cfa88e

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/arcade

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/arcade:a08169b890573cfd7f949ea9062c86a4db1aab1b..https://github.com/dotnet/dotnet:darc-main-bd00d4d5-f997-4c77-afdc-6d0506cfa88e

@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 309972 of https://github.com/dotnet/arcade/tree/a08169b890573cfd7f949ea9062c86a4db1aab1b.

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/dotnet
    cd dotnet
  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 ab0d56ad-2ca6-45b9-98fc-393e964e843f
    This should apply the build 309972 with sources from a08169b
  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.

ellahathaway and others added 2 commits April 22, 2026 09:18
Diff: https://github.com/dotnet/arcade/compare/a08169b890573cfd7f949ea9062c86a4db1aab1b..a08169b890573cfd7f949ea9062c86a4db1aab1b

From: dotnet/arcade@a08169b
To: dotnet/arcade@a08169b

The following files had conflicts that were resolved by a user:

- .config/CredScanSuppressions.json
- src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
- src/source-build-assets/eng/common/core-templates/steps/component-governance.yml
- src/source-build-assets/eng/common/generate-sbom-prep.ps1
- src/source-build-assets/eng/common/generate-sbom-prep.sh
- src/source-build-assets/eng/common/post-build/sourcelink-validation.ps1
- src/source-build-assets/eng/common/templates-official/steps/component-governance.yml
- src/source-build-assets/eng/common/templates/steps/component-governance.yml
@wtgodbe wtgodbe enabled auto-merge (squash) April 22, 2026 21:19
@wtgodbe wtgodbe merged commit 78cb6cb into main Apr 22, 2026
15 of 16 checks passed
@wtgodbe wtgodbe deleted the darc-main-bd00d4d5-f997-4c77-afdc-6d0506cfa88e branch April 22, 2026 23:35
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.

2 participants