Skip to content

[main] Source code updates from dotnet/scenario-tests#3417

Merged
dotnet-maestro[bot] merged 2 commits intomainfrom
darc-main-eb3ab335-0d5a-4a6f-be36-e988a18eb0a9
Nov 18, 2025
Merged

[main] Source code updates from dotnet/scenario-tests#3417
dotnet-maestro[bot] merged 2 commits intomainfrom
darc-main-eb3ab335-0d5a-4a6f-be36-e988a18eb0a9

Conversation

@dotnet-maestro
Copy link
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/scenario-tests

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 18, 2025

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/scenario-tests/tree/21ded7efec7463ab807b22a8e119b228d4039a1c.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

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

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
  2. cd to the cloned repository
  3. Make sure your darc is up-to-date and run
    darc vmr resolve-conflict --subscription 00000000-1825-4942-b806-d187e43bb454
  4. Follow the instructions provided by the command to resolve the conflict and push the update
  5. This should apply the build 291013 with sources from 21ded7efec7463ab807b22a8e119b228d4039a1c
  6. Once the changes are pushed, the Codeflow verification check will turn green

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

@ViktorHofer
Copy link
Member

I'm not 100% sure why I got pinged on this PR.

@premun
Copy link
Member

premun commented Nov 18, 2025

@ViktorHofer the subscription had the product-construction in the Notification tags. I removed it from the subscription (and comment)

Copy link
Member

@premun premun left a comment

Choose a reason for hiding this comment

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

Using this to test the resolve command

@dotnet-maestro dotnet-maestro bot merged commit 9447c70 into main Nov 18, 2025
16 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-eb3ab335-0d5a-4a6f-be36-e988a18eb0a9 branch November 18, 2025 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants