Skip to content

[release/10.0.1xx] Source code updates from dotnet/windowsdesktop#3217

Merged
mmitche merged 4 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-b78c593b-e649-42f2-bb22-cd36bb8a1ec3
Nov 5, 2025
Merged

[release/10.0.1xx] Source code updates from dotnet/windowsdesktop#3217
mmitche merged 4 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-b78c593b-e649-42f2-bb22-cd36bb8a1ec3

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 4, 2025

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

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 4, 2025

Note

PRs from original repository included in this codeflow update:

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

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 4, 2025

Important

There are conflicts with the release/10.0.1xx branch in this PR.
Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file src/source-manifest.json.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

{
  "barId": 289525,
  "path": "windowsdesktop",
  "remoteUri": "https://github.com/dotnet/windowsdesktop",
  "commitSha": "ec87661c6d9499452ac519c1442fcac092861c95"
}

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

@dotnet-policy-service dotnet-policy-service bot requested a review from a team November 4, 2025 19:57
@mmitche mmitche enabled auto-merge (squash) November 5, 2025 01:38
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 5, 2025

Important

The source repository has received code changes from an opposite flow. Any additional codeflows into this PR may potentially result in lost changes.

Please continue with one of the following options:

  1. Close or merge this PR and let the codeflow continue normally
  2. Close or merge this PR and receive the new codeflow immediately by triggering the subscription:
    darc trigger-subscriptions --id fd79bc74-2220-4fa2-9076-2941b02dd4e8
  3. Force-flow new changes into this PR at your own risk (some PR commits might be reverted):
    darc trigger-subscriptions --force --id fd79bc74-2220-4fa2-9076-2941b02dd4e8

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

@mmitche mmitche merged commit ddb2927 into release/10.0.1xx Nov 5, 2025
14 of 16 checks passed
@mmitche mmitche deleted the darc-release/10.0.1xx-b78c593b-e649-42f2-bb22-cd36bb8a1ec3 branch November 5, 2025 04:53
This was referenced Dec 9, 2025
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.

1 participant