Skip to content

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 5, 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/wpf

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 5, 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 5, 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": 289585,
  "path": "wpf",
  "remoteUri": "https://github.com/dotnet/wpf",
  "commitSha": "0b7181a78155201bf79f77f2fa804aa4d8093f2a"
}

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

@mmitche mmitche enabled auto-merge (squash) November 5, 2025 17:12
@mmitche mmitche disabled auto-merge November 5, 2025 17:13
@mmitche mmitche closed this Nov 5, 2025
@dotnet-maestro dotnet-maestro bot deleted the darc-release/10.0.1xx-3c144baf-6c22-460e-b1ee-236ecb74f00e branch November 5, 2025 17:14
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