feat(cmdpal): Implement CommandResult.GoToPage()

Add handling for CommandResultKind.GoToPage in the shell, allowing
extensions to navigate to a specific top-level page after a command
completes, with Push, GoBack, or GoHome navigation modes.

Co-authored-by: niels9001 <9866362+niels9001@users.noreply.github.com>
Agent-Logs-Url: https://github.com/microsoft/PowerToys/sessions/dfde3ba3-e879-4fd7-ad6d-667e5ba79632

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -40,7 +40,6 @@ body:
       - Other (please specify in "Steps to Reproduce")
   validations:
     required: true
-
 - type: dropdown
   attributes:
     label: Area(s) with issue?
@@ -106,7 +105,13 @@ body:
     placeholder: What happened instead?
   validations:
     required: false
-
+- type: upload
+  id: bugreportfile 
+  attributes:
+    label: Upload Bug Report ZIP-file
+    description: Right-clicking the PowerToys tray icon in the taskbar and selecting “Report bug” generates a ZIP file containing diagnostic information about your setup and PowerToys logs, helping us better understand and troubleshoot the issue.
+  validations:
+    required: false
 - id: additionalInfo
   type: textarea
   attributes:

.github/actions/spell-check/allow/code.txt

@@ -1,6 +1,7 @@
 # COLORS
 
 argb
+Bgr
 bgra
 BLACKONWHITE
 BLUEGRAY
@@ -28,6 +29,7 @@ RUS
 
 AYUV
 bak
+HDP
 Bcl
 bgcode
 Deflatealgorithm
@@ -46,6 +48,7 @@ nupkg
 petabyte
 resw
 resx
+runtimeconfig
 srt
 Stereolithography
 terabyte
@@ -297,6 +300,8 @@ pwa
 
 AOT
 Aot
+ify
+TFM
 
 # YML
 onefuzz

.github/actions/spell-check/expect.txt

@@ -16,6 +16,7 @@ adaptivecards
 ADDSTRING
 ADDUNDORECORD
 ADifferent
+ADMINS
 adml
 admx
 advfirewall
@@ -67,6 +68,7 @@ ARPINSTALLLOCATION
 ARPPRODUCTICON
 ARRAYSIZE
 ARROWKEYS
+arrowshape
 asf
 AShortcut
 ASingle
@@ -128,6 +130,7 @@ bthprops
 bti
 BTNFACE
 bugreport
+bugreportfile
 BUILDARCH
 BUILDNUMBER
 buildtransitive
@@ -167,7 +170,11 @@ cim
 CImage
 cla
 CLASSDC
+classguid
+classmethod
 CLASSNOTAVAILABLE
+claude
+CLEARTYPE
 clickable
 clickonce
 clientside
@@ -199,11 +206,13 @@ colorformat
 colorhistory
 colorhistorylimit
 COLORKEY
+colorref
 comctl
 comdlg
 comexp
 cominterop
 commandpalette
+commoncontrols
 compmgmt
 COMPOSITIONFULL
 CONFIGW
@@ -215,6 +224,8 @@ CONTEXTHELP
 CONTEXTMENUHANDLER
 contractversion
 CONTROLPARENT
+Convs
+cooldown
 copiedcolorrepresentation
 COPYPEN
 COREWINDOW
@@ -225,6 +236,8 @@ cpcontrols
 cph
 cplusplus
 CPower
+cpptools
+cppvsdbg
 cppwinrt
 createdump
 CREATEPROCESS
@@ -247,6 +260,8 @@ CTLCOLORSTATIC
 CURRENTDIR
 CURSORINFO
 cursorpos
+CURSORSHOWING
+cursorwrap
 customaction
 CUSTOMACTIONTEST
 CVal
@@ -263,12 +278,14 @@ dacl
 datareader
 datatracker
 Dayof
+dbcc
 DBID
 DBLCLKS
 DBLEPSILON
 DBPROP
 DBPROPIDSET
 DBPROPSET
+DBT
 DCBA
 DCOM
 DComposition
@@ -284,6 +301,8 @@ DEFAULTFLAGS
 DEFAULTICON
 defaultlib
 DEFAULTONLY
+DEFAULTSIZE
+defaulttonearest
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
@@ -303,11 +322,21 @@ DESKTOPABSOLUTEPARSING
 desktopshorcutinstalled
 devblogs
 devdocs
+devenv
+DEVICEINTERFACE
+devicetype
+DEVINTERFACE
 devmgmt
 DEVMODE
 DEVMODEW
+DEVNODES
 devpal
+DEVTYP
+dfx
 DIALOGEX
+diffs
+digicert
+DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
 diskmgmt
@@ -421,6 +450,12 @@ eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
 FARPROC
+fdw
+fdx
+FErase
+fesf
+FFFF
+Figma
 FILEEXPLORER
 FILEFLAGS
 FILEFLAGSMASK
@@ -437,6 +472,7 @@ FILESYSPATH
 Filetime
 FILEVERSION
 FILTERMODE
+FInc
 findfast
 FIXEDFILEINFO
 FIXEDSYS
@@ -492,6 +528,7 @@ GPOCA
 gpp
 gpu
 gradians
+GRGX
 GSM
 gtm
 guiddata
@@ -522,11 +559,13 @@ HCRYPTPROV
 hcursor
 hcwhite
 hdc
+HDEVNOTIFY
 hdr
 hdrop
 hdwwiz
 Helpline
 helptext
+hgdiobj
 HGFE
 hglobal
 hhk
@@ -537,6 +576,8 @@ HIBYTE
 hicon
 HIDEWINDOW
 Hif
+highlightbackground
+highlightthickness
 HIMAGELIST
 himl
 hinst
@@ -627,6 +668,7 @@ inetcpl
 Infobar
 INFOEXAMPLE
 Infotip
+initialfile
 INITDIALOG
 INITGUID
 INITTOLOGFONTSTRUCT
@@ -668,6 +710,7 @@ jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
 jjw
 jobject
+JOBOBJECT
 jpe
 jpnime
 Jsons
@@ -701,6 +744,7 @@ Ldone
 Ldr
 LEFTSCROLLBAR
 LEFTTEXT
+leftclick
 LError
 LEVELID
 LExit
@@ -732,6 +776,8 @@ lowlevel
 LOWORD
 lparam
 LPBITMAPINFOHEADER
+LPCFHOOKPROC
+lpch
 LPCITEMIDLIST
 LPCLSID
 lpcmi
@@ -749,6 +795,7 @@ LPMONITORINFO
 LPOSVERSIONINFOEXW
 LPQUERY
 lprc
+LPrivate
 LPSAFEARRAY
 lpstr
 lpsz
@@ -790,10 +837,13 @@ MAPPEDTOSAMEKEY
 MAPTOSAMESHORTCUT
 MAPVK
 MARKDOWNPREVIEWHANDLERCPP
+MAXDWORD
 MAXSHORTCUTSIZE
 maxversiontested
 MBM
 MBR
+Mbuttondown
+mcp
 MDICHILD
 MDL
 mdtext
@@ -805,7 +855,10 @@ MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
+Metacharacter
+metadatamatters
 Metadatas
+Metacharacter
 metafile
 metapackage
 mfc
@@ -831,6 +884,7 @@ mmsys
 mobileredirect
 mockapi
 MODALFRAME
+modelcontextprotocol
 MODESPRUNED
 MONITORENUMPROC
 MONITORINFO
@@ -865,7 +919,9 @@ MSLLHOOKSTRUCT
 Mso
 msrc
 msstore
+mstsc
 msvcp
+MT
 MTND
 MULTIPLEUSE
 multizone
@@ -874,6 +930,8 @@ mvvm
 MVVMTK
 MWBEx
 MYICON
+myorg
+myrepo
 NAMECHANGE
 namespaceanddescendants
 nao
@@ -976,6 +1034,7 @@ NTAPI
 ntdll
 NTSTATUS
 NTSYSAPI
+nullability
 NULLCURSOR
 nullonfailure
 numberbox
@@ -987,6 +1046,8 @@ OEMCONVERT
 officehubintl
 OFN
 ofs
+OICI
+OICIIO
 oldcolor
 olditem
 oldpath
@@ -997,6 +1058,7 @@ openas
 opencode
 OPENFILENAME
 opensource
+openurl
 openxmlformats
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
@@ -1017,6 +1079,9 @@ OWNDC
 OWNERDRAWFIXED
 Packagemanager
 PACL
+padx
+pady
+PAI
 PAINTSTRUCT
 PALETTEWINDOW
 PARENTNOTIFY
@@ -1189,6 +1254,7 @@ RAWPATH
 rbhid
 rclsid
 RCZOOMIT
+rdp
 RDW
 READMODE
 READOBJECTS
@@ -1216,6 +1282,7 @@ remappings
 REMAPSUCCESSFUL
 REMAPUNSUCCESSFUL
 Remotable
+remotedesktop
 remoteip
 Removelnk
 renamable
@@ -1246,6 +1313,7 @@ RIGHTSCROLLBAR
 riid
 RKey
 RNumber
+rollups
 rop
 ROUNDSMALL
 rpcrt
@@ -1278,7 +1346,7 @@ SCREENFONTS
 screensaver
 screenshots
 scrollviewer
-SDDL
+sddl
 SDKDDK
 sdns
 searchterm
@@ -1448,6 +1516,7 @@ STYLECHANGING
 subkeys
 sublang
 SUBMODULEUPDATE
+sug
 Superbar
 sut
 svchost
@@ -1456,6 +1525,9 @@ SVGIO
 svgz
 SVSI
 SWFO
+swp
+SWPNOSIZE
+SWPNOZORDER
 SWRESTORE
 symbolrequestprod
 SYMCACHE
@@ -1472,6 +1544,8 @@ SYSKEY
 syskeydown
 SYSKEYUP
 SYSLIB
+sysmenu
+systemai
 SYSTEMAPPS
 SYSTEMMODAL
 SYSTEMTIME
@@ -1520,6 +1594,7 @@ tlc
 TPMLEFTALIGN
 TPMRETURNCMD
 TNP
+Toggleable
 Toolhelp
 toolwindow
 TOPDOWNDIB
@@ -1557,6 +1632,9 @@ UHash
 UIA
 UIEx
 ULONGLONG
+Ultrawide
+UMax
+UMin
 ums
 uncompilable
 UNCPRIORITY
@@ -2032,6 +2110,7 @@ metadatamatters
 middleclickaction
 MIIM
 mikeclayton
+mikehall
 minimizebox
 modelcontextprotocol
 mousehighlighter
@@ -2152,6 +2231,7 @@ taskbar
 TESTONLY
 TEXTBOXNEWLINE
 textextractor
+textvariable
 tgamma
 THEMECHANGED
 thickframe
@@ -2191,6 +2271,7 @@ wft
 wikimedia
 wikipedia
 windowedge
+WINDOWSAPPRUNTIME
 windowsml
 winexe
 winforms

.github/actions/spell-check/patterns.txt

@@ -289,3 +289,6 @@ St&yle
 
 # Microsoft Store URLs and product IDs
 ms-windows-store://\S+
