Skip to content

[release/10.0.3xx] Source code updates from dotnet/templating#6164

Merged
wtgodbe merged 5 commits intorelease/10.0.3xxfrom
darc-release/10.0.3xx-97bc86dd-2e52-4c29-8ff9-077a2ee2bbed
Apr 23, 2026
Merged

[release/10.0.3xx] Source code updates from dotnet/templating#6164
wtgodbe merged 5 commits intorelease/10.0.3xxfrom
darc-release/10.0.3xx-97bc86dd-2e52-4c29-8ff9-077a2ee2bbed

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented Apr 21, 2026 •
edited
Loading

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/templating

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/templating:a397da1b5747f31a7d91d024609c6e529679b694..https://github.com/dotnet/dotnet:darc-release/10.0.3xx-97bc86dd-2e52-4c29-8ff9-077a2ee2bbed

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented Apr 21, 2026

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 311226 of https://github.com/dotnet/templating/tree/6a821cbc27c1f32731c3f0b3543fb03e9d9b0f7f.

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/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 9e869fd4-6563-46dc-9239-2fd9b0c686fe
    This should apply the build 311226 with sources from 6a821cb
  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

dotnet-maestro Bot commented Apr 21, 2026

Note

PRs from original repository included in this codeflow update:

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

@dotnet-policy-service dotnet-policy-service Bot requested a review from a team April 21, 2026 10:12
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented Apr 23, 2026

Note

PRs from original repository included in this codeflow update:

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

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented Apr 23, 2026

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 9e869fd4-6563-46dc-9239-2fd9b0c686fe
  • 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 9e869fd4-6563-46dc-9239-2fd9b0c686fe --force

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

@wtgodbe wtgodbe merged commit 83402a4 into release/10.0.3xx Apr 23, 2026
13 checks passed
@wtgodbe wtgodbe deleted the darc-release/10.0.3xx-97bc86dd-2e52-4c29-8ff9-077a2ee2bbed branch April 23, 2026 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wtgodbe wtgodbe wtgodbe approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@wtgodbe