Batch cherry-pick: 9 h3xds1nz upstream PRs (clean apply onto if/main)#3
Merged
oysteinkrog merged 9 commits intoif/mainfrom May 1, 2026
Merged
Conversation
dfff4ed to
d2bc09f
Compare
(cherry picked from commit 0c13826)
(cherry picked from commit 5b0b50e)
(cherry picked from commit 72d1865)
(cherry picked from commit ef0a28d)
(cherry picked from commit 24c293c)
(cherry picked from commit 8741728)
(cherry picked from commit 3a1c6d1)
(cherry picked from commit b1d5aa5)
(cherry picked from commit 52c25da)
d2bc09f to
ebb958a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Batch cherry-pick of 9 cleanly-applied h3xds1nz PRs from
dotnet/wpfupstream that haven't been picked up there. Picks up where Phase B left off — these are the perf/cleanup PRs h3xds1nz opened after his last upstream-merged work in May 2025.Stacked on: #1 (crossgen2 R2R) and #2 (CommandManager typeof fix + denylist) — both merged. Branch is rebased onto current
if/main.Cherry-picked PRs (all clean apply)
All applied with
git cherry-pick -x …so the upstream SHA is recorded in each commit.Dropped from initial batch
IDE0077.severity = suggestion). Upstream's PR is safe because it's stacked on a separateGlobalSuppressions.csmodernization (commit980642f4d) we haven't picked. Dropping the override without that modernization makes IDE0077 fire aserroragainst existing legacy-formatSuppressMessageAttributeentries. Re-pick once we adopt the modernization commit.Deferred (50 PRs with conflicts)
The remaining 50 of the 60 candidate PRs touch files we've diverged on. They need per-PR judgment.
Modify/delete on already-removed files (5 PRs)
GenericsInstances.cs), 10009 (PartialArray.cs), 10245 (MessageWindow.cs) — upstream removes; our fork keptWeakReferenceCache.cs) — already deleted in our fork; drop the upstream PRTreeBuilder.cs) — upstream removes; our fork kept.editorconfigoverlaps (2 PRs)Content conflicts (43 PRs)
Files where our fork has accumulated edits that conflict with upstream's edits. Full list captured in
cherrypick-results.txt(local).Test plan
(cherry picked from commit ...)trailer🤖 Generated with Claude Code