+
+# ANSI color codes
+(?:\\(?:u00|x)1[Bb]|\\03[1-7]|\x1b|\\u\{1[Bb]\})\[\d+(?:;\d+)*m

.github/copilot-instructions.md

@@ -33,4 +33,4 @@ These are auto-applied based on file location:
 ## Detailed Documentation
 
 - [Architecture](../doc/devdocs/core/architecture.md)
-- [Coding Style](../doc/devdocs/development/style.md)
+- [Coding Style](../doc/devdocs/development/style.md)

.github/skills/release-note-generation/SKILL.md

@@ -33,7 +33,7 @@ Generated Files/ReleaseNotes/
 
 ## Prerequisites
 
-- GitHub CLI (`gh`) installed and authenticated
+- **GitHub CLI (`gh`) installed and authenticated** — The collection script uses `gh pr view` and `gh api graphql` to fetch PR metadata and co-author information. Run `gh auth status` to verify; if not logged in, run `gh auth login` first. See [Step 1.0.0](./references/step1-collection.md) for details.
 - MCP Server: github-mcp-server installed
 - GitHub Copilot code review enabled for the org/repo
 
@@ -49,6 +49,10 @@ Generated Files/ReleaseNotes/
 
 ```
 ┌────────────────────────────────┐
+│ 1.0 Verify gh auth + MemberList │
+└────────────────────────────────┘
+              ↓
+┌────────────────────────────────┐
 │ 1.1 Collect PRs (stable range) │
 └────────────────────────────────┘
               ↓
@@ -85,6 +89,7 @@ Generated Files/ReleaseNotes/
 
 | Step | Action | Details |
 |------|--------|---------|
+| 1.0 | Verify prerequisites | `gh auth status` must pass; generate MemberList.md |
 | 1.1 | Collect PRs | From previous release tag on `stable` branch → `sorted_prs.csv` |
 | 1.2 | Assign Milestones | Ensure all PRs have correct milestone |
 | 2.1–2.4 | Label PRs | Auto-suggest + human label low-confidence |

.github/skills/release-note-generation/references/SampleOutput.md

@@ -1,9 +1,9 @@
- - Added mouse button actions so you can choose what left, right, or middle click does. Thanks [@PesBandi](https://github.com/PesBandi)!  
+ - Added mouse button actions so you can choose what left, right, or middle click does in [#1234](https://github.com/microsoft/PowerToys/pull/1234) by [@PesBandi](https://github.com/PesBandi)  
 
- - Aligned window styling with current Windows theme for a cleaner look. Thanks [@sadirano](https://github.com/sadirano)!  
+ - Aligned window styling with current Windows theme for a cleaner look in [#1235](https://github.com/microsoft/PowerToys/pull/1235) by [@sadirano](https://github.com/sadirano)  
 
- - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
+ - Ensured screen readers are notified when the selected item in the list changes for better accessibility in [#1236](https://github.com/microsoft/PowerToys/pull/1236)
 
- - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours.
+ - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours in [#1237](https://github.com/microsoft/PowerToys/pull/1237)
 
- - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!  
+ - Fixed Alt+Left Arrow navigation not working when search box contains text in [#1238](https://github.com/microsoft/PowerToys/pull/1238) by [@jiripolasek](https://github.com/jiripolasek)  

.github/skills/release-note-generation/references/step1-collection.md

@@ -1,6 +1,7 @@
 # Step 1: Collection and Milestones
 
 ## 1.0 To-do
+- 1.0.0 Verify GitHub CLI authentication (REQUIRED)
 - 1.0.1 Generate MemberList.md (REQUIRED)
 - 1.1 Collect PRs
 - 1.2 Assign Milestones (REQUIRED)
@@ -20,6 +21,34 @@
 
 ---
 
+## 1.0.0 Verify GitHub CLI Authentication (REQUIRED)
+
+⚠️ **BLOCKING:** The collection script requires an authenticated `gh` CLI to fetch PR metadata and co-author information via GitHub's GraphQL API. Without authentication, PR data and `NeedThanks` attribution will be incomplete.
+
+### Check authentication status
+
+```powershell
+gh auth status
+```
+
+**If authenticated:** You'll see `Logged in to github.com account <username>`. Proceed to 1.0.1.
+
+**If NOT authenticated:** Run the login flow before continuing:
+
+```powershell
+# Interactive login (opens browser for OAuth)
+gh auth login --hostname github.com --web
+
+# Or use a personal access token
+gh auth login --with-token <<< "YOUR_GITHUB_TOKEN"
+```
+
+**Required scopes:** `repo` (for reading PR data and assigning milestones)
+
+After login, verify again with `gh auth status` and confirm exit code 0.
+
+---
+
 ## 1.0.1 Generate MemberList.md (REQUIRED)
 
 Create `Generated Files/ReleaseNotes/MemberList.md` from the **PowerToys core team** section in [COMMUNITY.md](../../../COMMUNITY.md).
@@ -80,6 +109,8 @@ The script detects both merge commits (`Merge pull request #12345`) and squash c
 **Output** (in `Generated Files/ReleaseNotes/`):
 - `milestone_prs.json` - raw PR data
 - `sorted_prs.csv` - sorted PR list with columns: Id, Title, Labels, Author, Url, Body, CopilotSummary, NeedThanks
+  - `Author`: Comma-separated list of all contributors (PR opener + co-authors from commit trailers)
+  - `NeedThanks`: Comma-separated list of external contributors to thank (excludes core team members from MemberList.md). Empty string means no thanks needed.
 
 ---
 

.github/skills/release-note-generation/references/step4-summarization.md

@@ -16,7 +16,7 @@ For each CSV in `Generated Files/ReleaseNotes/grouped_csv/`, create a markdown f
 - Use the “Verb-ed + Scenario + Impact” sentence structure—make readers think, “That’s exactly what I need” or “Yes, that’s an awesome fix.”; The "impact" can be end-user focused (written to convey user excitement) or technical (performance/stability) when user-facing impact is minimal.
 - If nothing special on impact or unclear impact, mark as needing human summary
 - Source from Title, Body, and CopilotSummary (prefer CopilotSummary when available)
-- If the column `NeedThanks` in CSV is `True`, append: `Thanks [@Author](https://github.com/Author)!`
+- The `NeedThanks` column contains a comma-separated list of external contributor usernames who should be thanked (empty = no thanks needed, all authors are core team). For each non-empty `NeedThanks` value, append thanks for **every** listed contributor: `Thanks [@user1](https://github.com/user1)!` for a single contributor, or `Thanks [@user1](https://github.com/user1) and [@user2](https://github.com/user2)!` for two, or `Thanks [@user1](https://github.com/user1), [@user2](https://github.com/user2), and [@user3](https://github.com/user3)!` for three or more.
 - Do NOT include PR numbers in bullet lines
 - Do NOT mention “security” or “privacy” issues, since these are not known and could be leveraged by attackers in earlier versions. Instead, describe the user-facing scenario, usage, or impact.
 - If confidence < 70%, write: `Human Summary Needed: <PR full link>`
@@ -72,13 +72,13 @@ Some items in the Development section may overlap and should be moved to the Mod
 
 ## Advanced Paste
 
-- Wrapped paste option lists in a single ScrollViewer
-- Added image input handling for AI-powered transformations
+- Wrapped paste option lists in a single ScrollViewer in [#5678](https://github.com/microsoft/PowerToys/pull/5678)
+- Added image input handling for AI-powered transformations in [#5679](https://github.com/microsoft/PowerToys/pull/5679)
 ...
 
 ## Awake
 
-- Fixed timed mode expiration. Thanks [@daverayment](https://github.com/daverayment)!
+- Fixed timed mode expiration in [#5680](https://github.com/microsoft/PowerToys/pull/5680) by [@daverayment](https://github.com/daverayment)
 ...
 
 ---

.github/skills/release-note-generation/scripts/dump-prs-since-commit.ps1

@@ -42,30 +42,7 @@ param(
     [string]$OutputJson = "milestone_prs.json"
 )
 
-<#
-.SYNOPSIS
-    Dump merged PR information whose merge commits are reachable from EndCommit but not from StartCommit.
-.DESCRIPTION
-    Uses git rev-list to compute commits in the (StartCommit, EndCommit] range, extracts PR numbers from merge commit messages,
-    queries GitHub (gh CLI) for details, then outputs a CSV.
-
-    PR merge commit messages in PowerToys generally contain patterns like:
-        Merge pull request #12345 from ...
-
-.EXAMPLE
-    pwsh ./dump-prs-since-commit.ps1 -StartCommit 0123abcd -Branch stable
-
-.EXAMPLE
-    pwsh ./dump-prs-since-commit.ps1 -StartCommit 0123abcd -EndCommit 89ef7654 -OutputCsv changes.csv
-
-.NOTES
-    Requires: gh CLI authenticated; git available in working directory (must be inside PowerToys repo clone).
-    CopilotSummary behavior:
-      - Attempts to locate the latest GitHub Copilot authored review (preferred).
-      - If no review is found, lazily fetches PR comments to look for a Copilot-authored comment.
-      - Normalizes whitespace and strips newlines. Empty when no Copilot activity detected.
-      - Run with -Verbose to see whether the summary came from a 'review' or 'comment' source.
-#>
+# (See top-level synopsis above for full documentation)
 
 function Write-Info($msg) { Write-Host $msg -ForegroundColor Cyan }
 function Write-Warn($msg) { Write-Host $msg -ForegroundColor Yellow }
@@ -151,11 +128,11 @@ catch {
 }
 
 Write-Info "Collecting commits between $startSha..$endSha (excluding start, including end)."
-    # Get list of commits reachable from end but not from start.
-    # IMPORTANT: In PowerShell, the .. operator creates a numeric/char range. If $startSha and $endSha look like hex strings,
-    # `$startSha..$endSha` must be passed as a single string argument.
-    $rangeArg = "$startSha..$endSha"
-    $commitList = git rev-list $rangeArg
+# Get list of commits reachable from end but not from start.
+# IMPORTANT: In PowerShell, the .. operator creates a numeric/char range. If $startSha and $endSha look like hex strings,
+# `$startSha..$endSha` must be passed as a single string argument.
+$rangeArg = "$startSha..$endSha"
+$commitList = git rev-list $rangeArg
 
 # Normalize list (filter out empty strings)
 $normalizedCommits = $commitList | Where-Object { $_ -and $_.Trim() -ne '' }
@@ -210,6 +187,63 @@ $prNumbers = $mergeCommits | Select-Object -ExpandProperty Pr -Unique | Sort-Obj
 Write-Info ("Found {0} unique PRs: {1}" -f $prNumbers.Count, ($prNumbers -join ', '))
 Write-DebugMsg ("Total merge commits examined: {0}" -f $mergeCommits.Count)
 
+# Build a map of PR number → list of commit SHAs (for co-author extraction)
+$prToCommits = @{}
+foreach ($mc in $mergeCommits) {
+    if (-not $prToCommits.ContainsKey($mc.Pr)) {
+        $prToCommits[$mc.Pr] = @()
+    }
+    $prToCommits[$mc.Pr] += $mc.Sha
+}
+
+<#
+.SYNOPSIS
+    Get all authors (including co-authors) for a set of commits via GitHub GraphQL API.
+.DESCRIPTION
+    Uses the Commit.authors field in GitHub's GraphQL API which natively includes
+    co-authors (from Co-authored-by trailers). Returns GitHub usernames (login)
+    without any email parsing — GitHub resolves the association for us.
+
+    NOTE: For squash merges this captures all co-authors correctly because GitHub
+    preserves Co-authored-by trailers in the squash commit. For traditional merge
+    commits, only the merger's author is returned — co-authors on individual PR
+    commits are not traversed. This is acceptable because PowerToys primarily uses
+    squash merging.
+#>
+function Get-CommitAuthors {
+    param(
+        [string[]]$CommitShas,
+        [string]$RepoFullName = "microsoft/PowerToys"
+    )
+    $parts = $RepoFullName -split '/'
+    $owner = $parts[0]
+    $repoName = $parts[1]
+    $allAuthors = @()
+
+    foreach ($sha in $CommitShas) {
+        try {
+            $query = "{ repository(owner: `"$owner`", name: `"$repoName`") { object(expression: `"$sha`") { ... on Commit { authors(first: 20) { nodes { user { login } name } } } } } }"
+            $result = gh api graphql -f query="$query" 2>$null | ConvertFrom-Json
+            $nodes = $result.data.repository.object.authors.nodes
+            if ($nodes) {
+                foreach ($node in $nodes) {
+                    if ($node.user -and $node.user.login) {
+                        $allAuthors += $node.user.login
+                    } else {
+                        # User without a GitHub account (rare) — use display name as fallback
+                        Write-DebugMsg "Commit $sha has an author without GitHub account: $($node.name)"
+                    }
+                }
+            }
+        }
+        catch {
+            Write-DebugMsg "GraphQL authors query failed for commit ${sha}: $_"
+        }
+    }
+
+    return $allAuthors | Select-Object -Unique
+}
+
 # Query GitHub for each PR
 $prDetails = @()
 function Get-CopilotSummaryFromPrJson {
@@ -307,22 +341,45 @@ foreach ($pr in $prNumbers) {
         $bodyValue = if ($json.body) { ($json.body -replace "`r", '') -replace "`n", ' ' } else { '' }
         $bodyValue = $bodyValue -replace '\s+', ' '
 
-        # Determine if author needs thanks (not in member list)
+        # Collect all contributors: PR author + co-authors from commit messages
         $authorLogin = $json.author.login
-        $needThanks = $true
-        if ($memberList.Count -gt 0 -and $authorLogin) {
-            $needThanks = -not ($memberList -contains $authorLogin)
+        $allContributors = @($authorLogin)
+
+        # Extract all authors (including co-authors) from associated commits via GitHub GraphQL API
+        if ($prToCommits.ContainsKey([int]$pr)) {
+            $commitAuthors = Get-CommitAuthors -CommitShas $prToCommits[[int]$pr] -RepoFullName $Repo
+            if ($commitAuthors) {
+                $allContributors += $commitAuthors
+            }
         }
 
+        # Deduplicate contributors (case-insensitive)
+        $allContributors = $allContributors | Where-Object { $_ } | Sort-Object -Unique
+
+        # Filter to only external contributors (not in member list) for thanks
+        $externalContributors = @()
+        if ($memberList.Count -gt 0) {
+            $externalContributors = $allContributors | Where-Object { -not ($memberList -contains $_) }
+        } else {
+            $externalContributors = $allContributors
+        }
+
+        # Author column: all contributors (comma-separated)
+        $authorField = ($allContributors -join ', ')
+
+        # NeedThanks column: comma-separated list of external contributors who
+        # deserve thanks attribution. Empty string means no thanks needed.
+        $needThanksField = ($externalContributors -join ', ')
+
         $prDetails += [PSCustomObject]@{
             Id = $json.number
             Title = $json.title
             Labels = $labelNames
-            Author = $authorLogin
+            Author = $authorField
             Url = $json.url
             Body = $bodyValue
             CopilotSummary = $copilot.Summary
-            NeedThanks = $needThanks
+            NeedThanks = $needThanksField
         }
     }
     catch {

.github/skills/winmd-api-search/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

.github/skills/winmd-api-search/SKILL.md

@@ -0,0 +1,192 @@
+---
+name: winmd-api-search
+description: 'Find and explore Windows desktop APIs. Use when building features that need platform capabilities — camera, file access, notifications, UI controls, AI/ML, sensors, networking, etc. Discovers the right API for a task and retrieves full type details (methods, properties, events, enumeration values).'
+license: Complete terms in LICENSE.txt
+---
+
+# WinMD API Search
+
+This skill helps you find the right Windows API for any capability and get its full details. It searches a local cache of all WinMD metadata from:
+
+- **Windows Platform SDK** — all `Windows.*` WinRT APIs (always available, no restore needed)
+- **WinAppSDK / WinUI** — bundled as a baseline in the cache generator (always available, no restore needed)
+- **NuGet packages** — any additional packages in restored projects that contain `.winmd` files
+- **Project-output WinMD** — class libraries (C++/WinRT, C#) that produce `.winmd` as build output
+
+Even on a fresh clone with no restore or build, you still get full Platform SDK + WinAppSDK coverage.
+
+## When to Use This Skill
+
+- User wants to build a feature and you need to find which API provides that capability
+- User asks "how do I do X?" where X involves a platform feature (camera, files, notifications, sensors, AI, etc.)
+- You need the exact methods, properties, events, or enumeration values of a type before writing code
+- You're unsure which control, class, or interface to use for a UI or system task
+
+## Prerequisites
+
+- **.NET SDK 8.0 or later** — required to build the cache generator. Install from [dotnet.microsoft.com](https://dotnet.microsoft.com/download) if not available.
+
+## Cache Setup (Required Before First Use)
+
+All query and search commands read from a local JSON cache. **You must generate the cache before running any queries.**
+
+```powershell
+# All projects in the repo (recommended for first run)
+.\.github\skills\winmd-api-search\scripts\Update-WinMdCache.ps1
+
+# Single project
+.\.github\skills\winmd-api-search\scripts\Update-WinMdCache.ps1 -ProjectDir <project-folder>
+```
+
+No project restore or build is needed for baseline coverage (Platform SDK + WinAppSDK). For additional NuGet packages, the project needs `dotnet restore` (which generates `project.assets.json`) or a `packages.config` file.
+
+Cache is stored at `Generated Files\winmd-cache\`, deduplicated per-package+version.
+
+### What gets indexed
+
+| Source | When available |
+|--------|----------------|
+| Windows Platform SDK | Always (reads from local SDK install) |
+| WinAppSDK (latest) | Always (bundled as baseline in cache generator) |
+| WinAppSDK Runtime | When installed on the system (detected via `Get-AppxPackage`) |
+| Project NuGet packages | After `dotnet restore` or with `packages.config` |
+| Project-output `.winmd` | After project build (class libraries that produce WinMD) |
+
+> **Note:** This cache directory should be in `.gitignore` — it's generated, not source.
+
+## How to Use
+
+Pick the path that matches the situation:
+
+---
+
+### Discover — "I don't know which API to use"
+
+The user describes a capability in their own words. You need to find the right API.
+
+**0. Ensure the cache exists**
+
+If the cache hasn't been generated yet, run `Update-WinMdCache.ps1` first — see [Cache Setup](#cache-setup-required-before-first-use) above.
+
+**1. Translate user language → search keywords**
+
+Map the user's daily language to programming terms. Try multiple variations:
+
+| User says | Search keywords to try (in order) |
+|-----------|-----------------------------------|
+| "take a picture" | `camera`, `capture`, `photo`, `MediaCapture` |
+| "load from disk" | `file open`, `picker`, `FileOpen`, `StorageFile` |
+| "describe what's in it" | `image description`, `Vision`, `Recognition` |
+| "show a popup" | `dialog`, `flyout`, `popup`, `ContentDialog` |
+| "drag and drop" | `drag`, `drop`, `DragDrop` |
+| "save settings" | `settings`, `ApplicationData`, `LocalSettings` |
+
+Start with simple everyday words. If results are weak or irrelevant, try the more technical variation.
+
+**2. Run searches**
+
+```powershell
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action search -Query "<keyword>"
+```
+
+This returns ranked namespaces with top matching types and the **JSON file path**.
+
+If results have **low scores (below 60) or are irrelevant**, fall back to searching online documentation:
+
+1. Use web search to find the right API on Microsoft Learn, for example:
+   - `site:learn.microsoft.com/uwp/api <capability keywords>` for `Windows.*` APIs
+   - `site:learn.microsoft.com/windows/windows-app-sdk/api/winrt <capability keywords>` for `Microsoft.*` WinAppSDK APIs
+2. Read the documentation pages to identify which type matches the user's requirement.
+3. Once you know the type name, come back and use `-Action members` or `-Action enums` to get the exact local signatures.
+
+**3. Read the JSON to choose the right API**
+
+Read the file at the path(s) from the top results. The JSON has all types in that namespace — full members, signatures, parameters, return types, enumeration values.
+
+Read and decide which types and members fit the user's requirement.
+
+**4. Look up official documentation for context**
+
+The cache contains only signatures — no descriptions or usage guidance. For explanations, examples, and remarks, look up the type on Microsoft Learn:
+
+| Namespace prefix | Documentation base URL |
+|-----------------|----------------------|
+| `Windows.*` | `https://learn.microsoft.com/uwp/api/{fully.qualified.typename}` |
+| `Microsoft.*` (WinAppSDK) | `https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/{fully.qualified.typename}` |
+
+For example, `Microsoft.UI.Xaml.Controls.NavigationView` maps to:
+`https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.navigationview`
+
+**5. Use the API knowledge to answer or write code**
+
+---
+
+### Lookup — "I know the API, show me the details"
+
+You already know (or suspect) the type or namespace name. Go direct:
+
+```powershell
+# Get all members of a known type
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action members -TypeName "Microsoft.UI.Xaml.Controls.NavigationView"
+
+# Get enum values
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action enums -TypeName "Microsoft.UI.Xaml.Visibility"
+
+# List all types in a namespace
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action types -Namespace "Microsoft.UI.Xaml.Controls"
+
+# Browse namespaces
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action namespaces -Filter "Microsoft.UI"
+```
+
+If you need full detail beyond what `-Action members` shows, use `-Action search` to get the JSON file path, then read the JSON file directly.
+
+---
+
+### Other Commands
+
+```powershell
+# List cached projects
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action projects
+
+# List packages for a project
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action packages
+
+# Show stats
+.\.github\skills\winmd-api-search\scripts\Invoke-WinMdQuery.ps1 -Action stats
+```
+
+> If only one project is cached, `-Project` is auto-selected.
+> If multiple projects exist, add `-Project <name>` (use `-Action projects` to see available names).
+> In scan mode, manifest names include a short hash suffix to avoid collisions; you can pass the base project name without the suffix if it's unambiguous.
+
+## Search Scoring
+
+The search ranks type names and member names against your query:
+
+| Score | Match type | Example |
+|-------|-----------|---------|
+| 100 | Exact name | `Button` → `Button` |
+| 80 | Starts with | `Navigation` → `NavigationView` |
+| 60 | Contains | `Dialog` → `ContentDialog` |
+| 50 | PascalCase initials | `ASB` → `AutoSuggestBox` |
+| 40 | Multi-keyword AND | `navigation item` → `NavigationViewItem` |
+| 20 | Fuzzy character match | `NavVw` → `NavigationView` |
+
+Results are grouped by namespace. Higher-scored namespaces appear first.
+
+## Troubleshooting
+
+| Issue | Fix |
+|-------|-----|
+| "Cache not found" | Run `Update-WinMdCache.ps1` |
+| "Multiple projects cached" | Add `-Project <name>` |
+| "Namespace not found" | Use `-Action namespaces` to list available ones |
+| "Type not found" | Use fully qualified name (e.g., `Microsoft.UI.Xaml.Controls.Button`) |
+| Stale after NuGet update | Re-run `Update-WinMdCache.ps1` |
+| Cache in git history | Add `Generated Files/` to `.gitignore` |
+
+## References
+
+- [Windows Platform SDK API reference](https://learn.microsoft.com/uwp/api/) — documentation for `Windows.*` namespaces
+- [Windows App SDK API reference](https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/) — documentation for `Microsoft.*` WinAppSDK namespaces

.github/skills/winmd-api-search/scripts/Invoke-WinMdQuery.ps1

@@ -0,0 +1,505 @@
+<#
+.SYNOPSIS
+    Query WinMD API metadata from cached JSON files.
+
+.DESCRIPTION
+    Reads pre-built JSON cache of WinMD types, members, and namespaces.
+    The cache is organized per-package (deduplicated) with project manifests
+    that map each project to its referenced packages.
+
+    Supports listing namespaces, types, members, searching, enum value lookup,
+    and listing cached projects/packages.
+
+.PARAMETER Action
+    The query action to perform:
+    - projects    : List cached projects
+    - packages    : List packages for a project
+    - stats       : Show aggregate statistics for a project
+    - namespaces  : List all namespaces (optional -Filter prefix)
+    - types       : List types in a namespace (-Namespace required)
+    - members     : List members of a type (-TypeName required)
+    - search      : Search types and members by name (-Query required)
+    - enums       : List enum values (-TypeName required)
+
+.PARAMETER Project
+    Project name to query. Auto-selected if only one project is cached.
+    Use -Action projects to list available projects.
+
+.PARAMETER Namespace
+    Namespace to query types from (used with -Action types).
+
+.PARAMETER TypeName
+    Full type name e.g. "Microsoft.UI.Xaml.Controls.Button" (used with -Action members, enums).
+
+.PARAMETER Query
+    Search query string (used with -Action search).
+
+.PARAMETER Filter
+    Optional prefix filter for namespaces (used with -Action namespaces).
+
+.PARAMETER CacheDir
+    Path to the winmd-cache directory. Defaults to "Generated Files\winmd-cache"
+    relative to the workspace root.
+
+.PARAMETER MaxResults
+    Maximum number of results to return for search. Defaults to 30.
+
+.EXAMPLE
+    .\Invoke-WinMdQuery.ps1 -Action projects
+    .\Invoke-WinMdQuery.ps1 -Action packages -Project BlankWinUI
+    .\Invoke-WinMdQuery.ps1 -Action stats -Project BlankWinUI
+    .\Invoke-WinMdQuery.ps1 -Action namespaces -Filter "Microsoft.UI"
+    .\Invoke-WinMdQuery.ps1 -Action types -Namespace "Microsoft.UI.Xaml.Controls"
+    .\Invoke-WinMdQuery.ps1 -Action members -TypeName "Microsoft.UI.Xaml.Controls.Button"
+    .\Invoke-WinMdQuery.ps1 -Action search -Query "NavigationView"
+    .\Invoke-WinMdQuery.ps1 -Action enums -TypeName "Microsoft.UI.Xaml.Visibility"
+#>
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory)]
+    [ValidateSet('projects', 'packages', 'stats', 'namespaces', 'types', 'members', 'search', 'enums')]
+    [string]$Action,
+
+    [string]$Project,
+    [string]$Namespace,
+    [string]$TypeName,
+    [string]$Query,
+    [string]$Filter,
+    [string]$CacheDir,
+    [int]$MaxResults = 30
+)
+
+# ─── Resolve cache directory ─────────────────────────────────────────────────
+
+if (-not $CacheDir) {
+    # Convention: skill lives at .github/skills/winmd-api-search/scripts/
+    # so workspace root is 4 levels up from $PSScriptRoot.
+    $scriptDir = $PSScriptRoot
+    $root = (Resolve-Path (Join-Path $scriptDir '..\..\..\..')).Path
+    $CacheDir = Join-Path $root 'Generated Files\winmd-cache'
+}
+
+if (-not (Test-Path $CacheDir)) {
+    Write-Error "Cache not found at: $CacheDir`nRun: .\Update-WinMdCache.ps1 (from .github\skills\winmd-api-search\scripts\)"
+    exit 1
+}
+
+# ─── Project resolution helpers ──────────────────────────────────────────────
+
+function Get-CachedProjects {
+    $projectsDir = Join-Path $CacheDir 'projects'
+    if (-not (Test-Path $projectsDir)) { return @() }
+    Get-ChildItem $projectsDir -Filter '*.json' | ForEach-Object { $_.BaseName }
+}
+
+function Resolve-ProjectManifest {
+    param([string]$Name)
+
+    $projectsDir = Join-Path $CacheDir 'projects'
+    if (-not (Test-Path $projectsDir)) {
+        Write-Error "No projects cached. Run Update-WinMdCache.ps1 first."
+        exit 1
+    }
+
+    if ($Name) {
+        $path = Join-Path $projectsDir "$Name.json"
+        if (-not (Test-Path $path)) {
+            # Scan mode appends a hash suffix -- try prefix match
+            $matching = @(Get-ChildItem $projectsDir -Filter "${Name}_*.json" -ErrorAction SilentlyContinue)
+            if ($matching.Count -eq 1) {
+                return Get-Content $matching[0].FullName -Raw | ConvertFrom-Json
+            }
+            if ($matching.Count -gt 1) {
+                $names = ($matching | ForEach-Object { $_.BaseName }) -join ', '
+                Write-Error "Multiple projects match '$Name'. Specify the full name: $names"
+                exit 1
+            }
+            $available = (Get-CachedProjects) -join ', '
+            Write-Error "Project '$Name' not found. Available: $available"
+            exit 1
+        }
+        return Get-Content $path -Raw | ConvertFrom-Json
+    }
+
+    # Auto-select if only one project
+    $manifests = Get-ChildItem $projectsDir -Filter '*.json' -ErrorAction SilentlyContinue
+    if ($manifests.Count -eq 0) {
+        Write-Error "No projects cached. Run Update-WinMdCache.ps1 first."
+        exit 1
+    }
+    if ($manifests.Count -eq 1) {
+        return Get-Content $manifests[0].FullName -Raw | ConvertFrom-Json
+    }
+
+    $available = ($manifests | ForEach-Object { $_.BaseName }) -join ', '
+    Write-Error "Multiple projects cached -- use -Project to specify. Available: $available"
+    exit 1
+}
+
+function Get-PackageCacheDirs {
+    param($Manifest)
+    $dirs = @()
+    foreach ($pkg in $Manifest.packages) {
+        $dir = Join-Path (Join-Path (Join-Path $CacheDir 'packages') $pkg.id) $pkg.version
+        if (Test-Path $dir) {
+            $dirs += $dir
+        }
+    }
+    return $dirs
+}
+
+# ─── Action: projects ────────────────────────────────────────────────────────
+
+function Show-Projects {
+    $projects = Get-CachedProjects
+    if ($projects.Count -eq 0) {
+        Write-Output "No projects cached."
+        return
+    }
+    Write-Output "Cached projects ($($projects.Count)):"
+    foreach ($p in $projects) {
+        $manifest = Get-Content (Join-Path (Join-Path $CacheDir 'projects') "$p.json") -Raw | ConvertFrom-Json
+        $pkgCount = $manifest.packages.Count
+        Write-Output "  $p ($pkgCount package(s))"
+    }
+}
+
+# ─── Action: packages ────────────────────────────────────────────────────────
+
+function Show-Packages {
+    $manifest = Resolve-ProjectManifest -Name $Project
+    Write-Output "Packages for project '$($manifest.projectName)' ($($manifest.packages.Count)):"
+    foreach ($pkg in $manifest.packages) {
+        $metaPath = Join-Path (Join-Path (Join-Path (Join-Path $CacheDir 'packages') $pkg.id) $pkg.version) 'meta.json'
+        if (Test-Path $metaPath) {
+            $meta = Get-Content $metaPath -Raw | ConvertFrom-Json
+            Write-Output "  $($pkg.id)@$($pkg.version) -- $($meta.totalTypes) types, $($meta.totalMembers) members"
+        } else {
+            Write-Output "  $($pkg.id)@$($pkg.version) -- (cache missing)"
+        }
+    }
+}
+
+# ─── Action: stats ───────────────────────────────────────────────────────────
+
+function Show-Stats {
+    $manifest = Resolve-ProjectManifest -Name $Project
+    $totalTypes = 0
+    $totalMembers = 0
+    $totalNamespaces = 0
+    $totalWinMd = 0
+
+    foreach ($pkg in $manifest.packages) {
+        $metaPath = Join-Path (Join-Path (Join-Path (Join-Path $CacheDir 'packages') $pkg.id) $pkg.version) 'meta.json'
+        if (Test-Path $metaPath) {
+            $meta = Get-Content $metaPath -Raw | ConvertFrom-Json
+            $totalTypes += $meta.totalTypes
+            $totalMembers += $meta.totalMembers
+            $totalNamespaces += $meta.totalNamespaces
+            $totalWinMd += $meta.winMdFiles.Count
+        }
+    }
+
+    Write-Output "WinMD Index Statistics -- $($manifest.projectName)"
+    Write-Output "======================================"
+    Write-Output "  Packages:   $($manifest.packages.Count)"
+    Write-Output "  Namespaces: $totalNamespaces (may overlap across packages)"
+    Write-Output "  Types:      $totalTypes"
+    Write-Output "  Members:    $totalMembers"
+    Write-Output "  WinMD files: $totalWinMd"
+}
+
+# ─── Action: namespaces ──────────────────────────────────────────────────────
+
+function Get-Namespaces {
+    param([string]$Prefix)
+    $manifest = Resolve-ProjectManifest -Name $Project
+    $dirs = Get-PackageCacheDirs -Manifest $manifest
+    $allNs = @()
+
+    foreach ($dir in $dirs) {
+        $nsFile = Join-Path $dir 'namespaces.json'
+        if (Test-Path $nsFile) {
+            $allNs += (Get-Content $nsFile -Raw | ConvertFrom-Json)
+        }
+    }
+
+    $allNs = $allNs | Sort-Object -Unique
+    if ($Prefix) {
+        $allNs = $allNs | Where-Object { $_ -like "$Prefix*" }
+    }
+    $allNs | ForEach-Object { Write-Output $_ }
+}
+
+# ─── Action: types ───────────────────────────────────────────────────────────
+
+function Get-TypesInNamespace {
+    param([string]$Ns)
+    if (-not $Ns) {
+        Write-Error "-Namespace is required for 'types' action."
+        exit 1
+    }
+
+    $manifest = Resolve-ProjectManifest -Name $Project
+    $dirs = Get-PackageCacheDirs -Manifest $manifest
+    $safeFile = $Ns.Replace('.', '_') + '.json'
+    $found = $false
+    $seen = @{}
+
+    foreach ($dir in $dirs) {
+        $filePath = Join-Path $dir "types\$safeFile"
+        if (-not (Test-Path $filePath)) { continue }
+        $found = $true
+        $types = Get-Content $filePath -Raw | ConvertFrom-Json
+        foreach ($t in $types) {
+            if ($seen.ContainsKey($t.fullName)) { continue }
+            $seen[$t.fullName] = $true
+            Write-Output "$($t.kind) $($t.fullName)$(if ($t.baseType) { " : $($t.baseType)" } else { '' })"
+        }
+    }
+
+    if (-not $found) {
+        Write-Error "Namespace not found: $Ns"
+        exit 1
+    }
+}
+
+# ─── Action: members ─────────────────────────────────────────────────────────
+
+function Get-MembersOfType {
+    param([string]$FullName)
+    if (-not $FullName) {
+        Write-Error "-TypeName is required for 'members' action."
+        exit 1
+    }
+
+    $lastDot = $FullName.LastIndexOf('.')
+    if ($lastDot -lt 0) {
+        Write-Error "-TypeName must include a namespace (for example: 'MyNamespace.MyType'). Provided: $FullName"
+        exit 1
+    }
+
+    $ns = $FullName.Substring(0, $lastDot)
+    $safeFile = $ns.Replace('.', '_') + '.json'
+
+    $manifest = Resolve-ProjectManifest -Name $Project
+    $dirs = Get-PackageCacheDirs -Manifest $manifest
+
+    foreach ($dir in $dirs) {
+        $filePath = Join-Path $dir "types\$safeFile"
+        if (-not (Test-Path $filePath)) { continue }
+
+        $types = Get-Content $filePath -Raw | ConvertFrom-Json
+        $type = $types | Where-Object { $_.fullName -eq $FullName }
+        if (-not $type) { continue }
+
+        Write-Output "$($type.kind) $($type.fullName)"
+        if ($type.baseType) { Write-Output "  Extends: $($type.baseType)" }
+        Write-Output ""
+        foreach ($m in $type.members) {
+            Write-Output "  [$($m.kind)] $($m.signature)"
+        }
+        return
+    }
+
+    Write-Error "Type not found: $FullName"
+    exit 1
+}
+
+# ─── Action: search ──────────────────────────────────────────────────────────
+# Ranks namespaces by best match score on type names and member names.
+# Outputs: ranked namespaces with top matching types and the JSON file path.
+# The agent can then read the JSON file to inspect all members intelligently.
+
+function Search-WinMd {
+    param([string]$SearchQuery, [int]$Max)
+    if (-not $SearchQuery) {
+        Write-Error "-Query is required for 'search' action."
+        exit 1
+    }
+
+    $manifest = Resolve-ProjectManifest -Name $Project
+    $dirs = Get-PackageCacheDirs -Manifest $manifest
+
+    # Collect: namespace -> { bestScore, matchingTypes[], filePath }
+    $nsResults = @{}
+
+    foreach ($dir in $dirs) {
+        $nsFile = Join-Path $dir 'namespaces.json'
+        if (-not (Test-Path $nsFile)) { continue }
+        $nsList = Get-Content $nsFile -Raw | ConvertFrom-Json
+
+        foreach ($n in $nsList) {
+            $safeFile = $n.Replace('.', '_') + '.json'
+            $filePath = Join-Path $dir "types\$safeFile"
+            if (-not (Test-Path $filePath)) { continue }
+
+            $types = Get-Content $filePath -Raw | ConvertFrom-Json
+            foreach ($t in $types) {
+                $typeScore = Get-MatchScore -Name $t.name -FullName $t.fullName -Query $SearchQuery
+
+                # Also search member names for matches
+                $bestMemberScore = 0
+                $matchingMember = $null
+                if ($t.members) {
+                    foreach ($m in $t.members) {
+                        $memberName = $m.name
+                        $mScore = Get-MatchScore -Name $memberName -FullName "$($t.fullName).$memberName" -Query $SearchQuery
+                        if ($mScore -gt $bestMemberScore) {
+                            $bestMemberScore = $mScore
+                            $matchingMember = $m.signature
+                        }
+                    }
+                }
+
+                $score = [Math]::Max($typeScore, $bestMemberScore)
+                if ($score -le 0) { continue }
+
+                if (-not $nsResults.ContainsKey($n)) {
+                    $nsResults[$n] = @{ BestScore = 0; Types = @(); FilePaths = @() }
+                }
+                $entry = $nsResults[$n]
+                if ($score -gt $entry.BestScore) { $entry.BestScore = $score }
+                if ($entry.FilePaths -notcontains $filePath) {
+                    $entry.FilePaths += $filePath
+                }
+
+                if ($typeScore -ge $bestMemberScore) {
+                    $entry.Types += @{ Text = "$($t.kind) $($t.fullName) [$typeScore]"; Score = $typeScore }
+                } else {
+                    $entry.Types += @{ Text = "$($t.kind) $($t.fullName) -> $matchingMember [$bestMemberScore]"; Score = $bestMemberScore }
+                }
+            }
+        }
+    }
+
+    if ($nsResults.Count -eq 0) {
+        Write-Output "No results found for: $SearchQuery"
+        return
+    }
+
+    $ranked = $nsResults.GetEnumerator() |
+        Sort-Object { $_.Value.BestScore } -Descending |
+        Select-Object -First $Max
+
+    foreach ($r in $ranked) {
+        $ns = $r.Key
+        $info = $r.Value
+        Write-Output "[$($info.BestScore)] $ns"
+        foreach ($fp in $info.FilePaths) {
+            Write-Output "    File: $fp"
+        }
+        # Show top 5 highest-scoring matching types in this namespace
+        $info.Types | Sort-Object { $_.Score } -Descending |
+            Select-Object -First 5 |
+            ForEach-Object { Write-Output "    $($_.Text)" }
+        Write-Output ""
+    }
+}
+
+# ─── Search scoring ──────────────────────────────────────────────────────────
+# Simple ranked scoring on type names. Higher = better.
+#   100 = exact name    80 = starts-with    60 = substring
+#    50 = PascalCase     40 = multi-keyword   20 = fuzzy subsequence
+
+function Get-MatchScore {
+    param([string]$Name, [string]$FullName, [string]$Query)
+
+    $q = $Query.Trim()
+    if (-not $q) { return 0 }
+
+    if ($Name -eq $q) { return 100 }
+    if ($Name -like "$q*") { return 80 }
+    if ($Name -like "*$q*" -or $FullName -like "*$q*") { return 60 }
+
+    $initials = ($Name.ToCharArray() | Where-Object { [char]::IsUpper($_) }) -join ''
+    if ($initials.Length -ge 2 -and $initials -like "*$q*") { return 50 }
+
+    $words = $q -split '\s+' | Where-Object { $_.Length -gt 0 }
+    if ($words.Count -gt 1) {
+        $allFound = $true
+        foreach ($w in $words) {
+            if ($Name -notlike "*$w*" -and $FullName -notlike "*$w*") {
+                $allFound = $false
+                break
+            }
+        }
+        if ($allFound) { return 40 }
+    }
+
+    if (Test-FuzzySubsequence -Text $Name -Pattern $q) { return 20 }
+
+    return 0
+}
+
+function Test-FuzzySubsequence {
+    param([string]$Text, [string]$Pattern)
+    $ti = 0
+    $tLower = $Text.ToLowerInvariant()
+    $pLower = $Pattern.ToLowerInvariant()
+    foreach ($ch in $pLower.ToCharArray()) {
+        $idx = $tLower.IndexOf($ch, $ti)
+        if ($idx -lt 0) { return $false }
+        $ti = $idx + 1
+    }
+    return $true
+}
+
+# ─── Action: enums ───────────────────────────────────────────────────────────
+
+function Get-EnumValues {
+    param([string]$FullName)
+    if (-not $FullName) {
+        Write-Error "-TypeName is required for 'enums' action."
+        exit 1
+    }
+
+    $lastDot = $FullName.LastIndexOf('.')
+    if ($lastDot -lt 1) {
+        Write-Error "-TypeName must be a fully-qualified type name including namespace, e.g. 'Namespace.TypeName'. Provided: $FullName"
+        exit 1
+    }
+
+    $ns = $FullName.Substring(0, $lastDot)
+    $safeFile = $ns.Replace('.', '_') + '.json'
+
+    $manifest = Resolve-ProjectManifest -Name $Project
+    $dirs = Get-PackageCacheDirs -Manifest $manifest
+
+    foreach ($dir in $dirs) {
+        $filePath = Join-Path $dir "types\$safeFile"
+        if (-not (Test-Path $filePath)) { continue }
+
+        $types = Get-Content $filePath -Raw | ConvertFrom-Json
+        $type = $types | Where-Object { $_.fullName -eq $FullName }
+        if (-not $type) { continue }
+
+        if ($type.kind -ne 'Enum') {
+            Write-Error "$FullName is not an Enum (kind: $($type.kind))"
+            exit 1
+        }
+        Write-Output "Enum $($type.fullName)"
+        if ($type.enumValues) {
+            $type.enumValues | ForEach-Object { Write-Output "  $_" }
+        } else {
+            Write-Output "  (no values)"
+        }
+        return
+    }
+
+    Write-Error "Type not found: $FullName"
+    exit 1
+}
+
+# ─── Dispatch ─────────────────────────────────────────────────────────────────
+
+switch ($Action) {
+    'projects'   { Show-Projects }
+    'packages'   { Show-Packages }
+    'stats'      { Show-Stats }
+    'namespaces' { Get-Namespaces -Prefix $Filter }
+    'types'      { Get-TypesInNamespace -Ns $Namespace }
+    'members'    { Get-MembersOfType -FullName $TypeName }
+    'search'     { Search-WinMd -SearchQuery $Query -Max $MaxResults }
+    'enums'      { Get-EnumValues -FullName $TypeName }
+}

.github/skills/winmd-api-search/scripts/Update-WinMdCache.ps1

@@ -0,0 +1,208 @@
+<#
+.SYNOPSIS
+    Generate or refresh the WinMD cache for the Agent Skill.
+
+.DESCRIPTION
+    Builds and runs the standalone cache generator to export cached JSON files
+    from all WinMD metadata found in project NuGet packages and Windows SDK.
+
+    The cache is per-package+version: if two projects reference the same
+    package at the same version, the WinMD data is parsed once and shared.
+
+    Supports single project or recursive scan of an entire repo.
+
+.PARAMETER ProjectDir
+    Path to a project directory (contains .csproj/.vcxproj), or a project file itself.
+    Defaults to scanning the workspace root.
+
+.PARAMETER Scan
+    Recursively discover all .csproj/.vcxproj files under ProjectDir.
+
+.PARAMETER OutputDir
+    Path to the cache output directory. Defaults to "Generated Files\winmd-cache".
+
+.EXAMPLE
+    .\Update-WinMdCache.ps1
+    .\Update-WinMdCache.ps1 -ProjectDir BlankWinUI
+    .\Update-WinMdCache.ps1 -Scan -ProjectDir .
+    .\Update-WinMdCache.ps1 -ProjectDir "src\MyApp\MyApp.csproj"
+#>
+[CmdletBinding()]
+param(
+    [string]$ProjectDir,
+    [switch]$Scan,
+    [string]$OutputDir = 'Generated Files\winmd-cache'
+)
+
+$ErrorActionPreference = 'Stop'
+
+# Convention: skill lives at .github/skills/winmd-api-search/scripts/
+# so workspace root is 4 levels up from $PSScriptRoot.
+$root = (Resolve-Path (Join-Path $PSScriptRoot '..\..\..\..')).Path
+$generatorProj = Join-Path (Join-Path $PSScriptRoot 'cache-generator') 'CacheGenerator.csproj'
+
+# ---------------------------------------------------------------------------
+# WinAppSDK version detection -- look only at the repo root folder (no recursion)
+# ---------------------------------------------------------------------------
+
+function Get-WinAppSdkVersionFromDirectoryPackagesProps {
+    <#
+    .SYNOPSIS
+        Extract Microsoft.WindowsAppSDK version from a Directory.Packages.props
+        (Central Package Management) at the repo root.
+    #>
+    param([string]$RepoRoot)
+    $propsFile = Join-Path $RepoRoot 'Directory.Packages.props'
+    if (-not (Test-Path $propsFile)) { return $null }
+    try {
+        [xml]$xml = Get-Content $propsFile -Raw
+        $node = $xml.SelectNodes('//PackageVersion') |
+            Where-Object { $_.Include -eq 'Microsoft.WindowsAppSDK' } |
+            Select-Object -First 1
+        if ($node) { return $node.Version }
+    } catch {
+        Write-Verbose "Could not parse $propsFile : $_"
+    }
+    return $null
+}
+
+function Get-WinAppSdkVersionFromPackagesConfig {
+    <#
+    .SYNOPSIS
+        Extract Microsoft.WindowsAppSDK version from a packages.config at the repo root.
+    #>
+    param([string]$RepoRoot)
+    $configFile = Join-Path $RepoRoot 'packages.config'
+    if (-not (Test-Path $configFile)) { return $null }
+    try {
+        [xml]$xml = Get-Content $configFile -Raw
+        $node = $xml.SelectNodes('//package') |
+            Where-Object { $_.id -eq 'Microsoft.WindowsAppSDK' } |
+            Select-Object -First 1
+        if ($node) { return $node.version }
+    } catch {
+        Write-Verbose "Could not parse $configFile : $_"
+    }
+    return $null
+}
+
+# Try Directory.Packages.props first (CPM), then packages.config
+$winAppSdkVersion = Get-WinAppSdkVersionFromDirectoryPackagesProps -RepoRoot $root
+if (-not $winAppSdkVersion) {
+    $winAppSdkVersion = Get-WinAppSdkVersionFromPackagesConfig -RepoRoot $root
+}
+if ($winAppSdkVersion) {
+    Write-Host "Detected WinAppSDK version from repo: $winAppSdkVersion" -ForegroundColor Cyan
+} else {
+    Write-Host "No WinAppSDK version found at repo root; will use latest (Version=*)" -ForegroundColor Yellow
+}
+
+# Default: if no ProjectDir, scan the workspace root
+if (-not $ProjectDir) {
+    $ProjectDir = $root
+    $Scan = $true
+}
+
+Push-Location $root
+
+try {
+    # Detect installed .NET SDK -- require >= 8.0, prefer stable over preview
+    $dotnetSdks = dotnet --list-sdks 2>$null
+    $bestMajor = $dotnetSdks |
+        Where-Object { $_ -notmatch 'preview|rc|alpha|beta' } |
+        ForEach-Object { if ($_ -match '^(\d+)\.') { [int]$Matches[1] } } |
+        Where-Object { $_ -ge 8 } |
+        Sort-Object -Descending |
+        Select-Object -First 1
+
+    # Fall back to preview SDKs if no stable SDK found
+    if (-not $bestMajor) {
+        $bestMajor = $dotnetSdks |
+            ForEach-Object { if ($_ -match '^(\d+)\.') { [int]$Matches[1] } } |
+            Where-Object { $_ -ge 8 } |
+            Sort-Object -Descending |
+            Select-Object -First 1
+    }
+
+    if (-not $bestMajor) {
+        Write-Error "No .NET SDK >= 8.0 found. Install from https://dotnet.microsoft.com/download"
+        exit 1
+    }
+
+    $targetFramework = "net$bestMajor.0"
+    Write-Host "Using .NET SDK: $targetFramework" -ForegroundColor Cyan
+
+    # Build MSBuild properties -- pass detected WinAppSDK version when available
+    $sdkVersionProp = ''
+    if ($winAppSdkVersion) {
+        $sdkVersionProp = "-p:WinAppSdkVersion=$winAppSdkVersion"
+    }
+
+    Write-Host "Building cache generator..." -ForegroundColor Cyan
+    $restoreArgs = @($generatorProj, "-p:TargetFramework=$targetFramework", '--nologo', '-v', 'q')
+    if ($sdkVersionProp) { $restoreArgs += $sdkVersionProp }
+    dotnet restore @restoreArgs
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Restore failed"
+        exit 1
+    }
+    $buildArgs = @($generatorProj, '-c', 'Release', '--nologo', '-v', 'q', "-p:TargetFramework=$targetFramework", '--no-restore')
+    if ($sdkVersionProp) { $buildArgs += $sdkVersionProp }
+    dotnet build @buildArgs
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Build failed"
+        exit 1
+    }
+
+    # Run the built executable directly (avoids dotnet run target framework mismatch issues)
+    $generatorDir = Join-Path $PSScriptRoot 'cache-generator'
+    $exePath = Join-Path $generatorDir "bin\Release\$targetFramework\CacheGenerator.exe"
+    if (-not (Test-Path $exePath)) {
+        # Fallback: try dll with dotnet
+        $dllPath = Join-Path $generatorDir "bin\Release\$targetFramework\CacheGenerator.dll"
+        if (Test-Path $dllPath) {
+            $exePath = $null
+        } else {
+            Write-Error "Built executable not found at: $exePath"
+            exit 1
+        }
+    }
+
+    $runArgs = @()
+    if ($Scan) {
+        $runArgs += '--scan'
+    }
+
+    # Detect installed WinAppSDK runtime via Get-AppxPackage (the WindowsApps
+    # folder is ACL-restricted so C# cannot enumerate it directly).
+    # WinMD files are architecture-independent metadata, so pick whichever arch
+    # matches the current OS to ensure the package is present.
+    $osArch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString()
+    $runtimePkg = Get-AppxPackage -Name 'Microsoft.WindowsAppRuntime.*' -ErrorAction SilentlyContinue |
+        Where-Object { $_.Name -notmatch 'CBS' -and $_.Architecture -eq $osArch } |
+        Sort-Object -Property Version -Descending |
+        Select-Object -First 1
+    if ($runtimePkg -and $runtimePkg.InstallLocation -and (Test-Path $runtimePkg.InstallLocation)) {
+        Write-Host "Detected WinAppSDK runtime: $($runtimePkg.Name) v$($runtimePkg.Version)" -ForegroundColor Cyan
+        $runArgs += '--winappsdk-runtime'
+        $runArgs += $runtimePkg.InstallLocation
+    }
+
+    $runArgs += $ProjectDir
+    $runArgs += $OutputDir
+
+    Write-Host "Exporting WinMD cache..." -ForegroundColor Cyan
+    if ($exePath) {
+        & $exePath @runArgs
+    } else {
+        dotnet $dllPath @runArgs
+    }
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Cache export failed"
+        exit 1
+    }
+
+    Write-Host "Cache updated at: $OutputDir" -ForegroundColor Green
+} finally {
+    Pop-Location
+}

.github/skills/winmd-api-search/scripts/cache-generator/CacheGenerator.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <!-- Default fallback; Update-WinMdCache.ps1 overrides via -p:TargetFramework=net{X}.0 -->
+    <TargetFramework Condition="'$(TargetFramework)' == ''">net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+  <!-- System.Reflection.Metadata is inbox in net9.0+, only needed for net8.0 -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="System.Reflection.Metadata" Version="8.0.1" />
+  </ItemGroup>
+
+  <!--
+    Baseline WinAppSDK packages: downloaded during restore so the cache generator
+    can always index WinAppSDK APIs, even if the target project hasn't been restored.
+    ExcludeAssets="all" means they're downloaded but don't affect this tool's build.
+
+    When the repo has a known version (passed via -p:WinAppSdkVersion=X.Y.Z from
+    Update-WinMdCache.ps1), prefer that version to avoid unnecessary NuGet downloads.
+    Falls back to Version="*" (latest) on fresh clones with no restore.
+  -->
+  <ItemGroup Condition="'$(WinAppSdkVersion)' != ''">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(WinAppSdkVersion)" ExcludeAssets="all" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(WinAppSdkVersion)' == ''">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="*" ExcludeAssets="all" />
+  </ItemGroup>
+</Project>

.github/skills/winmd-api-search/scripts/cache-generator/Directory.Build.props

@@ -0,0 +1,3 @@
+<Project>
+  <!-- Isolate this standalone tool from the repo-level build configuration -->
+</Project>

.github/skills/winmd-api-search/scripts/cache-generator/Directory.Build.targets

@@ -0,0 +1,3 @@
+<Project>
+  <!-- Isolate this standalone tool from the repo-level build targets -->
+</Project>

.github/skills/winmd-api-search/scripts/cache-generator/Directory.Packages.props

@@ -0,0 +1,3 @@
+<Project>
+  <!-- Isolate this standalone tool from the repo-level Central Package Management -->
+</Project>

.github/skills/wpf-to-winui3-migration/SKILL.md

@@ -0,0 +1,165 @@
+---
+name: wpf-to-winui3-migration
+description: Guide for migrating PowerToys modules from WPF to WinUI 3 (Windows App SDK). Use when asked to migrate WPF code, convert WPF XAML to WinUI, replace System.Windows namespaces with Microsoft.UI.Xaml, update Dispatcher to DispatcherQueue, replace DynamicResource with ThemeResource, migrate imaging APIs from System.Windows.Media.Imaging to Windows.Graphics.Imaging, convert WPF Window to WinUI Window, migrate .resx to .resw resources, migrate custom Observable/RelayCommand to CommunityToolkit.Mvvm source generators, handle WPF-UI (Lepo) to WinUI native control migration, or fix installer/build pipeline issues after migration. Keywords: WPF, WinUI, WinUI3, migration, porting, convert, namespace, XAML, Dispatcher, DispatcherQueue, imaging, BitmapImage, Window, ContentDialog, ThemeResource, DynamicResource, ResourceLoader, resw, resx, CommunityToolkit, ObservableProperty, WPF-UI, SizeToContent, AppWindow, SoftwareBitmap.
+license: Complete terms in LICENSE.txt
+---
+
+# WPF to WinUI 3 Migration Skill
+
+Migrate PowerToys modules from WPF (`System.Windows.*`) to WinUI 3 (`Microsoft.UI.Xaml.*` / Windows App SDK). Based on patterns validated in the ImageResizer module migration.
+
+## When to Use This Skill
+
+- Migrate a PowerToys module from WPF to WinUI 3
+- Convert WPF XAML files to WinUI 3 XAML
+- Replace `System.Windows` namespaces with `Microsoft.UI.Xaml`
+- Migrate `Dispatcher` usage to `DispatcherQueue`
+- Migrate custom `Observable`/`RelayCommand` to CommunityToolkit.Mvvm source generators
+- Replace WPF-UI (Lepo) controls with native WinUI 3 controls
+- Convert imaging code from `System.Windows.Media.Imaging` to `Windows.Graphics.Imaging`
+- Handle WPF `Window` vs WinUI `Window` differences (sizing, positioning, SizeToContent)
+- Migrate resource files from `.resx` to `.resw` with `ResourceLoader`
+- Fix installer/build pipeline issues after WinUI 3 migration
+- Update project files, NuGet packages, and signing config
+
+## Prerequisites
+
+- Visual Studio 2022 17.4+
+- Windows App SDK NuGet package (`Microsoft.WindowsAppSDK`)
+- .NET 8+ with `net8.0-windows10.0.19041.0` TFM
+- Windows 10 1803+ (April 2018 Update or newer)
+
+## Migration Strategy
+
+### Recommended Order
+
+1. **Project file** — Update TFM, NuGet packages, set `<UseWinUI>true</UseWinUI>`
+2. **Data models and business logic** — No UI dependencies, migrate first
+3. **MVVM framework** — Replace custom Observable/RelayCommand with CommunityToolkit.Mvvm
+4. **Resource strings** — Migrate `.resx` → `.resw`, introduce `ResourceLoaderInstance`
+5. **Services and utilities** — Replace `System.Windows` types, async-ify imaging code
+6. **ViewModels** — Update Dispatcher usage, binding patterns
+7. **Views/Pages** — Starting from leaf pages with fewest dependencies
+8. **Main page / shell** — Last, since it depends on everything
+9. **App.xaml / startup code** — Merge carefully (do NOT overwrite WinUI 3 boilerplate)
+10. **Installer & build pipeline** — Update WiX, signing, build events
+11. **Tests** — Adapt for WinUI 3 runtime, async patterns
+
+### Key Principles
+
+- **Do NOT overwrite `App.xaml` / `App.xaml.cs`** — WinUI 3 has different application lifecycle boilerplate. Merge your resources and initialization code into the generated WinUI 3 App class.
+- **Do NOT create Exe→WinExe `ProjectReference`** — Extract shared code to a Library project. This causes phantom build artifacts.
+- **Use `Lazy<T>` for resource-dependent statics** — `ResourceLoader` is not available at class-load time in all contexts.
+
+## Quick Reference Tables
+
+### Namespace Mapping
+
+| WPF | WinUI 3 |
+|-----|---------|
+| `System.Windows` | `Microsoft.UI.Xaml` |
+| `System.Windows.Controls` | `Microsoft.UI.Xaml.Controls` |
+| `System.Windows.Media` | `Microsoft.UI.Xaml.Media` |
+| `System.Windows.Media.Imaging` | `Microsoft.UI.Xaml.Media.Imaging` (UI) / `Windows.Graphics.Imaging` (processing) |
+| `System.Windows.Input` | `Microsoft.UI.Xaml.Input` |
+| `System.Windows.Data` | `Microsoft.UI.Xaml.Data` |
+| `System.Windows.Threading` | `Microsoft.UI.Dispatching` |
+| `System.Windows.Interop` | `WinRT.Interop` |
+
+### Critical API Replacements
+
+| WPF | WinUI 3 | Notes |
+|-----|---------|-------|
+| `Dispatcher.Invoke()` | `DispatcherQueue.TryEnqueue()` | Different return type (`bool`) |
+| `Dispatcher.CheckAccess()` | `DispatcherQueue.HasThreadAccess` | Property vs method |
+| `Application.Current.Dispatcher` | Store `DispatcherQueue` in static field | See [Threading](./references/threading-and-windowing.md) |
+| `MessageBox.Show()` | `ContentDialog` | Must set `XamlRoot` |
+| `DynamicResource` | `ThemeResource` | Theme-reactive only |
+| `clr-namespace:` | `using:` | XAML namespace prefix |
+| `{x:Static props:Resources.Key}` | `x:Uid` or `ResourceLoader.GetString()` | .resx → .resw |
+| `DataType="{x:Type m:Foo}"` | Remove or use code-behind | `x:Type` not supported |
+| `Properties.Resources.MyString` | `ResourceLoaderInstance.ResourceLoader.GetString("MyString")` | Lazy-init pattern |
+| `Application.Current.MainWindow` | Custom `App.Window` static property | Must track manually |
+| `SizeToContent="Height"` | Custom `SizeToContent()` via `AppWindow.Resize()` | See [Windowing](./references/threading-and-windowing.md) |
+| `MouseLeftButtonDown` | `PointerPressed` | Mouse → Pointer events |
+| `Pack URI (pack://...)` | `ms-appx:///` | Resource URI scheme |
+| `Observable` (custom base) | `ObservableObject` + `[ObservableProperty]` | CommunityToolkit.Mvvm |
+| `RelayCommand` (custom) | `[RelayCommand]` source generator | CommunityToolkit.Mvvm |
+| `JpegBitmapEncoder` | `BitmapEncoder.CreateAsync(JpegEncoderId, stream)` | Async, unified API |
+| `encoder.QualityLevel = 85` | `BitmapPropertySet { "ImageQuality", 0.85f }` | int 1-100 → float 0-1 |
+
+### NuGet Package Migration
+
+| WPF | WinUI 3 |
+|-----|---------|
+| `Microsoft.Xaml.Behaviors.Wpf` | `Microsoft.Xaml.Behaviors.WinUI.Managed` |
+| `WPF-UI` (Lepo) | Remove — use native WinUI 3 controls |
+| `CommunityToolkit.Mvvm` | `CommunityToolkit.Mvvm` (same) |
+| `Microsoft.Toolkit.Wpf.*` | `CommunityToolkit.WinUI.*` |
+| (none) | `Microsoft.WindowsAppSDK` |
+| (none) | `Microsoft.Windows.SDK.BuildTools` |
+| (none) | `WinUIEx` (optional, for window helpers) |
+| (none) | `CommunityToolkit.WinUI.Converters` |
+
+### XAML Syntax Changes
+
+| WPF | WinUI 3 |
+|-----|---------|
+| `xmlns:local="clr-namespace:MyApp"` | `xmlns:local="using:MyApp"` |
+| `{DynamicResource Key}` | `{ThemeResource Key}` |
+| `{x:Static Type.Member}` | `{x:Bind}` or code-behind |
+| `{x:Type local:MyType}` | Not supported |
+| `<Style.Triggers>` / `<DataTrigger>` | `VisualStateManager` |
+| `{Binding}` in `Setter.Value` | Not supported — use `StaticResource` |
+| `Content="{x:Static p:Resources.Cancel}"` | `x:Uid="Cancel"` with `.Content` in `.resw` |
+| `<ui:FluentWindow>` / `<ui:Button>` (WPF-UI) | Native `<Window>` / `<Button>` |
+| `<ui:NumberBox>` / `<ui:ProgressRing>` (WPF-UI) | Native `<NumberBox>` / `<ProgressRing>` |
+| `BasedOn="{StaticResource {x:Type ui:Button}}"` | `BasedOn="{StaticResource DefaultButtonStyle}"` |
+| `IsDefault="True"` / `IsCancel="True"` | `Style="{StaticResource AccentButtonStyle}"` / handle via KeyDown |
+| `<AccessText>` | Not available — use `AccessKey` property |
+| `<behaviors:Interaction.Triggers>` | Migrate to code-behind or WinUI behaviors |
+
+## Detailed Reference Docs
+
+Read only the section relevant to your current task:
+
+- [Namespace and API Mapping](./references/namespace-api-mapping.md) — Full type mapping, NuGet changes, project file, CsWinRT interop
+- [XAML Migration Guide](./references/xaml-migration.md) — XAML syntax, WPF-UI removal, markup extensions, styles, resources, data binding
+- [Threading and Window Management](./references/threading-and-windowing.md) — Dispatcher, DispatcherQueue, SizeToContent, AppWindow, HWND interop, custom entry point
+- [Imaging API Migration](./references/imaging-migration.md) — BitmapEncoder/Decoder, SoftwareBitmap, CodecHelper, async patterns, int→uint
+- [PowerToys-Specific Patterns](./references/powertoys-patterns.md) — MVVM migration, ResourceLoader, Lazy init, installer, signing, test adaptation, build pipeline
+
+## Common Pitfalls (from ImageResizer migration)
+
+| Pitfall | Solution |
+|---------|----------|
+| `ContentDialog` throws "does not have a XamlRoot" | Set `dialog.XamlRoot = this.Content.XamlRoot` before `ShowAsync()` |
+| `FilePicker` throws error in desktop app | Call `WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd)` |
+| `Window.Dispatcher` returns null | Use `Window.DispatcherQueue` instead |
+| Resources on `Window` element not found | Move resources to root layout container (`Grid.Resources`) |
+| `VisualStateManager` on `Window` fails | Use `UserControl` or `Page` inside the Window |
+| Satellite assembly installer errors (`WIX0103`) | Remove `.resources.dll` refs from `Resources.wxs`; WinUI 3 uses `.pri` |
+| Phantom `.exe`/`.deps.json` in root output dir | Avoid Exe→WinExe `ProjectReference`; use Library project |
+| `ResourceLoader` crash at static init | Wrap in `Lazy<T>` or null-coalescing property — see [Lazy Init](./references/powertoys-patterns.md#lazy-initialization-for-resource-dependent-statics) |
+| `SizeToContent` not available | Implement manual content measurement + `AppWindow.Resize()` with DPI scaling |
+| `x:Bind` default mode is `OneTime` | Explicitly set `Mode=OneWay` or `Mode=TwoWay` |
+| `DynamicResource` / `x:Static` not compiling | Replace with `ThemeResource` / `ResourceLoader` or `x:Uid` |
+| `IValueConverter.Convert` signature mismatch | Last param: `CultureInfo` → `string` (language tag) |
+| Test project can't resolve WPF types | Add `<UseWPF>true</UseWPF>` temporarily; remove after imaging migration |
+| Pixel dimension type mismatch (`int` vs `uint`) | WinRT uses `uint` for pixel sizes — add `u` suffix in test assertions |
+| `$(SolutionDir)` empty in standalone project build | Use `$(MSBuildThisFileDirectory)` with relative paths instead |
+| JPEG quality value wrong after migration | WPF: int 1-100; WinRT: float 0.0-1.0 |
+| MSIX packaging fails in PreBuildEvent | Move to PostBuildEvent; artifacts not ready at PreBuild time |
+| RC file icon path with forward slashes | Use double-backslash escaping: `..\\ui\\Assets\\icon.ico` |
+
+## Troubleshooting
+
+| Issue | Solution |
+|-------|----------|
+| Build fails after namespace rename | Check for lingering `System.Windows` usings; some types have no direct equivalent |
+| Missing `PresentationCore.dll` at runtime | Ensure ALL imaging code uses `Windows.Graphics.Imaging`, not `System.Windows.Media.Imaging` |
+| `DataContext` not working on Window | WinUI 3 `Window` is not a `DependencyObject`; use a root `Page` or `UserControl` |
+| XAML designer not available | WinUI 3 does not support XAML Designer; use Hot Reload instead |
+| NuGet restore failures | Run `build-essentials.cmd` after adding `Microsoft.WindowsAppSDK` package |
+| `Parallel.ForEach` compilation error | Migrate to `Parallel.ForEachAsync` for async imaging operations |
+| Signing check fails on leaked artifacts | Run `generateAllFileComponents.ps1`; verify only `WinUI3Apps\\` paths in signing config |

.github/skills/wpf-to-winui3-migration/references/imaging-migration.md

@@ -0,0 +1,287 @@
+# Imaging API Migration
+
+Migrating from WPF (`System.Windows.Media.Imaging` / `PresentationCore.dll`) to WinRT (`Windows.Graphics.Imaging`). Based on the ImageResizer migration.
+
+## Why This Migration Is Required
+
+WinUI 3 apps deployed as self-contained do NOT include `PresentationCore.dll`. Any code using `System.Windows.Media.Imaging` will throw `FileNotFoundException` at runtime. ALL imaging code must use WinRT APIs.
+
+| Purpose | Namespace |
+|---------|-----------|
+| UI display (`Image.Source`) | `Microsoft.UI.Xaml.Media.Imaging` |
+| Image processing (encode/decode/transform) | `Windows.Graphics.Imaging` |
+
+## Architecture Change: Pipeline vs Declarative
+
+The fundamental architecture differs:
+
+**WPF**: In-memory pipeline of bitmap objects. Decode → transform → encode synchronously.
+```csharp
+var decoder = BitmapDecoder.Create(stream, ...);
+var transform = new TransformedBitmap(decoder.Frames[0], new ScaleTransform(...));
+var encoder = new JpegBitmapEncoder();
+encoder.Frames.Add(BitmapFrame.Create(transform, ...));
+encoder.Save(outputStream);
+```
+
+**WinRT**: Declarative transform model. Configure transforms on the encoder, which handles pixel manipulation internally. All async.
+```csharp
+var decoder = await BitmapDecoder.CreateAsync(winrtStream);
+var encoder = await BitmapEncoder.CreateForTranscodingAsync(outputStream, decoder);
+encoder.BitmapTransform.ScaledWidth = newWidth;
+encoder.BitmapTransform.ScaledHeight = newHeight;
+encoder.BitmapTransform.InterpolationMode = BitmapInterpolationMode.Fant;
+await encoder.FlushAsync();
+```
+
+## Core Type Mapping
+
+### Decoders
+
+| WPF | WinRT | Notes |
+|-----|-------|-------|
+| `BitmapDecoder.Create(stream, options, cache)` | `BitmapDecoder.CreateAsync(stream)` | Async, auto-detects format |
+| `JpegBitmapDecoder` / `PngBitmapDecoder` / etc. | `BitmapDecoder.CreateAsync(stream)` | Single unified decoder |
+| `decoder.Frames[0]` | `await decoder.GetFrameAsync(0)` | Async frame access |
+| `decoder.Frames.Count` | `decoder.FrameCount` (uint) | `int` → `uint` |
+| `decoder.CodecInfo.ContainerFormat` | `decoder.DecoderInformation.CodecId` | Different property path |
+| `decoder.Frames[0].PixelWidth` (int) | `decoder.PixelWidth` (uint) | `int` → `uint` |
+| `WmpBitmapDecoder` | Not available | WMP/HDP not supported |
+
+### Encoders
+
+| WPF | WinRT | Notes |
+|-----|-------|-------|
+| `new JpegBitmapEncoder()` | `BitmapEncoder.CreateAsync(BitmapEncoder.JpegEncoderId, stream)` | Async factory |
+| `new PngBitmapEncoder()` | `BitmapEncoder.CreateAsync(BitmapEncoder.PngEncoderId, stream)` | No interlace control |
+| `encoder.Frames.Add(frame)` | `encoder.SetSoftwareBitmap(bitmap)` | Different API |
+| `encoder.Save(stream)` | `await encoder.FlushAsync()` | Async |
+
+### Encoder Properties (Strongly-Typed → BitmapPropertySet)
+
+WPF had type-specific encoder subclasses. WinRT uses a generic property set:
+
+```csharp
+// WPF
+case JpegBitmapEncoder jpeg: jpeg.QualityLevel = 85;        // int 1-100
+case PngBitmapEncoder png:   png.Interlace = PngInterlaceOption.On;
+case TiffBitmapEncoder tiff: tiff.Compression = TiffCompressOption.Lzw;
+
+// WinRT — JPEG quality (float 0.0-1.0)
+await encoder.BitmapProperties.SetPropertiesAsync(new BitmapPropertySet
+{
+    { "ImageQuality", new BitmapTypedValue(0.85f, PropertyType.Single) }
+});
+
+// WinRT — TIFF compression (via BitmapPropertySet at creation time)
+var props = new BitmapPropertySet
+{
+    { "TiffCompressionMethod", new BitmapTypedValue((byte)2, PropertyType.UInt8) }
+};
+var encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.TiffEncoderId, stream, props);
+```
+
+**JPEG quality scale change**: WPF int `1-100` → WinRT float `0.0-1.0`. Divide by 100.
+
+### Bitmap Types
+
+| WPF | WinRT | Notes |
+|-----|-------|-------|
+| `BitmapSource` | `SoftwareBitmap` | Central pixel-data type |
+| `BitmapImage` | `BitmapImage` (in `Microsoft.UI.Xaml.Media.Imaging`) | UI display only |
+| `FormatConvertedBitmap` | `SoftwareBitmap.Convert()` | |
+| `TransformedBitmap` + `ScaleTransform` | `BitmapTransform` via encoder | Declarative |
+| `CroppedBitmap` | `BitmapTransform.Bounds` | |
+
+### Metadata
+
+| WPF | WinRT | Notes |
+|-----|-------|-------|
+| `BitmapMetadata` | `BitmapProperties` | Different API surface |
+| `BitmapMetadata.Clone()` | No equivalent | Cannot selectively clone |
+| Selective metadata removal | Not supported | All-or-nothing only |
+
+**Two encoder creation strategies for metadata:**
+- `CreateForTranscodingAsync()` — preserves ALL metadata from source
+- `CreateAsync()` — creates fresh encoder with NO metadata
+
+This eliminated ~258 lines of manual metadata manipulation code (`BitmapMetadataExtension.cs`) in ImageResizer.
+
+### Interpolation Modes
+
+| WPF `BitmapScalingMode` | WinRT `BitmapInterpolationMode` |
+|------------------------|-------------------------------|
+| `HighQuality` / `Fant` | `Fant` |
+| `Linear` | `Linear` |
+| `NearestNeighbor` | `NearestNeighbor` |
+| `Unspecified` / `LowQuality` | `Linear` |
+
+## Stream Interop
+
+WinRT imaging requires `IRandomAccessStream` instead of `System.IO.Stream`:
+
+```csharp
+using var stream = File.OpenRead(path);
+var winrtStream = stream.AsRandomAccessStream();  // Extension method
+var decoder = await BitmapDecoder.CreateAsync(winrtStream);
+```
+
+**Critical**: For transcode, seek the input stream back to 0 before creating the encoder:
+```csharp
+winrtStream.Seek(0);
+var encoder = await BitmapEncoder.CreateForTranscodingAsync(outputStream, decoder);
+```
+
+## CodecHelper Pattern (from ImageResizer)
+
+WPF stored container format GUIDs in `settings.json`. WinRT uses different codec IDs. Create a `CodecHelper` to bridge them:
+
+```csharp
+internal static class CodecHelper
+{
+    // Maps WPF container format GUIDs (stored in settings JSON) to WinRT encoder IDs
+    private static readonly Dictionary<Guid, Guid> LegacyGuidToEncoderId = new()
+    {
+        [new Guid("19e4a5aa-5662-4fc5-a0c0-1758028e1057")] = BitmapEncoder.JpegEncoderId,
+        [new Guid("1b7cfaf4-713f-473c-bbcd-6137425faeaf")] = BitmapEncoder.PngEncoderId,
+        [new Guid("0af1d87e-fcfe-4188-bdeb-a7906471cbe3")] = BitmapEncoder.BmpEncoderId,
+        [new Guid("163bcc30-e2e9-4f0b-961d-a3e9fdb788a3")] = BitmapEncoder.TiffEncoderId,
+        [new Guid("1f8a5601-7d4d-4cbd-9c82-1bc8d4eeb9a5")] = BitmapEncoder.GifEncoderId,
+    };
+
+    // Maps decoder IDs to corresponding encoder IDs
+    private static readonly Dictionary<Guid, Guid> DecoderIdToEncoderId = new()
+    {
+        [BitmapDecoder.JpegDecoderId] = BitmapEncoder.JpegEncoderId,
+        [BitmapDecoder.PngDecoderId] = BitmapEncoder.PngEncoderId,
+        // ...
+    };
+
+    public static Guid GetEncoderIdFromLegacyGuid(Guid legacyGuid)
+        => LegacyGuidToEncoderId.GetValueOrDefault(legacyGuid, Guid.Empty);
+
+    public static Guid GetEncoderIdForDecoder(BitmapDecoder decoder)
+        => DecoderIdToEncoderId.GetValueOrDefault(decoder.DecoderInformation.CodecId, Guid.Empty);
+}
+```
+
+This preserves backward compatibility with existing `settings.json` files that contain WPF-era GUIDs.
+
+## ImagingEnums Pattern (from ImageResizer)
+
+WPF-specific enums (`PngInterlaceOption`, `TiffCompressOption`) from `System.Windows.Media.Imaging` are used in settings JSON. Create custom enums with identical integer values for backward-compatible deserialization:
+
+```csharp
+// Replace System.Windows.Media.Imaging.PngInterlaceOption
+public enum PngInterlaceOption { Default = 0, On = 1, Off = 2 }
+
+// Replace System.Windows.Media.Imaging.TiffCompressOption
+public enum TiffCompressOption { Default = 0, None = 1, Ccitt3 = 2, Ccitt4 = 3, Lzw = 4, Rle = 5, Zip = 6 }
+```
+
+## Async Migration Patterns
+
+### Method Signatures
+
+All imaging operations become async:
+
+| Before | After |
+|--------|-------|
+| `void Execute(file, settings)` | `async Task ExecuteAsync(file, settings)` |
+| `IEnumerable<Error> Process()` | `async Task<IEnumerable<Error>> ProcessAsync()` |
+
+### Parallel Processing
+
+```csharp
+// WPF (synchronous)
+Parallel.ForEach(Files, new ParallelOptions { MaxDegreeOfParallelism = ... },
+    (file, state, i) => { Execute(file, settings); });
+
+// WinRT (async)
+await Parallel.ForEachAsync(Files, new ParallelOptions { MaxDegreeOfParallelism = ... },
+    async (file, ct) => { await ExecuteAsync(file, settings); });
+```
+
+### CLI Async Bridge
+
+CLI entry points must bridge async to sync:
+```csharp
+return RunSilentModeAsync(cliOptions).GetAwaiter().GetResult();
+```
+
+### Task.Factory.StartNew → Task.Run
+
+```csharp
+// WPF
+_ = Task.Factory.StartNew(StartExecutingWork, token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+// WinUI 3
+_ = Task.Run(() => StartExecutingWorkAsync());
+```
+
+## SoftwareBitmap as Interface Type
+
+When modules expose imaging interfaces (e.g., AI super-resolution), change parameter/return types:
+
+```csharp
+// WPF
+BitmapSource ApplySuperResolution(BitmapSource source, int scale, string filePath);
+
+// WinRT
+SoftwareBitmap ApplySuperResolution(SoftwareBitmap source, int scale, string filePath);
+```
+
+This eliminates manual `BitmapSource ↔ SoftwareBitmap` conversion code (unsafe `IMemoryBufferByteAccess` COM interop).
+
+## MultiFrame Image Handling
+
+```csharp
+// WinRT multi-frame encode (e.g., multi-page TIFF, animated GIF)
+for (uint i = 0; i < decoder.FrameCount; i++)
+{
+    if (i > 0)
+        await encoder.GoToNextFrameAsync();
+
+    var frame = await decoder.GetFrameAsync(i);
+    var bitmap = await frame.GetSoftwareBitmapAsync(
+        frame.BitmapPixelFormat,
+        BitmapAlphaMode.Premultiplied,
+        transform,
+        ExifOrientationMode.IgnoreExifOrientation,
+        ColorManagementMode.DoNotColorManage);
+    encoder.SetSoftwareBitmap(bitmap);
+}
+await encoder.FlushAsync();
+```
+
+## int → uint for Pixel Dimensions
+
+WinRT uses `uint` for all pixel dimensions. This affects:
+- `decoder.PixelWidth` / `decoder.PixelHeight` — `uint`
+- `BitmapTransform.ScaledWidth` / `ScaledHeight` — `uint`
+- `SoftwareBitmap` constructor — `uint` parameters
+- Test assertions: `Assert.AreEqual(96, ...)` → `Assert.AreEqual(96u, ...)`
+
+## Display SoftwareBitmap in UI
+
+```csharp
+var source = new SoftwareBitmapSource();
+// Must convert to Bgra8/Premultiplied for display
+if (bitmap.BitmapPixelFormat != BitmapPixelFormat.Bgra8 ||
+    bitmap.BitmapAlphaMode != BitmapAlphaMode.Premultiplied)
+{
+    bitmap = SoftwareBitmap.Convert(bitmap, BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied);
+}
+await source.SetBitmapAsync(bitmap);
+myImage.Source = source;
+```
+
+## Known Limitations
+
+| Feature | WPF | WinRT | Impact |
+|---------|-----|-------|--------|
+| PNG interlace | `PngBitmapEncoder.Interlace` | Not available | Always non-interlaced |
+| Metadata stripping | Selective via `BitmapMetadata.Clone()` | All-or-nothing | Orientation EXIF also removed |
+| Pixel formats | Many (`Pbgra32`, `Bgr24`, `Indexed8`, ...) | Primarily `Bgra8`, `Rgba8`, `Gray8/16` | Convert to `Bgra8` |
+| WMP/HDP format | `WmpBitmapDecoder` | Not available | Not supported |
+| Pixel differences | WPF scaler | `BitmapInterpolationMode.Fant` | Not bit-identical |

.github/skills/wpf-to-winui3-migration/references/namespace-api-mapping.md

@@ -0,0 +1,226 @@
+# Namespace and API Mapping Reference
+
+Complete reference for mapping WPF types to WinUI 3 equivalents, based on the ImageResizer migration.
+
+## Root Namespace Mapping
+
+| WPF Namespace | WinUI 3 Namespace |
+|---------------|-------------------|
+| `System.Windows` | `Microsoft.UI.Xaml` |
+| `System.Windows.Automation` | `Microsoft.UI.Xaml.Automation` |
+| `System.Windows.Automation.Peers` | `Microsoft.UI.Xaml.Automation.Peers` |
+| `System.Windows.Controls` | `Microsoft.UI.Xaml.Controls` |
+| `System.Windows.Controls.Primitives` | `Microsoft.UI.Xaml.Controls.Primitives` |
+| `System.Windows.Data` | `Microsoft.UI.Xaml.Data` |
+| `System.Windows.Documents` | `Microsoft.UI.Xaml.Documents` |
+| `System.Windows.Input` | `Microsoft.UI.Xaml.Input` |
+| `System.Windows.Markup` | `Microsoft.UI.Xaml.Markup` |
+| `System.Windows.Media` | `Microsoft.UI.Xaml.Media` |
+| `System.Windows.Media.Animation` | `Microsoft.UI.Xaml.Media.Animation` |
+| `System.Windows.Media.Imaging` | `Microsoft.UI.Xaml.Media.Imaging` |
+| `System.Windows.Navigation` | `Microsoft.UI.Xaml.Navigation` |
+| `System.Windows.Shapes` | `Microsoft.UI.Xaml.Shapes` |
+| `System.Windows.Threading` | `Microsoft.UI.Dispatching` |
+| `System.Windows.Interop` | `WinRT.Interop` |
+
+## Core Type Mapping
+
+| WPF Type | WinUI 3 Type |
+|----------|-------------|
+| `System.Windows.Application` | `Microsoft.UI.Xaml.Application` |
+| `System.Windows.Window` | `Microsoft.UI.Xaml.Window` (NOT a DependencyObject) |
+| `System.Windows.DependencyObject` | `Microsoft.UI.Xaml.DependencyObject` |
+| `System.Windows.DependencyProperty` | `Microsoft.UI.Xaml.DependencyProperty` |
+| `System.Windows.FrameworkElement` | `Microsoft.UI.Xaml.FrameworkElement` |
+| `System.Windows.UIElement` | `Microsoft.UI.Xaml.UIElement` |
+| `System.Windows.Visibility` | `Microsoft.UI.Xaml.Visibility` |
+| `System.Windows.Thickness` | `Microsoft.UI.Xaml.Thickness` |
+| `System.Windows.CornerRadius` | `Microsoft.UI.Xaml.CornerRadius` |
+| `System.Windows.Media.Color` | `Windows.UI.Color` (note: `Windows.UI`, not `Microsoft.UI`) |
+| `System.Windows.Media.Colors` | `Microsoft.UI.Colors` |
+
+## Controls Mapping
+
+### Direct Mapping (namespace-only change)
+
+These controls exist in both frameworks with the same name — change `System.Windows.Controls` to `Microsoft.UI.Xaml.Controls`:
+
+`Button`, `TextBox`, `TextBlock`, `ComboBox`, `CheckBox`, `ListBox`, `ListView`, `Image`, `StackPanel`, `Grid`, `Border`, `ScrollViewer`, `ContentControl`, `UserControl`, `Page`, `Frame`, `Slider`, `ProgressBar`, `ToolTip`, `RadioButton`, `ToggleButton`
+
+### Controls With Different Names or Behavior
+
+| WPF | WinUI 3 | Notes |
+|-----|---------|-------|
+| `MessageBox` | `ContentDialog` | Must set `XamlRoot` before `ShowAsync()` |
+| `ContextMenu` | `MenuFlyout` | Different API surface |
+| `TabControl` | `TabView` | Different API |
+| `Menu` | `MenuBar` | Different API |
+| `StatusBar` | Custom `StackPanel` layout | No built-in equivalent |
+| `AccessText` | Not available | Use `AccessKey` property on target control |
+
+### WPF-UI (Lepo) to Native WinUI 3
+
+ImageResizer used the `WPF-UI` library (Lepo) for Fluent styling. These must be replaced with native WinUI 3 equivalents:
+
+| WPF-UI (Lepo) | WinUI 3 Native | Notes |
+|----------------|---------------|-------|
+| `<ui:FluentWindow>` | `<Window>` | Native window + `ExtendsContentIntoTitleBar` |
+| `<ui:Button>` | `<Button>` | Native button |
+| `<ui:NumberBox>` | `<NumberBox>` | Built into WinUI 3 |
+| `<ui:ProgressRing>` | `<ProgressRing>` | Built into WinUI 3 |
+| `<ui:SymbolIcon>` | `<SymbolIcon>` or `<FontIcon>` | Built into WinUI 3 |
+| `<ui:InfoBar>` | `<InfoBar>` | Built into WinUI 3 |
+| `<ui:TitleBar>` | Custom title bar via `SetTitleBar()` | Use `ExtendsContentIntoTitleBar` |
+| `<ui:ThemesDictionary>` | `<XamlControlsResources>` | In merged dictionaries |
+| `<ui:ControlsDictionary>` | Remove | Not needed — WinUI 3 has its own control styles |
+| `BasedOn="{StaticResource {x:Type ui:Button}}"` | `BasedOn="{StaticResource DefaultButtonStyle}"` | Named style keys |
+
+## Input Event Mapping
+
+| WPF Event | WinUI 3 Event | Notes |
+|-----------|--------------|-------|
+| `MouseLeftButtonDown` | `PointerPressed` | Check `IsLeftButtonPressed` on args |
+| `MouseLeftButtonUp` | `PointerReleased` | Check pointer properties |
+| `MouseRightButtonDown` | `RightTapped` | Or `PointerPressed` with right button check |
+| `MouseMove` | `PointerMoved` | Uses `PointerRoutedEventArgs` |
+| `MouseWheel` | `PointerWheelChanged` | Different event args |
+| `MouseEnter` | `PointerEntered` | |
+| `MouseLeave` | `PointerExited` | |
+| `MouseDoubleClick` | `DoubleTapped` | Different event args |
+| `KeyDown` | `KeyDown` | Same name, args type: `KeyRoutedEventArgs` |
+| `PreviewKeyDown` | No direct equivalent | Use `KeyDown` with handled pattern |
+
+## IValueConverter Signature Change
+
+| WPF | WinUI 3 |
+|-----|---------|
+| `Convert(object value, Type targetType, object parameter, CultureInfo culture)` | `Convert(object value, Type targetType, object parameter, string language)` |
+| `ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)` | `ConvertBack(object value, Type targetType, object parameter, string language)` |
+
+Last parameter changes from `CultureInfo` to `string` (BCP-47 language tag). All converter classes must be updated.
+
+## Types That Moved to Different Hierarchies
+
+| WPF | WinUI 3 | Notes |
+|-----|---------|-------|
+| `System.Windows.Threading.Dispatcher` | `Microsoft.UI.Dispatching.DispatcherQueue` | Completely different API |
+| `System.Windows.Threading.DispatcherPriority` | `Microsoft.UI.Dispatching.DispatcherQueuePriority` | Only 3 levels: High/Normal/Low |
+| `System.Windows.Interop.HwndSource` | `WinRT.Interop.WindowNative` | For HWND interop |
+| `System.Windows.Interop.WindowInteropHelper` | `WinRT.Interop.WindowNative.GetWindowHandle()` | |
+| `System.Windows.SystemColors` | Resource keys via `ThemeResource` | No direct static class |
+| `System.Windows.SystemParameters` | Win32 API or `DisplayInformation` | No direct equivalent |
+
+## NuGet Package Migration
+
+| WPF | WinUI 3 | Notes |
+|-----|---------|-------|
+| Built into .NET (no NuGet needed) | `Microsoft.WindowsAppSDK` | Required |
+| `PresentationCore` / `PresentationFramework` | `Microsoft.WinUI` (transitive) | |
+| `Microsoft.Xaml.Behaviors.Wpf` | `Microsoft.Xaml.Behaviors.WinUI.Managed` | |
+| `WPF-UI` (Lepo) | **Remove** — use native WinUI 3 controls | |
+| `CommunityToolkit.Mvvm` | `CommunityToolkit.Mvvm` (same) | |
+| `Microsoft.Toolkit.Wpf.*` | `CommunityToolkit.WinUI.*` | |
+| (none) | `Microsoft.Windows.SDK.BuildTools` | Required |
+| (none) | `WinUIEx` | Optional, window helpers |
+| (none) | `CommunityToolkit.WinUI.Converters` | Optional |
+| (none) | `CommunityToolkit.WinUI.Extensions` | Optional |
+| (none) | `Microsoft.Web.WebView2` | If using WebView |
+
+## Project File Changes
+
+### WPF .csproj
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <ApplicationManifest>ImageResizerUI.dev.manifest</ApplicationManifest>
+    <ApplicationIcon>Resources\ImageResizer.ico</ApplicationIcon>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+</Project>
+```
+
+### WinUI 3 .csproj
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <UseWinUI>true</UseWinUI>
+    <SelfContained>true</SelfContained>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <WindowsPackageType>None</WindowsPackageType>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationIcon>Assets\ImageResizer\ImageResizer.ico</ApplicationIcon>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN,TRACE</DefineConstants>
+    <ProjectPriFileName>PowerToys.ModuleName.pri</ProjectPriFileName>
+  </PropertyGroup>
+</Project>
+```
+
+Key changes:
+- `UseWPF` → `UseWinUI`
+- TFM: `net8.0-windows` → `net8.0-windows10.0.19041.0`
+- Add `WindowsPackageType=None` for unpackaged desktop apps
+- Add `SelfContained=true` + `WindowsAppSDKSelfContained=true`
+- Add `DISABLE_XAML_GENERATED_MAIN` if using custom `Program.cs` entry point
+- Set `ProjectPriFileName` to match your module's assembly name
+- Move icon from `Resources/` to `Assets/<Module>/`
+
+### XAML ApplicationDefinition Setup
+
+WinUI 3 requires explicit `ApplicationDefinition` declaration:
+
+```xml
+<ItemGroup>
+  <Page Remove="ImageResizerXAML\App.xaml" />
+</ItemGroup>
+<ItemGroup>
+  <ApplicationDefinition Include="ImageResizerXAML\App.xaml" />
+</ItemGroup>
+```
+
+### CsWinRT Interop (for GPO and native references)
+
+If the module references native C++ projects (like `GPOWrapper`):
+
+```xml
+<PropertyGroup>
+  <CsWinRTIncludes>PowerToys.GPOWrapper</CsWinRTIncludes>
+  <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
+</PropertyGroup>
+```
+
+Change `GPOWrapperProjection.csproj` reference to direct `GPOWrapper.vcxproj` reference.
+
+### InternalsVisibleTo Migration
+
+Move from code file to `.csproj`:
+
+```csharp
+// DELETE: Properties/InternalsVisibleTo.cs
+// [assembly: InternalsVisibleTo("ImageResizer.Test")]
+```
+
+```xml
+<!-- ADD to .csproj: -->
+<ItemGroup>
+  <InternalsVisibleTo Include="ImageResizer.Test" />
+</ItemGroup>
+```
+
+### Items to Remove from .csproj
+
+```xml
+<!-- DELETE: WPF resource embedding -->
+<EmbeddedResource Update="Properties\Resources.resx">...</EmbeddedResource>
+<Resource Include="Resources\ImageResizer.ico" />
+<Compile Update="Properties\Resources.Designer.cs">...</Compile>
+<FrameworkReference Include="Microsoft.WindowsDesktop.App.WPF" /> <!-- from CLI project -->
+```

.github/skills/wpf-to-winui3-migration/references/powertoys-patterns.md

@@ -0,0 +1,516 @@
+# PowerToys-Specific Migration Patterns
+
+Patterns and conventions specific to the PowerToys codebase, based on the ImageResizer migration.
+
+## Project Structure
+
+### Before (WPF Module)
+
+```
+src/modules/<module>/
+├── <Module>UI/
+│   ├── <Module>UI.csproj        # OutputType=WinExe, UseWPF=true
+│   ├── App.xaml / App.xaml.cs
+│   ├── MainWindow.xaml / .cs
+│   ├── Views/
+│   ├── ViewModels/
+│   ├── Helpers/
+│   │   ├── Observable.cs        # Custom INotifyPropertyChanged
+│   │   └── RelayCommand.cs      # Custom ICommand
+│   ├── Properties/
+│   │   ├── Resources.resx       # WPF resource strings
+│   │   ├── Resources.Designer.cs
+│   │   └── InternalsVisibleTo.cs
+│   └── Telemetry/
+├── <Module>CLI/
+│   └── <Module>CLI.csproj       # OutputType=Exe
+└── tests/
+```
+
+### After (WinUI 3 Module)
+
+```
+src/modules/<module>/
+├── <Module>UI/
+│   ├── <Module>UI.csproj        # OutputType=WinExe, UseWinUI=true
+│   ├── Program.cs               # Custom entry point (DISABLE_XAML_GENERATED_MAIN)
+│   ├── app.manifest             # Single manifest file
+│   ├── ImageResizerXAML/
+│   │   ├── App.xaml / App.xaml.cs   # WinUI 3 App class
+│   │   ├── MainWindow.xaml / .cs
+│   │   └── Views/
+│   ├── Converters/              # WinUI 3 IValueConverter (string language)
+│   ├── ViewModels/
+│   ├── Helpers/
+│   │   └── ResourceLoaderInstance.cs  # Static ResourceLoader accessor
+│   ├── Utilities/
+│   │   └── CodecHelper.cs       # WPF→WinRT codec ID mapping (if imaging)
+│   ├── Models/
+│   │   └── ImagingEnums.cs      # Custom enums replacing WPF imaging enums
+│   ├── Strings/
+│   │   └── en-us/
+│   │       └── Resources.resw   # WinUI 3 resource strings
+│   └── Assets/
+│       └── <Module>/
+│           └── <Module>.ico     # Moved from Resources/
+├── <Module>Common/              # NEW: shared library for CLI
+│   └── <Module>Common.csproj    # OutputType=Library
+├── <Module>CLI/
+│   └── <Module>CLI.csproj       # References Common, NOT UI
+└── tests/
+```
+
+### Critical: CLI Dependency Pattern
+
+**Do NOT** create `ProjectReference` from Exe to WinExe. This causes phantom build artifacts (`.exe`, `.deps.json`, `.runtimeconfig.json`) in the root output directory.
+
+```
+WRONG:  ImageResizerCLI (Exe) → ImageResizerUI (WinExe)    ← phantom artifacts
+CORRECT: ImageResizerCLI (Exe) → ImageResizerCommon (Library)
+         ImageResizerUI (WinExe) → ImageResizerCommon (Library)
+```
+
+Follow the `FancyZonesCLI` → `FancyZonesEditorCommon` pattern.
+
+### Files to Delete
+
+| File | Reason |
+|------|--------|
+| `Properties/Resources.resx` | Replaced by `Strings/en-us/Resources.resw` |
+| `Properties/Resources.Designer.cs` | Auto-generated; no longer needed |
+| `Properties/InternalsVisibleTo.cs` | Moved to `.csproj` `<InternalsVisibleTo>` |
+| `Helpers/Observable.cs` | Replaced by `CommunityToolkit.Mvvm.ObservableObject` |
+| `Helpers/RelayCommand.cs` | Replaced by `CommunityToolkit.Mvvm.Input` |
+| `Resources/*.ico` / `Resources/*.png` | Moved to `Assets/<Module>/` |
+| WPF `.dev.manifest` / `.prod.manifest` | Replaced by single `app.manifest` |
+| WPF-specific converters | Replaced by WinUI 3 converters with `string language` |
+
+---
+
+## MVVM Migration: Custom → CommunityToolkit.Mvvm Source Generators
+
+### Observable Base Class → ObservableObject + [ObservableProperty]
+
+**Before (custom Observable):**
+```csharp
+public class ResizeSize : Observable
+{
+    private int _id;
+    public int Id { get => _id; set => Set(ref _id, value); }
+
+    private ResizeFit _fit;
+    public ResizeFit Fit
+    {
+        get => _fit;
+        set
+        {
+            Set(ref _fit, value);
+            UpdateShowHeight();
+        }
+    }
+
+    private bool _showHeight = true;
+    public bool ShowHeight { get => _showHeight; set => Set(ref _showHeight, value); }
+    private void UpdateShowHeight() { ShowHeight = Fit == ResizeFit.Stretch || Unit != ResizeUnit.Percent; }
+}
+```
+
+**After (CommunityToolkit.Mvvm source generators):**
+```csharp
+public partial class ResizeSize : ObservableObject  // MUST be partial
+{
+    [ObservableProperty]
+    [JsonPropertyName("Id")]
+    private int _id;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowHeight))]  // Replaces manual UpdateShowHeight()
+    private ResizeFit _fit;
+
+    // Computed property — no backing field, no manual update method
+    public bool ShowHeight => Fit == ResizeFit.Stretch || Unit != ResizeUnit.Percent;
+}
+```
+
+Key changes:
+- Class must be `partial` for source generators
+- `Observable` → `ObservableObject` (from CommunityToolkit.Mvvm)
+- Manual `Set(ref _field, value)` → `[ObservableProperty]` attribute
+- `PropertyChanged` dependencies → `[NotifyPropertyChangedFor(nameof(...))]`
+- Computed properties with manual `UpdateXxx()` → direct expression body
+
+### Custom Name Setter with Transform
+
+For properties that transform the value before storing:
+
+```csharp
+// Cannot use [ObservableProperty] because of value transformation
+private string _name;
+public string Name
+{
+    get => _name;
+    set => SetProperty(ref _name, ReplaceTokens(value));  // SetProperty from ObservableObject
+}
+```
+
+### RelayCommand → [RelayCommand] Source Generator
+
+```csharp
+// DELETE: Helpers/RelayCommand.cs (custom ICommand)
+
+// Before
+public ICommand ResizeCommand { get; } = new RelayCommand(Execute);
+
+// After
+[RelayCommand]
+private void Resize() { /* ... */ }
+// Source generator creates ResizeCommand property automatically
+```
+
+---
+
+## Resource String Migration (.resx → .resw)
+
+### ResourceLoaderInstance Helper
+
+```csharp
+internal static class ResourceLoaderInstance
+{
+    internal static ResourceLoader ResourceLoader { get; private set; }
+
+    static ResourceLoaderInstance()
+    {
+        ResourceLoader = new ResourceLoader("PowerToys.ImageResizer.pri");
+    }
+}
+```
+
+**Note**: Use the single-argument `ResourceLoader` constructor. The two-argument version (`ResourceLoader("file.pri", "path/Resources")`) may fail if the resource map path doesn't match the actual PRI structure.
+
+### Usage
+
+```csharp
+// WPF
+using ImageResizer.Properties;
+string text = Resources.MyStringKey;
+
+// WinUI 3
+string text = ResourceLoaderInstance.ResourceLoader.GetString("MyStringKey");
+```
+
+### Lazy Initialization for Resource-Dependent Statics
+
+`ResourceLoader` is not available at class-load time in all contexts (CLI mode, test harness). Use lazy initialization:
+
+**Before (crashes at class load):**
+```csharp
+private static readonly CompositeFormat _format =
+    CompositeFormat.Parse(Resources.Error_Format);
+
+private static readonly Dictionary<string, string> _tokens = new()
+{
+    ["$small$"] = Resources.Small,
+    ["$medium$"] = Resources.Medium,
+};
+```
+
+**After (lazy, safe):**
+```csharp
+private static CompositeFormat _format;
+private static CompositeFormat Format => _format ??=
+    CompositeFormat.Parse(ResourceLoaderInstance.ResourceLoader.GetString("Error_Format"));
+
+private static readonly Lazy<Dictionary<string, string>> _tokens = new(() =>
+    new Dictionary<string, string>
+    {
+        ["$small$"] = ResourceLoaderInstance.ResourceLoader.GetString("Small"),
+        ["$medium$"] = ResourceLoaderInstance.ResourceLoader.GetString("Medium"),
+    });
+// Usage: _tokens.Value.TryGetValue(...)
+```
+
+### XAML: x:Static → x:Uid
+
+```xml
+<!-- WPF -->
+<Button Content="{x:Static p:Resources.Cancel}" />
+<!-- WinUI 3 -->
+<Button x:Uid="Cancel" />
+```
+
+In `.resw`, use property-suffixed keys: `Cancel.Content`, `Header.Text`, etc.
+
+---
+
+## CLI Options Migration
+
+`System.CommandLine.Option<T>` constructor signature changed:
+
+```csharp
+// WPF era — string[] aliases
+public DestinationOption()
+    : base(_aliases, Properties.Resources.CLI_Option_Destination)
+
+// WinUI 3 — single string name
+public DestinationOption()
+    : base(_aliases[0], ResourceLoaderInstance.ResourceLoader.GetString("CLI_Option_Destination"))
+```
+
+---
+
+## Installer Updates
+
+### WiX Changes
+
+#### 1. Remove Satellite Assembly References
+
+Remove from `installer/PowerToysSetupVNext/Resources.wxs`:
+- `<Component>` entries for `<Module>.resources.dll`
+- `<RemoveFolder>` entries for locale directories
+- Module from `WinUI3AppsInstallFolder` `ParentDirectory` loop
+
+#### 2. Update File Component Generation
+
+Run `generateAllFileComponents.ps1` after migration. For Exe→WinExe dependency issues, add cleanup logic:
+
+```powershell
+# Strip phantom ImageResizer files from BaseApplications.wxs
+$content = $content -replace 'PowerToys\.ImageResizer\.exe', ''
+$content = $content -replace 'PowerToys\.ImageResizer\.deps\.json', ''
+$content = $content -replace 'PowerToys\.ImageResizer\.runtimeconfig\.json', ''
+```
+
+#### 3. Output Directory
+
+WinUI 3 modules output to `WinUI3Apps/`:
+```xml
+<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutputPath>
+```
+
+### ESRP Signing
+
+Update `.pipelines/ESRPSigning_core.json` — all module binaries must use `WinUI3Apps\\` paths:
+
+```json
+{
+    "FileList": [
+        "WinUI3Apps\\PowerToys.ImageResizer.exe",
+        "WinUI3Apps\\PowerToys.ImageResizerExt.dll",
+        "WinUI3Apps\\PowerToys.ImageResizerContextMenu.dll"
+    ]
+}
+```
+
+---
+
+## Build Pipeline Fixes
+
+### $(SolutionDir) → $(MSBuildThisFileDirectory)
+
+`$(SolutionDir)` is empty when building individual projects outside the solution. Replace with relative paths from the project file:
+
+```xml
+<!-- Before (breaks on standalone project build) -->
+<Exec Command="powershell $(SolutionDir)tools\build\convert-resx-to-rc.ps1" />
+
+<!-- After (works always) -->
+<Exec Command="powershell $(MSBuildThisFileDirectory)..\..\..\..\tools\build\convert-resx-to-rc.ps1" />
+```
+
+### MSIX Packaging: PreBuild → PostBuild
+
+MSIX packaging must happen AFTER the build (artifacts not ready at PreBuild):
+
+```xml
+<!-- Before -->
+<PreBuildEvent>MakeAppx.exe pack /d . /p "$(OutDir)Package.msix" /o</PreBuildEvent>
+
+<!-- After -->
+<PostBuildEvent>
+  if exist "$(OutDir)Package.msix" del "$(OutDir)Package.msix"
+  MakeAppx.exe pack /d "$(MSBuildThisFileDirectory)." /p "$(OutDir)Package.msix" /o
+</PostBuildEvent>
+```
+
+### RC File Icon Path Escaping
+
+Windows Resource Compiler requires double-backslash paths:
+
+```c
+// Before (breaks)
+IDI_ICON1 ICON "..\\ui\Assets\ImageResizer\ImageResizer.ico"
+// After
+IDI_ICON1 ICON "..\\ui\\Assets\\ImageResizer\\ImageResizer.ico"
+```
+
+### BOM/Encoding Normalization
+
+Migration may strip UTF-8 BOM from C# files (`// Copyright` → `// Copyright`). This is cosmetic and safe, but be aware it will show as changes in diff.
+
+---
+
+## Test Adaptation
+
+### Tests Requiring WPF Runtime
+
+If tests still need WPF types (e.g., comparing old vs new output), temporarily add:
+```xml
+<UseWPF>true</UseWPF>
+```
+Remove this after fully migrating all test code to WinRT APIs.
+
+### Tests Using ResourceLoader
+
+Unit tests cannot easily initialize WinUI 3 `ResourceLoader`. Options:
+- Hardcode expected strings in tests: `"Value must be between '{0}' and '{1}'."`
+- Delete tests that only verify resource string lookup
+- Avoid creating `App` instances in test harness (WinUI App cannot be instantiated in tests)
+
+### Async Test Methods
+
+All imaging tests become async:
+```csharp
+// Before
+[TestMethod]
+public void ResizesImage() { ... }
+
+// After
+[TestMethod]
+public async Task ResizesImageAsync() { ... }
+```
+
+### uint Assertions
+
+```csharp
+// Before
+Assert.AreEqual(96, image.Frames[0].PixelWidth);
+// After
+Assert.AreEqual(96u, decoder.PixelWidth);
+```
+
+### Pixel Data Access in Tests
+
+```csharp
+// Before (WPF)
+public static Color GetFirstPixel(this BitmapSource source)
+{
+    var pixel = new byte[4];
+    new FormatConvertedBitmap(
+        new CroppedBitmap(source, new Int32Rect(0, 0, 1, 1)),
+        PixelFormats.Bgra32, null, 0).CopyPixels(pixel, 4, 0);
+    return Color.FromArgb(pixel[3], pixel[2], pixel[1], pixel[0]);
+}
+
+// After (WinRT)
+public static async Task<(byte R, byte G, byte B, byte A)> GetFirstPixelAsync(
+    this BitmapDecoder decoder)
+{
+    using var bitmap = await decoder.GetSoftwareBitmapAsync(
+        BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied);
+    var buffer = new Windows.Storage.Streams.Buffer(
+        (uint)(bitmap.PixelWidth * bitmap.PixelHeight * 4));
+    bitmap.CopyToBuffer(buffer);
+    using var reader = DataReader.FromBuffer(buffer);
+    byte b = reader.ReadByte(), g = reader.ReadByte(),
+         r = reader.ReadByte(), a = reader.ReadByte();
+    return (r, g, b, a);
+}
+```
+
+### Metadata Assertions
+
+```csharp
+// Before
+Assert.AreEqual("Test", ((BitmapMetadata)image.Frames[0].Metadata).Comment);
+
+// After
+var props = await decoder.BitmapProperties.GetPropertiesAsync(
+    new[] { "System.Photo.DateTaken" });
+Assert.IsTrue(props.ContainsKey("System.Photo.DateTaken"),
+    "Metadata should be preserved during transcode");
+```
+
+### AllowUnsafeBlocks for SoftwareBitmap Tests
+
+If tests access pixel data via `IMemoryBufferByteAccess`, add:
+```xml
+<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+```
+
+---
+
+## Settings JSON Backward Compatibility
+
+- Settings are stored in `%LOCALAPPDATA%\Microsoft\PowerToys\<ModuleName>\`
+- Schema must remain backward-compatible across upgrades
+- Add new fields with defaults; never remove or rename existing fields
+- Create custom enums matching WPF enum integer values for deserialization (e.g., `ImagingEnums.cs`)
+- See: `src/settings-ui/Settings.UI.Library/`
+
+## IPC Contract
+
+If the module communicates with the runner or settings UI:
+1. Update BOTH sides of the IPC contract
+2. Test settings changes are received by the module
+3. Test module state changes are reflected in settings UI
+4. Reference: `doc/devdocs/core/settings/runner-ipc.md`
+
+---
+
+## Checklist for PowerToys Module Migration
+
+### Project & Dependencies
+- [ ] Update `.csproj`: `UseWPF` → `UseWinUI`, TFM → `net8.0-windows10.0.19041.0`
+- [ ] Add `WindowsPackageType=None`, `SelfContained=true`, `WindowsAppSDKSelfContained=true`
+- [ ] Add `DISABLE_XAML_GENERATED_MAIN` if using custom `Program.cs`
+- [ ] Replace NuGet packages (WPF-UI → remove, add WindowsAppSDK, etc.)
+- [ ] Update project references (GPOWrapperProjection → GPOWrapper + CsWinRT)
+- [ ] Move `InternalsVisibleTo` from code to `.csproj`
+- [ ] Extract CLI shared logic to Library project (avoid Exe→WinExe dependency)
+
+### MVVM & Resources
+- [ ] Replace custom `Observable`/`RelayCommand` with CommunityToolkit.Mvvm source generators
+- [ ] Migrate `.resx` → `.resw` (`Properties/Resources.resx` → `Strings/en-us/Resources.resw`)
+- [ ] Create `ResourceLoaderInstance` helper
+- [ ] Wrap resource-dependent statics in `Lazy<T>` or null-coalescing properties
+- [ ] Delete `Properties/Resources.Designer.cs`, `Observable.cs`, `RelayCommand.cs`
+
+### XAML
+- [ ] Replace `clr-namespace:` → `using:` in all xmlns declarations
+- [ ] Remove WPF-UI (Lepo) xmlns and controls — use native WinUI 3
+- [ ] Replace `{x:Static p:Resources.Key}` → `x:Uid` with `.resw` keys
+- [ ] Replace `{DynamicResource}` → `{ThemeResource}`
+- [ ] Replace `DataType="{x:Type ...}"` → `x:DataType="..."`
+- [ ] Replace `<Style.Triggers>` → `VisualStateManager`
+- [ ] Add `<XamlControlsResources/>` to `App.xaml` merged dictionaries
+- [ ] Move `Window.Resources` to root container's `Resources`
+- [ ] Run XamlStyler: `.\.pipelines\applyXamlStyling.ps1 -Main`
+
+### Code-Behind & APIs
+- [ ] Replace all `System.Windows.*` namespaces with `Microsoft.UI.Xaml.*`
+- [ ] Replace `Dispatcher` with `DispatcherQueue`
+- [ ] Store `DispatcherQueue` reference explicitly (no `Application.Current.Dispatcher`)
+- [ ] Implement `SizeToContent()` via AppWindow if needed
+- [ ] Update `ContentDialog` calls to set `XamlRoot`
+- [ ] Update `FilePicker` calls with HWND initialization
+- [ ] Migrate imaging code to `Windows.Graphics.Imaging` (async, `SoftwareBitmap`)
+- [ ] Create `CodecHelper` for legacy GUID → WinRT codec ID mapping (if imaging)
+- [ ] Create custom imaging enums for JSON backward compatibility (if imaging)
+- [ ] Update all `IValueConverter` signatures (`CultureInfo` → `string`)
+
+### Build & Installer
+- [ ] Update WiX installer: remove satellite assembly refs from `Resources.wxs`
+- [ ] Run `generateAllFileComponents.ps1`; handle phantom artifacts
+- [ ] Update ESRP signing paths to `WinUI3Apps\\`
+- [ ] Fix `$(SolutionDir)` → `$(MSBuildThisFileDirectory)` in build events
+- [ ] Move MSIX packaging from PreBuild to PostBuild
+- [ ] Fix RC file path escaping (double-backslash)
+- [ ] Verify output dir is `WinUI3Apps/`
+
+### Testing & Validation
+- [ ] Update test project: async methods, `uint` assertions
+- [ ] Handle ResourceLoader unavailability in tests (hardcode strings or skip)
+- [ ] Build clean: `cd` to project folder, `tools/build/build.cmd`, exit code 0
+- [ ] Run tests for affected module
+- [ ] Verify settings JSON backward compatibility
+- [ ] Test IPC contracts (runner ↔ settings UI)

.github/skills/wpf-to-winui3-migration/references/threading-and-windowing.md

@@ -0,0 +1,314 @@
+# Threading and Window Management Migration
+
+Based on patterns from the ImageResizer migration.
+
+## Dispatcher → DispatcherQueue
+
+### API Mapping
+
+| WPF | WinUI 3 |
+|-----|---------|
+| `Dispatcher.Invoke(Action)` | `DispatcherQueue.TryEnqueue(Action)` |
+| `Dispatcher.BeginInvoke(Action)` | `DispatcherQueue.TryEnqueue(Action)` |
+| `Dispatcher.Invoke(DispatcherPriority, Action)` | `DispatcherQueue.TryEnqueue(DispatcherQueuePriority, Action)` |
+| `Dispatcher.CheckAccess()` | `DispatcherQueue.HasThreadAccess` |
+| `Dispatcher.VerifyAccess()` | Check `DispatcherQueue.HasThreadAccess` (no exception-throwing method) |
+
+### Priority Mapping
+
+WinUI 3 has only 3 levels: `High`, `Normal`, `Low`.
+
+| WPF `DispatcherPriority` | WinUI 3 `DispatcherQueuePriority` |
+|-------------------------|----------------------------------|
+| `Send` | `High` |
+| `Normal` / `Input` / `Loaded` / `Render` / `DataBind` | `Normal` |
+| `Background` / `ContextIdle` / `ApplicationIdle` / `SystemIdle` | `Low` |
+
+### Pattern: Global DispatcherQueue Access (from ImageResizer)
+
+WPF provided `Application.Current.Dispatcher` globally. WinUI 3 requires explicit storage:
+
+```csharp
+// Store DispatcherQueue at app startup
+private static DispatcherQueue _uiDispatcherQueue;
+
+public static void InitializeDispatcher()
+{
+    _uiDispatcherQueue = DispatcherQueue.GetForCurrentThread();
+}
+```
+
+Usage with thread-check pattern (from `Settings.Reload()`):
+```csharp
+var currentDispatcher = DispatcherQueue.GetForCurrentThread();
+if (currentDispatcher != null)
+{
+    // Already on UI thread
+    ReloadCore(jsonSettings);
+}
+else if (_uiDispatcherQueue != null)
+{
+    // Dispatch to UI thread
+    _uiDispatcherQueue.TryEnqueue(() => ReloadCore(jsonSettings));
+}
+else
+{
+    // Fallback (e.g., CLI mode, no UI)
+    ReloadCore(jsonSettings);
+}
+```
+
+### Pattern: DispatcherQueue in ViewModels (from ProgressViewModel)
+
+```csharp
+public class ProgressViewModel
+{
+    private readonly DispatcherQueue _dispatcherQueue;
+
+    public ProgressViewModel()
+    {
+        _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+    }
+
+    private void OnProgressChanged(double progress)
+    {
+        _dispatcherQueue.TryEnqueue(() =>
+        {
+            Progress = progress;
+            // other UI updates...
+        });
+    }
+}
+```
+
+### Pattern: Async Dispatch (await)
+
+```csharp
+// WPF
+await this.Dispatcher.InvokeAsync(() => { /* UI work */ });
+
+// WinUI 3 (using TaskCompletionSource)
+var tcs = new TaskCompletionSource();
+this.DispatcherQueue.TryEnqueue(() =>
+{
+    try { /* UI work */ tcs.SetResult(); }
+    catch (Exception ex) { tcs.SetException(ex); }
+});
+await tcs.Task;
+```
+
+### C++/WinRT Threading
+
+| Old API | New API |
+|---------|---------|
+| `winrt::resume_foreground(CoreDispatcher)` | `wil::resume_foreground(DispatcherQueue)` |
+| `CoreDispatcher.RunAsync()` | `DispatcherQueue.TryEnqueue()` |
+
+Add `Microsoft.Windows.ImplementationLibrary` NuGet for `wil::resume_foreground`.
+
+---
+
+## Window Management
+
+### WPF Window vs WinUI 3 Window
+
+| Feature | WPF `Window` | WinUI 3 `Window` |
+|---------|-------------|------------------|
+| Base class | `ContentControl` → `DependencyObject` | **NOT** a control, NOT a `DependencyObject` |
+| `Resources` property | Yes | No — use root container's `Resources` |
+| `DataContext` property | Yes | No — use root `Page`/`UserControl` |
+| `VisualStateManager` | Yes | No — use inside child controls |
+| `Load`/`Unload` events | Yes | No |
+| `SizeToContent` | Yes (`Height`/`Width`/`WidthAndHeight`) | No — must implement manually |
+| `WindowState` (min/max/normal) | Yes | No — use `AppWindow.Presenter` |
+| `WindowStyle` | Yes | No — use `AppWindow` title bar APIs |
+| `ResizeMode` | Yes | No — use `AppWindow.Presenter` |
+| `WindowStartupLocation` | Yes | No — calculate manually |
+| `Icon` | `Window.Icon` | `AppWindow.SetIcon()` |
+| `Title` | `Window.Title` | `AppWindow.Title` (or `Window.Title`) |
+| Size (Width/Height) | Yes | No — use `AppWindow.Resize()` |
+| Position (Left/Top) | Yes | No — use `AppWindow.Move()` |
+| `IsDefault`/`IsCancel` on buttons | Yes | No — handle Enter/Escape in code-behind |
+
+### Getting AppWindow from Window
+
+```csharp
+using Microsoft.UI;
+using Microsoft.UI.Windowing;
+using WinRT.Interop;
+
+IntPtr hwnd = WindowNative.GetWindowHandle(window);
+WindowId windowId = Win32Interop.GetWindowIdFromWindow(hwnd);
+AppWindow appWindow = AppWindow.GetFromWindowId(windowId);
+```
+
+### Pattern: SizeToContent Replacement (from ImageResizer)
+
+WinUI 3 has no `SizeToContent`. ImageResizer implemented a manual equivalent:
+
+```csharp
+private void SizeToContent()
+{
+    if (Content is not FrameworkElement content)
+        return;
+
+    // Measure desired content size
+    content.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+    var desiredHeight = content.DesiredSize.Height + WindowChromeHeight + Padding;
+
+    // Account for DPI scaling
+    var scaleFactor = Content.XamlRoot.RasterizationScale;
+    var pixelHeight = (int)(desiredHeight * scaleFactor);
+    var pixelWidth = (int)(WindowWidth * scaleFactor);
+
+    // Resize via AppWindow
+    var hwnd = WindowNative.GetWindowHandle(this);
+    var windowId = Win32Interop.GetWindowIdFromWindow(hwnd);
+    var appWindow = AppWindow.GetFromWindowId(windowId);
+    appWindow.Resize(new Windows.Graphics.SizeInt32(pixelWidth, pixelHeight));
+}
+```
+
+**Key details:**
+- `WindowChromeHeight` ≈ 32px for the title bar
+- Must multiply by `RasterizationScale` for DPI-aware sizing
+- Call `SizeToContent()` after page navigation or content changes
+- Unsubscribe previous event handlers before subscribing new ones to avoid memory leaks
+
+### Window Positioning (Center Screen)
+
+```csharp
+var displayArea = DisplayArea.GetFromWindowId(windowId, DisplayAreaFallback.Nearest);
+var centerX = (displayArea.WorkArea.Width - appWindow.Size.Width) / 2;
+var centerY = (displayArea.WorkArea.Height - appWindow.Size.Height) / 2;
+appWindow.Move(new Windows.Graphics.PointInt32(centerX, centerY));
+```
+
+### Window State (Minimize/Maximize)
+
+```csharp
+(appWindow.Presenter as OverlappedPresenter)?.Maximize();
+(appWindow.Presenter as OverlappedPresenter)?.Minimize();
+(appWindow.Presenter as OverlappedPresenter)?.Restore();
+```
+
+### Title Bar Customization
+
+```csharp
+// Extend content into title bar
+this.ExtendsContentIntoTitleBar = true;
+this.SetTitleBar(AppTitleBar); // AppTitleBar is a XAML element
+
+// Or via AppWindow API
+if (AppWindowTitleBar.IsCustomizationSupported())
+{
+    var titleBar = appWindow.TitleBar;
+    titleBar.ExtendsContentIntoTitleBar = true;
+    titleBar.ButtonBackgroundColor = Colors.Transparent;
+}
+```
+
+### Tracking the Main Window
+
+```csharp
+public partial class App : Application
+{
+    public static Window MainWindow { get; private set; }
+
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
+    {
+        MainWindow = new MainWindow();
+        MainWindow.Activate();
+    }
+}
+```
+
+### ContentDialog Requires XamlRoot
+
+```csharp
+var dialog = new ContentDialog
+{
+    Title = "Confirm",
+    Content = "Are you sure?",
+    PrimaryButtonText = "Yes",
+    CloseButtonText = "No",
+    XamlRoot = this.Content.XamlRoot  // REQUIRED
+};
+var result = await dialog.ShowAsync();
+```
+
+### File Pickers Require HWND
+
+```csharp
+var picker = new FileOpenPicker();
+picker.FileTypeFilter.Add(".jpg");
+
+// REQUIRED for desktop apps
+var hwnd = WindowNative.GetWindowHandle(App.MainWindow);
+WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
+
+var file = await picker.PickSingleFileAsync();
+```
+
+### Window Close Handling
+
+```csharp
+// WPF
+protected override void OnClosing(CancelEventArgs e) { e.Cancel = true; this.Hide(); }
+
+// WinUI 3
+this.AppWindow.Closing += (s, e) => { e.Cancel = true; this.AppWindow.Hide(); };
+```
+
+---
+
+## Custom Entry Point (DISABLE_XAML_GENERATED_MAIN)
+
+ImageResizer uses a custom `Program.cs` entry point instead of the WinUI 3 auto-generated `Main`. This is needed for:
+- CLI mode (process files without showing UI)
+- Custom initialization before the WinUI 3 App starts
+- Single-instance enforcement
+
+### Setup
+
+In `.csproj`:
+```xml
+<DefineConstants>DISABLE_XAML_GENERATED_MAIN,TRACE</DefineConstants>
+```
+
+Create `Program.cs`:
+```csharp
+public static class Program
+{
+    [STAThread]
+    public static int Main(string[] args)
+    {
+        if (args.Length > 0)
+        {
+            // CLI mode — no UI
+            return RunCli(args);
+        }
+
+        // GUI mode
+        WinRT.ComWrappersSupport.InitializeComWrappers();
+        Application.Start((p) =>
+        {
+            var context = new DispatcherQueueSynchronizationContext(
+                DispatcherQueue.GetForCurrentThread());
+            SynchronizationContext.SetSynchronizationContext(context);
+            _ = new App();
+        });
+        return 0;
+    }
+}
+```
+
+### WPF App Constructor Removal
+
+WPF modules often created `new App()` to initialize the WPF `Application` and get `Application.Current.Dispatcher`. This is no longer needed — the WinUI 3 `Application.Start()` handles this.
+
+```csharp
+// DELETE (WPF pattern):
+_imageResizerApp = new App();
+// REPLACE with: Store DispatcherQueue explicitly (see Global DispatcherQueue Access above)
+```

.github/skills/wpf-to-winui3-migration/references/xaml-migration.md

@@ -0,0 +1,365 @@
+# XAML Migration Guide
+
+Detailed reference for migrating XAML from WPF to WinUI 3, based on the ImageResizer migration.
+
+## XML Namespace Declaration Changes
+
+### Before (WPF)
+
+```xml
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:MyApp"
+        xmlns:m="clr-namespace:ImageResizer.Models"
+        xmlns:p="clr-namespace:ImageResizer.Properties"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
+        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+        x:Class="MyApp.MainWindow">
+```
+
+### After (WinUI 3)
+
+```xml
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:MyApp"
+        xmlns:m="using:ImageResizer.Models"
+        xmlns:converters="using:ImageResizer.Converters"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        x:Class="MyApp.MainWindow">
+```
+
+### Key Changes
+
+| WPF Syntax | WinUI 3 Syntax | Notes |
+|------------|---------------|-------|
+| `clr-namespace:Foo` | `using:Foo` | CLR namespace mapping |
+| `clr-namespace:Foo;assembly=Bar` | `using:Foo` | Assembly qualification not needed |
+| `xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"` | **Remove entirely** | WPF-UI namespace no longer needed |
+| `xmlns:p="clr-namespace:...Properties"` | **Remove** | No more `.resx` string bindings |
+| `sys:String` (from mscorlib) | `x:String` | XAML intrinsic types |
+| `sys:Int32` | `x:Int32` | XAML intrinsic types |
+| `sys:Boolean` | `x:Boolean` | XAML intrinsic types |
+| `sys:Double` | `x:Double` | XAML intrinsic types |
+
+## Unsupported Markup Extensions
+
+| WPF Markup Extension | WinUI 3 Alternative |
+|----------------------|---------------------|
+| `{DynamicResource Key}` | `{ThemeResource Key}` (theme-reactive) or `{StaticResource Key}` |
+| `{x:Static Type.Member}` | `{x:Bind}` to a static property, or code-behind |
+| `{x:Type local:MyType}` | Not supported; use code-behind |
+| `{x:Array}` | Not supported; create collections in code-behind |
+| `{x:Code}` | Not supported |
+
+### DynamicResource → ThemeResource
+
+```xml
+<!-- WPF -->
+<TextBlock Foreground="{DynamicResource MyBrush}" />
+
+<!-- WinUI 3 -->
+<TextBlock Foreground="{ThemeResource MyBrush}" />
+```
+
+`ThemeResource` automatically updates when the app theme changes (Light/Dark/HighContrast). For truly dynamic non-theme resources, set values in code-behind or use data binding.
+
+### x:Static Resource Strings → x:Uid
+
+This is the most pervasive XAML change. WPF used `{x:Static}` to bind to strongly-typed `.resx` resource strings. WinUI 3 uses `x:Uid` with `.resw` files.
+
+**WPF:**
+```xml
+<Button Content="{x:Static p:Resources.Cancel}" />
+<TextBlock Text="{x:Static p:Resources.Input_Header}" />
+```
+
+**WinUI 3:**
+```xml
+<Button x:Uid="Cancel" />
+<TextBlock x:Uid="Input_Header" />
+```
+
+In `Strings/en-us/Resources.resw`:
+```xml
+<data name="Cancel.Content" xml:space="preserve">
+    <value>Cancel</value>
+</data>
+<data name="Input_Header.Text" xml:space="preserve">
+    <value>Select a size</value>
+</data>
+```
+
+The `x:Uid` suffix (`.Content`, `.Text`, `.Header`, `.PlaceholderText`, etc.) matches the target property name.
+
+### DataType with x:Type → Remove
+
+**WPF:**
+```xml
+<DataTemplate DataType="{x:Type m:ResizeSize}">
+```
+
+**WinUI 3:**
+```xml
+<DataTemplate x:DataType="m:ResizeSize">
+```
+
+## WPF-UI (Lepo) Controls Removal
+
+If the module uses the `WPF-UI` library, replace all Lepo controls with native WinUI 3 equivalents.
+
+### Window
+
+```xml
+<!-- WPF (WPF-UI) -->
+<ui:FluentWindow
+    ExtendsContentIntoTitleBar="True"
+    WindowStartupLocation="CenterScreen">
+    <ui:TitleBar Title="Image Resizer" />
+    ...
+</ui:FluentWindow>
+
+<!-- WinUI 3 (native) -->
+<Window>
+    <!-- Title bar managed via code-behind: this.ExtendsContentIntoTitleBar = true; -->
+    ...
+</Window>
+```
+
+### App.xaml Resources
+
+```xml
+<!-- WPF (WPF-UI) -->
+<Application.Resources>
+    <ResourceDictionary>
+        <ResourceDictionary.MergedDictionaries>
+            <ui:ThemesDictionary Theme="Dark" />
+            <ui:ControlsDictionary />
+        </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+</Application.Resources>
+
+<!-- WinUI 3 (native) -->
+<Application.Resources>
+    <ResourceDictionary>
+        <ResourceDictionary.MergedDictionaries>
+            <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+        </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+</Application.Resources>
+```
+
+### Common Control Replacements
+
+```xml
+<!-- WPF-UI NumberBox -->
+<ui:NumberBox Value="{Binding Width}" />
+<!-- WinUI 3 -->
+<NumberBox Value="{x:Bind ViewModel.Width, Mode=TwoWay}" />
+
+<!-- WPF-UI InfoBar -->
+<ui:InfoBar Title="Warning" Message="..." IsOpen="True" Severity="Warning" />
+<!-- WinUI 3 -->
+<InfoBar Title="Warning" Message="..." IsOpen="True" Severity="Warning" />
+
+<!-- WPF-UI ProgressRing -->
+<ui:ProgressRing IsIndeterminate="True" />
+<!-- WinUI 3 -->
+<ProgressRing IsActive="True" />
+
+<!-- WPF-UI SymbolIcon -->
+<ui:SymbolIcon Symbol="Add" />
+<!-- WinUI 3 -->
+<SymbolIcon Symbol="Add" />
+```
+
+### Button Patterns
+
+```xml
+<!-- WPF -->
+<Button IsDefault="True" Content="OK" />
+<Button IsCancel="True" Content="Cancel" />
+
+<!-- WinUI 3 (no IsDefault/IsCancel) -->
+<Button Style="{StaticResource AccentButtonStyle}" Content="OK" />
+<Button Content="Cancel" />
+<!-- Handle Enter/Escape keys in code-behind if needed -->
+```
+
+## Style and Template Changes
+
+### Triggers → VisualStateManager
+
+WPF `Triggers`, `DataTriggers`, and `EventTriggers` are not supported.
+
+**WPF:**
+```xml
+<Style TargetType="Button">
+    <Style.Triggers>
+        <Trigger Property="IsMouseOver" Value="True">
+            <Setter Property="Background" Value="LightBlue"/>
+        </Trigger>
+        <DataTrigger Binding="{Binding IsEnabled}" Value="False">
+            <Setter Property="Opacity" Value="0.5"/>
+        </DataTrigger>
+    </Style.Triggers>
+</Style>
+```
+
+**WinUI 3:**
+```xml
+<Style TargetType="Button">
+    <Setter Property="Template">
+        <Setter.Value>
+            <ControlTemplate TargetType="Button">
+                <Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
+                    <VisualStateManager.VisualStateGroups>
+                        <VisualStateGroup x:Name="CommonStates">
+                            <VisualState x:Name="PointerOver">
+                                <VisualState.Setters>
+                                    <Setter Target="RootGrid.Background" Value="LightBlue"/>
+                                </VisualState.Setters>
+                            </VisualState>
+                        </VisualStateGroup>
+                    </VisualStateManager.VisualStateGroups>
+                    <ContentPresenter />
+                </Grid>
+            </ControlTemplate>
+        </Setter.Value>
+    </Setter>
+</Style>
+```
+
+### No Binding in Setter.Value
+
+```xml
+<!-- WPF (works) -->
+<Setter Property="Foreground" Value="{Binding TextColor}"/>
+
+<!-- WinUI 3 (does NOT work — use StaticResource) -->
+<Setter Property="Foreground" Value="{StaticResource TextColorBrush}"/>
+```
+
+### Visual State Name Changes
+
+| WPF | WinUI 3 |
+|-----|---------|
+| `MouseOver` | `PointerOver` |
+| `Disabled` | `Disabled` |
+| `Pressed` | `Pressed` |
+
+## Resource Dictionary Changes
+
+### Window.Resources → Grid.Resources
+
+WinUI 3 `Window` is NOT a `DependencyObject` — no `Window.Resources`, `DataContext`, or `VisualStateManager`.
+
+```xml
+<!-- WPF -->
+<Window>
+    <Window.Resources>
+        <SolidColorBrush x:Key="MyBrush" Color="Red"/>
+    </Window.Resources>
+    <Grid>...</Grid>
+</Window>
+
+<!-- WinUI 3 -->
+<Window>
+    <Grid>
+        <Grid.Resources>
+            <SolidColorBrush x:Key="MyBrush" Color="Red"/>
+        </Grid.Resources>
+        ...
+    </Grid>
+</Window>
+```
+
+### Theme Dictionaries
+
+```xml
+<ResourceDictionary>
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+            <SolidColorBrush x:Key="MyBrush" Color="#FF000000"/>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Dark">
+            <SolidColorBrush x:Key="MyBrush" Color="#FFFFFFFF"/>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="HighContrast">
+            <SolidColorBrush x:Key="MyBrush" Color="{ThemeResource SystemColorWindowTextColor}"/>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+</ResourceDictionary>
+```
+
+## URI Scheme Changes
+
+| WPF | WinUI 3 |
+|-----|---------|
+| `pack://application:,,,/MyAssembly;component/image.png` | `ms-appx:///Assets/image.png` |
+| `pack://application:,,,/image.png` | `ms-appx:///image.png` |
+| Relative path `../image.png` | `ms-appx:///image.png` |
+
+Assets directory convention: `Resources/` → `Assets/<Module>/`
+
+## Data Binding Changes
+
+### {Binding} vs {x:Bind}
+
+Both are available. Prefer `{x:Bind}` for compile-time safety and performance.
+
+| Feature | `{Binding}` | `{x:Bind}` |
+|---------|------------|------------|
+| Default mode | `OneWay` | **`OneTime`** (explicit `Mode=OneWay` required!) |
+| Context | `DataContext` | Code-behind class |
+| Resolution | Runtime | Compile-time |
+| Performance | Reflection-based | Compiled |
+| Function binding | No | Yes |
+
+### WPF-Specific Binding Features to Remove
+
+```xml
+<!-- These WPF-only features must be removed or rewritten -->
+<TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" />
+<!-- WinUI 3: UpdateSourceTrigger not needed; TextBox uses PropertyChanged by default -->
+<TextBox Text="{x:Bind ViewModel.Value, Mode=TwoWay}" />
+
+{Binding RelativeSource={RelativeSource Self}, ...}
+<!-- WinUI 3: Use x:Bind which binds to the page itself, or use ElementName -->
+
+<ItemsControl ItemsSource="{Binding}" />
+<!-- WinUI 3: Must specify explicit path -->
+<ItemsControl ItemsSource="{x:Bind ViewModel.Items}" />
+```
+
+## WPF-Only Window Properties to Remove
+
+These properties exist on WPF `Window` but not WinUI 3:
+
+```xml
+<!-- Remove from XAML — handle in code-behind via AppWindow API -->
+SizeToContent="Height"
+WindowStartupLocation="CenterScreen"
+ResizeMode="NoResize"
+ExtendsContentIntoTitleBar="True"  <!-- Set in code-behind -->
+```
+
+## XAML Control Property Changes
+
+| WPF Property | WinUI 3 Property | Notes |
+|-------------|-----------------|-------|
+| `Focusable` | `IsTabStop` | Different name |
+| `SnapsToDevicePixels` | Not available | WinUI handles pixel snapping internally |
+| `UseLayoutRounding` | `UseLayoutRounding` | Same |
+| `IsHitTestVisible` | `IsHitTestVisible` | Same |
+| `TextBox.VerticalScrollBarVisibility` | `ScrollViewer.VerticalScrollBarVisibility` (attached) | Attached property |
+
+## XAML Formatting (XamlStyler)
+
+After migration, run XamlStyler to normalize formatting:
+- Alphabetize xmlns declarations and element attributes
+- Add UTF-8 BOM to all XAML files
+- Normalize comment spacing: `<!-- text -->` → `<!--  text  -->`
+
+PowerToys command: `.\.pipelines\applyXamlStyling.ps1 -Main`

.gitignore

@@ -360,3 +360,8 @@ src/common/Telemetry/*.etl
 # PowerToysInstaller Build Temp Files
 installer/*/*.wxs.bk
 /src/modules/awake/.claude
+
+# Squad / Copilot agents — local-only, not committed
+.squad/
+.squad-workstream
+.github/agents/

.pipelines/ESRPSigning_core.json

@@ -106,7 +106,13 @@
             "PowerToys.SvgThumbnailProvider.dll",
             "PowerToys.SvgThumbnailProvider.exe",
             "PowerToys.SvgThumbnailProviderCpp.dll",
+            "PowerToys.KeyboardManager.dll",
 
+            "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
+            "WinUI3Apps\\PowerToys.KeyboardManagerEditorUI.exe",
+            "WinUI3Apps\\PowerToys.KeyboardManagerEditorUI.dll",
+            "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
+            "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",
             "WinUI3Apps\\PowerToys.HostsModuleInterface.dll",
             "WinUI3Apps\\PowerToys.HostsUILib.dll",
             "WinUI3Apps\\PowerToys.Hosts.dll",
@@ -211,9 +217,6 @@
             "PowerToys.PowerAccentModuleInterface.dll",
             "PowerToys.PowerAccentKeyboardService.dll",
 
-            "PowerToys.PowerDisplayModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.PowerDisplay.dll",
-            "WinUI3Apps\\PowerToys.PowerDisplay.exe",
             "PowerDisplay.Lib.dll",
 
             "WinUI3Apps\\PowerToys.PowerRenameExt.dll",

.pipelines/loc/loc.yml

@@ -9,7 +9,7 @@ schedules:
     always: false # only run if there's code changes!
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-latest
 
 resources:
   repositories:

.pipelines/v2/templates/job-build-project.yml

@@ -200,7 +200,7 @@ jobs:
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
-      version: '10.0'
+      version: '9.0'
 
   - ${{ if eq(parameters.runTests, true) }}:
     - task: VisualStudioTestPlatformInstaller@1
@@ -210,6 +210,9 @@ jobs:
       & '.pipelines/applyXamlStyling.ps1' -Passive
     displayName: Verify XAML formatting
 
+  - task: NuGetAuthenticate@1
+    displayName: Authenticate NuGet feeds for verification
+
   - pwsh: |-
       & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.slnx'
     displayName: Verify Nuget package versions for PowerToys.slnx
@@ -415,7 +418,7 @@ jobs:
           /p:VCRTForwarders-IncludeDebugCRT=false
           /p:PowerToysRoot=$(Build.SourcesDirectory)
           /p:PublishProfile=InstallationPublishProfile.pubxml
-          /p:TargetFramework=net10.0-windows10.0.26100.0
+          /p:TargetFramework=net9.0-windows10.0.26100.0
           /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog
           $(RestoreAdditionalProjectSourcesArg)
         platform: $(BuildPlatform)

.pipelines/v2/templates/steps-ensure-dotnet-version.yml

@@ -1,7 +1,7 @@
 parameters:
 - name: version
   type: string
-  default: "10.0"
+  default: "9.0"
 - name: sdk
   type: boolean
   default: false

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -22,7 +22,7 @@ $totalList = $projFiles | ForEach-Object -Parallel {
     #Workaround for preventing exit code from dotnet process from reflecting exit code in PowerShell
     $procInfo = New-Object System.Diagnostics.ProcessStartInfo -Property @{ 
         FileName               = "dotnet.exe"; 
-        Arguments              = "list $csproj package --no-restore"; 
+        Arguments              = "list $csproj package"; 
         RedirectStandardOutput = $true; 
         RedirectStandardError  = $true; 
     }

.pipelines/verifyPossibleAssetConflicts.ps1

@@ -17,10 +17,10 @@ $nonDirectoryAssetsItems = Get-ChildItem $targetAssetsDir -Attributes !Directory
 $directoryAssetsItems = Get-ChildItem $targetAssetsDir -Attributes Directory
 
 if ($directoryAssetsItems.Count -le 0) {
-    Write-Host -ForegroundColor Red "No directories detected in " $nonDirectoryAssetsItems ". Are you sure this is the right path?`r`n"
+    Write-Host -ForegroundColor Red "ERROR: No directories detected in " $nonDirectoryAssetsItems ". Are you sure this is the right path?`r`n"
     $totalFailures++;
 } elseif ($nonDirectoryAssetsItems.Count -gt 0) {
-    Write-Host -ForegroundColor Red "Detected " $nonDirectoryAssetsItems " files in " $targetAssetsDir "`r`n"
+    Write-Host -ForegroundColor Red "ERROR: Detected " $nonDirectoryAssetsItems " files in " $targetAssetsDir ". Each application should use a named subdirectory for assets.`r`n"
     $totalFailures++;
 } else {
     Write-Host -ForegroundColor Green "Only directories detected in " $targetAssetsDir "`r`n"
@@ -29,7 +29,7 @@ if ($directoryAssetsItems.Count -le 0) {
 # Make sure there's no resources.pri file. Each application should use a different name for their own resources file path.
 $resourcesPriFiles = Get-ChildItem $targetDir -Filter resources.pri
 if ($resourcesPriFiles.Count -gt 0) {
-    Write-Host -ForegroundColor Red "Detected a resources.pri file in " $targetDir "`r`n"
+    Write-Host -ForegroundColor Red "ERROR: Detected a resources.pri file in " $targetDir ". Each application should use a unique name for its resources file.`r`n"
     $totalFailures++;
 } else {
     Write-Host -ForegroundColor Green "No resources.pri file detected in " $targetDir "`r`n"
@@ -38,7 +38,7 @@ if ($resourcesPriFiles.Count -gt 0) {
 # Each application should have their XAML files in their own paths to avoid these conflicts.
 $resourcesPriFiles = Get-ChildItem $targetDir -Filter *.xbf
 if ($resourcesPriFiles.Count -gt 0) {
-    Write-Host -ForegroundColor Red "Detected a .xbf file in " $targetDir "`r`n"
+    Write-Host -ForegroundColor Red "ERROR: Detected a .xbf file in " $targetDir ". Ensure all XAML files are placed in a subdirectory in each application.`r`n"
     $totalFailures++;
 } else {
     Write-Host -ForegroundColor Green "No .xbf files detected in " $targetDir "`r`n"

Directory.Build.props

@@ -20,6 +20,7 @@
     <NuGetAuditMode>direct</NuGetAuditMode>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
     <PlatformTarget>$(Platform)</PlatformTarget>
+    <RestoreEnablePackagePruning Condition=" '$(VisualStudioVersion)' == '17.0'">false </RestoreEnablePackagePruning>
 
     <!-- Enable Microsoft.Testing.Platform -->
     <EnableMSTestRunner>true</EnableMSTestRunner>
@@ -170,12 +171,6 @@
       $(USERPROFILE)\AppData\LocalLow\Microsoft\PowerToys\**;
     </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
 
-    <!-- dotnet.exe seems to access files after builds. Temporarily putting in this entry for testing if we get further. This looks to be related to a .NET Roslyn Analyzer in .NET 10-->
-    <MSBuildCacheAllowFileAccessAfterProjectFinishProcessPatterns>
-      $(MSBuildCacheAllowFileAccessAfterProjectFinishProcessPatterns);
-      \**\dotnet\dotnet.exe;
-      \**\vbcscompiler.exe;
-    </MSBuildCacheAllowFileAccessAfterProjectFinishProcessPatterns>
     <!-- 
       This repo uses a common output directory with many projects writing duplicate outputs. Allow everything, but note this costs some performance in the form of requiring
       the cache to use copies instead of hardlinks when pulling from cache.

Directory.Packages.props

@@ -39,23 +39,22 @@
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageVersion Include="MessagePack" Version="3.1.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.102" />
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.5.250829002" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
     <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.250303.1" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
     <PackageVersion Include="Microsoft.Extensions.AI" Version="9.9.1" />
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.10" />
     <PackageVersion Include="Microsoft.AI.Foundry.Local" Version="0.3.0" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.66.0" />
@@ -66,9 +65,9 @@
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.10" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -76,7 +75,7 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.231216.1" />
+    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.231216.1"/>
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.260203002" />
@@ -106,30 +105,31 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="10.0.3" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.10" />
+    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="10.0.3" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.3" />
-    <PackageVersion Include="System.Data.OleDb" Version="10.0.3" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.10" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.10" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="10.0.3" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.10" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.3" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.10" />
     <PackageVersion Include="System.ClientModel" Version="1.7.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="10.0.3" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.10" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="10.0.3" />
+    <PackageVersion Include="System.Management" Version="9.0.10" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Numerics.Tensors" Version="9.0.11" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="10.0.3" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.3" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.3" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.3" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.10" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.10" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="ToolGood.Words.Pinyin" Version="3.1.0.3" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
@@ -153,4 +153,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

PowerToys.slnx

@@ -497,6 +497,31 @@
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj" Id="ba661f5b-1d5a-4ffc-9bf1-fc39df280bdd" />
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj" Id="e496b7fc-1e99-4bab-849b-0e8367040b02" />
   </Folder>
+  <Folder Name="/modules/MouseUtils/">
+    <Project Path="src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj" Id="48a1db8c-5df8-4fb3-9e14-2b67f3f2d8b5" />
+    <Project Path="src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj" Id="e94fd11c-0591-456f-899f-efc0ca548336" />
+    <Project Path="src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj" Id="782a61be-9d85-4081-b35c-1ccc9dcc1e88" />
+    <Project Path="src/modules/MouseUtils/MouseJump.Common/MouseJump.Common.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/MouseUtils/MouseJump/MouseJump.vcxproj" Id="8a08d663-4995-40e3-b42c-3f910625f284" />
+    <Project Path="src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj" Id="eae14c0e-7a6b-45da-9080-a7d8c077ba6e" />
+  </Folder>
+  <Folder Name="/modules/MouseUtils/Tests/">
+    <Project Path="src/modules/MouseUtils/MouseJump.Common.UnitTests/MouseJump.Common.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/MouseUtils/MouseUtils.UITests/MouseUtils.UITests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+  </Folder>
   <Folder Name="/modules/keyboardmanager/Tests/">
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj" Id="62173d9a-6724-4c00-a1c8-fb646480a9ec" />
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj" Id="7f4b3a60-bc27-45a7-8000-68b0b6ea7466" />
@@ -688,11 +713,13 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
+    <!-- TEMPORARILY_DISABLED: PowerDisplay
     <Project Path="src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
     <Project Path="src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj" Id="d1234567-8901-2345-6789-abcdef012345" />
+    -->
   </Folder>
   <Folder Name="/modules/PowerDisplay/Tests/">
     <Project Path="src/modules/powerdisplay/PowerDisplay.Lib.UnitTests/PowerDisplay.Lib.UnitTests.csproj">
@@ -718,31 +745,6 @@
       <Platform Solution="*|x64" Project="x64" />
     </Project>
   </Folder>
-  <Folder Name="/modules/MouseUtils/">
-    <Project Path="src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj" Id="48a1db8c-5df8-4fb3-9e14-2b67f3f2d8b5" />
-    <Project Path="src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj" Id="e94fd11c-0591-456f-899f-efc0ca548336" />
-    <Project Path="src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj" Id="782a61be-9d85-4081-b35c-1ccc9dcc1e88" />
-    <Project Path="src/modules/MouseUtils/MouseJump.Common/MouseJump.Common.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/MouseUtils/MouseJump/MouseJump.vcxproj" Id="8a08d663-4995-40e3-b42c-3f910625f284" />
-    <Project Path="src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj" Id="eae14c0e-7a6b-45da-9080-a7d8c077ba6e" />
-  </Folder>
-  <Folder Name="/modules/MouseUtils/Tests/">
-    <Project Path="src/modules/MouseUtils/MouseJump.Common.UnitTests/MouseJump.Common.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/MouseUtils/MouseUtils.UITests/MouseUtils.UITests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-  </Folder>
   <Folder Name="/modules/MouseWithoutBorders/">
     <Project Path="src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />

README.md

@@ -51,19 +51,19 @@ But to get started quickly, choose one of the installation methods below:
 Go to the <a href="https://aka.ms/installPowerToys">PowerToys GitHub releases</a>, click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.98%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysUserSetup-0.97.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysUserSetup-0.97.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysSetup-0.97.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysSetup-0.97.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.99%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.98%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.0/PowerToysUserSetup-0.98.0-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.0/PowerToysUserSetup-0.98.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.0/PowerToysSetup-0.98.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.0/PowerToysSetup-0.98.0-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.97.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.97.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.97.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.97.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.98.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.98.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.98.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.98.0-arm64.exe][ptMachineArm64] |
 
 </details>
 
@@ -102,242 +102,14 @@ winget install --scope machine Microsoft.PowerToys -s winget
 There are <a href="https://learn.microsoft.com/windows/powertoys/install#community-driven-install-tools">community driven install methods</a> such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
 </details>
 
-## ✨ What's new
+## ✨ What's new?
 
-**Version 0.97.2 (Feb 2026)**
+[![What's new image](doc/images/readme/Release-Banner.png)](https://github.com/microsoft/PowerToys/releases)
 
-This patch release fixes several important stability issues identified in v0.97.0 based on incoming reports. Check out the [v0.97.0](https://github.com/microsoft/PowerToys/releases/tag/v0.97.0) notes for the full list of changes.
-
-## Advanced Paste
-- #45207 Fixed a crash in the Advanced Paste settings page caused by null values during JSON deserialization.
-
-## Color Picker
-- #45367 Fixed contrast issue in Color picker UI.
-
-## Command Palette
-- #45194 Fixed an issue where some Command Palette PowerToys Extension strings were not localised.
-
-## Cursor Wrap
-- #45210 Fixed "Automatically activate on utility startup" setting not persisting when disabled. Thanks [@ThanhNguyxn](https://github.com/ThanhNguyxn)!
-- #45303 Added option to disable Cursor Wrapping when only a single monitor is connected. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-
-## Image Resizer
-- #45184 Fixed Image Resizer not working after upgrading PowerToys on Windows 10 by properly cleaning up legacy sparse app packages.
-
-## LightSwitch
-- #45304 Fixed Light Switch startup logic to correctly apply the appropriate theme on launch.
-
-## Workspaces
-- #45183 Fixed overlay positioning issue in workspace snapshot draw caused by DPI-aware coordinate mismatch.
-
-## Quick Access and Measure Tool
-- #45443 Fixed crash related to `IsShownInSwitchers` property when Explorer is not running.
-
-**Version 0.97.1 (January 2026)**
-
-**Highlights**
-
-### Advanced Paste
-- #44862: Fixed Settings UI advanced paste page crash by using correct settings repository for null checking.
-
-### Command Palette
-- #44886: Fixed personalization section not appearing by using latest MSIX for installation.
-- #44938: Fixed loading of icons from internet shortcuts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- #45076: Fixed potential deadlock from lazy-loading AppListItem details. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-
-### Cursor Wrap
-- #44936: Added improved multi-monitor support; Added laptop lid close detection for dynamic monitor topology updates. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-- #44936: Added new settings dropdown to constrain wrapping to horizontal-only, vertical-only, or both directions. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-
-### Peek
-- #44995: Fixed Space key triggering Peek during file rename, search, or address bar typing.
-
-### PowerRename
-- #44944: Fixed regex `$` not working, preventing users from adding text at the end of filenames.
-
-### Runner
-- #44931: Monochrome tray icon now adapts to Windows system theme instead of app theme.
-- #44982: Fixed right-click menu to dynamically update based on Quick Access enabled/disabled state.
-
-### GPO / Enterprise
-- #45028: Added CursorWrap policy definition to ADMX templates. Thanks [@htcfreek](https://github.com/htcfreek)!
-
-For the full list of v0.97 changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
-
-## Advanced Paste
-
-- Added hex color previews in clipboard history. Thanks [@crramirez](https://github.com/crramirez)!
-- Added automatic placeholder endpoints when required fields are left empty.
-- Fixed a grammar issue in the AI settings description. Thanks [@erik-anderson](https://github.com/erik-anderson)!
-- Fixed loading order so custom action hotkeys are read correctly.
-- Updated Advanced Paste descriptions to reflect support for online and local models.
-- Fixed clipboard history item selection so it doesn’t duplicate entries.
-- Prevented placeholder endpoints from being saved for providers that don’t need them.
-- Added image input support for AI transforms and improved clipboard change tracking.
-
-## Awake
-
-- Fixed Awake CLI so help, errors, and logs appear correctly in the console. Thanks [@daverayment](https://github.com/daverayment)!
-
-## Command Palette
-
-- Fixed background image loading in BlurImageControl. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Fixed SDK packaging paths and added a CI SDK build stage.
-- Aligned naming and spell-checking with .NET conventions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added drag-and-drop support for Command Palette items. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added a PowerToys Command Palette extension to discover and launch PowerToys utilities.
-- Fixed grid view bindings and layout issues. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Fixed a line-break issue in RDC extension toast messages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Made the Settings button text localizable. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Hid the RDC fallback on the home page and fixed MSTSC working directory handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Optimized result list merging for better performance. Thanks [@daverayment](https://github.com/daverayment)!
-- Added Small/Medium/Large detail sizes in the extensions API. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)!
-- Hid fallback commands on the home page when no query is entered. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added back navigation support in the Settings window. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added a Command Palette solution filter. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Updated Extension SDK documentation links to Microsoft Learn. Thanks [@RubenFricke](https://github.com/RubenFricke)!
-- Added a custom search engine URL setting for Web Search. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added pinyin matching for Chinese input. Thanks [@frg2089](https://github.com/frg2089)!
-- Bumped Command Palette version to 0.8.
-- Removed subtitles from built-in top-level commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Refined separator styling in the details pane. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added a built-in Remote Desktop extension.
-- Added a Peek command to the Indexer extension.
-- Improved default browser detection using the Windows Shell API. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added Escape key behavior options. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added theme and background customization options. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved WinGet package app matching. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added an auto-return-home delay setting. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added fallback ranking and global results settings.
-- Removed the selection indicator in the context menu list. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added a developer ribbon with build and log info. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Updated the “Learn more” string for Command Palette. Thanks [@pratnala](https://github.com/pratnala)!
-- Added arrow-key navigation for grid views. Thanks [@samrueby](https://github.com/samrueby)!
-- Fixed version display when running unpackaged. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added a native debugging launch profile. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Reduced redundant property change notifications in the SDK. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved section readability and accessibility. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Made gallery spacing uniform. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added sections and separators for list and grid pages. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)!
-
-## Crop & Lock
-
-- Added a screenshot mode that freezes a cropped region into its own window. Thanks [@fm-sys](https://github.com/fm-sys)!
-
-## Cursor Wrap
-
-- Improved Cursor Wrap behavior on multi-monitor setups by wrapping only at outer edges. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-
-## FancyZones
-
-- Fixed editor overlay positioning on mixed-DPI multi-monitor setups. Thanks [@Memphizzz](https://github.com/Memphizzz)!
-- Added a FancyZones CLI for command-line layout management.
-
-## File Locksmith
-
-- Added a File Locksmith CLI for querying, waiting on, or killing file locks.
-
-## Find My Mouse
-
-- Improved spotlight edge rendering for clearer Find My Mouse visuals.
-- Added telemetry to track how Find My Mouse is triggered.
-
-## Image Resizer
-
-- Fixed Fill mode cropping when Shrink Only is enabled. Thanks [@daverayment](https://github.com/daverayment)!
-- Added a dedicated Image Resizer CLI for scripted resizing.
-
-## Light Switch
-
-- Added telemetry events for Light Switch usage and settings changes.
-- Added a Follow Night Light mode to sync theme changes with Night Light.
-- Clarified LightSwitchService and LightSwitchStateManager roles in docs.
-- Added a Quick Access dashboard button to toggle Light Switch quickly.
-- Ensured Light Switch honors GPO policy states with clear status messaging.
-
-## Mouse Without Borders
-
-- Continued refactoring Mouse Without Borders by splitting the large Common class into focused components. Thanks [@mikeclayton](https://github.com/mikeclayton)!
-- Completed the Common class refactor with Core and IPC helper extraction. Thanks [@mikeclayton](https://github.com/mikeclayton)!
-
-## Peek
-
-- Hardened Peek previews with strict resource filtering and safer external link warnings.
-- Improved SVG preview compatibility by rendering via WebView2.
-
-## PowerRename
-
-- Added HEIF/AVIF EXIF metadata extraction and extension status guidance for related previews.
-- Fixed undefined behavior in file time handling. Thanks [@safocl](https://github.com/safocl)!
-- Optimized memory allocation for depth-based rename processing.
-- Fixed Unicode normalization and non‑breaking space matching. Thanks [@daverayment](https://github.com/daverayment)!
-- Fixed date token replacements followed by capital letters. Thanks [@daverayment](https://github.com/daverayment)!
-
-## PowerToys Run Plugins
-
-- Fixed a plugin name typo and added Project Launcher to the third‑party list. Thanks [@artickc](https://github.com/artickc)!
-- Added the Open With Antigravity plugin to the third‑party list. Thanks [@artickc](https://github.com/artickc)!
-
-## PowerToys Run
-
-- Avoided unnecessary hotkey conflict checks when settings change.
-- Added QuickAI to the third-party PowerToys Run plugin list. Thanks [@ruslanlap](https://github.com/ruslanlap)!
-
-## Quick Accent
-
-- Added localized quotation marks to Quick Accent. Thanks [@warquys](https://github.com/warquys)!
-- Fixed duplicate and redundant characters in Quick Accent sets. Thanks [@noraa-junker](https://github.com/noraa-junker)!
-- Fixed DPI positioning issues for Quick Accent on mixed-DPI setups. Thanks [@noraa-junker](https://github.com/noraa-junker)!
-
-## Settings
-
-- Added a new tray icon that adapts to theme changes. Thanks [@HO-COOH](https://github.com/HO-COOH)!
-- Centralized module enable/disable logic for cleaner Settings UI updates.
-- Simplified Settings utilities by removing ISettingsUtils/ISettingsPath interfaces. Thanks [@noraa-junker](https://github.com/noraa-junker)!
-- Improved Settings UI consistency and disabled-state visuals.
-- Added semantic headings to the Dashboard for better accessibility.
-- Introduced Quick Access as a standalone host with updated Settings integration.
-- Fixed Dashboard toggle flicker and sort menu checkmarks. Thanks [@daverayment](https://github.com/daverayment)!
-- Added Native AOT-compatible settings serialization.
-- Standardized mouse tool description text. Thanks [@daverayment](https://github.com/daverayment)!
-- Added a global SettingsUtils singleton to reduce repeated initialization.
-
-## Development
-
-- Fixed broken devdocs links to the coding style guide. Thanks [@RubenFricke](https://github.com/RubenFricke)!
-- Migrated main and installer solutions to .slnx for improved build tooling.
-- Restored local installer builds after the WiX v5 upgrade with signing and versioning fixes.
-- Added incremental review tooling and structured AI prompts for PR/issue reviews.
-- Documented bot commands and cleaned up devdocs structure. Thanks [@noraa-junker](https://github.com/noraa-junker)!
-- Updated WinAppSDK pipeline defaults to 1.8 and fixed restore handling.
-- Updated the COMMUNITY list to reflect current roles.
-- Maintained community member ordering and added a new entry.
-- Re-enabled centralized PackageReference for native projects with VS auto-restore.
-- Disabled MSBuild caching by default in CI to avoid build instability.
-- Updated the latest WinAppSDK daily pipeline for split-dependency restores.
-- Suppressed experimental build warnings and aligned WrapPanel stretch handling.
-- Reordered the spell-check expect list for consistent automation.
-- Migrated native projects to centralized PackageReference management.
-- Cleaned spell-check dictionary entries and capitalization.
-- Synced commit/PR prompts and wired VS Code to repo prompt files.
-- Added VS Code build tasks and improved build script path handling.
-- Updated Windows App SDK package versions in central package management.
-- Migrated cmdpal extension native project to PackageReference and fixed outputs.
-- Reverted PackageReference changes back to packages.config where needed.
-- Bypassed a release version check for a failing DLL to keep pipelines green.
-- Consolidated Copilot instructions and fixed prompt frontmatter.
-- Added signing entries for new Quick Access binaries and CLI version metadata.
-- Fixed install scope detection to avoid mixed per-user/per-machine installs.
-- Added a Module Loader tool to quickly test PowerToys modules without full builds. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-- Added update telemetry to understand auto-update checks and downloads.
-- Updated the telemetry package for new compliance requirements. Thanks [@carlos-zamora](https://github.com/carlos-zamora)!
-- Documented missing telemetry events in DATA_AND_PRIVACY.
-- Fixed UI test pipeline restores for .slnx solutions.
-- Added UI automation coverage for Advanced Paste clipboard history flows.
-- Stabilized FancyZones UI tests with more reliable selectors and screen recordings.
+To see what's new, check out the [release notes](https://github.com/microsoft/PowerToys/releases/tag/v0.98.0).
 
 ## 🛣️ Roadmap 
-We are planning some nice new features and improvements for the next releases – PowerDisplay, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.98][github-next-release-work]!
+We are planning some nice new features and improvements for the next releases – PowerDisplay, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.99][github-next-release-work]!
 
 ## ❤️ PowerToys Community 
 The PowerToys team is extremely grateful to have the [support of an amazing active community][community-link]. The work you do is incredibly important. PowerToys wouldn't be nearly what it is today without your help filing bugs, updating documentation, guiding the design, or writing features. We want to say thank you and take time to recognize your work. Your contributions and feedback improve PowerToys month after month!

auto-cherry-pick.ps1

@@ -1,54 +0,0 @@
-# Auto-resolve cherry-pick conflicts
-param([int]$MaxAttempts = 100)
-
-$attempts = 0
-while ($attempts -lt $MaxAttempts) {
-    $attempts++
-    
-    # Check if cherry-pick is in progress
-    $status = git status --porcelain
-    if (-not $status) {
-        Write-Host "Cherry-pick complete!" -ForegroundColor Green
-        break
-    }
-    
-    # Get conflicted files
-    $conflicts = git diff --name-only --diff-filter=U
-    
-    if ($conflicts) {
-        Write-Host "Attempt $attempts`: Resolving conflicts..." -ForegroundColor Yellow
-        
-        foreach ($file in $conflicts) {
-            Write-Host "  Resolving: $file"
-            git checkout --ours $file 2>$null
-        }
-        
-        # Handle deleted files
-        git status --short | Where-Object { $_ -match '^DU' } | ForEach-Object {
-            $file = ($_ -split '\s+', 2)[1]
-            Write-Host "  Removing deleted: $file"
-            git rm $file 2>$null
-        }
-        
-        git add . 2>$null
-    }
-    
-    # Try to continue
-    $result = git cherry-pick --continue 2>&1
-    
-    if ($LASTEXITCODE -eq 0) {
-        Write-Host "  Continued successfully" -ForegroundColor Green
-    }
-    elseif ($result -match 'empty') {
-        Write-Host "  Skipping empty commit" -ForegroundColor Cyan
-        git cherry-pick --skip 2>&1 | Out-Null
-    }
-    else {
-        Write-Host "  Error: $result" -ForegroundColor Red
-        Start-Sleep -Seconds 1
-    }
-}
-
-if ($attempts -ge $MaxAttempts) {
-    Write-Host "Max attempts reached. Check status manually." -ForegroundColor Red
-}

doc/devdocs/modules/launcher/new-plugin-checklist.md

@@ -3,9 +3,9 @@
 - [ ] The plugin is a project under `modules\launcher\Plugins`
 - [ ] Microsoft plugin project name pattern: `Microsoft.PowerToys.Run.Plugin.{PluginName}`
 - [ ] Community plugin project name pattern: `Community.PowerToys.Run.Plugin.{PluginName}`
-- [ ] The plugin target framework should be `net10.0-windows10.0.22621.0`
+- [ ] The plugin target framework should be `net9.0-windows10.0.22621.0`
 - [ ] If the plugin uses any 3rd party dependencies the project file should import `DynamicPlugin.props`
-- [ ] 3rd party dependencies must be compatible with .NET 10
+- [ ] 3rd party dependencies must be compatible with .NET 9
 - [ ] The plugin has to contain a `plugin.json` file of the following format in its root folder:
 
 ```json

doc/devdocs/modules/newplus.md

@@ -141,3 +141,10 @@ Note: The DllHost process loads the DLL only when the context menu is triggered
   - A signature issue with the MSIX package
   
 - For development and testing, using the Windows 10 handler can be easier since it doesn't require signing.
+
+## Restoring Built-in Windows New context menu
+If the Windows 11 built-in New context menu doesn't reappear on uninstalling PowerToys, some issue with settings etc. here's how to restore the built-in New context menu.
+
+1. Open Registry Editor
+1. Go to the key "Computer\HKEY_CURRENT_USER\Software\Classes\Directory\background\ShellEx\ContextMenuHandlers"
+1. Delete the "New" subkey (i.e. fullpath "Computer\HKEY_CURRENT_USER\Software\Classes\Directory\background\ShellEx\ContextMenuHandlers\New")

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -1119,6 +1119,35 @@ LExit:
     return WcaFinalize(er);
 }
 
+UINT __stdcall RestoreBuiltInNewContextMenuCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    hr = WcaInitialize(hInstall, "RestoreBuiltInNewContextMenuCA");
+
+    constexpr wchar_t built_in_new_registry_path[] = LR"(Software\Classes\Directory\Background\ShellEx\ContextMenuHandlers\New)";
+
+    HKEY key{};
+
+    if (RegOpenKeyExW(HKEY_CURRENT_USER,
+        built_in_new_registry_path,
+        0,
+        KEY_ALL_ACCESS,
+        &key) != ERROR_SUCCESS)
+    {
+        return WcaFinalize(ERROR_SUCCESS);
+    }
+
+    if (RegDeleteValueW(key, nullptr) != ERROR_SUCCESS)
+    {
+        RegCloseKey(key);
+        return WcaFinalize(ERROR_SUCCESS);
+    }
+
+    RegCloseKey(key);
+
+    return WcaFinalize(ERROR_SUCCESS);
+}
+
 UINT __stdcall TelemetryLogInstallSuccessCA(MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;
@@ -1565,7 +1594,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.PowerRename.exe",
         L"PowerToys.ImageResizer.exe",
         L"PowerToys.LightSwitchService.exe",
-        L"PowerToys.PowerDisplay.exe",
         L"PowerToys.GcodeThumbnailProvider.exe",
         L"PowerToys.BgcodeThumbnailProvider.exe",
         L"PowerToys.PdfThumbnailProvider.exe",

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

@@ -7,6 +7,7 @@ EXPORTS
 	ApplyModulesRegistryChangeSetsCA
 	DetectPrevInstallPathCA
 	RemoveScheduledTasksCA
+	RestoreBuiltInNewContextMenuCA
 	TelemetryLogInstallSuccessCA
 	TelemetryLogInstallCancelCA
 	TelemetryLogInstallFailCA

installer/PowerToysSetupVNext/DscResources.wxs

@@ -22,6 +22,16 @@
 
     <ComponentGroup Id="DscResourcesComponentGroup">
       <ComponentRef Id="PowerToysDSCReference" />
+      <?if $(var.PerUser) = "false" ?>
+      <Component Id="SecureDSCModulesFolder" Guid="7D2F4E57-CCB2-4F89-9B8B-62E9B3CC4E12" Directory="DSCModulesReferenceFolder" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="SecureDSCModulesFolder" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <CreateFolder>
+          <PermissionEx Sddl="D:PAI(A;OICI;GA;;;SY)(A;OICI;GA;;;BA)(A;OICI;GRGX;;;BU)(A;OICIIO;GA;;;CO)" />
+        </CreateFolder>
+      </Component>
+      <?endif?>
       <Component Id="RemoveDSCModulesFolder" Guid="A3C77D92-4E97-4C1A-9F2E-8B3C5D6E7F80" Directory="DSCModulesReferenceFolder">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveDSCModulesFolder" Value="" KeyPath="yes" />

installer/PowerToysSetupVNext/KeyboardManager.wxs

@@ -2,7 +2,29 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
+  <?define KeyboardManagerAssetsFiles=?>
+  <?define KeyboardManagerAssetsWinUI3Files=?>
+  <?define KeyboardManagerAssetsFilesPath=$(var.BinDir)\Assets\KeyboardManager\?>
+  <?define KeyboardManagerAssetsWinUI3FilesPath=$(var.BinDir)\WinUI3Apps\Assets\KeyboardManagerEditor\?>
+
   <Fragment>
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="KeyboardManagerAssetsInstallFolder" Name="KeyboardManager" />
+    </DirectoryRef>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="KeyboardManagerAssetsWinUI3InstallFolder" Name="KeyboardManagerEditor" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="KeyboardManagerAssetsInstallFolder" FileSource="$(var.KeyboardManagerAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--KeyboardManagerAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="KeyboardManagerAssetsWinUI3InstallFolder" FileSource="$(var.KeyboardManagerAssetsWinUI3FilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--KeyboardManagerAssetsWinUI3Files_Component_Def-->
+    </DirectoryRef>
+
     <DirectoryRef Id="INSTALLFOLDER">
       <Directory Id="KeyboardManagerEditorInstallFolder" Name="KeyboardManagerEditor" />
       <Directory Id="KeyboardManagerEngineInstallFolder" Name="KeyboardManagerEngine" />
@@ -44,6 +66,8 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveKeyboardManagerFolder" Value="" KeyPath="yes" />
         </RegistryKey>
+        <RemoveFolder Id="RemoveFolderKeyboardManagerAssetsInstallFolder" Directory="KeyboardManagerAssetsInstallFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveFolderKeyboardManagerAssetsWinUI3InstallFolder" Directory="KeyboardManagerAssetsWinUI3InstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderKeyboardManagerEditorFolder" Directory="KeyboardManagerEditorInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderKeyboardManagerEngineFolder" Directory="KeyboardManagerEngineInstallFolder" On="uninstall" />
       </Component>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -47,7 +47,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
       call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
       call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
-      call move /Y ..\..\..\PowerDisplay.wxs.bk ..\..\..\PowerDisplay.wxs
       call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
       call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
       call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
@@ -124,7 +123,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
-    <Compile Include="PowerDisplay.wxs" />
     <Compile Include="DscResources.wxs" />
     <Compile Include="RegistryPreview.wxs" />
     <Compile Include="Run.wxs" />

installer/PowerToysSetupVNext/Product.wxs

@@ -53,7 +53,6 @@
       <ComponentGroupRef Id="LightSwitchComponentGroup" />
       <ComponentGroupRef Id="PeekComponentGroup" />
       <ComponentGroupRef Id="PowerRenameComponentGroup" />
-      <ComponentGroupRef Id="PowerDisplayComponentGroup" />
       <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
       <ComponentGroupRef Id="RunComponentGroup" />
       <ComponentGroupRef Id="SettingsComponentGroup" />
@@ -162,6 +161,9 @@
       <!-- Clean Video Conference Mute registry keys that might be around from previous installations. We've deprecated this utility since then. -->
       <Custom Action="CleanVideoConferenceRegistry" Before="InstallFinalize" Condition="NOT Installed" />
 
+      <!-- Restore built-in "New" context menu in case user disabled it via New+ -->
+      <Custom Action="RestoreBuiltInNewContextMenu" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
+
     </InstallExecuteSequence>
 
     <CustomAction Id="SetLaunchPowerToysParam" Property="LaunchPowerToys" Value="[INSTALLFOLDER]" />
@@ -263,6 +265,8 @@
 
     <CustomAction Id="SetBundleInstallLocation" Return="ignore" Impersonate="no" Execute="deferred" DllEntry="SetBundleInstallLocationCA" BinaryRef="PTCustomActions" />
 
+    <CustomAction Id="RestoreBuiltInNewContextMenu" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="RestoreBuiltInNewContextMenuCA" BinaryRef="PTCustomActions" />
+
     <!-- Close 'PowerToys.exe' before uninstall-->
     <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
     <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -172,14 +172,16 @@ Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptR
 Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ImageResizer"
 Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs
 
+#KeyboardManager
+Generate-FileList -fileDepsJson "" -fileListName KeyboardManagerAssetsFiles -wxsFilePath $PSScriptRoot\KeyboardManager.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\KeyboardManager"
+Generate-FileList -fileDepsJson "" -fileListName KeyboardManagerAssetsWinUI3Files -wxsFilePath $PSScriptRoot\KeyboardManager.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\KeyboardManagerEditor"
+Generate-FileComponents -fileListName "KeyboardManagerAssetsFiles" -wxsFilePath $PSScriptRoot\KeyboardManager.wxs
+Generate-FileComponents -fileListName "KeyboardManagerAssetsWinUI3Files" -wxsFilePath $PSScriptRoot\KeyboardManager.wxs
+
 # Light Switch Service
 Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
 Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs
 
-#PowerDisplay
-Generate-FileList -fileDepsJson "" -fileListName PowerDisplayAssetsFiles -wxsFilePath $PSScriptRoot\PowerDisplay.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerDisplay"
-Generate-FileComponents -fileListName "PowerDisplayAssetsFiles" -wxsFilePath $PSScriptRoot\PowerDisplay.wxs
-
 #New+
 Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
 Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs

installer/PowerToysSetupVNext/publish.cmd

@@ -8,10 +8,10 @@ SET VCToolsVersion=!VCToolsVersion!
 SET ClearDevCommandPromptEnvVars=false
 
 rem In case of Release we should not use Debug CRT in VCRT forwarders
-msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
 
-msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
 
-msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
 
-msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net10.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0

src/ActionRunner/actionRunner.vcxproj

@@ -62,7 +62,7 @@
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -70,6 +70,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/ActionRunner/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/Common.Dotnet.CsWinRT.props

@@ -4,7 +4,7 @@
   <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
 
   <PropertyGroup>
-    <CoreTargetFramework>net10.0</CoreTargetFramework>
+    <CoreTargetFramework>net9.0</CoreTargetFramework>
     <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
     <TargetFramework>$(CoreTargetFramework)-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>

src/PackageIdentity/PackageIdentity.vcxproj

@@ -117,4 +117,4 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 
-</Project>
+</Project>

src/Update/PowerToys.Update.vcxproj

@@ -68,7 +68,7 @@
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -76,6 +76,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/Update/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/COMUtils/COMUtils.vcxproj

@@ -36,12 +36,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/COMUtils/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/Common.UI.Controls/Common.UI.Controls.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <RootNamespace>Microsoft.PowerToys.Common.UI.Controls</RootNamespace>
     <AssemblyName>PowerToys.Common.UI.Controls</AssemblyName>
     <UseWinUI>true</UseWinUI>

src/common/Common.UI.Controls/Controls/KeyVisual/KeyVisual.xaml

@@ -1,11 +1,11 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Common.UI.Controls">
+    xmlns:commoncontrols="using:Microsoft.PowerToys.Common.UI.Controls">
 
-    <Style BasedOn="{StaticResource DefaultKeyVisualStyle}" TargetType="local:KeyVisual" />
+    <Style BasedOn="{StaticResource DefaultKeyVisualStyle}" TargetType="commoncontrols:KeyVisual" />
 
-    <Style x:Key="DefaultKeyVisualStyle" TargetType="local:KeyVisual">
+    <Style x:Key="DefaultKeyVisualStyle" TargetType="commoncontrols:KeyVisual">
         <Setter Property="MinWidth" Value="16" />
         <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
         <Setter Property="IsTabStop" Value="False" />
@@ -25,7 +25,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KeyVisual">
+                <ControlTemplate TargetType="commoncontrols:KeyVisual">
                     <Grid
                         x:Name="KeyHolder"
                         MinWidth="{TemplateBinding MinWidth}"
@@ -40,7 +40,7 @@
                         <Grid.BackgroundTransition>
                             <BrushTransition Duration="0:0:0.083" />
                         </Grid.BackgroundTransition>
-                        <local:KeyCharPresenter
+                        <commoncontrols:KeyCharPresenter
                             x:Name="KeyPresenter"
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -87,12 +87,12 @@
     <Style
         x:Key="SubtleKeyVisualStyle"
         BasedOn="{StaticResource DefaultKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="commoncontrols:KeyVisual">
         <Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KeyVisual">
+                <ControlTemplate TargetType="commoncontrols:KeyVisual">
                     <Grid
                         x:Name="KeyHolder"
                         MinWidth="{TemplateBinding MinWidth}"
@@ -106,7 +106,7 @@
                         <Grid.BackgroundTransition>
                             <BrushTransition Duration="0:0:0.083" />
                         </Grid.BackgroundTransition>
-                        <local:KeyCharPresenter
+                        <commoncontrols:KeyCharPresenter
                             x:Name="KeyPresenter"
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -145,14 +145,14 @@
     <Style
         x:Key="AccentKeyVisualStyle"
         BasedOn="{StaticResource DefaultKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="commoncontrols:KeyVisual">
         <Setter Property="Background" Value="{ThemeResource AccentFillColorDefaultBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource AccentControlElevationBorderBrush}" />
         <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KeyVisual">
+                <ControlTemplate TargetType="commoncontrols:KeyVisual">
                     <Grid
                         x:Name="KeyHolder"
                         MinWidth="{TemplateBinding MinWidth}"
@@ -168,7 +168,7 @@
                         <Grid.BackgroundTransition>
                             <BrushTransition Duration="0:0:0.083" />
                         </Grid.BackgroundTransition>
-                        <local:KeyCharPresenter
+                        <commoncontrols:KeyCharPresenter
                             x:Name="KeyPresenter"
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"

src/common/FilePreviewCommon/FilePreviewCommon.csproj

@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Markdig.Signed" />
+    <PackageReference Include="System.Text.Encoding.CodePages" />
     <PackageReference Include="UTF.Unknown" />
   </ItemGroup>
 </Project>

src/common/GPOWrapper/GPOWrapper.cpp

@@ -292,4 +292,8 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredRunAtStartupValue());
     }
+    GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusHideBuiltInNewContextMenuValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusHideBuiltInNewContextMenuValue());
+    }
 }

src/common/GPOWrapper/GPOWrapper.h

@@ -78,6 +78,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetAllowDataDiagnosticsValue();
         static GpoRuleConfigured GetConfiguredRunAtStartupValue();
         static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue();
+        static GpoRuleConfigured GetConfiguredNewPlusHideBuiltInNewContextMenuValue();
     };
 }
 

src/common/GPOWrapper/GPOWrapper.idl

@@ -82,6 +82,7 @@ namespace PowerToys
             static GpoRuleConfigured GetAllowDataDiagnosticsValue();
             static GpoRuleConfigured GetConfiguredRunAtStartupValue();
             static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue();
+            static GpoRuleConfigured GetConfiguredNewPlusHideBuiltInNewContextMenuValue();
         }
     }
 }

src/common/ManagedCommon/ColorFormatHelper.cs

@@ -515,8 +515,7 @@ namespace ManagedCommon
                     return lightnessL.ToString(CultureInfo.InvariantCulture);
                 case "Lc":
                     var (lightnessC, _, _) = ConvertToCIELABColor(color);
-                    lightnessC = Math.Round(lightnessC, 2);
-                    return lightnessC.ToString(CultureInfo.InvariantCulture);
+                    return ColorPercentFormatted(lightnessC, paramFormat, 2);
                 case "Lo":
                     var (lightnessO, _, _) = ConvertToOklabColor(color);
                     lightnessO = Math.Round(lightnessO, 2);
@@ -531,12 +530,10 @@ namespace ManagedCommon
                     return blackness.ToString(CultureInfo.InvariantCulture);
                 case "Ca":
                     var (_, chromaticityA, _) = ConvertToCIELABColor(color);
-                    chromaticityA = Math.Round(chromaticityA, 2);
-                    return chromaticityA.ToString(CultureInfo.InvariantCulture);
+                    return ColorPercentFormatted(chromaticityA, paramFormat, 2);
                 case "Cb":
                     var (_, _, chromaticityB) = ConvertToCIELABColor(color);
-                    chromaticityB = Math.Round(chromaticityB, 2);
-                    return chromaticityB.ToString(CultureInfo.InvariantCulture);
+                    return ColorPercentFormatted(chromaticityB, paramFormat, 2);
                 case "Oa":
                     var (_, chromaticityAOklab, _) = ConvertToOklabColor(color);
                     chromaticityAOklab = Math.Round(chromaticityAOklab, 2);
@@ -595,6 +592,24 @@ namespace ManagedCommon
             }
         }
 
+        private static string ColorPercentFormatted(double colorPercentValue, char paramFormat, int defaultDecimalDigits)
+        {
+            switch (paramFormat)
+            {
+                case 'i':
+                    double roundedColorPercentValue = Math.Round(colorPercentValue);
+                    if (roundedColorPercentValue == 0)
+                    {
+                        // convert -0 to 0
+                        roundedColorPercentValue = 0.0;
+                    }
+
+                    return roundedColorPercentValue.ToString(CultureInfo.InvariantCulture);
+                default:
+                    return Math.Round(colorPercentValue, defaultDecimalDigits).ToString(CultureInfo.InvariantCulture);
+            }
+        }
+
         public static string GetDefaultFormat(string formatName)
         {
             switch (formatName)

src/common/SettingsAPI/SettingsAPI.vcxproj

@@ -55,7 +55,7 @@
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -63,6 +63,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/Telemetry/EtwTrace/EtwTrace.vcxproj

@@ -38,7 +38,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -46,6 +46,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/Telemetry/EtwTrace/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/UITestAutomation/UITestAutomation.csproj

@@ -8,7 +8,7 @@
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
@@ -18,6 +18,7 @@
     <!-- Test libraries/utilities should not use the metapackage. -->
     <PackageReference Include="MSTest.TestFramework" />
     <PackageReference Include="System.IO.Abstractions" />
+    <PackageReference Include="System.Text.RegularExpressions" />
     <PackageReference Include="CoenM.ImageSharp.ImageHash" />
   </ItemGroup>
 

src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj

@@ -27,7 +27,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\utils;..\Telemetry;..\..\;..\..\..\deps\;..\..\..\deps\spdlog\include;..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\utils;..\Telemetry;..\..\;..\..\..\deps\;..\..\..\deps\spdlog\include;..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp23</LanguageStandard>
       <PreprocessorDefinitions>SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_HEADER_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>

src/common/interop/Constants.cpp

@@ -287,4 +287,26 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::POWER_DISPLAY_TERMINATE_APP_MESSAGE;
     }
+    hstring Constants::MWBToggleEasyMouseEvent()
+    {
+        return CommonSharedConstants::MWB_TOGGLE_EASY_MOUSE_EVENT;
+    }
+    hstring Constants::MWBReconnectEvent()
+    {
+        return CommonSharedConstants::MWB_RECONNECT_EVENT;
+    }
+
+    hstring Constants::OpenNewKeyboardManagerEvent()
+    {
+        return CommonSharedConstants::OPEN_NEW_KEYBOARD_MANAGER_EVENT;
+    }
+    hstring Constants::ToggleKeyboardManagerActiveEvent()
+    {
+        return CommonSharedConstants::TOGGLE_KEYBOARD_MANAGER_ACTIVE_EVENT;
+    }
+    hstring Constants::KeyboardManagerEngineInstanceMutex()
+    {
+        return CommonSharedConstants::KEYBOARD_MANAGER_ENGINE_INSTANCE_MUTEX;
+    }
 }
+

src/common/interop/Constants.h

@@ -75,6 +75,11 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring PowerDisplayToggleMessage();
         static hstring PowerDisplayApplyProfileMessage();
         static hstring PowerDisplayTerminateAppMessage();
+        static hstring MWBToggleEasyMouseEvent();
+        static hstring MWBReconnectEvent();
+        static hstring OpenNewKeyboardManagerEvent();
+        static hstring ToggleKeyboardManagerActiveEvent();
+        static hstring KeyboardManagerEngineInstanceMutex();
     };
 }
 
@@ -84,3 +89,4 @@ namespace winrt::PowerToys::Interop::factory_implementation
     {
     };
 }
+

src/common/interop/Constants.idl

@@ -72,6 +72,12 @@ namespace PowerToys
             static String PowerDisplayToggleMessage();
             static String PowerDisplayApplyProfileMessage();
             static String PowerDisplayTerminateAppMessage();
+            static String MWBToggleEasyMouseEvent();
+            static String MWBReconnectEvent();
+            static String OpenNewKeyboardManagerEvent();
+            static String ToggleKeyboardManagerActiveEvent();
+            static String KeyboardManagerEngineInstanceMutex();
         }
     }
 }
+

src/common/interop/PowerToys.Interop.vcxproj

@@ -172,14 +172,14 @@
   <ImportGroup Label="ExtensionTargets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>

src/common/interop/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/interop/shared_constants.h

@@ -170,10 +170,20 @@ namespace CommonSharedConstants
     const wchar_t LIGHT_SWITCH_LIGHT_THEME_EVENT[] = L"Local\\PowerToysLightSwitch-LightThemeEvent-50077121-2ffc-4841-9c86-ab1bd3f9baca";
     const wchar_t LIGHT_SWITCH_DARK_THEME_EVENT[] = L"Local\\PowerToysLightSwitch-DarkThemeEvent-b3a835c0-eaa2-49b0-b8eb-f793e3df3368";
 
+    // Path to events used by Keyboard Manager
+    const wchar_t OPEN_NEW_KEYBOARD_MANAGER_EVENT[] = L"Local\\PowerToysOpenNewKeyboardManagerEvent-9c1d2e3f-4b5a-6c7d-8e9f-0a1b2c3d4e5f";
+    const wchar_t TOGGLE_KEYBOARD_MANAGER_ACTIVE_EVENT[] = L"Local\\PowerToysToggleKeyboardManagerActiveEvent-7f3a1d5c-2e94-4ff4-8b6a-90fd2bc4d2a7";
+    const wchar_t KEYBOARD_MANAGER_ENGINE_INSTANCE_MUTEX[] = L"Local\\PowerToys_KBMEngine_InstanceMutex";
+
     // used from quick access window
     const wchar_t CMDPAL_SHOW_EVENT[] = L"Local\\PowerToysCmdPal-ShowEvent-62336fcd-8611-4023-9b30-091a6af4cc5a";
     const wchar_t CMDPAL_EXIT_EVENT[] = L"Local\\PowerToysCmdPal-ExitEvent-eb73f6be-3f22-4b36-aee3-62924ba40bfd";
 
+    // Path to the events used by MouseWithoutBorders
+    const wchar_t MWB_TOGGLE_EASY_MOUSE_EVENT[] = L"Local\\PowerToysMWB-ToggleEasyMouseEvent-a9c8d7b6-e5f4-3c2a-1b0d-9e8f7a6b5c4d";
+    const wchar_t MWB_RECONNECT_EVENT[] = L"Local\\PowerToysMWB-ReconnectEvent-b8d7c6a5-f4e3-2b1c-0a9d-8e7f6a5b4c3d";
+
     // Max DWORD for key code to disable keys.
     const DWORD VK_DISABLED = 0x100;
 }
+

src/common/notifications/notifications.vcxproj

@@ -46,7 +46,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -54,6 +54,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/notifications/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/updating/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/common/updating/updating.vcxproj

@@ -58,7 +58,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -66,6 +66,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/utils/gpo.h

@@ -103,6 +103,7 @@ namespace powertoys_gpo
     const std::wstring POLICY_MWB_POLICY_DEFINED_IP_MAPPING_RULES = L"MwbPolicyDefinedIpMappingRules";
     const std::wstring POLICY_NEW_PLUS_HIDE_TEMPLATE_FILENAME_EXTENSION = L"NewPlusHideTemplateFilenameExtension";
     const std::wstring POLICY_NEW_PLUS_REPLACE_VARIABLES = L"NewPlusReplaceVariablesInTemplateFilenames";
+    const std::wstring POLICY_NEW_PLUS_HIDE_BUILT_IN_NEW_CONTEXT_MENU = L"NewPlusHideBuiltInNewContextMenu";
 
     // Methods used for reading the registry
 #pragma region ReadRegistryMethods
@@ -700,5 +701,10 @@ namespace powertoys_gpo
         return getConfiguredValue(POLICY_NEW_PLUS_REPLACE_VARIABLES);
     }
     
+    inline gpo_rule_configured_t getConfiguredNewPlusHideBuiltInNewContextMenuValue()
+    {
+        return getConfiguredValue(POLICY_NEW_PLUS_HIDE_BUILT_IN_NEW_CONTEXT_MENU);
+    }
+
 #pragma endregion IndividualModuleSettingPolicies
 }

src/gpo/assets/PowerToys.admx

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.19" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.20" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <policyNamespaces>
     <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
   </policyNamespaces>
-  <resources minRequiredRevision="1.19"/><!-- Last changed with PowerToys v0.97.0 -->
+  <resources minRequiredRevision="1.20"/><!-- Last changed with PowerToys v0.98.0 -->
   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -28,6 +28,7 @@
       <definition name="SUPPORTED_POWERTOYS_0_90_0" displayName="$(string.SUPPORTED_POWERTOYS_0_90_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_96_0" displayName="$(string.SUPPORTED_POWERTOYS_0_96_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_97_0" displayName="$(string.SUPPORTED_POWERTOYS_0_97_0)"/>
+      <definition name="SUPPORTED_POWERTOYS_0_98_0" displayName="$(string.SUPPORTED_POWERTOYS_0_98_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1)"/>
     </definitions>
   </supportedOn>
@@ -149,6 +150,7 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <!-- TEMPORARILY_DISABLED: PowerDisplay
     <policy name="ConfigureEnabledUtilityPowerDisplay" class="Both" displayName="$(string.ConfigureEnabledUtilityPowerDisplay)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityPowerDisplay">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_95_0" />
@@ -159,6 +161,7 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    -->
     <policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />
@@ -824,5 +827,15 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="NewPlusHideBuiltInNewContextMenu" class="Both" displayName="$(string.NewPlusHideBuiltInNewContextMenu)" explainText="$(string.NewPlusHideBuiltInNewContextMenuDescription)" key="Software\Policies\PowerToys" valueName="NewPlusHideBuiltInNewContextMenu">
+      <parentCategory ref="NewPlus" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_98_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
   </policies>
 </policyDefinitions>

src/gpo/assets/en-US/PowerToys.adml

@@ -35,6 +35,7 @@
       <string id="SUPPORTED_POWERTOYS_0_90_0">PowerToys version 0.90.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_96_0">PowerToys version 0.96.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_97_0">PowerToys version 0.97.0 or later</string>
+      <string id="SUPPORTED_POWERTOYS_0_98_0">PowerToys version 0.98.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1">From PowerToys version 0.64.0 until PowerToys version 0.87.1</string>
 
       <string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.
@@ -238,7 +239,7 @@ If you disable this policy, the setting is disabled and variables in filenames w
 
 If you don't configure this policy, the user will be able to control the setting and can enable or disable it.
 </string>
-
+        
       <string id="ConfigureAllUtilityGlobalEnabledState">Configure global utility enabled state</string>
       <string id="ConfigureEnabledUtilityAdvancedPaste">Advanced Paste: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityAlwaysOnTop">Always On Top: Configure enabled state</string>
@@ -248,7 +249,7 @@ If you don't configure this policy, the user will be able to control the setting
       <string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
-      <string id="ConfigureEnabledUtilityPowerDisplay">PowerDisplay: Configure enabled state</string>
+      <!-- <string id="ConfigureEnabledUtilityPowerDisplay">PowerDisplay: Configure enabled state</string> --><!-- TEMPORARILY_DISABLED: PowerDisplay -->
       <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>
@@ -356,6 +357,15 @@ If you disable this policy, users will not be able to select or use Foundry Loca
       <string id="AllowDiagnosticData">Allow sending diagnostic data</string>
       <string id="ConfigureRunAtStartup">Configure the run at startup setting</string>
       <string id="NewPlusReplaceVariablesInTemplateFilenames">Replace variables in template filenames</string>
+      <string id="NewPlusHideBuiltInNewContextMenu">Hide the built-in "New" context menu</string>
+      <string id="NewPlusHideBuiltInNewContextMenuDescription">This policy configures if Windows' built-in New context menu should be hidden on the context menu.
+
+If you enable this policy, then the built-in New context menu will be hidden, and user can only create new files and folders using New+ and the explorer toolbar New button.
+
+If you disable this policy, then the build-in New context menu will be displayed as normal in Windows.
+
+If you don't configure this policy, the user will be able to control the setting and can enable or disable it.
+</string>        
     </stringTable>
 
     <presentationTable>
@@ -369,4 +379,3 @@ If you disable this policy, users will not be able to select or use Foundry Loca
 
   </resources>
 </policyDefinitionResources>
-

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj

@@ -74,6 +74,8 @@
     <PackageReference Include="ReverseMarkdown" />
     <PackageReference Include="StreamJsonRpc" />
     <PackageReference Include="WinUIEx" />
+    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+    <PackageReference Include="System.Text.Json" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
     <PackageReference Include="Microsoft.Web.WebView2" />
     <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->

src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPaste-UITests.csproj

@@ -20,6 +20,9 @@
 	<ItemGroup>
 		<PackageReference Include="Appium.WebDriver" />
 		<PackageReference Include="MSTest" />
+		<PackageReference Include="System.Net.Http" />
+		<PackageReference Include="System.Private.Uri" />
+		<PackageReference Include="System.Text.RegularExpressions" />
 	</ItemGroup>
 
 	<ItemGroup>

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -161,7 +161,7 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets" Condition="Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -170,6 +170,6 @@
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/modules/CropAndLock/CropAndLock/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="robmikh.common" version="0.0.23-beta" targetFramework="native" />
 </packages>

src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj

@@ -103,7 +103,7 @@
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets" Condition="Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -113,6 +113,6 @@
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\robmikh.common.0.0.23-beta\build\native\robmikh.common.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/modules/CropAndLock/CropAndLockModuleInterface/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj

@@ -65,6 +65,8 @@
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
     <PackageReference Include="WinUIEx" />
+    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+    <PackageReference Include="System.Text.Json" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
     <PackageReference Include="Microsoft.Web.WebView2" />
     <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj

@@ -49,6 +49,8 @@
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" />
     <PackageReference Include="System.IO.Abstractions" />
+    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+    <PackageReference Include="System.Text.Json" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 

src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj

@@ -144,14 +144,14 @@ MakeAppx.exe pack /d . /p $(OutDir)FileLocksmithContextMenuPackage.msix /nv</Com
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>

src/modules/FileLocksmith/FileLocksmithContextMenu/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj

@@ -61,6 +61,7 @@
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <PackageReference Include="System.Drawing.Common" />
     <PackageReference Include="WinUIEx" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
     <PackageReference Include="Microsoft.Web.WebView2" />

src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>

src/modules/Hosts/Hosts.FuzzTests/OneFuzzConfig.json

@@ -5,7 +5,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv4",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -46,7 +46,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv6",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -87,7 +87,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidHosts",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -128,7 +128,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzWriteAsync",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"

src/modules/Hosts/Hosts.UITests/HostsEditor.UITests.csproj

@@ -31,6 +31,9 @@
 
     <ItemGroup>
       <PackageReference Include="MSTest" />
+      <PackageReference Include="System.Net.Http" />
+      <PackageReference Include="System.Private.Uri" />
+      <PackageReference Include="System.Text.RegularExpressions" />
       <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
     </ItemGroup>
 </Project>

src/modules/Hosts/Hosts/Hosts.csproj

@@ -64,6 +64,8 @@
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
     <PackageReference Include="WinUIEx" />
+    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+    <PackageReference Include="System.Text.Json" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
     <PackageReference Include="Microsoft.Web.WebView2" />
     <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->

src/modules/Hosts/HostsUILib/Helpers/HostsService.cs

@@ -16,7 +16,6 @@ using System.Threading.Tasks;
 using HostsUILib.Exceptions;
 using HostsUILib.Models;
 using HostsUILib.Settings;
-using Microsoft.Win32;
 
 namespace HostsUILib.Helpers
 {
@@ -223,64 +222,17 @@ namespace HostsUILib.Helpers
 
         public void OpenHostsFile()
         {
-            var notepadFallback = false;
-
             try
             {
-                // Try to open in default editor
-                var key = Registry.ClassesRoot.OpenSubKey("SystemFileAssociations\\text\\shell\\edit\\command");
-                if (key != null)
-                {
-                    var commandPattern = key.GetValue(string.Empty).ToString(); // Default value
-                    var file = null as string;
-                    var args = null as string;
-
-                    if (commandPattern.StartsWith('\"'))
-                    {
-                        var endQuoteIndex = commandPattern.IndexOf('\"', 1);
-                        if (endQuoteIndex != -1)
-                        {
-                            file = commandPattern[1..endQuoteIndex];
-                            args = commandPattern[(endQuoteIndex + 1)..].Trim();
-                        }
-                    }
-                    else
-                    {
-                        var spaceIndex = commandPattern.IndexOf(' ');
-                        if (spaceIndex != -1)
-                        {
-                            file = commandPattern[..spaceIndex];
-                            args = commandPattern[(spaceIndex + 1)..].Trim();
-                        }
-                    }
-
-                    if (file != null && args != null)
-                    {
-                        args = args.Replace("%1", HostsFilePath);
-                        Process.Start(new ProcessStartInfo(file, args));
-                    }
-                    else
-                    {
-                        notepadFallback = true;
-                    }
-                }
+                var notepadPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.Windows),
+                    "System32",
+                    "notepad.exe");
+                Process.Start(new ProcessStartInfo(notepadPath, HostsFilePath));
             }
             catch (Exception ex)
             {
-                LoggerInstance.Logger.LogError("Failed to open default editor", ex);
-                notepadFallback = true;
-            }
-
-            if (notepadFallback)
-            {
-                try
-                {
-                    Process.Start(new ProcessStartInfo("notepad.exe", HostsFilePath));
-                }
-                catch (Exception ex)
-                {
-                    LoggerInstance.Logger.LogError("Failed to open notepad", ex);
-                }
+                LoggerInstance.Logger.LogError("Failed to open notepad", ex);
             }
         }
 

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -118,7 +118,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.260126.7\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
 </Project>

src/modules/LightSwitch/LightSwitchService/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.260126.7" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj

@@ -13,13 +13,11 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -112,12 +110,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="COMPLETE_REWRITE_SUMMARY.md" />
-    <None Include="CRITICAL_BUG_ANALYSIS.md" />
-    <None Include="CURSOR_WRAP_FIX_ANALYSIS.md" />
-    <None Include="DEBUG_GUIDE.md" />
+    <None Include="CursorWrapTests\WrapSimulator\test_new_algorithm.py" />
     <None Include="packages.config" />
-    <None Include="VERTICAL_WRAP_BUG_FIX.md" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
@@ -130,4 +124,4 @@
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-</Project>
+</Project>