fix: address issue #37800

.claude/CLAUDE.md

@@ -1 +0,0 @@
-../.github/copilot-instructions.md

.claude/agents

@@ -1 +0,0 @@
-../.github/agents

.claude/commands

@@ -1 +0,0 @@
-../.github/prompts

.claude/rules

@@ -1 +0,0 @@
-../.github/instructions

.claude/skills

@@ -1 +0,0 @@
-../.github/skills

.config/configuration.vsEnterprise.winget

@@ -1,5 +1,5 @@
 # yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
     - resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio 2026 Enterprise (Any edition will work)
+        description: Install Visual Studio 2022 Enterprise (Any edition will work)
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        id: Microsoft.VisualStudio.Enterprise
+        id: Microsoft.VisualStudio.2022.Enterprise
         source: winget
     - resource: Microsoft.VisualStudio.DSC/VSComponents
       dependsOn:
@@ -29,7 +29,7 @@ properties:
         securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Enterprise
-        channelId: VisualStudio.18.Release
+        channelId: VisualStudio.17.Release
         vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
   configurationVersion: 0.2.0
 

.config/configuration.vsProfessional.winget

@@ -1,5 +1,5 @@
 # yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
     - resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio 2026 Professional (Any edition will work)
+        description: Install Visual Studio 2022 Professional (Any edition will work)
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        id: Microsoft.VisualStudio.Professional
+        id: Microsoft.VisualStudio.2022.Professional
         source: winget
     - resource: Microsoft.VisualStudio.DSC/VSComponents
       dependsOn:
@@ -29,7 +29,7 @@ properties:
         securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Professional
-        channelId: VisualStudio.18.Release
+        channelId: VisualStudio.17.Release
         vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
   configurationVersion: 0.2.0
 

.config/configuration.winget

@@ -1,5 +1,5 @@
 # yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
     - resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio 2026 Community (Any edition will work)
+        description: Install Visual Studio 2022 Community (Any edition will work)
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        id: Microsoft.VisualStudio.Community
+        id: Microsoft.VisualStudio.2022.Community
         source: winget
     - resource: Microsoft.VisualStudio.DSC/VSComponents
       dependsOn:
@@ -29,7 +29,7 @@ properties:
         securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Community
-        channelId: VisualStudio.18.Release
+        channelId: VisualStudio.17.Release
         vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
   configurationVersion: 0.2.0
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -40,6 +40,7 @@ body:
       - Other (please specify in "Steps to Reproduce")
   validations:
     required: true
+
 - type: dropdown
   attributes:
     label: Area(s) with issue?
@@ -105,13 +106,7 @@ 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

@@ -38,7 +38,6 @@ Gbps
 gcode
 Heatshrink
 Mbits
-Kbits
 MBs
 mkv
 msix
@@ -98,7 +97,6 @@ Yubico
 Perplexity
 Groq
 svgl
-devhome
 
 # KEYS
 
@@ -315,7 +313,6 @@ xef
 xes
 PACKAGEVERSIONNUMBER
 APPXMANIFESTVERSION
-PROGMAN
 
 # MRU lists
 CACHEWRITE
@@ -325,15 +322,6 @@ REGSTR
 
 # Misc Win32 APIs and PInvokes
 INVOKEIDLIST
-MEMORYSTATUSEX
-ABE
-HTCAPTION
-POSCHANGED
-QUERYPOS
-SETAUTOHIDEBAR
-WINDOWPOS
-WINEVENTPROC
-WORKERW
 
 # PowerRename metadata pattern abbreviations (used in tests and regex patterns)
 DDDD
@@ -354,10 +342,3 @@ reportbug
 #ffmpeg
 crf
 nostdin
-
-# Performance counter keys
-engtype
-Nonpaged
-
-# XAML
-Untargeted

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

@@ -192,7 +192,6 @@ ycv
 yeelam
 Yuniardi
 yuyoyuppe
-zadjii
 Zeol
 Zhao
 Zhaopeng
@@ -207,7 +206,6 @@ Bilibili
 BVID
 capturevideosample
 cmdow
-Contoso
 Controlz
 cortana
 devhints
@@ -230,7 +228,6 @@ regedit
 roslyn
 Skia
 Spotify
-taskmgr
 tldr
 Vanara
 wangyi
@@ -246,3 +243,4 @@ xamlstyler
 Xavalon
 Xbox
 Youdao
+zadjii

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

@@ -1,63 +0,0 @@
-acq
-APPLYTOSUBMENUS
-AUDCLNT
-bitmaps
-BUFFERFLAGS
-centiseconds
-Ctl
-CTLCOLOR
-CTLCOLORBTN
-CTLCOLORDLG
-CTLCOLOREDIT
-CTLCOLORLISTBOX
-CTrim
-DFCS
-dlg
-dlu
-DONTCARE
-DRAWITEM
-DRAWITEMSTRUCT
-DWLP
-EDITCONTROL
-ENABLEHOOK
-FDE
-GETCHANNELRECT
-GETCHECK
-GETTHUMBRECT
-GIFs
-HTBOTTOMRIGHT
-HTHEME
-KSDATAFORMAT
-LEFTNOWORDWRAP
-letterbox
-lld
-logfont
-lround
-MENUINFO
-mic
-MMRESULT
-OWNERDRAW
-PBGRA
-pfdc
-playhead
-pwfx
-quantums
-REFKNOWNFOLDERID
-reposted
-SCROLLSIZEGRIP
-SETDEFID
-SETRECT
-SHAREMODE
-SHAREVIOLATION
-STREAMFLAGS
-submix
-tci
-TEXTMETRIC
-tme
-TRACKMOUSEEVENT
-Unadvise
-WASAPI
-WAVEFORMATEX
-WAVEFORMATEXTENSIBLE
-wil
-WMU

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

@@ -101,7 +101,6 @@
 ^doc/devdocs/akaLinks\.md$
 ^NOTICE\.md$
 ^src/common/CalculatorEngineCommon/exprtk\.hpp$
-^src/common/UnitTests-CommonUtils/
 ^src/common/ManagedCommon/ColorFormatHelper\.cs$
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
@@ -110,8 +109,7 @@
 ^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
 ^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/cmdpal/Microsoft\.CmdPal\.UI/Settings/InternalPage\.SampleData\.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/.*\.TestData\.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/Text/.*\.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Core\.Common\.UnitTests/.*\.TestData\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$
@@ -143,5 +141,3 @@ ignore$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
 ^src/common/CalculatorEngineCommon/exprtk\.hpp$
 src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs
-^src/modules/powerrename/unittests/testdata/avif_test\.avif$
-^src/modules/powerrename/unittests/testdata/heif_test\.heic$

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

@@ -274,21 +274,5 @@ St&yle
 # 0x6f677548 is user name but user folder causes a flag
 \bx6f677548\b
 
-# Windows API constants and hardware interface terms
-\bCOINIT[_A-Z]*\b
-\bEOAC[_A-Z]*\b
-\b(?:RPC_C_AUTHN_)?WINNT\b
-\bUPDATEREGISTRY\b
-\b(?:CDS_)?UPDATEREGISTRY\b
-
-# Display interface terms (HDMI, DVI, DisplayPort)
-\b(?:HDMI|DVI|DisplayPort)(?:-\d+)?\b
-
-# 2D Region struct names
-\bDisplayConfig2?D?Region\b
-
 # 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** — 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.
+- GitHub CLI (`gh`) installed and authenticated
 - MCP Server: github-mcp-server installed
 - GitHub Copilot code review enabled for the org/repo
 
@@ -49,10 +49,6 @@ Generated Files/ReleaseNotes/
 
 ```
 ┌────────────────────────────────┐
-│ 1.0 Verify gh auth + MemberList │
-└────────────────────────────────┘
-              ↓
-┌────────────────────────────────┐
 │ 1.1 Collect PRs (stable range) │
 └────────────────────────────────┘
               ↓
@@ -89,7 +85,6 @@ 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 in [#1234](https://github.com/microsoft/PowerToys/pull/1234) by [@PesBandi](https://github.com/PesBandi)  
+ - Added mouse button actions so you can choose what left, right, or middle click does. Thanks [@PesBandi](https://github.com/PesBandi)!  
 
- - 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)  
+ - Aligned window styling with current Windows theme for a cleaner look. Thanks [@sadirano](https://github.com/sadirano)!  
 
- - 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)
+ - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
 
- - 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)
+ - 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.
 
- - 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)  
+ - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!  

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

@@ -1,7 +1,6 @@
 # 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)
@@ -21,34 +20,6 @@
 
 ---
 
-## 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).
@@ -109,8 +80,6 @@ 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)
-- 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.
+- If the column `NeedThanks` in CSV is `True`, append: `Thanks [@Author](https://github.com/Author)!`
 - 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 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)
+- Wrapped paste option lists in a single ScrollViewer
+- Added image input handling for AI-powered transformations
 ...
 
 ## Awake
 
-- Fixed timed mode expiration in [#5680](https://github.com/microsoft/PowerToys/pull/5680) by [@daverayment](https://github.com/daverayment)
+- Fixed timed mode expiration. Thanks [@daverayment](https://github.com/daverayment)!
 ...
 
 ---

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

@@ -42,7 +42,30 @@ param(
     [string]$OutputJson = "milestone_prs.json"
 )
 
-# (See top-level synopsis above for full documentation)
+<#
+.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.
+#>
 
 function Write-Info($msg) { Write-Host $msg -ForegroundColor Cyan }
 function Write-Warn($msg) { Write-Host $msg -ForegroundColor Yellow }
@@ -128,11 +151,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 '' }
@@ -187,63 +210,6 @@ $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 {
@@ -341,45 +307,22 @@ foreach ($pr in $prNumbers) {
         $bodyValue = if ($json.body) { ($json.body -replace "`r", '') -replace "`n", ' ' } else { '' }
         $bodyValue = $bodyValue -replace '\s+', ' '
 
-        # Collect all contributors: PR author + co-authors from commit messages
+        # Determine if author needs thanks (not in member list)
         $authorLogin = $json.author.login
-        $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
-            }
+        $needThanks = $true
+        if ($memberList.Count -gt 0 -and $authorLogin) {
+            $needThanks = -not ($memberList -contains $authorLogin)
         }
 
-        # 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 = $authorField
+            Author = $authorLogin
             Url = $json.url
             Body = $bodyValue
             CopilotSummary = $copilot.Summary
-            NeedThanks = $needThanksField
+            NeedThanks = $needThanks
         }
     }
     catch {

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

@@ -1,21 +0,0 @@
-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

@@ -1,192 +0,0 @@
----
-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

@@ -1,505 +0,0 @@
-<#
-.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

@@ -1,208 +0,0 @@
-<#
-.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

@@ -1,29 +0,0 @@
-<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

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

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

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

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

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

.pipelines/ESRPSigning_core.json

@@ -18,7 +18,6 @@
             "StylesReportTool\\PowerToys.StylesReportTool.exe",
 
             "CalculatorEngineCommon.dll",
-            "PowerToys.Common.UI.Controls.dll",
             "PowerToys.ManagedTelemetry.dll",
             "PowerToys.ManagedCommon.dll",
             "PowerToys.ManagedCsWin32.dll",
@@ -106,13 +105,7 @@
             "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",
@@ -217,8 +210,6 @@
             "PowerToys.PowerAccentModuleInterface.dll",
             "PowerToys.PowerAccentKeyboardService.dll",
 
-            "PowerDisplay.Lib.dll",
-
             "WinUI3Apps\\PowerToys.PowerRenameExt.dll",
             "WinUI3Apps\\PowerToys.PowerRename.exe",
             "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
@@ -387,8 +378,6 @@
                 "UnitsNet.dll",
                 "UtfUnknown.dll",
                 "Wpf.Ui.dll",
-                "WmiLight.dll",
-                "WmiLight.Native.dll",
                 "Shmuelie.WinRTServer.dll",
                 "ToolGood.Words.Pinyin.dll"
             ],

.pipelines/UpdateVersions.ps1

@@ -13,36 +13,9 @@ Param(
 
   # Root folder Path for processing
   [Parameter(Mandatory=$False,Position=4)]
-  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json",
-
-  # Use Azure Pipeline artifact as source for metapackage
-  [Parameter(Mandatory=$False,Position=5)]
-  [boolean]$useArtifactSource = $False,
-
-  # Azure DevOps organization URL
-  [Parameter(Mandatory=$False,Position=6)]
-  [string]$azureDevOpsOrg = "https://dev.azure.com/microsoft",
-
-  # Azure DevOps project name
-  [Parameter(Mandatory=$False,Position=7)]
-  [string]$azureDevOpsProject = "ProjectReunion",
-
-  # Pipeline build ID (or "latest" for latest build)
-  [Parameter(Mandatory=$False,Position=8)]
-  [string]$buildId = "",
-
-  # Artifact name containing the NuGet packages
-  [Parameter(Mandatory=$False,Position=9)]
-  [string]$artifactName = "WindowsAppSDK_Nuget_And_MSIX",
-
-  # Metapackage name to look for in artifact
-  [Parameter(Mandatory=$False,Position=10)]
-  [string]$metaPackageName = "Microsoft.WindowsAppSDK"
+  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 )
 
-# Script-level constants
-$script:PackageVersionRegex = '^(.+?)\.(\d+\..*)$'
-
 
 
 function Read-FileWithEncoding {
@@ -84,7 +57,7 @@ function Add-NuGetSourceAndMapping {
 
     # Ensure packageSources exists
     if (-not $Xml.configuration.packageSources) {
-        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSources"))
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSources")) | Out-Null
     }
     $sources = $Xml.configuration.packageSources
 
@@ -93,13 +66,13 @@ function Add-NuGetSourceAndMapping {
     if (-not $sourceNode) {
         $sourceNode = $Xml.CreateElement("add")
         $sourceNode.SetAttribute("key", $Key)
-        $null = $sources.AppendChild($sourceNode)
+        $sources.AppendChild($sourceNode) | Out-Null
     }
     $sourceNode.SetAttribute("value", $Value)
 
     # Ensure packageSourceMapping exists
     if (-not $Xml.configuration.packageSourceMapping) {
-        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping"))
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping")) | Out-Null
     }
     $mapping = $Xml.configuration.packageSourceMapping
 
@@ -107,7 +80,7 @@ function Add-NuGetSourceAndMapping {
     $invalidNodes = $mapping.SelectNodes("packageSource[not(@key) or @key='']")
     if ($invalidNodes) {
         foreach ($node in $invalidNodes) {
-            $null = $mapping.RemoveChild($node)
+            $mapping.RemoveChild($node) | Out-Null
         }
     }
 
@@ -118,9 +91,9 @@ function Add-NuGetSourceAndMapping {
         $mappingSource.SetAttribute("key", $Key)
         # Insert at top for priority
         if ($mapping.HasChildNodes) {
-            $null = $mapping.InsertBefore($mappingSource, $mapping.FirstChild)
+            $mapping.InsertBefore($mappingSource, $mapping.FirstChild) | Out-Null
         } else {
-            $null = $mapping.AppendChild($mappingSource)
+            $mapping.AppendChild($mappingSource) | Out-Null
         }
     }
     
@@ -137,273 +110,14 @@ function Add-NuGetSourceAndMapping {
     foreach ($pattern in $Patterns) {
         $pkg = $Xml.CreateElement("package")
         $pkg.SetAttribute("pattern", $pattern)
-        $null = $mappingSource.AppendChild($pkg)
+        $mappingSource.AppendChild($pkg) | Out-Null
     }
 }
 
-function Download-ArtifactFromPipeline {
-    param (
-        [string]$Organization,
-        [string]$Project,
-        [string]$BuildId,
-        [string]$ArtifactName,
-        [string]$OutputDir
-    )
-
-    Write-Host "Downloading artifact '$ArtifactName' from build $BuildId..."
-    $null = New-Item -ItemType Directory -Path $OutputDir -Force
-
-    try {
-        # Authenticate with Azure DevOps using System Access Token (if available)
-        if ($env:SYSTEM_ACCESSTOKEN) {
-            Write-Host "Authenticating with Azure DevOps using System Access Token..."
-            $env:AZURE_DEVOPS_EXT_PAT = $env:SYSTEM_ACCESSTOKEN
-        } else {
-            Write-Host "No SYSTEM_ACCESSTOKEN found, assuming az CLI is already authenticated..."
-        }
-
-        # Use az CLI to download artifact
-        & az pipelines runs artifact download `
-            --organization $Organization `
-            --project $Project `
-            --run-id $BuildId `
-            --artifact-name $ArtifactName `
-            --path $OutputDir
-
-        if ($LASTEXITCODE -eq 0) {
-            Write-Host "Successfully downloaded artifact to $OutputDir"
-            return $true
-        } else {
-            Write-Warning "Failed to download artifact. Exit code: $LASTEXITCODE"
-            return $false
-        }
-    } catch {
-        Write-Warning "Error downloading artifact: $_"
-        return $false
-    }
-}
-
-function Get-NuspecDependencies {
-    param (
-        [string]$NupkgPath,
-        [string]$TargetFramework = ""
-    )
-
-    $tempDir = Join-Path $env:TEMP "nuspec_parse_$(Get-Random)"
-
-    try {
-        # Extract .nupkg (it's a zip file)
-        # Workaround: Expand-Archive may not recognize .nupkg extension, so copy to .zip first
-        $tempZip = Join-Path $env:TEMP "temp_$(Get-Random).zip"
-        Copy-Item $NupkgPath -Destination $tempZip -Force
-        Expand-Archive -Path $tempZip -DestinationPath $tempDir -Force
-        Remove-Item $tempZip -Force -ErrorAction SilentlyContinue
-
-        # Find .nuspec file
-        $nuspecFile = Get-ChildItem -Path $tempDir -Filter "*.nuspec" -Recurse | Select-Object -First 1
-
-        if (-not $nuspecFile) {
-            Write-Warning "No .nuspec file found in $NupkgPath"
-            return @{}
-        }
-
-        [xml]$nuspec = Get-Content $nuspecFile.FullName
-
-        # Extract package info
-        $packageId = $nuspec.package.metadata.id
-        $version = $nuspec.package.metadata.version
-        Write-Host "Parsing $packageId version $version"
-
-        # Parse dependencies
-        $dependencies = @{}
-        $depGroups = $nuspec.package.metadata.dependencies.group
-
-        if ($depGroups) {
-            # Dependencies are grouped by target framework
-            foreach ($group in $depGroups) {
-                $fx = $group.targetFramework
-                Write-Host "  Target Framework: $fx"
-
-                foreach ($dep in $group.dependency) {
-                    $depId = $dep.id
-                    $depVer = $dep.version
-                    # Remove version range brackets if present (e.g., "[2.0.0]" -> "2.0.0")
-                    $depVer = $depVer -replace '[\[\]]', ''
-                    $dependencies[$depId] = $depVer
-                    Write-Host "    - ${depId} : ${depVer}"
-                }
-            }
-        } else {
-            # No grouping, direct dependencies
-            $deps = $nuspec.package.metadata.dependencies.dependency
-            if ($deps) {
-                foreach ($dep in $deps) {
-                    $depId = $dep.id
-                    $depVer = $dep.version
-                    $depVer = $depVer -replace '[\[\]]', ''
-                    $dependencies[$depId] = $depVer
-                    Write-Host "  - ${depId} : ${depVer}"
-                }
-            }
-        }
-
-        return $dependencies
-    }
-    catch {
-        Write-Warning "Failed to parse nuspec: $_"
-        return @{}
-    }
-    finally {
-        Remove-Item $tempDir -Recurse -Force -ErrorAction SilentlyContinue
-    }
-}
-
-function Resolve-ArtifactBasedDependencies {
-    param (
-        [string]$ArtifactDir,
-        [string]$MetaPackageName,
-        [string]$SourceUrl,
-        [string]$OutputDir
-    )
-
-    Write-Host "Resolving dependencies from artifact-based metapackage..."
-    $null = New-Item -ItemType Directory -Path $OutputDir -Force
-
-    # Find the metapackage in artifact
-    $metaNupkg = Get-ChildItem -Path $ArtifactDir -Recurse -Filter "$MetaPackageName.*.nupkg" |
-                 Where-Object { $_.Name -notmatch "Runtime" } |
-                 Select-Object -First 1
-
-    if (-not $metaNupkg) {
-        Write-Warning "Metapackage $MetaPackageName not found in artifact"
-        return @{}
-    }
-
-    # Extract version from filename
-    if ($metaNupkg.Name -match "$MetaPackageName\.(.+)\.nupkg") {
-        $metaVersion = $Matches[1]
-        Write-Host "Found metapackage: $MetaPackageName version $metaVersion"
-    } else {
-        Write-Warning "Could not extract version from $($metaNupkg.Name)"
-        return @{}
-    }
-
-    # Parse dependencies from metapackage
-    $dependencies = Get-NuspecDependencies -NupkgPath $metaNupkg.FullName
-
-    # Copy metapackage to output directory
-    Copy-Item $metaNupkg.FullName -Destination $OutputDir -Force
-    Write-Host "Copied metapackage to $OutputDir"
-
-    # Prepare package versions hashtable - initialize with metapackage version
-    $packageVersions = @{ $MetaPackageName = $metaVersion }
-
-    # Copy Runtime package from artifact (it's not in feed) and extract its version
-    $runtimeNupkg = Get-ChildItem -Path $ArtifactDir -Recurse -Filter "$MetaPackageName.Runtime.*.nupkg" | Select-Object -First 1
-    if ($runtimeNupkg) {
-        Copy-Item $runtimeNupkg.FullName -Destination $OutputDir -Force
-        Write-Host "Copied Runtime package to $OutputDir"
-
-        # Extract version from Runtime package filename
-        if ($runtimeNupkg.Name -match "$MetaPackageName\.Runtime\.(.+)\.nupkg") {
-            $runtimeVersion = $Matches[1]
-            $packageVersions["$MetaPackageName.Runtime"] = $runtimeVersion
-            Write-Host "Extracted Runtime package version: $runtimeVersion"
-        } else {
-            Write-Warning "Could not extract version from Runtime package: $($runtimeNupkg.Name)"
-        }
-    }
-
-    # Download other dependencies from feed (excluding Runtime as it's already copied)
-    # Create temp nuget.config that includes both local packages and remote feed
-    # This allows NuGet to find packages already copied from artifact
-    $tempConfig = Join-Path $env:TEMP "nuget_artifact_$(Get-Random).config"
-    $tempConfigContent = @"
-<?xml version='1.0' encoding='utf-8'?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key='LocalPackages' value='$OutputDir' />
-    <add key='RemoteFeed' value='$SourceUrl' />
-  </packageSources>
-</configuration>
-"@
-    Set-Content -Path $tempConfig -Value $tempConfigContent
-
-    try {
-        foreach ($depId in $dependencies.Keys) {
-            # Skip Runtime as it's already copied from artifact
-            if ($depId -like "*Runtime*") {
-                # Don't overwrite the version we extracted from the Runtime package filename
-                if (-not $packageVersions.ContainsKey($depId)) {
-                    $packageVersions[$depId] = $dependencies[$depId]
-                }
-                Write-Host "Skipping $depId (already in artifact)"
-                continue
-            }
-
-            $depVersion = $dependencies[$depId]
-            Write-Host "Downloading dependency: $depId version $depVersion from feed..."
-
-            & nuget install $depId `
-                -Version $depVersion `
-                -ConfigFile $tempConfig `
-                -OutputDirectory $OutputDir `
-                -NonInteractive `
-                -NoCache `
-                | Out-Null
-
-            if ($LASTEXITCODE -eq 0) {
-                $packageVersions[$depId] = $depVersion
-                Write-Host "  Successfully downloaded $depId"
-            } else {
-                Write-Warning "  Failed to download $depId version $depVersion"
-            }
-        }
-    }
-    finally {
-        Remove-Item $tempConfig -Force -ErrorAction SilentlyContinue
-    }
-
-    # Parse all downloaded packages to get actual versions
-    $directories = Get-ChildItem -Path $OutputDir -Directory
-    $allLocalPackages = @()
-
-    # Add metapackage and runtime to the list (they are .nupkg files, not directories)
-    $allLocalPackages += $MetaPackageName
-    if ($packageVersions.ContainsKey("$MetaPackageName.Runtime")) {
-        $allLocalPackages += "$MetaPackageName.Runtime"
-    }
-
-    foreach ($dir in $directories) {
-        if ($dir.Name -match $script:PackageVersionRegex) {
-            $pkgId = $Matches[1]
-            $pkgVer = $Matches[2]
-            $allLocalPackages += $pkgId
-            if (-not $packageVersions.ContainsKey($pkgId)) {
-                $packageVersions[$pkgId] = $pkgVer
-            }
-        }
-    }
-
-    # Update nuget.config dynamically during pipeline execution
-    # This modification is temporary and won't be committed back to the repo
-    $nugetConfig = Join-Path $rootPath "nuget.config"
-    $configData = Read-FileWithEncoding -Path $nugetConfig
-    [xml]$xml = $configData.Content
-
-    Add-NuGetSourceAndMapping -Xml $xml -Key "localpackages" -Value $OutputDir -Patterns $allLocalPackages
-
-    $xml.Save($nugetConfig)
-    Write-Host "Updated nuget.config with localpackages mapping (temporary, for pipeline execution only)."
-
-    return ,$packageVersions
-}
-
 function Resolve-WinAppSdkSplitDependencies {
     Write-Host "Version $WinAppSDKVersion detected. Resolving split dependencies..."
     $installDir = Join-Path $rootPath "localpackages\output"
-    $null = New-Item -ItemType Directory -Path $installDir -Force
+    New-Item -ItemType Directory -Path $installDir -Force | Out-Null
 
     # Create a temporary nuget.config to avoid interference from the repo's config
     $tempConfig = Join-Path $env:TEMP "nuget_$(Get-Random).config"
@@ -417,24 +131,14 @@ function Resolve-WinAppSdkSplitDependencies {
             if ($propsContent -match '<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="([^"]+)"') {
                 $buildToolsVersion = $Matches[1]
                 Write-Host "Downloading Microsoft.Windows.SDK.BuildTools version $buildToolsVersion..."
-                & nuget install Microsoft.Windows.SDK.BuildTools `
-                    -Version $buildToolsVersion `
-                    -ConfigFile $tempConfig `
-                    -OutputDirectory $installDir `
-                    -NonInteractive `
-                    -NoCache `
-                    | Out-Null
+                $nugetArgsBuildTools = "install Microsoft.Windows.SDK.BuildTools -Version $buildToolsVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+                Invoke-Expression "nuget $nugetArgsBuildTools" | Out-Null
             }
         }
 
         # Download package to inspect nuspec and keep it for the build
-        & nuget install Microsoft.WindowsAppSDK `
-            -Version $WinAppSDKVersion `
-            -ConfigFile $tempConfig `
-            -OutputDirectory $installDir `
-            -NonInteractive `
-            -NoCache `
-            | Out-Null
+        $nugetArgs = "install Microsoft.WindowsAppSDK -Version $WinAppSDKVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+        Invoke-Expression "nuget $nugetArgs" | Out-Null
 
         # Parse dependencies from the installed folders
         # Folder structure is typically {PackageId}.{Version}
@@ -468,101 +172,52 @@ function Resolve-WinAppSdkSplitDependencies {
     }
 }
 
-# Main logic: choose between artifact-based or feed-based approach
-if ($useArtifactSource) {
-    Write-Host "=== Using Artifact-Based Source ===" -ForegroundColor Cyan
-    Write-Host "Organization: $azureDevOpsOrg"
-    Write-Host "Project: $azureDevOpsProject"
-    Write-Host "Build ID: $buildId"
-    Write-Host "Artifact: $artifactName"
-
-    if ([string]::IsNullOrEmpty($buildId) -or $buildId -eq 'N/A') {
-        Write-Error "buildId parameter is required when using artifact source. Please provide a valid Windows App SDK Build ID."
-        Write-Host "Tip: You can find the build ID from the Windows App SDK pipeline run in Azure DevOps."
-        exit 1
-    }
-
-    # Download artifact
-    $artifactDir = Join-Path $rootPath "localpackages\artifact"
-    $downloadSuccess = Download-ArtifactFromPipeline `
-        -Organization $azureDevOpsOrg `
-        -Project $azureDevOpsProject `
-        -BuildId $buildId `
-        -ArtifactName $artifactName `
-        -OutputDir $artifactDir
-
-    if (-not $downloadSuccess) {
-        Write-Host "Failed to download artifact"
-        exit 1
-    }
-
-    # Resolve dependencies from artifact
-    $installDir = Join-Path $rootPath "localpackages\output"
-    $packageVersions = Resolve-ArtifactBasedDependencies `
-        -ArtifactDir $artifactDir `
-        -MetaPackageName $metaPackageName `
-        -SourceUrl $sourceLink `
-        -OutputDir $installDir
-
-    if ($packageVersions.Count -eq 0) {
-        Write-Error "Failed to resolve dependencies from artifact"
-        exit 1
-    }
-
-    $WinAppSDKVersion = $packageVersions[$metaPackageName]
-    Write-Host "WinAppSDK Version: $WinAppSDKVersion"
-    Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
-
+# Execute nuget list and capture the output
+if ($useExperimentalVersion) {
+    # The nuget list for experimental versions will cost more time
+    # So, we will not use -AllVersions to wast time
+    # But it can only get the latest experimental version
+    Write-Host "Fetching WindowsAppSDK with experimental versions"
+    $nugetOutput = nuget list Microsoft.WindowsAppSDK `
+        -Source  $sourceLink `
+        -Prerelease
+    # Filter versions based on the specified version prefix
+    $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
+    $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
+    $latestVersions = $filteredVersions
 } else {
-    Write-Host "=== Using Feed-Based Source ===" -ForegroundColor Cyan
-
-    # Execute nuget list and capture the output
-    if ($useExperimentalVersion) {
-        # The nuget list for experimental versions will cost more time
-        # So, we will not use -AllVersions to wast time
-        # But it can only get the latest experimental version
-        Write-Host "Fetching WindowsAppSDK with experimental versions"
-        $nugetOutput = nuget list Microsoft.WindowsAppSDK `
-            -Source  $sourceLink `
-            -Prerelease
-        # Filter versions based on the specified version prefix
-        $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
-        $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
-        $latestVersions = $filteredVersions
-    } else {
-        Write-Host "Fetching stable WindowsAppSDK versions for $winAppSdkVersionNumber"
-        $nugetOutput = nuget list Microsoft.WindowsAppSDK `
-            -Source $sourceLink `
-            -AllVersions
-        # Filter versions based on the specified version prefix
-        $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
-        $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
-        $latestVersions = $filteredVersions | Sort-Object { [version]($_ -split ' ')[1] } -Descending | Select-Object -First 1
-    }
-
-    Write-Host "Latest versions found: $latestVersions"
-    # Extract the latest version number from the output
-    $latestVersion = $latestVersions -split "`n" | `
-        Select-String -Pattern 'Microsoft.WindowsAppSDK\s*([0-9]+\.[0-9]+\.[0-9]+-*[a-zA-Z0-9]*)' | `
-        ForEach-Object { $_.Matches[0].Groups[1].Value } | `
-        Sort-Object -Descending | `
-        Select-Object -First 1
-
-    if ($latestVersion) {
-        $WinAppSDKVersion = $latestVersion
-        Write-Host "Extracted version: $WinAppSDKVersion"
-        Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
-    } else {
-        Write-Host "Failed to extract version number from nuget list output"
-        exit 1
-    }
-
-    # Resolve dependencies for 1.8+
-    $packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
-
-    Resolve-WinAppSdkSplitDependencies
+    Write-Host "Fetching stable WindowsAppSDK versions for $winAppSdkVersionNumber"
+    $nugetOutput = nuget list Microsoft.WindowsAppSDK `
+        -Source $sourceLink `
+        -AllVersions
+    # Filter versions based on the specified version prefix
+    $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
+    $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
+    $latestVersions = $filteredVersions | Sort-Object { [version]($_ -split ' ')[1] } -Descending | Select-Object -First 1
 }
 
+Write-Host "Latest versions found: $latestVersions"
+# Extract the latest version number from the output
+$latestVersion = $latestVersions -split "`n" | `
+    Select-String -Pattern 'Microsoft.WindowsAppSDK\s*([0-9]+\.[0-9]+\.[0-9]+-*[a-zA-Z0-9]*)' | `
+    ForEach-Object { $_.Matches[0].Groups[1].Value } | `
+    Sort-Object -Descending | `
+    Select-Object -First 1
+
+if ($latestVersion) {
+    $WinAppSDKVersion = $latestVersion
+    Write-Host "Extracted version: $WinAppSDKVersion"
+    Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
+} else {
+    Write-Host "Failed to extract version number from nuget list output"
+    exit 1
+}
+
+# Resolve dependencies for 1.8+
+$packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
+
+Resolve-WinAppSdkSplitDependencies
+
 # Update Directory.Packages.props file
 Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
     $file = Read-FileWithEncoding -Path $_.FullName
@@ -571,16 +226,9 @@ Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Obje
     
     foreach ($pkgId in $packageVersions.Keys) {
         $ver = $packageVersions[$pkgId]
-
-        # Skip packages with empty versions to prevent corruption
-        if ([string]::IsNullOrWhiteSpace($ver)) {
-            Write-Warning "Skipping ${pkgId}: version is empty"
-            continue
-        }
-
         # Escape dots in package ID for regex
         $pkgIdRegex = $pkgId -replace '\.', '\.'
-
+        
         $newVersionString = "<PackageVersion Include=""$pkgId"" Version=""$ver"" />"
         $oldVersionString = "<PackageVersion Include=""$pkgIdRegex"" Version=""[-.0-9a-zA-Z]*"" />"
 

.pipelines/loc/loc.yml

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

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -1,8 +1,3 @@
-# NOTE: When using artifact mode (useArtifactSource: true), the pipeline needs
-# permission to access System.AccessToken. This is automatically handled by the
-# script if SYSTEM_ACCESSTOKEN environment variable is available.
-# If you encounter authentication errors, ensure the job has oauth access enabled.
-
 trigger: none
 pr: none
 schedules:
@@ -42,23 +37,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters (optional)
-  - name: useArtifactSource
-    type: boolean
-    displayName: "Use Artifact Source (instead of feed)"
-    default: false
-  - name: buildId
-    type: string
-    displayName: "Windows App SDK Build ID (required only if using artifact source)"
-    default: 'N/A'
-  - name: azureDevOpsProject
-    type: string
-    displayName: "Source Project (for artifact mode, default: ProjectReunion)"
-    default: 'ProjectReunion'
-  - name: artifactName
-    type: string
-    displayName: "Artifact Name (for artifact mode, default: WindowsAppSDK_Nuget_And_MSIX)"
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
 
 extends:
   template: templates/pipeline-ci-build.yml
@@ -71,7 +49,3 @@ extends:
     useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
     winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
     useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-    useArtifactSource: ${{ parameters.useArtifactSource }}
-    buildId: ${{ parameters.buildId }}
-    azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-    artifactName: ${{ parameters.artifactName }}

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

@@ -74,25 +74,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
   - name: csProjectsToPublish
     type: object
     default:
@@ -210,9 +191,6 @@ 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
@@ -248,12 +226,6 @@ jobs:
       parameters:
         versionNumber: ${{ parameters.winAppSDKVersionNumber }}
         useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-        useArtifactSource: ${{ parameters.useArtifactSource }}
-        azureDevOpsOrg: ${{ parameters.azureDevOpsOrg }}
-        azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-        buildId: ${{ parameters.buildId }}
-        artifactName: ${{ parameters.artifactName }}
-        metaPackageName: ${{ parameters.metaPackageName }}
   
   - ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
     - template: .\steps-restore-nuget.yml

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

@@ -108,6 +108,9 @@ jobs:
       sdk: true
       version: '9.0'
 
+  - task: VisualStudioTestPlatformInstaller@1
+    displayName: Ensure VSTest Platform
+
   - pwsh: |-
       & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
     displayName: Download and install WinAppDriver
@@ -149,7 +152,46 @@ jobs:
       inputs:
         displaySettings: 'optimal'
 
-  - script: |
-      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\FancyZones.UITests\FancyZones.UITests.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
-      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\FancyZonesEditor.UITests\FancyZonesEditor.UITests.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
-    displayName: "Run UI Tests"
+  - ${{ if eq(length(parameters.uiTestModules), 0) }}:
+    - task: VSTest@3
+      displayName: Run UI Tests
+      inputs:
+        platform: '$(BuildPlatform)'
+        configuration: '$(BuildConfiguration)'
+        testSelector: 'testAssemblies'
+        searchFolder: '$(Pipeline.Workspace)\$(TestArtifactsName)'
+        vsTestVersion: 'toolsInstaller'
+        uiTests: true
+        rerunFailedTests: true
+        testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
+        # Since UITests-FancyZonesEditor.dll is generated in both UITests-FancyZonesEditor and UITests-FancyZones, removed one to avoid duplicate test runs
+        testAssemblyVer2: |
+          **\*UITest*.dll
+          !**\obj\**
+          !**\ref\**
+          !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
+      env:
+        platform: '$(TestPlatform)'
+        useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
+
+  - ${{ if ne(length(parameters.uiTestModules), 0) }}:
+    - ${{ each module in parameters.uiTestModules }}:
+      - task: VSTest@3
+        displayName: Run UI Test - ${{ module }}
+        inputs:
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          testSelector: 'testAssemblies'
+          searchFolder: '$(Pipeline.Workspace)\$(TestArtifactsName)'
+          vsTestVersion: 'toolsInstaller'
+          uiTests: true
+          rerunFailedTests: true
+          testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
+          testAssemblyVer2: |
+            **\*${{ module }}*.dll
+            !**\obj\**
+            !**\ref\**
+            !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
+        env:
+          platform: '$(TestPlatform)'
+          useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -34,25 +34,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
 
 stages:
   - ${{ each platform in parameters.buildPlatforms }}:
@@ -84,12 +65,6 @@ stages:
             ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
               winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
               useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-              useArtifactSource: ${{ parameters.useArtifactSource }}
-              azureDevOpsOrg: ${{ parameters.azureDevOpsOrg }}
-              azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-              buildId: ${{ parameters.buildId }}
-              artifactName: ${{ parameters.artifactName }}
-              metaPackageName: ${{ parameters.metaPackageName }}
             timeoutInMinutes: 90
 
   - stage: Build_SDK

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -5,25 +5,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
 
 steps:
 - task: NuGetAuthenticate@1
@@ -31,20 +12,12 @@ steps:
 
 - task: PowerShell@2
   displayName: Update WinAppSDK Versions
-  env:
-    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
   inputs:
     filePath: '$(build.sourcesdirectory)\.pipelines\UpdateVersions.ps1'
     arguments: >
       -winAppSdkVersionNumber ${{ parameters.versionNumber }}
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
       -rootPath "$(build.sourcesdirectory)"
-      -useArtifactSource $${{ parameters.useArtifactSource }}
-      -azureDevOpsOrg "${{ parameters.azureDevOpsOrg }}"
-      -azureDevOpsProject "${{ parameters.azureDevOpsProject }}"
-      -buildId "${{ parameters.buildId }}"
-      -artifactName "${{ parameters.artifactName }}"
-      -metaPackageName "${{ parameters.metaPackageName }}"
 
 # - task: NuGetCommand@2
 #   displayName: 'Restore NuGet packages (slnx)'
@@ -63,4 +36,3 @@ steps:
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
     workingDirectory: '$(build.sourcesdirectory)'
-    arguments: '/p:NoWarn=NU1602,NU1604'

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -93,8 +93,7 @@ if ($noticeMatch.Success) {
 # Test-only packages that are allowed to be in NOTICE.md but not in the build
 # (e.g., when BuildTests=false, these packages won't appear in the NuGet list)
 $allowedExtraPackages = @(
-	"- Moq",
-	"- MSTest"
+	"- Moq"
 )
 
 if (!$noticeFile.Trim().EndsWith($returnList.Trim()))

.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 "ERROR: No directories detected in " $nonDirectoryAssetsItems ". Are you sure this is the right path?`r`n"
+    Write-Host -ForegroundColor Red "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 "ERROR: Detected " $nonDirectoryAssetsItems " files in " $targetAssetsDir ". Each application should use a named subdirectory for assets.`r`n"
+    Write-Host -ForegroundColor Red "Detected " $nonDirectoryAssetsItems " files in " $targetAssetsDir "`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 "ERROR: Detected a resources.pri file in " $targetDir ". Each application should use a unique name for its resources file.`r`n"
+    Write-Host -ForegroundColor Red "Detected a resources.pri file in " $targetDir "`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 "ERROR: Detected a .xbf file in " $targetDir ". Ensure all XAML files are placed in a subdirectory in each application.`r`n"
+    Write-Host -ForegroundColor Red "Detected a .xbf file in " $targetDir "`r`n"
     $totalFailures++;
 } else {
     Write-Host -ForegroundColor Green "No .xbf files detected in " $targetDir "`r`n"

Cpp.Build.props

@@ -64,6 +64,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <BuildStlModules>false</BuildStlModules>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <!-- TODO: _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING for compatibility with VS 17.8. Check if we can remove. -->
       <PreprocessorDefinitions>_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- CLR + CFG are not compatible >:{ -->

Directory.Build.props

@@ -1,8 +1,5 @@
 <Project>
-  <PropertyGroup>
-    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
-  </PropertyGroup>
-  <Import Project="$(RepoRoot)src\Version.props" />
+  <Import Project="src\Version.props" />
   <PropertyGroup>
     <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
     <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
@@ -20,24 +17,6 @@
     <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>
-    <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
-    <TestingPlatformDotNetTestSupport>true</TestingPlatformDotNetTestSupport>
-    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --report-trx</TestingPlatformCommandLineArguments>
-    <!-- No arm64 agents to run the tests. -->
-    <TestingPlatformDisableCustomTestTarget Condition="'$(Platform)' == 'ARM64'">true</TestingPlatformDisableCustomTestTarget>
-  </PropertyGroup>
-
-  <!--
-    UI tests are run in dedicated UI test jobs/pipelines.
-    In CI, the main build uses `/t:Build;Test` across the full solution, so
-    prevent UI test projects from being executed in that pass.
-  -->
-  <PropertyGroup Condition="'$(TF_BUILD)' != '' and $(MSBuildProjectName.Contains('UITest'))">
-    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
   </PropertyGroup>
 
   <!--
@@ -82,7 +61,7 @@
 
   <PropertyGroup>
     <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
-    <ForceImportBeforeCppProps>$(RepoRoot)Cpp.Build.props</ForceImportBeforeCppProps>
+    <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
   </PropertyGroup>
 
 
@@ -91,8 +70,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <Compile Include="$(RepoRoot)src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
-    <AdditionalFiles Include="$(RepoRoot)src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
+    <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
 
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <PrivateAssets>all</PrivateAssets>
@@ -100,15 +79,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <!-- In CI, we build and test with `/t:Build;Test` -->
-  <!-- So, for non-test projects, we want the target to be there and it's basically doing nothing -->
-  <!-- For C# test projects, Microsoft.Testing.Platform should inject Test target here: -->
-  <!-- https://github.com/microsoft/testfx/blob/5ad21909704db501f58f27d4a7ec241edd761af5/src/Platform/Microsoft.Testing.Platform.MSBuild/buildMultiTargeting/Microsoft.Testing.Platform.MSBuild.targets#L270-L273 -->
-  <!-- For C++ test projects, the RunVSTest SDK will do its job -->
-  <Target Name="Test" />
-
-  <!-- Add ability to run tests via "msbuild /t:Test" using the RunVSTest SDK -->
-  <!-- This is only needed for C++, as we use Microsoft.Testing.Platform for C# -->
+  <!-- Add ability to run tests via "msbuild /t:Test" -->
   <!--
     Work around an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
     See: https://github.com/dotnet/msbuild/pull/9984
@@ -118,11 +89,11 @@
           Once the change referenced above is fixed, the ImportGroup below can be replaced with:
             <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
   -->
-  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64' AND ('$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj')">
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
     <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
     <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
   </ImportGroup>
-  <PropertyGroup Condition="'$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj'">
+  <PropertyGroup>
     <VSTestLogger>trx</VSTestLogger>
     <!--
       RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,

Directory.Packages.props

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <MSTestVersion>3.8.3</MSTestVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
@@ -40,12 +39,12 @@
     <!-- 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="9.0.0" />
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.9.260303001" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.5.250829002" />
     <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="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.Windows.CppWinRT" Version="2.0.240111.5" />
     <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" />
@@ -78,24 +77,22 @@
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <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" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.47" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.260209005" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.251104000" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.39" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.251106002" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="$(MSTestVersion)" />
-    <PackageVersion Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
+    <PackageVersion Include="MSTest" Version="3.8.3" />
     <PackageVersion Include="NJsonSchema" Version="11.4.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
     <PackageVersion Include="OpenAI" Version="2.5.0" />
-    <PackageVersion Include="Polly.Core" Version="8.6.5" />
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
@@ -107,7 +104,6 @@
     <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="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="9.0.10" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
@@ -137,7 +133,6 @@
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
     <PackageVersion Include="WinUIEx" Version="2.8.0" />
-    <PackageVersion Include="WmiLight" Version="6.14.0" />
     <PackageVersion Include="WPF-UI" Version="3.0.5" />
     <PackageVersion Include="WyHash" Version="1.0.5" />
     <PackageVersion Include="WixToolset.Heat" Version="5.0.2" />

NOTICE.md

@@ -10,7 +10,6 @@ This software incorporates material from third parties.
 - Installer/Runner
 - Measure tool
 - Peek
-- PowerDisplay
 - Registry Preview
 
 ## Utility: Color Picker
@@ -1520,35 +1519,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
-## Utility: PowerDisplay
-
-### Twinkle Tray
-
-PowerDisplay's DDC/CI implementation references techniques from Twinkle Tray.
-
-**Source**: https://github.com/xanderfrangos/twinkle-tray
-
-MIT License
-
-Copyright © 2020 Xander Frangos
-
-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.
 
 ## NuGet Packages used by PowerToys
 
@@ -1582,13 +1552,11 @@ SOFTWARE.
 - ModernWpfUI
 - Moq
 - MSTest
-- MSTest.TestFramework
 - NJsonSchema
 - NLog
 - NLog.Extensions.Logging
 - NLog.Schema
 - OpenAI
-- Polly.Core
 - ReverseMarkdown
 - ScipBe.Common.Office.OneNote
 - SharpCompress
@@ -1601,6 +1569,5 @@ SOFTWARE.
 - UnitsNet
 - UTF.Unknown
 - WinUIEx
-- WmiLight
 - WPF-UI
-- WyHash
+- WyHash

PowerToys.slnx

@@ -4,6 +4,10 @@
     <Platform Name="x64" />
   </Configurations>
   <Folder Name="/common/">
+    <Project Path="src/common/AllExperiments/AllExperiments.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj" Id="2cf78cf7-8feb-4be1-9591-55fa25b48fc6" />
     <Project Path="src/common/Common.Search/Common.Search.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
@@ -13,10 +17,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/common/Common.UI.Controls/Common.UI.Controls.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/common/COMUtils/COMUtils.vcxproj" Id="7319089e-46d6-4400-bc65-e39bdf1416ee" />
     <Project Path="src/common/Display/Display.vcxproj" Id="caba8dfb-823b-4bf2-93ac-3f31984150d9" />
     <Project Path="src/common/FilePreviewCommon/FilePreviewCommon.csproj">
@@ -55,7 +55,6 @@
       <Platform Solution="*|x64" Project="x64" />
     </Project>
     <Project Path="src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj" Id="1a066c63-64b3-45f8-92fe-664e1cce8077" />
-    <Project Path="src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj" Id="8b5cfb38-ccba-40a8-ad7a-89c57b070884" />
     <Project Path="src/common/updating/updating.vcxproj" Id="17da04df-e393-4397-9cf0-84dabe11032e" />
     <Project Path="src/common/version/version.vcxproj" Id="cc6e41ac-8174-4e8a-8d22-85dd7f4851df" />
   </Folder>
@@ -196,10 +195,6 @@
   <Folder Name="/modules/CommandPalette/">
     <Project Path="src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj" Id="5f63c743-f6ce-4dba-a200-2b3f8a14e8c2" />
     <Project Path="src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj" Id="0adeb797-c8c7-4ffa-acd5-2af6cad7ecd8" />
-    <Project Path="src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
   </Folder>
   <Folder Name="/modules/CommandPalette/Built-in Extensions/">
     <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj">
@@ -223,10 +218,6 @@
       <Platform Solution="*|x64" Project="x64" />
       <Deploy />
     </Project>
-    <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Microsoft.CmdPal.Ext.PerformanceMonitor.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Microsoft.CmdPal.Ext.PowerToys.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -279,6 +270,16 @@
       <Deploy />
     </Project>
   </Folder>
+  <Folder Name="/modules/CommandPalette/Core/">
+    <Project Path="src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+  </Folder>
   <Folder Name="/modules/CommandPalette/Extension SDK/">
     <Project Path="src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Microsoft.CommandPalette.Extensions.Toolkit.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
@@ -299,7 +300,7 @@
     </Project>
   </Folder>
   <Folder Name="/modules/CommandPalette/Tests/">
-    <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Microsoft.CmdPal.Common.UnitTests.csproj">
+    <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Core.Common.UnitTests/Microsoft.CmdPal.Core.Common.UnitTests.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
@@ -497,31 +498,6 @@
     <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" />
@@ -708,25 +684,6 @@
       <Deploy />
     </Project>
   </Folder>
-  <Folder Name="/modules/PowerDisplay/">
-    <Project Path="src/modules/powerdisplay/PowerDisplay.Lib/PowerDisplay.Lib.csproj">
-      <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">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-  </Folder>
   <Folder Name="/modules/MeasureTool/">
     <Project Path="src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj" Id="54a93af7-60c7-4f6c-99d2-fbb1f75f853a">
       <BuildDependency Project="src/common/Display/Display.vcxproj" />
@@ -745,6 +702,31 @@
       <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

@@ -53,17 +53,17 @@ Go to the <a href="https://aka.ms/installPowerToys">PowerToys GitHub releases</a
 <!-- 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.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
+[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
  
 |  Description   | Filename |
 |----------------|----------|
-| 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] |
+| 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] |
 
 </details>
 
@@ -103,254 +103,213 @@ There are <a href="https://learn.microsoft.com/windows/powertoys/install#communi
 </details>
 
 ## ✨ What's new
+**Version 0.97.1 (January 2026)**
 
-**Version 0.98.0 (March 2026)**
+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.
 
-This version includes major updates to Command Palette and the Keyboard Manager Editor along with feature and stability improvements across the PowerToys suite.
+**Highlights**
 
-## Highlights
+### Advanced Paste
+- #44862: Fixed Settings UI advanced paste page crash by using correct settings repository for null checking.
 
 ### Command Palette
-
-- Added Dock — a persistent launcher bar at the edge of your screen for instant access to pinned commands and apps.
-- Faster search and responsiveness thanks to improved fuzzy matching and related performance optimizations. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- New Performance Monitor extension ports DevHome perf widgets into CmdPal, single-row list items, transparent window, and searchable filter dropdown
-
-### Keyboard Manager
-
-- Redesigned the Keyboard Manager Editor using WinUI 3 for an updated interface and usability improvements.
-- Added support for enabling or disabling shortcuts directly from the Editor UI.
-
-### Always on Top
-
-- Added the ability to enable and disable Always on Top directly from each window's right-click title bar menu.
-- Added support for adjusting the transparency of pinned windows.
-
-### ZoomIt
-
-- Added a video trim dialog for editing recordings and configurable audio track input
+- #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)!
 
-- Redesigned wrapping engine with multi-monitor support, GPO policy, and configurable wrap modes
+### Peek
+- #44995: Fixed Space key triggering Peek during file rename, search, or address bar typing.
 
-### New+
+### PowerRename
+- #44944: Fixed regex `$` not working, preventing users from adding text at the end of filenames.
 
-- Added ability to hide the Windows built-in "New" context menu to avoid duplicates
+### 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.
 
-### Settings
+### GPO / Enterprise
+- #45028: Added CursorWrap policy definition to ADMX templates. Thanks [@htcfreek](https://github.com/htcfreek)!
 
-- Tray icon now follows system theme, singleton shortcut conflict window, and multiple crash fixes
-
-### Build
-
-- Added Visual Studio 2026 support, upgraded WASDK to 1.8.5, and CppWinRT to 2.0.250303.1
-
----
+For the full list of v0.97 changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
 
 ## Advanced Paste
 
-- Fixed a crash on the Advanced Paste settings page caused by null property values in [#45207](https://github.com/microsoft/PowerToys/pull/45207)
-- Fixed a crash on the Advanced Paste settings page caused by unsafe settings upgrade logic in [#44862](https://github.com/microsoft/PowerToys/pull/44862)
-- Fixed a settings page crash by resolving the Foundry Local AI endpoint when it changes in [#45699](https://github.com/microsoft/PowerToys/pull/45699)
-- Added resilient handling of Foundry Local port changes at runtime so AI paste actions recover automatically in [#45362](https://github.com/microsoft/PowerToys/pull/45362)
-- Added auto-copy selection for custom action hotkeys so users can copy and paste with a single shortcut in [#44767](https://github.com/microsoft/PowerToys/pull/44767)
-- Updated OOBE description to clarify AI features now support more than just OpenAI API keys in [#45233](https://github.com/microsoft/PowerToys/pull/45233)
-- Added AI preview credit documentation in [#45236](https://github.com/microsoft/PowerToys/pull/45236)
-
-## Always On Top
-
-- Added a "Toggle always on top" entry to the window system menu (title bar right-click) for easy access without hotkeys in [#45773](https://github.com/microsoft/PowerToys/pull/45773)
-- Added transparency adjustment support for pinned windows using modifier keys + plus/minus shortcuts in [#44815](https://github.com/microsoft/PowerToys/pull/44815). Thanks [@Copilot](https://github.com/Copilot)!
-- Fixed an issue where Always on Top settings changes were not applied immediately in [#45994](https://github.com/microsoft/PowerToys/pull/45994)
-- Fixed duplicate command entries in the window system menu in [#45845](https://github.com/microsoft/PowerToys/pull/45845)
+- 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
 
-- Improved code quality and developer documentation for Awake in [#44795](https://github.com/microsoft/PowerToys/pull/44795). Thanks [@dend](https://github.com/dend)!
-
-## Color Picker
-
-- Added an optional integer-rounding formatter for CIELab color components, with updated help in Settings in [#42986](https://github.com/microsoft/PowerToys/pull/42986). Thanks [@ruthiesun](https://github.com/ruthiesun)!
+- Fixed Awake CLI so help, errors, and logs appear correctly in the console. Thanks [@daverayment](https://github.com/daverayment)!
 
 ## Command Palette
 
-### Dock (New Feature)
-- Added Dock, a persistent command and application launcher in [#45824](https://github.com/microsoft/PowerToys/pull/45824)
-- Added Dock APIs, allowing extensions to integrate with the launcher in [#45432](https://github.com/microsoft/PowerToys/pull/45432)
-- Fixed several visual and behavior issues in the pre-release Dock including handling multiple app bars, keyboard focus order, and missing icons in [#45871](https://github.com/microsoft/PowerToys/pull/45871), [#45873](https://github.com/microsoft/PowerToys/pull/45873), [#45954](https://github.com/microsoft/PowerToys/pull/45954), [#45837](https://github.com/microsoft/PowerToys/pull/45837), [#45839](https://github.com/microsoft/PowerToys/pull/45839), [#45898](https://github.com/microsoft/PowerToys/pull/45898) and [#45968](https://github.com/microsoft/PowerToys/pull/45968). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added instructions for pinning items to Dock in [#46052](https://github.com/microsoft/PowerToys/pull/46052).
-- Added pin instructions for Dock in [#46052](https://github.com/microsoft/PowerToys/pull/46052)
+- 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)!
 
-### Performance & Reliability
-- Dramatically improved Command Palette search and launch performance in [#45764](https://github.com/microsoft/PowerToys/pull/45764) and [#44090](https://github.com/microsoft/PowerToys/pull/44090). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved fuzzy matching accuracy and robustness, including better Unicode and emoji handling in [#45275](https://github.com/microsoft/PowerToys/pull/45275), [#44809](https://github.com/microsoft/PowerToys/pull/44809) and [#44807](https://github.com/microsoft/PowerToys/pull/44807). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved icon loading performance, and fixed icon loading issues in [#44938](https://github.com/microsoft/PowerToys/pull/44938), [#44973](https://github.com/microsoft/PowerToys/pull/44973), [#44538](https://github.com/microsoft/PowerToys/pull/44538), [#45460](https://github.com/microsoft/PowerToys/pull/45460) and [#45980](https://github.com/microsoft/PowerToys/pull/45980). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved UI responsiveness during search and result updates in [#44545](https://github.com/microsoft/PowerToys/pull/44545) and [#45782](https://github.com/microsoft/PowerToys/pull/45782). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved extension loading reliability so one faulty extension no longer blocks others in [#45720](https://github.com/microsoft/PowerToys/pull/45720). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Fixed several threading and stability issues in [#42273](https://github.com/microsoft/PowerToys/pull/42273), [#45076](https://github.com/microsoft/PowerToys/pull/45076) and [#44729](https://github.com/microsoft/PowerToys/pull/44729). Thanks [@jiripolasek](https://github.com/jiripolasek)!
+## Crop & Lock
 
-### UI & UX
-- Switched to single-row result items for a cleaner, more compact layout in [#45763](https://github.com/microsoft/PowerToys/pull/45763). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added support for translucent Command Palette windows in [#45159](https://github.com/microsoft/PowerToys/pull/45159). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Replaced the filter dropdown with a searchable version in [#45747](https://github.com/microsoft/PowerToys/pull/45747). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added a context menu for quick actions on search results in [#45086](https://github.com/microsoft/PowerToys/pull/45086). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added a "Keep previous query" setting to preserve search text between invocations in [#45742](https://github.com/microsoft/PowerToys/pull/45742).
-- Added the ability to retain the selected item when refreshing results in [#45882](https://github.com/microsoft/PowerToys/pull/45882). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Fixed several UI bugs affecting selection, focus, and scrolling in [#46038](https://github.com/microsoft/PowerToys/pull/46038), [#45949](https://github.com/microsoft/PowerToys/pull/45949) (Thanks [@jiripolasek](https://github.com/jiripolasek)!), [#44757](https://github.com/microsoft/PowerToys/pull/44757), [#45309](https://github.com/microsoft/PowerToys/pull/45309) (Thanks [@jiripolasek](https://github.com/jiripolasek)!) and [#45815](https://github.com/microsoft/PowerToys/pull/45815) (Thanks [@jiripolasek](https://github.com/jiripolasek)!).
-- Added the ability to pin and manage commands from anywhere in the command tree [#45673](https://github.com/microsoft/PowerToys/pull/45673) and [#45566](https://github.com/microsoft/PowerToys/pull/45566).
-- Improved window positioning and multi-display behavior in [#45057](https://github.com/microsoft/PowerToys/pull/45057), [#45877](https://github.com/microsoft/PowerToys/pull/45877) and [#45585](https://github.com/microsoft/PowerToys/pull/45585). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved icons, Home page headings, and added developer UI toggle in [#45870](https://github.com/microsoft/PowerToys/pull/45870), [#45958](https://github.com/microsoft/PowerToys/pull/45958), [#45979](https://github.com/microsoft/PowerToys/pull/45979), and [#45379](https://github.com/microsoft/PowerToys/pull/45379). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-
-### Extensions & SDK
-- Added a new Performance Monitor extension that brings DevHome performance widgets into Command Palette in [#45217](https://github.com/microsoft/PowerToys/pull/45217).
-- Added an option to hide non-application results from search in [#45741](https://github.com/microsoft/PowerToys/pull/45741). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved the reliability of several extensions including Calculator, All Apps, and RDP in [#44594](https://github.com/microsoft/PowerToys/pull/44594), [#45804](https://github.com/microsoft/PowerToys/pull/45804), [#45716](https://github.com/microsoft/PowerToys/pull/45716), and [#45740](https://github.com/microsoft/PowerToys/pull/45740). Thanks [@jiripolasek](https://github.com/jiripolasek) and [@michaeljolley](https://github.com/michaeljolley)!
-- Added Mouse Without Borders easy mouse support to the PowerToys extension in [#45350](https://github.com/microsoft/PowerToys/pull/45350).
-- Fixed Window Walker issues when enumerating UWP apps in [#45601](https://github.com/microsoft/PowerToys/pull/45601). Thanks [@daverayment](https://github.com/daverayment)!
-- Improved localization and accessibility across extensions in [#45505](https://github.com/microsoft/PowerToys/pull/45505), [#45506](https://github.com/microsoft/PowerToys/pull/45506), [#45508](https://github.com/microsoft/PowerToys/pull/45508), and [#45589](https://github.com/microsoft/PowerToys/pull/45589). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-
-### Infrastructure & Code Quality
-- Introduced a global error-handling foundation for Command Palette, including an error report builder and PII sanitizer, with improvements to version reporting and sanitizer behavior in [#44140](https://github.com/microsoft/PowerToys/pull/44140), [#45374](https://github.com/microsoft/PowerToys/pull/45374), and [#45613](https://github.com/microsoft/PowerToys/pull/45613). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved stability and thread safety across several components, fixing potential race conditions and UI threading issues in [#46020](https://github.com/microsoft/PowerToys/pull/46020), [#46021](https://github.com/microsoft/PowerToys/pull/46021), [#45498](https://github.com/microsoft/PowerToys/pull/45498), [#45502](https://github.com/microsoft/PowerToys/pull/45502), and [#45878](https://github.com/microsoft/PowerToys/pull/45878). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Refactored internal architecture and removed obsolete code to simplify the Command Palette codebase, including factory usage improvements, Window Walker cleanup, and Core project removal in [#45572](https://github.com/microsoft/PowerToys/pull/45572), [#45570](https://github.com/microsoft/PowerToys/pull/45570), and [#45693](https://github.com/microsoft/PowerToys/pull/45693). Thanks [@jiripolasek](https://github.com/jiripolasek) and [@michaeljolley](https://github.com/michaeljolley)!
-- Added unique IDs to all PowerToys commands to allow them to be pinned to Home in [#45840](https://github.com/microsoft/PowerToys/pull/45840).
-- Improved build reliability and tooling by addressing CsWinRT warnings, WinUI binding issues, and markup extension limitations in [#45827](https://github.com/microsoft/PowerToys/pull/45827), [#45324](https://github.com/microsoft/PowerToys/pull/45324), [#45830](https://github.com/microsoft/PowerToys/pull/45830), and [#45833](https://github.com/microsoft/PowerToys/pull/45833). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved development workflow and repository configuration, including formatting rules, solution filters, and build configuration fixes in [#45739](https://github.com/microsoft/PowerToys/pull/45739), [#45738](https://github.com/microsoft/PowerToys/pull/45738), [#45096](https://github.com/microsoft/PowerToys/pull/45096), and [#45250](https://github.com/microsoft/PowerToys/pull/45250). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Improved extension infrastructure and documentation, including updated installation tooling and new development guides in [#44886](https://github.com/microsoft/PowerToys/pull/44886), [#44863](https://github.com/microsoft/PowerToys/pull/44863), [#45632](https://github.com/microsoft/PowerToys/pull/45632), and [#45967](https://github.com/microsoft/PowerToys/pull/45967).
-- Improved system command handling by running shutdown and restart actions in a hidden window in [#45062](https://github.com/microsoft/PowerToys/pull/45062). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Optimized Performance Monitor GPU statistics collection using batched counter reads in [#45835](https://github.com/microsoft/PowerToys/pull/45835). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Updated dependencies and project improvements including MarkdownTextBlock upgrades, SDK spec corrections, and string updates in [#44793](https://github.com/microsoft/PowerToys/pull/44793), [#44781](https://github.com/microsoft/PowerToys/pull/44781) (Thanks [@RubenFricke](https://github.com/RubenFricke)!), and [#46040](https://github.com/microsoft/PowerToys/pull/46040). 
+- Added a screenshot mode that freezes a cropped region into its own window. Thanks [@fm-sys](https://github.com/fm-sys)!
 
 ## Cursor Wrap
 
-- Added an enhanced cursor wrapping engine which includes enhanced multi-monitor support, display change handling, configurable wrap modes (horizontal, vertical, or both), and enterprise policy support in [#44936](https://github.com/microsoft/PowerToys/pull/44936). Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-- Added option to disable CursorWrap when only a single monitor is connected in [#45303](https://github.com/microsoft/PowerToys/pull/45303). Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-- Improved wrapping behavior and diagnostics with updated edge-wrapping model, cursor logging, and module loader settings support in [#45915](https://github.com/microsoft/PowerToys/pull/45915). Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-- Updated modifier-key activation so wrapping only occurs while Ctrl/Shift is held, matching similar behavior in Mouse Without Borders in [#46009](https://github.com/microsoft/PowerToys/pull/46009).
+- Improved Cursor Wrap behavior on multi-monitor setups by wrapping only at outer edges. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
 
-## File Explorer
+## FancyZones
 
-- Updated the Markdown previewer to prevent unsafe navigation in [#45801](https://github.com/microsoft/PowerToys/pull/45801)
+- 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
 
-- Temporarily disabled AI Super Resolution feature and refactored caching in [#44768](https://github.com/microsoft/PowerToys/pull/44768) and [#44759](https://github.com/microsoft/PowerToys/pull/44759).
-
-## Keyboard Manager
-
-- Added a hotkey (Win + Shift + K) to enable or disable Keyboard Manager on the fly in [#42472](https://github.com/microsoft/PowerToys/pull/42472). Thanks [@weikequ](https://github.com/weikequ)!
-- Updated Keyboard Manager to a modern WinUI3 interface with the ability to enable or disable individual mappings in [#45649](https://github.com/microsoft/PowerToys/pull/45649). Thanks [@chenmy77](https://github.com/chenmy77) and [@Jay-o-Way](https://github.com/Jay-o-Way)!
-- Fixed new Keyboard Manager entry not being shown in the Settings shortcut list in [#45938](https://github.com/microsoft/PowerToys/pull/45938).
-- Improved performance when performing multiple text replacements quickly in [#46046](https://github.com/microsoft/PowerToys/pull/46046).
+- 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
 
-- Fixed an issue where Light Switch could be manually enabled or disabled even when Group Policy restrictions were active in [#45756](https://github.com/microsoft/PowerToys/pull/45756).
-- Improved the reliability of location detection by adding a timeout and validation checks in [#45887](https://github.com/microsoft/PowerToys/pull/45887).
-- Updated sunrise/sunset offset validation rules to make the feature more robust in [#45125](https://github.com/microsoft/PowerToys/pull/45125)
-- Fixed incorrect theme being loaded at startup in [#45304](https://github.com/microsoft/PowerToys/pull/45304).
+- 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 Utilities
+## Mouse Without Borders
 
-
-## New+
-
-- Added ability to hide the Windows built-in "New" context menu when New+ is enabled to avoid duplicate entries in [#44979](https://github.com/microsoft/PowerToys/pull/44979). Thanks [@cgaarden](https://github.com/cgaarden)!
-- Fixed issue where templates with numeric-only names were not displayed correctly in [#45439](https://github.com/microsoft/PowerToys/pull/45439). Thanks [@cgaarden](https://github.com/cgaarden)!
-- Fixed error dialog appearing when toggling the built-in "New" context menu visibility in Settings in [#46029](https://github.com/microsoft/PowerToys/pull/46029)
+- 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
 
-- Fixed file rename or search operations in Explorer incorrectly triggering Peek in [#44995](https://github.com/microsoft/PowerToys/pull/44995)
+- Hardened Peek previews with strict resource filtering and safer external link warnings.
+- Improved SVG preview compatibility by rendering via WebView2.
 
 ## PowerRename
 
-- Improved Unicode normalization and added regex metacharacter tests in [#44944](https://github.com/microsoft/PowerToys/pull/44944)
+- 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
 
-- Improved Window Walker search performance and significantly reduced memory usage when matching repeated/similar strings in [#44551](https://github.com/microsoft/PowerToys/pull/44551). Thanks [@daverayment](https://github.com/daverayment)!
+- 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
 
-- Prevented duplicate Shortcut Conflict windows by introducing a singleton pattern in [#42440](https://github.com/microsoft/PowerToys/pull/42440). Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-- Fixed multiple UI and usability issues across Settings, including tray icon theme handling, context menus, contrast issues, and incorrect button states in [#44931](https://github.com/microsoft/PowerToys/pull/44931), [#44982](https://github.com/microsoft/PowerToys/pull/44982), [#44736](https://github.com/microsoft/PowerToys/pull/44736), and [#45367](https://github.com/microsoft/PowerToys/pull/45367).
-- Fixed reliability issues including crashes, incorrect symbols, and Settings process shutdown behavior in [#45766](https://github.com/microsoft/PowerToys/pull/45766), [#45787](https://github.com/microsoft/PowerToys/pull/45787), and [#45696](https://github.com/microsoft/PowerToys/pull/45696).
-- Refactored OOBE/SCOOBE flows into standalone windows and removed unused experimentation plumbing in [#44721](https://github.com/microsoft/PowerToys/pull/44721).
-- Added an Open Settings button to SCOOBE for easier access in [#45775](https://github.com/microsoft/PowerToys/pull/45775).
-- Improved Settings UX and policy messaging in [#45513](https://github.com/microsoft/PowerToys/pull/45513), [#45030](https://github.com/microsoft/PowerToys/pull/45030) and [#45033](https://github.com/microsoft/PowerToys/pull/45033). Thanks [@htcfreek](https://github.com/htcfreek)!
-- Reduced overhead by using OneTime bindings for static Dashboard controls in [#45765](https://github.com/microsoft/PowerToys/pull/45765).
-- Updated badges and telemetry handling in the system tray and Dashboard in [#45992](https://github.com/microsoft/PowerToys/pull/45992), [#44985](https://github.com/microsoft/PowerToys/pull/44985), and [#46048](https://github.com/microsoft/PowerToys/pull/46048).
-- Added solution filter support for Settings UI projects and improved layout constraints in [#46036](https://github.com/microsoft/PowerToys/pull/46036) and [#46035](https://github.com/microsoft/PowerToys/pull/46035). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-
-## Workspaces
-
-- Fixed overlay positioning on multi-monitor setups with mixed DPI settings [#45183](https://github.com/microsoft/PowerToys/pull/45183)
-
-## ZoomIt
-
-- Added a video trim dialog for editing recordings directly in ZoomIt in [#45334](https://github.com/microsoft/PowerToys/pull/45334). Thanks [@foxmsft](https://github.com/foxmsft) and [@MarioHewardt](https://github.com/MarioHewardt)!
-- Added configurable audio inputs for recordings, fixing silent recording issue in [#45700](https://github.com/microsoft/PowerToys/pull/45700). Thanks [@foxmsft](https://github.com/foxmsft)!
-- Fixed issues affecting recording saving, subsequent recording startup, and virtual microphone cleanup in [#46034](https://github.com/microsoft/PowerToys/pull/46034) and [#45386](https://github.com/microsoft/PowerToys/pull/45386). Thanks [@foxmsft](https://github.com/foxmsft)!
-- Fixed an ampersand typing bug and debug assertion failure in [#43679](https://github.com/microsoft/PowerToys/pull/43679). Thanks [@daverayment](https://github.com/daverayment)!
-- Added datetime suffix to screenshot filenames for easier organization in [#43172](https://github.com/microsoft/PowerToys/pull/43172). Thanks [@daverayment](https://github.com/daverayment)!
-- Added the full ZoomIt hotkey list to ZoomIt's settings page in [#43073](https://github.com/microsoft/PowerToys/pull/43073).
-
----
+- 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
 
-### Build & CI
-- Added support for Visual Studio 2026 and centralized the PlatformToolset configuration in [#44304](https://github.com/microsoft/PowerToys/pull/44304). Thanks [@snickler](https://github.com/snickler)!
-- Improved build configuration and project consistency, including centralized .NET target framework handling in [#41366](https://github.com/microsoft/PowerToys/pull/41366). Thanks [@snickler](https://github.com/snickler)!
-- Upgraded dependencies including Windows App SDK and the C++ runtime in [#45532](https://github.com/microsoft/PowerToys/pull/45532) and [#45420](https://github.com/microsoft/PowerToys/pull/45420). Thanks [@snickler](https://github.com/snickler)!
-- Improved async infrastructure with WinRT coroutine support in [#45522](https://github.com/microsoft/PowerToys/pull/45522).
-- Fixed several CI and release pipeline issues affecting signing, build failures, and Windows App SDK compatibility in [#45971](https://github.com/microsoft/PowerToys/pull/45971), [#45211](https://github.com/microsoft/PowerToys/pull/45211), [#45390](https://github.com/microsoft/PowerToys/pull/45390), [#44639](https://github.com/microsoft/PowerToys/pull/44639), [#45582](https://github.com/microsoft/PowerToys/pull/45582), and [#44800](https://github.com/microsoft/PowerToys/pull/44800).
-- Improved development environment tooling and solution organization in [#45990](https://github.com/microsoft/PowerToys/pull/45990) and [#45555](https://github.com/microsoft/PowerToys/pull/45555).
-
-### Documentation
-- Added documentation for writing a new PowerToy module in [#44242](https://github.com/microsoft/PowerToys/pull/44242)
-- Added telemetry developer documentation in [#44912](https://github.com/microsoft/PowerToys/pull/44912). Thanks [@chatasweetie](https://github.com/chatasweetie)!
-- Improved developer docs in [#45534](https://github.com/microsoft/PowerToys/pull/45534). Thanks [@noraa-junker](https://github.com/noraa-junker) and [@snickler](https://github.com/snickler)!
-- Updated the data and privacy documentation to reflect current telemetry events in [#44844](https://github.com/microsoft/PowerToys/pull/44844). Thanks [@chatasweetie](https://github.com/chatasweetie)!
-- Added spellcheck words and sorted expect.txt in [#45251](https://github.com/microsoft/PowerToys/pull/45251). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Added dev guideline to verify builds before opening PRs in [#45419](https://github.com/microsoft/PowerToys/pull/45419)
-
-### Testing
-- Fixed libFuzzer failing to resolve target class name in Hosts fuzz tests in [#45784](https://github.com/microsoft/PowerToys/pull/45784)
-- Added unit tests to protect common utility code and fixed discovered bugs in [#45290](https://github.com/microsoft/PowerToys/pull/45290)
-- Migrated test infrastructure to newer MSTest framework in [#37651](https://github.com/microsoft/PowerToys/pull/37651). Thanks [@Youssef1313](https://github.com/Youssef1313)!
-- Fixed UI tests for Light Switch, Hosts, Workspaces, and Mouse in [#44754](https://github.com/microsoft/PowerToys/pull/44754)
-
-### Localization
-- Updated localization build dependencies and bundled extension localization files into installer in [#45889](https://github.com/microsoft/PowerToys/pull/45889) and [#45194](https://github.com/microsoft/PowerToys/pull/45194).
-
-### UI Framework
-- Created Common.UI.Controls library to consolidate shared WinUI controls in [#45542](https://github.com/microsoft/PowerToys/pull/45542). Thanks [@jiripolasek](https://github.com/jiripolasek)!
-
-### Enterprise
-- Added Group Policy definition for CursorWrap to ADMX/Intune templates in [#45028](https://github.com/microsoft/PowerToys/pull/45028). Thanks [@htcfreek](https://github.com/htcfreek)!
-
-### Installer
-- Fixed Image Resizer not working after upgrade on Windows 10 in [#45184](https://github.com/microsoft/PowerToys/pull/45184)
-
-### Copilot & Tooling
-- Improved internal tooling for release note generation, PR comment workflows, and developer utilities in [#44762](https://github.com/microsoft/PowerToys/pull/44762), [#44996](https://github.com/microsoft/PowerToys/pull/44996), [#45204](https://github.com/microsoft/PowerToys/pull/45204), and [#45606](https://github.com/microsoft/PowerToys/pull/45606).
-- Improved development environment setup tooling in [#45813](https://github.com/microsoft/PowerToys/pull/45813). Thanks [@SeanKilleen](https://github.com/SeanKilleen)!
-
-### GitHub Workflow
-- Updated Assets conflict script to improve error message clarity in [#45551](https://github.com/microsoft/PowerToys/pull/45551)
-- Updated release note generation skill to quote co-authors in [#45819](https://github.com/microsoft/PowerToys/pull/45819)
-- Enhanced bug report template with file upload option in [#46015](https://github.com/microsoft/PowerToys/pull/46015). Thanks [@noraa-junker](https://github.com/noraa-junker)!
-
-### Other
-- Properly localized "View on GitHub" link and release date in What's New OOBE page in [#45847](https://github.com/microsoft/PowerToys/pull/45847). Thanks [@PesBandi](https://github.com/PesBandi)!
-- Fixed WinUIEx crash issue in [#45443](https://github.com/microsoft/PowerToys/pull/45443)
-
+- 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.
 
 ## 🛣️ Roadmap 
-We are planning some nice new features and improvements for the next releases – a brand new PowerToy called PowerDisplay, even more Command Palette improvements, and a brand-new Shortcut Guide experience! Stay tuned for [v0.99][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.98][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!

doc/devdocs/core/installer.md

@@ -88,7 +88,7 @@
 ### Building PowerToys Locally
 
 #### One stop script for building installer
-1. Open `Developer PowerShell for VS`.
+1. Open `Developer Powershell for VS 2022` or `Developer PowerShell for VS` for VS 2026.
 2. Run tools\build\build-installer.ps1
 > For the first-time setup, please run the installer as an administrator. This ensures that the Wix tool can move wix.target to the desired location and trust the certificate used to sign the MSIX packages.
 
@@ -109,7 +109,7 @@ dotnet tool install --global wix --version 5.0.2
 
 ##### From the command line
 
-1. From the start menu, open a `Developer Command Prompt for VS`
+1. From the start menu, open a `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS`
 1. Ensure `nuget.exe` is in your `%path%`
 1. In the repo root, run these commands:
   
@@ -140,7 +140,7 @@ If you prefer, you can alternatively build prerequisite projects for the install
 
 The resulting installer will be available in the `installer\PowerToysSetupVNext\x64\Release\` folder.
 
-To build the installer from the command line, run `Developer Command Prompt for VS` in admin mode and execute the following commands. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
+To build the installer from the command line, run `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS` in admin mode and execute the following commands. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
 
 ```
 git clean -xfd  -e *exe -- .\installer\

doc/devdocs/development/debugging.md

@@ -15,7 +15,7 @@ Before you can start debugging PowerToys, you need to set up your development en
 
 You can build the entire solution from the command line, which is sometimes faster than building within Visual Studio:
 
-1. Open `Developer Command Prompt for VS`
+1. Open `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS`
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
    ```pwsh
@@ -105,7 +105,7 @@ If you encounter build errors about missing image files (e.g., `.png`, `.ico`, o
 
 1. **Clean the solution in Visual Studio**: Build > Clean Solution
 
-   Or from the command line (`Developer Command Prompt for VS`):
+   Or from the command line (Developer Command Prompt for VS 2022 or Developer Command Prompt for VS):
    ```pwsh
    msbuild PowerToys.slnx /t:Clean /p:Platform=x64 /p:Configuration=Debug
    ```

doc/devdocs/development/dev-with-vscode.md

@@ -15,27 +15,9 @@ VS Code extensions Needed:
 ---
 
 ## Building in VS Code
-### Configure Developer PowerShell for VS for more convenient development experience in VS Code
-1. Configure profile in settings, entry: `terminal.integrated.profiles.windows`
-2. Add below config as entry (choose VS 2026 or VS 2022 based on your installation):
-
-**For Visual Studio 2026 (recommended):**
-```json
-    "Developer PowerShell for VS": {
-		// Configure based on your preference
-        "path": "C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.5.2.0_arm64__8wekyb3d8bbwe\\pwsh.exe",
-        "args": [
-            "-NoExit",
-            "-Command",
-            "& {",
-            "$orig = Get-Location;",
-            // Adjust path based on your edition (Community/Professional/Enterprise)
-            "& 'C:\\Program Files\\Microsoft Visual Studio\\18\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
-            "Set-Location $orig",
-            "}"
-        ]
-    },
-```
+### Configure Developer Powershell for VS 2022 or Developer Powershell for VS for more convenient dev in vscode.
+1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
+2. Add below config as entry (choose VS 2022 or VS 2026 based on your installation):
 
 **For Visual Studio 2022:**
 ```json
@@ -55,6 +37,24 @@ VS Code extensions Needed:
     },
 ```
 
+**For Visual Studio 2026:**
+```json
+    "Developer PowerShell for VS": {
+		// Configure based on your preference
+        "path": "C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.5.2.0_arm64__8wekyb3d8bbwe\\pwsh.exe",
+        "args": [
+            "-NoExit",
+            "-Command",
+            "& {",
+            "$orig = Get-Location;",
+            // Adjust path based on your edition (Community/Professional/Enterprise)
+            "& 'C:\\Program Files\\Microsoft Visual Studio\\18\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
+            "Set-Location $orig",
+            "}"
+        ]
+    },
+```
+
 3. [Optional] Set your Developer PowerShell profile as the default, so that you can get a deep integration with vscode coding agent. 
 
 4. Now you can build with plain `msbuild` or configure tasks.json in below section.

doc/devdocs/development/new-powertoy.md

@@ -12,11 +12,22 @@ A PowerToy module is a self-contained utility integrated into the PowerToys ecos
 
 ### Requirements
 
-Follow the [Getting Started](../readme.md#getting-started) guide to set up your development environment, then [validate that you are able to build and run](debugging.md) `PowerToys.slnx`.
+- [Visual Studio 2026](https://visualstudio.microsoft.com/downloads/) and the following workloads/individual components:
+  - Desktop Development with C++
+  - WinUI application development
+  - .NET desktop development
+  - Windows 10 SDK (10.0.22621.0)
+  - Windows 11 SDK (10.0.26100.3916)
+- .NET 8 SDK
+- Fork the [PowerToys repository](https://github.com/microsoft/PowerToys/tree/main) locally
+- [Validate that you are able to build and run](https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/development/debugging.md) `PowerToys.slnx`.
 
 Optional: 
 - [WiX v5 toolset](https://github.com/microsoft/PowerToys/tree/main) for the installer
 
+> [!NOTE]
+> To ensure all the correct VS Workloads are installed, use [the WinGet configuration files](https://github.com/microsoft/PowerToys/tree/e13d6a78aafbcf32a4bb5f8581d041e1d057c3f1/.config) in the project repository. (Use the one that matches your VS distribution. ie: VS Community would use `configuration.winget`)
+
 ### Folder structure
 
 ```

doc/devdocs/events.md

@@ -1,197 +0,0 @@
-# Telemetry Events
-
-PowerToys collects limited telemetry to understand feature usage, reliability, and product quality. When adding a new telemetry event, follow the steps below to ensure the event is properly declared, documented, and available after release.
-
-**⚠️ Important**: Telemetry must never include personal information, file paths, or user‑generated content.
-
-## Developer Effort Overview (What to Expect)
-
-Adding a telemetry event is a **multi-step process** that typically spans several areas of the codebase and documentation.
-
-At a high level, developers should expect to:
-
-1. Within one PR:
-    1. Add a new telemetry event(s) to module
-    1. Add the new event(s) DATA_AND_PRIVACY.md
-1. Reach out to @carlos-zamora or @chatasweetie so internal scripts can process new event(s)
-
-### Privacy Guidelines
-
-**NEVER** log:
-
-- User data (text, files, emails, etc.)
-- File paths or filenames
-- Personal information
-- Sensitive system information
-- Anything that could identify a specific user
-
-DO log:
-
-- Feature usage (which features, how often)
-- Success/failure status
-- Timing/performance metrics
-- Error types (not error messages with user data)
-- Aggregate counts
-
-### Event Naming Convention
-
-Follow this pattern: `UtilityName_EventDescription`
-
-Examples:
-
-- `ColorPicker_Session`
-- `FancyZones_LayoutApplied`
-- `PowerRename_Rename`
-- `AdvancedPaste_FormatClicked`
-- `CmdPal_ExtensionInvoked`
-
-## Adding Telemetry Events to PowerToys
-
-PowerToys uses ETW (Event Tracing for Windows) for telemetry in both C++ and C# modules. The telemetry system is:
-
-- Opt-in by default (disabled since v0.86)
-- Privacy-focused - never logs personal info, file paths, or user-generated content
-- Controlled by registry - HKEY_CURRENT_USER\Software\Classes\PowerToys\AllowDataDiagnostics
-
-### C++ Telemetry Implementation
-
-**Core Components**
-
-| File  | Purpose |
-| ------------- |:-------------:|
-| [ProjectTelemetry.h](../../src/common/Telemetry/ProjectTelemetry.h)    | Declares the global ETW provider g_hProvider     |
-| [TraceBase.h](../../src/common/Telemetry/TraceBase.h)      | Base class with RegisterProvider(), UnregisterProvider(), and IsDataDiagnosticsEnabled() check     |
-| [TraceLoggingDefines.h](../../src/common/Telemetry/TraceLoggingDefines.h)      | Privacy tags and telemetry option group macros
-
-
-#### Pattern for C++ Modules
-
-1. Create a `Trace` class inheriting from `telemetry::TraceBase` (src/common/Telemetry/TraceBase.h):
-
-    ```c
-    // trace.h
-    #pragma once
-    #include <common/Telemetry/TraceBase.h>
-    
-    class Trace : public telemetry::TraceBase
-    {
-    public:
-        static void MyEvent(/* parameters */);
-    };
-    ```
-
-2. Implement events using `TraceLoggingWriteWrapper`:
-
-    ```cpp
-    // trace.cpp
-    #include "trace.h"
-    #include <common/Telemetry/TraceBase.h>
-    
-    TRACELOGGING_DEFINE_PROVIDER(
-        g_hProvider,
-        "Microsoft.PowerToys",
-        (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
-        TraceLoggingOptionProjectTelemetry());
-    
-    void Trace::MyEvent(bool enabled)
-    {
-        TraceLoggingWriteWrapper(
-            g_hProvider,
-            "ModuleName_EventName",           // Event name
-            TraceLoggingBoolean(enabled, "Enabled"),  // Event data
-            ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-            TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-            TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-    }
-    ```
-
-**Key C++ Telemetry Macros**
-
-| Macro  | Purpose |
-| ------------- |:-------------:|
-| `TraceLoggingWriteWrapper` [CustomAction.cpp](../../installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp)     | Wraps `TraceLoggingWrite` with `IsDataDiagnosticsEnabled()` check     |
-| `ProjectTelemetryPrivacyDataTag(tag)` [TraceLoggingDefines.h](../../src/common/Telemetry/TraceLoggingDefines.h)     | Sets privacy classification |
-
-### C# Telemetry Implementation
-
-**Core Components**
-
-| File  | Purpose |
-| ------------- |:-------------:|
-| [PowerToysTelemetry.cs](../../src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs)    | Singleton `Log` instance with `WriteEvent<T>()` method     |
-| [EventBase.cs](../../src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs)      | Base class for all events (provides `EventName`, `Version`)     |
-| [IEvent.cs](../../src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs)     | Interface requiring `PartA_PrivTags` property     |
-| [TelemetryBase.cs](../../src/common/Telemetry/TelemetryBase.cs)     | 	Inherits from `EventSource`, defines ETW constants     |
-| [DataDiagnosticsSettings.cs](../../src/common/ManagedTelemetry/Telemetry/DataDiagnosticsSettings.cs)     | Registry-based enable/disable check 
-
-#### Pattern for C# Modules
-
-1. Create an event class inheriting from `EventBase` and implementing `IEvent`:
-
-    ```csharp
-    using System.Diagnostics.CodeAnalysis;
-    using System.Diagnostics.Tracing;
-    using Microsoft.PowerToys.Telemetry;
-    using Microsoft.PowerToys.Telemetry.Events;
-    
-    namespace MyModule.Telemetry
-    {
-        [EventData]
-        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
-        public class MyModuleEvent : EventBase, IEvent
-        {
-            // Event properties (logged as telemetry data)
-            public string SomeProperty { get; set; }
-            public int SomeValue { get; set; }
-    
-            // Required: Privacy tag
-            public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    
-            // Optional: Set EventName in constructor (defaults to class name)
-            public MyModuleEvent(string prop, int val)
-            {
-                EventName = "MyModule_EventName";
-                SomeProperty = prop;
-                SomeValue = val;
-            }
-        }
-    }
-    ```
-
-2. Log the event:
-
-```csharp
-PowerToysTelemetry.Log.WriteEvent(new MyModuleEvent("value", 42));
-```
-
-**Privacy Tags (C#)**
-
-| Tag  | Use Case |
-| ------------- |:-------------:|
-| `PartA_PrivTags.ProductAndServiceUsage`  [TelemetryBase.cs](../../src/common/Telemetry/TelemetryBase.cs)     | Feature usage events
-| `PartA_PrivTags.ProductAndServicePerformance` [TelemetryBase.cs](../../src/common/Telemetry/TelemetryBase.cs)     | Performance/timing events
-  
-### Update DATA_AND_PRIVACY.md file
-
-Add your new event(s) to [DATA_AND_PRIVACY.md](../../DATA_AND_PRIVACY.md).
-
-## Launch Product Version Containing the new events
-
-Events do not become active until they ship in a released PowerToys version. After your PRs are merged:
-
-- The event will begin firing once users install the version that includes it
-- In order for PowerToys to process these events, you must complete the next section
-
-## Next Steps
-
-Reach out to @carlos-zamora or @chatasweetie so internal scripts can process new event(s).
-
-## Summary
-
-Required steps:
-
-1. In one PR:
-    - Add the event(s) in code
-    - Document event(s) in DATA_AND_PRIVACY.md
-1. Ship the change in a PowerToys release
-1. Reach out for next steps

doc/devdocs/modules/fancyzones.md

@@ -152,7 +152,7 @@ FancyZones is divided into several projects:
 ## Development Environment Setup
 
 ### Prerequisites
-- Visual Studio 2026 (or 2022 17.4+): Required for building and debugging
+- Visual Studio 2022 or 2026: Required for building and debugging
 - Windows 10 SDK: Ensure the latest version is installed
 - PowerToys Repository: Clone from GitHub
 
@@ -183,7 +183,7 @@ FancyZones is divided into several projects:
 ## Debugging
 
 ### Setup for Debugging
-1. In Visual Studio, set FancyZonesEditor as the startup project
+1. In Visual Studio 2022 or 2026, set FancyZonesEditor as the startup project
 2. Set breakpoints in the code where needed
 3. Click Run to start debugging
 

doc/devdocs/modules/newplus.md

@@ -141,10 +141,3 @@ 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")

doc/devdocs/modules/powerdisplay/mccsParserDesign.md

@@ -1,223 +0,0 @@
-# MCCS Capabilities String Parser - Recursive Descent Design
-
-## Overview
-
-This document describes the recursive descent parser implementation for DDC/CI MCCS (Monitor Control Command Set) capabilities strings.
-
-### Attention!
-This document and the code implement are generated by Copilot.
-
-## Grammar Definition (BNF)
-
-```bnf
-capabilities      ::= ['('] segment* [')']
-segment           ::= identifier '(' segment_content ')'
-segment_content   ::= text | vcp_entries | hex_list
-vcp_entries       ::= vcp_entry*
-vcp_entry         ::= hex_byte [ '(' hex_list ')' ]
-hex_list          ::= hex_byte*
-hex_byte          ::= [0-9A-Fa-f]{2}
-identifier        ::= [a-z_A-Z]+
-text              ::= [^()]+
-```
-
-## Example Input
-
-```
-(prot(monitor)type(lcd)model(PD3220U)cmds(01 02 03 07)vcp(10 12 14(04 05 06) 16 60(11 12 0F) DC DF)mccs_ver(2.2)vcpname(F0(Custom Setting)))
-```
-
-## Parser Architecture
-
-### Component Hierarchy
-
-```
-MccsCapabilitiesParser (main parser)
-├── ParseCapabilities()      → MccsParseResult
-├── ParseSegment()           → ParsedSegment?
-├── ParseBalancedContent()   → string
-├── ParseIdentifier()        → ReadOnlySpan<char>
-├── ApplySegment()           → void
-│   ├── ParseHexList()       → List<byte>
-│   ├── ParseVcpEntries()    → Dictionary<byte, VcpCodeInfo>
-│   └── ParseVcpNames()      → void
-│
-├── VcpEntryParser (sub-parser for vcp() content)
-│   └── TryParseEntry()      → VcpEntry
-│
-├── VcpNameParser (sub-parser for vcpname() content)
-│   └── TryParseEntry()      → (byte code, string name)
-│
-└── WindowParser (sub-parser for windowN() content)
-    ├── Parse()              → WindowCapability
-    └── ParseSubSegment()    → (name, content)?
-```
-
-### Design Principles
-
-1. **ref struct for Zero Allocation**
-   - Main parser uses `ref struct` to avoid heap allocation
-   - Works with `ReadOnlySpan<char>` for efficient string slicing
-   - No intermediate string allocations during parsing
-
-2. **Recursive Descent Pattern**
-   - Each grammar rule has a corresponding parse method
-   - Methods call each other recursively for nested structures
-   - Single-character lookahead via `Peek()`
-
-3. **Error Recovery**
-   - Errors are accumulated, not thrown
-   - Parser attempts to continue after errors
-   - Returns partial results when possible
-
-4. **Sub-parsers for Specialized Content**
-   - `VcpEntryParser` for VCP code entries
-   - `VcpNameParser` for custom VCP names
-   - Each sub-parser handles its own grammar subset
-
-## Parse Methods Detail
-
-### ParseCapabilities()
-Entry point. Handles optional outer parentheses and iterates through segments.
-
-```csharp
-private MccsParseResult ParseCapabilities()
-{
-    // Handle optional outer parens
-    // while (!IsAtEnd()) { ParseSegment() }
-    // Return result with accumulated errors
-}
-```
-
-### ParseSegment()
-Parses a single `identifier(content)` segment.
-
-```csharp
-private ParsedSegment? ParseSegment()
-{
-    // 1. ParseIdentifier()
-    // 2. Expect '('
-    // 3. ParseBalancedContent()
-    // 4. Expect ')'
-}
-```
-
-### ParseBalancedContent()
-Extracts content between balanced parentheses, handling nested parens.
-
-```csharp
-private string ParseBalancedContent()
-{
-    int depth = 1;
-    while (depth > 0) {
-        if (char == '(') depth++;
-        if (char == ')') depth--;
-    }
-}
-```
-
-### ParseVcpEntries()
-Delegates to `VcpEntryParser` for the specialized VCP entry grammar.
-
-```csharp
-vcp_entry ::= hex_byte [ '(' hex_list ')' ]
-
-Examples:
-- "10"           → code=0x10, values=[]
-- "14(04 05 06)" → code=0x14, values=[4, 5, 6]
-- "60(11 12 0F)" → code=0x60, values=[0x11, 0x12, 0x0F]
-```
-
-## Comparison with Other Approaches
-
-| Approach | Pros | Cons |
-|----------|------|------|
-| **Recursive Descent** (this) | Clear structure, handles nesting, extensible | More code |
-| **Regex** (DDCSharp) | Concise | Hard to debug, limited nesting |
-| **Mixed** (original) | Pragmatic | Inconsistent, hard to maintain |
-
-## Performance Characteristics
-
-- **Time Complexity**: O(n) where n = input length
-- **Space Complexity**: O(1) for parsing + O(m) for output where m = number of VCP codes
-- **Allocations**: Minimal - only for output structures
-
-## Supported Segments
-
-| Segment | Description | Parser |
-|---------|-------------|--------|
-| `prot(...)` | Protocol type | Direct assignment |
-| `type(...)` | Display type (lcd/crt) | Direct assignment |
-| `model(...)` | Model name | Direct assignment |
-| `cmds(...)` | Supported commands | ParseHexList |
-| `vcp(...)` | VCP code entries | VcpEntryParser |
-| `mccs_ver(...)` | MCCS version | Direct assignment |
-| `vcpname(...)` | Custom VCP names | VcpNameParser |
-| `windowN(...)` | PIP/PBP window capabilities | WindowParser |
-
-### Window Segment Format
-
-The `windowN` segment (where N is 1, 2, 3, etc.) describes PIP/PBP window capabilities:
-
-```
-window1(type(PIP) area(25 25 1895 1175) max(640 480) min(10 10) window(10))
-```
-
-| Sub-field | Format | Description |
-|-----------|--------|-------------|
-| `type` | `type(PIP)` or `type(PBP)` | Window type (Picture-in-Picture or Picture-by-Picture) |
-| `area` | `area(x1 y1 x2 y2)` | Window area coordinates in pixels |
-| `max` | `max(width height)` | Maximum window dimensions |
-| `min` | `min(width height)` | Minimum window dimensions |
-| `window` | `window(id)` | Window identifier |
-
-All sub-fields are optional; missing fields default to zero values.
-
-## Error Handling
-
-```csharp
-public readonly struct ParseError
-{
-    public int Position { get; }    // Character position
-    public string Message { get; }  // Human-readable error
-}
-
-public sealed class MccsParseResult
-{
-    public VcpCapabilities Capabilities { get; }
-    public IReadOnlyList<ParseError> Errors { get; }
-    public bool HasErrors => Errors.Count > 0;
-    public bool IsValid => !HasErrors && Capabilities.SupportedVcpCodes.Count > 0;
-}
-```
-
-## Usage Example
-
-```csharp
-// Parse capabilities string
-var result = MccsCapabilitiesParser.Parse(capabilitiesString);
-
-if (result.IsValid)
-{
-    var caps = result.Capabilities;
-    Console.WriteLine($"Model: {caps.Model}");
-    Console.WriteLine($"MCCS Version: {caps.MccsVersion}");
-    Console.WriteLine($"VCP Codes: {caps.SupportedVcpCodes.Count}");
-}
-
-if (result.HasErrors)
-{
-    foreach (var error in result.Errors)
-    {
-        Console.WriteLine($"Parse error at {error.Position}: {error.Message}");
-    }
-}
-```
-
-## Edge Cases Handled
-
-1. **Missing outer parentheses** (Apple Cinema Display)
-2. **No spaces between hex bytes** (`010203` vs `01 02 03`)
-3. **Nested parentheses** in VCP values
-4. **Unknown segments** (logged but not fatal)
-5. **Malformed input** (partial results returned)

doc/devdocs/readme.md

@@ -2,31 +2,90 @@
 
 Welcome to the PowerToys developer documentation. This documentation provides information for developers who want to contribute to PowerToys or understand how it works.
 
-## Getting Started
+## Core Architecture
 
-### Prerequisites
+- [Architecture Overview](core/architecture.md) - Overview of the PowerToys architecture and module interface
+- [Runner and System tray](core/runner.md) - Details about the PowerToys Runner process
+- [Settings](core/settings/readme.md) - Documentation on the settings system
+- [Installer](core/installer.md) - Information about the PowerToys installer
+- [Modules](modules/readme.md) - Documentation for individual PowerToys modules
 
-1. Windows 10 April 2018 Update (version 1803) or newer
-1. [Visual Studio 2026](https://visualstudio.microsoft.com/downloads/) (recommended) or Visual Studio 2022 17.4+ with the following workloads/components:
-   - Desktop Development with C++
-   - WinUI application development
-   - .NET desktop development
-   - Windows 10 SDK (10.0.22621.0)
-   - Windows 11 SDK (10.0.26100.3916)
-1. .NET 8 SDK
-1. Enable long paths in Windows (see [Enable Long Paths](https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation#enabling-long-paths-in-windows-10-version-1607-and-later) for details)
+## Common Components
 
-> **Tip:** You can install Visual Studio with all required workloads automatically using the [WinGet configuration files](https://github.com/microsoft/PowerToys/tree/main/.config) in the repository:
-> ```powershell
-> winget configure .config\configuration.winget
-> ```
-> Pick the file that matches your VS edition (e.g., `configuration.vsProfessional.winget` or `configuration.vsEnterprise.winget`).
+- [Context Menu Handlers](common/context-menus.md) - How PowerToys implements and registers Explorer context menu handlers
+- [Monaco Editor](common/monaco-editor.md) - How PowerToys uses the Monaco code editor component across modules
+- [Logging and Telemetry](development/logging.md) - How to use logging and telemetry
+- [Localization](development/localization.md) - How to support multiple languages
 
-### Fork, Clone, and Set Up
+## Development Guidelines
+
+- [Coding Guidelines](development/guidelines.md) - Development guidelines and best practices
+- [Coding Style](development/style.md) - Code formatting and style conventions
+- [UI Testing](development/ui-tests.md) - How to write UI tests for PowerToys
+- [Debugging](development/debugging.md) - Techniques for debugging PowerToys
+
+## Tools
+
+- [Tools Overview](tools/readme.md) - Overview of tools in PowerToys
+- [Build Tools](tools/build-tools.md) - Tools that help building PowerToys
+- [Bug Report Tool](tools/bug-report-tool.md) - Tool for collecting logs and system information
+- [Debugging Tools](tools/debugging-tools.md) - Specialized tools for debugging
+- [Fuzzing Testing](tools/fuzzingtesting.md) - How to implement and run fuzz testing for PowerToys modules
+
+## Processes
+
+- [Release Process](processes/release-process.md) - How PowerToys releases are prepared and published
+- [Update Process](processes/update-process.md) - How PowerToys updates work
+- [GPO Implementation](processes/gpo.md) - Group Policy Objects implementation details
+
+## Other Resources
+
+- [aka.ms links](akaLinks.md) - List of short links
+- [Issue/PR commands](commands.md) - Special commands for managing issues and pull requests
+
+## Fork, Clone, Branch and Create your PR
+
+Once you've discussed your proposed feature/fix/etc. with a team member, and an approach or a spec has been written and approved, it's time to start development:
 
 1. Fork the repo on GitHub if you haven't already
 1. Clone your fork locally
-1. Run the automated setup script (**recommended**):
+1. Create a feature branch
+1. Work on your changes
+1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
+1. When ready, mark your PR as "ready for review".
+
+## Rules
+
+- **Follow the pattern of what you already see in the code.**
+- [Coding style](development/style.md).
+- Try to package new functionality/components into libraries that have nicely defined interfaces.
+- Package new functionality into classes or refactor existing functionality into a class as you extend the code.
+- When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.
+
+## GitHub Workflow
+
+- Before starting to work on a fix/feature, make sure there is an open issue to track the work.
+- Add the `In progress` label to the issue, if not already present. Also add a `Cost-Small/Medium/Large` estimate and make sure all appropriate labels are set.
+- If you are a community contributor, you will not be able to add labels to the issue; in that case just add a comment saying that you have started work on the issue and try to give an estimate for the delivery date.
+- If the work item has a medium/large cost, using the markdown task list, list each sub item and update the list with a check mark after completing each sub item.
+- When opening a PR, follow the PR template.
+- When you'd like the team to take a look (even if the work is not yet fully complete) mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
+- When the PR is approved, let the owner of the PR merge it. For community contributions, the reviewer who approved the PR can also merge it.
+- Use the `Squash and merge` option to merge a PR. If you don't want to squash it because there are logically different commits, use `Rebase and merge`.
+- Close issues automatically when referenced in a PR. You can use [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in the body of the PR to have GitHub automatically link your PR to the issue.
+
+## Compiling PowerToys
+
+### Prerequisites for Compiling PowerToys
+
+1. Windows 10 April 2018 Update (version 1803) or newer
+1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer, or Visual Studio 2026
+1. A local clone of the PowerToys repository
+1. Enable long paths in Windows (see [Enable Long Paths](https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation#enabling-long-paths-in-windows-10-version-1607-and-later) for details)
+
+### Automated Setup (Recommended)
+
+Run the setup script to automatically configure your development environment:
 
 ```powershell
 .\tools\build\setup-dev-environment.ps1
@@ -38,10 +97,15 @@ This script will:
 - Guide you through installing required Visual Studio components from `.vsconfig`
 - Initialize git submodules
 
-Run with `-Help` to see all available options.
+Run with `-Help` to see all available options:
 
-<details>
-<summary><strong>Manual setup (if you prefer not to use the script)</strong></summary>
+```powershell
+.\tools\build\setup-dev-environment.ps1 -Help
+```
+
+### Manual Setup
+
+If you prefer to set up manually, follow these steps:
 
 #### Install Visual Studio dependencies
 
@@ -50,17 +114,15 @@ Run with `-Help` to see all available options.
 
 Alternatively, import the `.vsconfig` file from the repository root using Visual Studio Installer to install all required workloads.
 
-#### Initialize submodules
+#### Get Submodules to compile
 
-This is a one-time step required before you can compile most parts of PowerToys.
+We have submodules that need to be initialized before you can compile most parts of PowerToys. This should be a one-time step.
 
 1. Open a terminal
 1. Navigate to the folder you cloned PowerToys to.
 1. Run `git submodule update --init --recursive`
 
-</details>
-
-### Building
+### Compiling Source Code
 
 #### Using Visual Studio
 
@@ -88,81 +150,7 @@ You can also build from the command line using the provided scripts in `tools\bu
 .\tools\build\build-installer.ps1
 ```
 
-### Debugging
-
-See [Debugging](development/debugging.md) for detailed debugging techniques, including Visual Studio setup, attaching to child processes, and troubleshooting build errors.
-
-### Creating a New PowerToy
-
-See [Creating a New PowerToy](development/new-powertoy.md) for an end-to-end guide covering module architecture, settings integration, installer packaging, and testing.
-
-### Building Command Palette Extensions
-
-If you want to build your own extensions for Command Palette, check out the [Command Palette extensibility documentation](https://aka.ms/building-cmdpal-extensions). It covers how to create, package, and distribute custom extensions that integrate with Command Palette.
-
-## Development Guidelines
-
-- [Coding Guidelines](development/guidelines.md) - Development guidelines and best practices
-- [Coding Style](development/style.md) - Code formatting and style conventions
-- [Logging and Telemetry](development/logging.md) - How to use logging and telemetry
-- [Localization](development/localization.md) - How to support multiple languages
-- [UI Testing](development/ui-tests.md) - How to write UI tests for PowerToys
-- [Developing with VS Code](development/dev-with-vscode.md) - Build, debug, and contribute using VS Code
-
-## Rules
-
-- **Follow the pattern of what you already see in the code.**
-- [Coding style](development/style.md).
-- Try to package new functionality/components into libraries that have nicely defined interfaces.
-- Package new functionality into classes or refactor existing functionality into a class as you extend the code.
-- When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.
-
-## GitHub Workflow
-
-- Before starting to work on a fix/feature, make sure there is an open issue to track the work.
-- Add the `In progress` label to the issue, if not already present. Also add a `Cost-Small/Medium/Large` estimate and make sure all appropriate labels are set.
-- If you are a community contributor, you will not be able to add labels to the issue; in that case just add a comment saying that you have started work on the issue and try to give an estimate for the delivery date.
-- If the work item has a medium/large cost, using the markdown task list, list each sub item and update the list with a check mark after completing each sub item.
-- **Before opening a PR, ensure your changes build successfully locally and functionality tests pass.** This is especially important for AI-assisted (vibe coding) contributions—always verify AI-generated code works as intended. Exploratory PRs or draft PRs for discussion are exceptions.
-- When opening a PR, follow the PR template.
-- When you'd like the team to take a look (even if the work is not yet fully complete) mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
-- When the PR is approved, let the owner of the PR merge it. For community contributions, the reviewer who approved the PR can also merge it.
-- Use the `Squash and merge` option to merge a PR. If you don't want to squash it because there are logically different commits, use `Rebase and merge`.
-- Close issues automatically when referenced in a PR. You can use [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in the body of the PR to have GitHub automatically link your PR to the issue.
-
-## Core Architecture
-
-- [Architecture Overview](core/architecture.md) - Overview of the PowerToys architecture and module interface
-- [Runner and System tray](core/runner.md) - Details about the PowerToys Runner process
-- [Settings](core/settings/readme.md) - Documentation on the settings system
-- [Installer](core/installer.md) - Information about the PowerToys installer
-- [Modules](modules/readme.md) - Documentation for individual PowerToys modules
-
-## Common Components
-
-- [Context Menu Handlers](common/context-menus.md) - How PowerToys implements and registers Explorer context menu handlers
-- [Monaco Editor](common/monaco-editor.md) - How PowerToys uses the Monaco code editor component across modules
-
-## Tools
-
-- [Tools Overview](tools/readme.md) - Overview of tools in PowerToys
-- [Build Tools](tools/build-tools.md) - Tools that help building PowerToys
-- [Bug Report Tool](tools/bug-report-tool.md) - Tool for collecting logs and system information
-- [Debugging Tools](tools/debugging-tools.md) - Specialized tools for debugging
-- [Fuzzing Testing](tools/fuzzingtesting.md) - How to implement and run fuzz testing for PowerToys modules
-
-## Processes
-
-- [Release Process](processes/release-process.md) - How PowerToys releases are prepared and published
-- [Update Process](processes/update-process.md) - How PowerToys updates work
-- [GPO Implementation](processes/gpo.md) - Group Policy Objects implementation details
-
-## Other Resources
-
-- [aka.ms links](akaLinks.md) - List of short links
-- [Issue/PR commands](commands.md) - Special commands for managing issues and pull requests
-
-## Building the Installer
+## Compile the installer
 
 Our installer is two parts, an EXE and an MSI.  The EXE (Bootstrapper) contains the MSI and handles more complex installation logic. 
 - The EXE installs all prerequisites and installs PowerToys via the MSI. It has additional features such as the installation flags (see below).
@@ -176,3 +164,8 @@ The installer can only be compiled in `Release` mode; steps 1 and 2 must be perf
 1. Compile `PowerToysSetup.slnx` Path from root: `installer\PowerToysSetup.slnx` (details listed below)
 
 See [Installer](core/installer.md) for more details on building and debugging the installer.
+
+## How to create new PowerToys
+
+See the instructions on [how to install the PowerToys Module project template](/tools/project_template). <br />
+Specifications for the [PowerToys settings API](core/settings/readme.md).

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -1119,35 +1119,6 @@ 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;
@@ -1578,7 +1549,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 45> processesToTerminate = {
+    std::array<std::wstring_view, 44> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

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

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props')" />
   <Import Project="..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props" Condition="Exists('..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props')" />
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B3A354B0-1E54-4B55-A962-FB5AF9330C19}</ProjectGuid>
@@ -88,7 +88,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>inc;..\..\src\;..\..\src\common\Telemetry;telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await /Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
@@ -165,14 +165,14 @@
   </ItemGroup>
   <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.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\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('..\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.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props'))" />
   </Target>

installer/PowerToysSetupCustomActionsVNext/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.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="WixToolset.DUtil" version="5.0.2" targetFramework="native" />
   <package id="WixToolset.WcaUtil" version="5.0.2" targetFramework="native" />
 </packages>

installer/PowerToysSetupVNext/KeyboardManager.wxs

@@ -2,19 +2,7 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define KeyboardManagerAssetsFiles=?>
-  <?define KeyboardManagerAssetsFilesPath=$(var.BinDir)\Assets\KeyboardManager\?>
-
   <Fragment>
-    <DirectoryRef Id="BaseApplicationsAssetsFolder">
-      <Directory Id="KeyboardManagerAssetsInstallFolder" Name="KeyboardManager" />
-    </DirectoryRef>
-
-    <DirectoryRef Id="KeyboardManagerAssetsInstallFolder" FileSource="$(var.KeyboardManagerAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--KeyboardManagerAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
     <DirectoryRef Id="INSTALLFOLDER">
       <Directory Id="KeyboardManagerEditorInstallFolder" Name="KeyboardManagerEditor" />
       <Directory Id="KeyboardManagerEngineInstallFolder" Name="KeyboardManagerEngine" />
@@ -56,7 +44,6 @@
         <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="RemoveFolderKeyboardManagerEditorFolder" Directory="KeyboardManagerEditorInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderKeyboardManagerEngineFolder" Directory="KeyboardManagerEngineInstallFolder" On="uninstall" />
       </Component>

installer/PowerToysSetupVNext/PowerDisplay.wxs

@@ -1,29 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define PowerDisplayAssetsFiles=?>
-  <?define PowerDisplayAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerDisplay?>
-
-  <Fragment>
-    <!-- Power Display -->
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="PowerDisplayAssetsInstallFolder" Name="PowerDisplay" />
-    </DirectoryRef>
-    <DirectoryRef Id="PowerDisplayAssetsInstallFolder" FileSource="$(var.PowerDisplayAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerDisplayAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="PowerDisplayComponentGroup">
-      <Component Id="RemovePowerDisplayFolder" Guid="B8F2E3A5-72C1-4A2D-9B3F-8E5D7C6A4F9B" Directory="PowerDisplayAssetsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemovePowerDisplayFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPowerDisplayAssetsFolder" Directory="PowerDisplayAssetsInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetupVNext/Product.wxs

@@ -146,7 +146,7 @@
       <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UninstallCommandNotFound" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UpgradeCommandNotFound" After="InstallFiles" Condition="WIX_UPGRADE_DETECTED" />
-      <Custom Action="UninstallPackageIdentityMSIX" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
+      <Custom Action="UninstallPackageIdentityMSIX" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UninstallServicesTask" After="InstallFinalize" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
         <!-- TODO: Use to activate embedded MSIX -->
       <!--<Custom Action="UninstallEmbeddedMSIXTask" After="InstallFinalize">
@@ -161,9 +161,6 @@
       <!-- 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]" />
@@ -265,8 +262,6 @@
 
     <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/Resources.wxs

@@ -367,12 +367,6 @@
         </RegistryKey>
         <File Id="BgcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.BgcodePreviewHandler.resources.dll" />
       </Component>
-      <Component Id="CmdPalExtPowerToys_$(var.IdSafeLanguage)_Component" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" Guid="$(var.CompGUIDPrefix)23">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="CmdPalExtPowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Id="CmdPalExtPowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\Microsoft.CmdPal.Ext.PowerToys.resources.dll" />
-      </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
       <?endforeach?>

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -172,10 +172,6 @@ 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-FileComponents -fileListName "KeyboardManagerAssetsFiles" -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

nuget.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<packageSources>
 		<clear />

src/ActionRunner/actionRunner.vcxproj

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(RepoRoot)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h actionRunner.base.rc actionRunner.rc" />
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h actionRunner.base.rc actionRunner.rc" />
   </Target>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -11,10 +10,11 @@
     <RootNamespace>actionRunner</RootNamespace>
     <ProjectName>PowerToys.ActionRunner</ProjectName>
   </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     
   </PropertyGroup>
-  <Import Project="$(RepoRoot)deps\expected.props" />
+  <Import Project="..\..\deps\expected.props" />
   <PropertyGroup>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
@@ -59,17 +59,17 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(RepoRoot)deps\spdlog.props" />
+  <Import Project="..\..\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.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="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.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>
       <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.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.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('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.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/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.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/Common.Dotnet.CsWinRT.props

@@ -4,9 +4,8 @@
   <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
 
   <PropertyGroup>
-    <CoreTargetFramework>net9.0</CoreTargetFramework>
     <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>$(CoreTargetFramework)-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>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>

src/Common.Dotnet.FuzzTest.props

@@ -7,13 +7,4 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
-
-  <!--
-    In CI, the main build runs `/t:Build;Test` across the full solution.
-    Fuzz test projects are built for OneFuzz ingestion, but should not be
-    executed as regular MSTest tests in this pass.
-  -->
-  <PropertyGroup Condition="'$(TF_BUILD)' != ''">
-    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
-  </PropertyGroup>
 </Project>

src/PackageIdentity/PackageIdentity.vcxproj

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

src/Update/PowerToys.Update.cpp

@@ -57,7 +57,7 @@ std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
 
     auto state = UpdateState::read();
 
-    const auto new_version_info = std::move(get_github_version_info_async()).get();
+    const auto new_version_info = get_github_version_info_async().get();
     if (std::holds_alternative<version_up_to_date>(*new_version_info))
     {
         isUpToDate = true;
@@ -76,7 +76,7 @@ std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
         // Cleanup old updates before downloading the latest
         updating::cleanup_updates();
 
-        auto downloaded_installer = std::move(download_new_version_async(std::get<new_version_download_info>(*new_version_info))).get();
+        auto downloaded_installer = download_new_version(std::get<new_version_download_info>(*new_version_info)).get();
         if (!downloaded_installer)
         {
             Logger::error("Couldn't download new installer");

src/Update/PowerToys.Update.vcxproj

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(RepoRoot)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h PowerToys.Update.base.rc PowerToys.Update.rc" />
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h PowerToys.Update.base.rc PowerToys.Update.rc" />
   </Target>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -11,10 +10,11 @@
     <RootNamespace>Update</RootNamespace>
     <ProjectName>PowerToys.Update</ProjectName>
   </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     
   </PropertyGroup>
-  <Import Project="$(RepoRoot)deps\expected.props" />
+  <Import Project="..\..\deps\expected.props" />
   <PropertyGroup>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
@@ -65,17 +65,17 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(RepoRoot)deps\spdlog.props" />
+  <Import Project="..\..\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.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="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.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>
       <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.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.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('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.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/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.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
 </packages>

src/codeAnalysis/GlobalSuppressions.cs

@@ -22,13 +22,13 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.SpecialRules", "SA0001:XmlCommentAnalysisDisabled", Justification = "Not enabled as we don't want or need XML documentation.")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1629:DocumentationTextMustEndWithAPeriod", Justification = "Not enabled as we don't want or need XML documentation.")]
 
-[assembly: SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly", Scope = "member", Target = "Microsoft.Templates.Locations.TemplatesSynchronization.#SyncStatusChanged", Justification = "Using an Action<object, SyncStatusEventArgs> does not allow the required notation")]
+[assembly: SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly", Scope = "member", Target = "Microsoft.Templates.Core.Locations.TemplatesSynchronization.#SyncStatusChanged", Justification = "Using an Action<object, SyncStatusEventArgs> does not allow the required notation")]
 
 // Non general suppressions
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "This is part of the markdown processing", MessageId = "System.Windows.Documents.Run.#ctor(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Controls.Markdown.#ImageInlineEvaluator(System.Text.RegularExpressions.Match)")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1<Microsoft.Templates.Composition.QueryNode>,Microsoft.Templates.Composition.QueryablePropertyDictionary)")]
-[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "Resource DictionaryWriter does not implement flush async", Scope = "member", Target = "~M:Microsoft.Templates.PostActions.Catalog.Merge.MergeResourceDictionaryPostAction.ExecuteInternalAsync~System.Threading.Tasks.Task")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1<Microsoft.Templates.Core.Composition.QueryNode>,Microsoft.Templates.Core.Composition.QueryablePropertyDictionary)")]
+[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "Resource DictionaryWriter does not implement flush async", Scope = "member", Target = "~M:Microsoft.Templates.Core.PostActions.Catalog.Merge.MergeResourceDictionaryPostAction.ExecuteInternalAsync~System.Threading.Tasks.Task")]
 [assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Used in a lot of places for meaningful method names")]
 [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Static methods may improve performance but decrease maintainability")]
 [assembly: SuppressMessage("Naming", "CA1711:Identifiers should not have incorrect suffix", Justification = "Renaming everything would be a lot of work. It does not do any harm if an EventHandler delegate ends with the suffix EventHandler. Besides this, the Rule causes some false positives.")]
@@ -43,10 +43,10 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.ViewModels.Common.SavedTemplateViewModel.OnDelete(Microsoft.Templates.UI.ViewModels.Common.SavedTemplateViewModel)")]
 
 // Localization suppressions
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#CreateJunction(System.String,System.String,System.Boolean)", Justification = "Only used for local generation")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#DeleteJunction(System.String)", Justification = "Only used for local generation")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#InternalGetTarget(Microsoft.Win32.SafeHandles.SafeFileHandle)", Justification = "Only used for local generation")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#OpenReparsePoint(System.String,Microsoft.Templates.Locations.JunctionNativeMethods+EFileAccess)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#CreateJunction(System.String,System.String,System.Boolean)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#DeleteJunction(System.String)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#InternalGetTarget(Microsoft.Win32.SafeHandles.SafeFileHandle)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#OpenReparsePoint(System.String,Microsoft.Templates.Core.Locations.JunctionNativeMethods+EFileAccess)", Justification = "Only used for local generation")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "System.Windows.Documents.InlineCollection.Add(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Extensions.TextBlockExtensions.#OnSequentialFlowStepChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)", Justification = "No text here")]
 [assembly: SuppressMessage("Globalization", "CA1309:Use ordinal string comparison", Justification = "The user's search term should be compared with culture based rules.", Scope = "type", Target = "~T:Microsoft.PowerToys.Run.Plugin.TimeDate.Components.SearchController")]
 

src/common/AllExperiments/AllExperiments.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <TargetName>PowerToys.AllExperiments</TargetName>
+    <MockDirectory>.\Microsoft.VariantAssignment\</MockDirectory>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
+    <ProjectReference Include="..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+  </ItemGroup>
+
+  <!-- Experimentation is live, forcing inclusion -->
+  <ItemGroup Condition="'$(IsExperimentationLive)'!=''">
+    <!-- Newtonsoft.Json is included and a version specified in Directory.Packages.props to avoid a vulnerability from older versions. -->
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="Microsoft.VariantAssignment.Client" />
+    <PackageReference Include="Microsoft.VariantAssignment.Contract" />
+    <Compile Remove=".\$(MockDirectory)\Client\*.cs" />
+    <Compile Remove=".\$(MockDirectory)\Contract\*.cs" />
+  </ItemGroup>
+
+</Project>

src/common/AllExperiments/Experiments.cs

@@ -0,0 +1,214 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Globalization;
+using System.Text.Json;
+
+using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.VariantAssignment.Client;
+using Microsoft.VariantAssignment.Contract;
+using Windows.System.Profile;
+
+namespace AllExperiments
+{
+    // The dependencies required to build this project are only available in the official build pipeline and are internal to Microsoft.
+    // However, this project is not required to build a test version of the application.
+    public class Experiments
+    {
+        public enum ExperimentState
+        {
+            Enabled,
+            Disabled,
+            NotLoaded,
+        }
+
+#pragma warning disable SA1401 // Need to use LandingPageExperiment as a static property in OobeShellPage.xaml.cs
+#pragma warning disable CA2211 // Non-constant fields should not be visible
+        public static ExperimentState LandingPageExperiment = ExperimentState.NotLoaded;
+#pragma warning restore CA2211
+#pragma warning restore SA1401
+
+        public async Task<bool> EnableLandingPageExperimentAsync()
+        {
+            if (Experiments.LandingPageExperiment != ExperimentState.NotLoaded)
+            {
+                return Experiments.LandingPageExperiment == ExperimentState.Enabled;
+            }
+
+            Experiments varServ = new Experiments();
+            await varServ.VariantAssignmentProvider_Initialize();
+            var landingPageExperiment = varServ.IsExperiment;
+
+            Experiments.LandingPageExperiment = landingPageExperiment ? ExperimentState.Enabled : ExperimentState.Disabled;
+
+            return landingPageExperiment;
+        }
+
+        private async Task VariantAssignmentProvider_Initialize()
+        {
+            IsExperiment = false;
+            string jsonFilePath = CreateFilePath();
+
+            var vaSettings = new VariantAssignmentClientSettings
+            {
+                Endpoint = new Uri("https://default.exp-tas.com/exptas77/a7a397e7-6fbe-4f21-a4e9-3f542e4b000e-exppowertoys/api/v1/tas"),
+                EnableCaching = true,
+                ResponseCacheTime = TimeSpan.FromMinutes(5),
+            };
+
+            try
+            {
+                var vaClient = vaSettings.GetTreatmentAssignmentServiceClient();
+                var vaRequest = GetVariantAssignmentRequest();
+                using var variantAssignments = await vaClient.GetVariantAssignmentsAsync(vaRequest).ConfigureAwait(false);
+
+                if (variantAssignments.AssignedVariants.Count != 0)
+                {
+                    var dataVersion = variantAssignments.DataVersion;
+                    var featureVariables = variantAssignments.GetFeatureVariables();
+                    var assignmentContext = variantAssignments.GetAssignmentContext();
+                    var featureFlagValue = featureVariables[0].GetStringValue();
+
+                    var experimentGroup = string.Empty;
+                    string json = File.ReadAllText(jsonFilePath);
+                    var jsonDictionary = JsonSerializer.Deserialize<Dictionary<string, object>>(json);
+
+                    if (jsonDictionary != null)
+                    {
+                        if (!jsonDictionary.TryGetValue("dataversion", out object? value))
+                        {
+                            value = dataVersion;
+                            jsonDictionary.Add("dataversion", value);
+                        }
+
+                        if (!jsonDictionary.ContainsKey("variantassignment"))
+                        {
+                            jsonDictionary.Add("variantassignment", featureFlagValue);
+                        }
+                        else
+                        {
+                            var jsonDataVersion = value.ToString();
+                            if (jsonDataVersion != null && int.Parse(jsonDataVersion, CultureInfo.InvariantCulture) < dataVersion)
+                            {
+                                jsonDictionary["dataversion"] = dataVersion;
+                                jsonDictionary["variantassignment"] = featureFlagValue;
+                            }
+                        }
+
+                        experimentGroup = jsonDictionary["variantassignment"].ToString();
+
+                        string output = JsonSerializer.Serialize(jsonDictionary);
+                        File.WriteAllText(jsonFilePath, output);
+                    }
+
+                    if (experimentGroup == "alternate" && AssignmentUnit != string.Empty)
+                    {
+                        IsExperiment = true;
+                    }
+
+                    PowerToysTelemetry.Log.WriteEvent(new OobeVariantAssignmentEvent() { AssignmentContext = assignmentContext, ClientID = AssignmentUnit });
+                }
+            }
+            catch (HttpRequestException ex)
+            {
+                string json = File.ReadAllText(jsonFilePath);
+                var jsonDictionary = JsonSerializer.Deserialize<Dictionary<string, object>>(json);
+
+                if (jsonDictionary != null)
+                {
+                    if (jsonDictionary.TryGetValue("variantassignment", out object? value))
+                    {
+                        if (value.ToString() == "alternate" && AssignmentUnit != string.Empty)
+                        {
+                            IsExperiment = true;
+                        }
+                    }
+                    else
+                    {
+                        jsonDictionary["variantassignment"] = "current";
+                    }
+                }
+
+                string output = JsonSerializer.Serialize(jsonDictionary);
+                File.WriteAllText(jsonFilePath, output);
+
+                Logger.LogError("Error getting to TAS endpoint", ex);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Error getting variant assignments for experiment", ex);
+            }
+        }
+
+        public bool IsExperiment { get; set; }
+
+        private string? AssignmentUnit { get; set; }
+
+        private VariantAssignmentRequest GetVariantAssignmentRequest()
+        {
+            var jsonFilePath = CreateFilePath();
+            try
+            {
+                if (!File.Exists(jsonFilePath))
+                {
+                    AssignmentUnit = Guid.NewGuid().ToString();
+                    var data = new Dictionary<string, string>()
+                    {
+                        ["clientid"] = AssignmentUnit,
+                    };
+                    string jsonData = JsonSerializer.Serialize(data);
+                    File.WriteAllText(jsonFilePath, jsonData);
+                }
+                else
+                {
+                    string json = File.ReadAllText(jsonFilePath);
+                    var jsonDictionary = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(json);
+                    if (jsonDictionary != null)
+                    {
+                        AssignmentUnit = jsonDictionary["clientid"]?.ToString();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Error creating/getting AssignmentUnit", ex);
+            }
+
+            var attrNames = new List<string> { "FlightRing", "c:InstallLanguage" };
+            var attrData = AnalyticsInfo.GetSystemPropertiesAsync(attrNames).AsTask().GetAwaiter().GetResult();
+
+            var flightRing = string.Empty;
+            var installLanguage = string.Empty;
+
+            if (attrData.ContainsKey("FlightRing"))
+            {
+                flightRing = attrData["FlightRing"];
+            }
+
+            if (attrData.ContainsKey("InstallLanguage"))
+            {
+                installLanguage = attrData["InstallLanguage"];
+            }
+
+            return new VariantAssignmentRequest
+            {
+                Parameters =
+                {
+                    { "installLanguage", installLanguage },
+                    { "flightRing", flightRing },
+                    { "clientid", AssignmentUnit },
+                },
+            };
+        }
+
+        private string CreateFilePath()
+        {
+            var exeDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var settingsPath = @"Microsoft\PowerToys\experimentation.json";
+            var filePath = Path.Combine(exeDir, settingsPath);
+            return filePath;
+        }
+    }
+}

src/common/AllExperiments/Logger.cs

@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO.Abstractions;
+
+namespace AllExperiments
+{
+    public static class Logger
+    {
+        private static readonly IFileSystem FileSystem = new FileSystem();
+        private static readonly IPath Path = FileSystem.Path;
+        private static readonly IDirectory Directory = FileSystem.Directory;
+
+        private static readonly string ApplicationLogPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\Settings Logs\\Experimentation");
+
+        static Logger()
+        {
+            if (!Directory.Exists(ApplicationLogPath))
+            {
+                Directory.CreateDirectory(ApplicationLogPath);
+            }
+
+            // Using InvariantCulture since this is used for a log file name
+            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+
+            Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
+
+            Trace.AutoFlush = true;
+        }
+
+        public static void LogInfo(string message)
+        {
+            Log(message, "INFO");
+        }
+
+        public static void LogError(string message)
+        {
+            Log(message, "ERROR");
+#if DEBUG
+            Debugger.Break();
+#endif
+        }
+
+        public static void LogError(string message, Exception e)
+        {
+            Log(
+                message + Environment.NewLine +
+                e?.Message + Environment.NewLine +
+                "Inner exception: " + Environment.NewLine +
+                e?.InnerException?.Message + Environment.NewLine +
+                "Stack trace: " + Environment.NewLine +
+                e?.StackTrace,
+                "ERROR");
+#if DEBUG
+            Debugger.Break();
+#endif
+        }
+
+        private static void Log(string message, string type)
+        {
+            Trace.WriteLine(type + ": " + DateTime.Now.TimeOfDay);
+            Trace.Indent();
+            Trace.WriteLine(GetCallerInfo());
+            Trace.WriteLine(message);
+            Trace.Unindent();
+        }
+
+        private static string GetCallerInfo()
+        {
+            StackTrace stackTrace = new StackTrace();
+
+            var methodName = stackTrace.GetFrame(3)?.GetMethod();
+            var className = methodName?.DeclaringType?.Name;
+            return "[Method]: " + methodName?.Name + " [Class]: " + className;
+        }
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Client/VariantAssignmentClientExtensionMethods.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.VariantAssignment.Contract;
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Client
+{
+#pragma warning disable SA1200 // Using directives should be placed correctly
+    using TreatmentAssignmentServiceClient = VariantAssignmentServiceClient<TreatmentAssignmentServiceResponse>;
+#pragma warning restore SA1200 // Using directives should be placed correctly
+
+    public static class VariantAssignmentClientExtensionMethods
+    {
+        public static IVariantAssignmentProvider GetTreatmentAssignmentServiceClient(this VariantAssignmentClientSettings settings)
+        {
+            return new TreatmentAssignmentServiceClient();
+        }
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Client/VariantAssignmentServiceClient.cs

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.VariantAssignment.Contract;
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Client
+{
+    internal sealed partial class VariantAssignmentServiceClient<TServerResponse> : IVariantAssignmentProvider, IDisposable
+        where TServerResponse : VariantAssignmentServiceResponse
+    {
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IVariantAssignmentResponse> GetVariantAssignmentsAsync(IVariantAssignmentRequest request, CancellationToken ct = default)
+        {
+            return Task.FromResult(EmptyVariantAssignmentResponse.Instance);
+        }
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/EmptyVariantAssignmentResponse.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    public class EmptyVariantAssignmentResponse : IVariantAssignmentResponse
+    {
+        /// <summary>
+        /// Singleton instance of <see cref="EmptyVariantAssignmentResponse"/>.
+        /// </summary>
+        public static readonly IVariantAssignmentResponse Instance = new EmptyVariantAssignmentResponse();
+
+        public EmptyVariantAssignmentResponse()
+        {
+        }
+
+        public long DataVersion => 0;
+
+        public string Thumbprint => string.Empty;
+
+        /// <inheritdoc/>
+        public IReadOnlyCollection<IAssignedVariant> AssignedVariants => Array.Empty<IAssignedVariant>();
+
+        /// <inheritdoc/>
+#pragma warning disable CS8603 // Possible null reference return.
+        public IFeatureVariable GetFeatureVariable(IReadOnlyList<string> path) => null;
+#pragma warning restore CS8603 // Possible null reference return.
+
+        /// <inheritdoc/>
+        public IReadOnlyList<IFeatureVariable> GetFeatureVariables(IReadOnlyList<string> prefix) => Array.Empty<IFeatureVariable>();
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+        string IVariantAssignmentResponse.GetAssignmentContext()
+        {
+            throw new NotImplementedException();
+        }
+
+        IReadOnlyList<IFeatureVariable> IVariantAssignmentResponse.GetFeatureVariables()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/IAssignedVariant.cs

@@ -2,11 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace KeyboardManagerEditorUI.Helpers
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
 {
-    public enum KeyInputMode
+    public interface IAssignedVariant
     {
-        OriginalKeys,
-        RemappedKeys,
     }
 }

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/IFeatureVariable.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    public interface IFeatureVariable
+    {
+        /// <summary>
+        /// Gets the variable's value as a string.
+        /// </summary>
+        /// <returns>String value of the variable.</returns>
+        string GetStringValue();
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/IVariantAssignmentProvider.cs

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    public interface IVariantAssignmentProvider : IDisposable
+    {
+        /// <summary>
+        /// Computes variant assignments based on <paramref name="request"/> data.
+        /// </summary>
+        /// <param name="request">Variant assignment parameters.</param>
+        /// <param name="ct">Propagates notification that operations should be canceled.</param>
+        /// <returns>An awaitable task that returns a <see cref="IVariantAssignmentResponse"/>.</returns>
+        Task<IVariantAssignmentResponse> GetVariantAssignmentsAsync(IVariantAssignmentRequest request, CancellationToken ct = default);
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/IVariantAssignmentRequest.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    public interface IVariantAssignmentRequest
+    {
+        /// <summary>
+        /// Gets inputs used for evaluating filters, assignment units, etc.
+        /// </summary>
+        IReadOnlyCollection<(string Key, string Value)> Parameters { get; }
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/IVariantAssignmentResponse.cs

@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    /// <summary>
+    /// Snapshot of variant assignments.
+    /// </summary>
+    public interface IVariantAssignmentResponse : IDisposable
+    {
+        ///// <summary>
+        ///// Gets the serial number of variant assignment configuration snapshot used when assigning variants.
+        ///// </summary>
+        long DataVersion { get; }
+
+        ///// <summary>
+        ///// Get a hash of the response suitable for caching.
+        ///// </summary>
+        // string Thumbprint { get; }
+
+        /// <summary>
+        /// Gets the variants assigned based on request parameters and a variant configuration snapshot.
+        /// </summary>
+        IReadOnlyCollection<IAssignedVariant> AssignedVariants { get; }
+
+        /// <summary>
+        /// Gets feature variables assigned by variants in this response.
+        /// </summary>
+        /// <param name="prefix">(Optional) Filter feature variables where <see cref="IFeatureVariable.KeySegments"/> contains the <paramref name="prefix"/>.</param>
+        /// <returns>Range of matching feature variables.</returns>
+        IReadOnlyList<IFeatureVariable> GetFeatureVariables(IReadOnlyList<string> prefix);
+
+        // this actually part of the interface but gets the job done
+        IReadOnlyList<IFeatureVariable> GetFeatureVariables();
+
+        // this actually part of the interface but gets the job done
+        string GetAssignmentContext();
+
+        /// <summary>
+        /// Gets a single feature variable assigned by variants in this response.
+        /// </summary>
+        /// <param name="path">Exact feature variable path.</param>
+        /// <returns>Matching feature variable or null.</returns>
+        IFeatureVariable GetFeatureVariable(IReadOnlyList<string> path);
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/TreatmentAssignmentServiceResponse.cs

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    internal sealed class TreatmentAssignmentServiceResponse : VariantAssignmentServiceResponse
+    {
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/VariantAssignmentClientSettings.cs

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.ComponentModel.DataAnnotations;
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    /// <summary>
+    /// Configuration for variant assignment service client.
+    /// </summary>
+    public class VariantAssignmentClientSettings
+    {
+        /// <summary>
+        /// Gets or sets the variant assignment service endpoint URL.
+        /// </summary>
+        [Required]
+        public Uri? Endpoint { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether gets or sets a value whether client side request caching should be enabled.
+        /// </summary>
+        public bool EnableCaching { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum time a cached variant assignment response may be used without re-validating.
+        /// </summary>
+        public TimeSpan ResponseCacheTime { get; set; }
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/VariantAssignmentRequest.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Specialized;
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    public class VariantAssignmentRequest : IVariantAssignmentRequest
+    {
+        private NameValueCollection _parameters = new NameValueCollection();
+
+        /// <summary>
+        /// Gets or sets mutable <see cref="IVariantAssignmentRequest.Parameters"/>.
+        /// </summary>
+        public NameValueCollection Parameters { get => _parameters; set => _parameters = value; }
+
+        IReadOnlyCollection<(string Key, string Value)> IVariantAssignmentRequest.Parameters => (IReadOnlyCollection<(string Key, string Value)>)_parameters;
+    }
+}

src/common/AllExperiments/Microsoft.VariantAssignment/Contract/VariantAssignmentServiceResponse.cs

@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// The goal of this class is to just mock out the Microsoft.VariantAssignment close source objects
+namespace Microsoft.VariantAssignment.Contract
+{
+    /// <summary>
+    /// Mutable implementation of <see cref="IVariantAssignmentResponse"/> for (de)serialization.
+    /// </summary>
+    internal class VariantAssignmentServiceResponse : IVariantAssignmentResponse, IDisposable
+    {
+        /// <inheritdoc />
+        public virtual long DataVersion { get; set; }
+
+        public virtual IReadOnlyCollection<IAssignedVariant> AssignedVariants { get; set; } = Array.Empty<IAssignedVariant>();
+
+        public IFeatureVariable GetFeatureVariable(IReadOnlyList<string> path)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IReadOnlyList<IFeatureVariable> GetFeatureVariables(IReadOnlyList<string> prefix)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public IReadOnlyList<IFeatureVariable> GetFeatureVariables()
+        {
+            throw new NotImplementedException();
+        }
+
+        public string GetAssignmentContext()
+        {
+            return string.Empty;
+        }
+    }
+}

src/common/COMUtils/COMUtils.vcxproj

@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(RepoRoot)src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -36,12 +36,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <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="..\..\..\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>
       <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.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('..\..\..\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/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
@@ -38,6 +37,7 @@
     <_NoWinAPIFamilyApp>true</_NoWinAPIFamilyApp>
   </PropertyGroup>
   <!-- END cppwinrt.build.pre.props -->
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     
@@ -66,7 +66,7 @@
   </ImportGroup>
   <PropertyGroup>
     <TargetName>CalculatorEngineCommon</TargetName>
-    <OutDir>$(RepoRoot)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -138,16 +138,16 @@
     <ResourceCompile Include="CalculatorEngineCommon.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(RepoRoot)deps\spdlog.props" />
+  <Import Project="..\..\..\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="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\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.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('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
   <!-- BEGIN common.build.post.props -->
   <!--

src/common/CalculatorEngineCommon/packages.config

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

src/common/Common.Search/Common.Search.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>

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

@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
-  <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
-
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
-    <RootNamespace>Microsoft.PowerToys.Common.UI.Controls</RootNamespace>
-    <AssemblyName>PowerToys.Common.UI.Controls</AssemblyName>
-    <UseWinUI>true</UseWinUI>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-    <GenerateLibraryLayout>true</GenerateLibraryLayout>
-    <ProjectPriFileName>PowerToys.Common.UI.Controls.pri</ProjectPriFileName>
-    <Nullable>enable</Nullable>
-    <Platforms>x64;ARM64</Platforms>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
-    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
-    <PackageReference Include="CommunityToolkit.WinUI.Converters" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ManagedCommon\ManagedCommon.csproj" />
-  </ItemGroup>
-
-</Project>

src/common/Common.UI.Controls/Themes/Generic.xaml

@@ -1,8 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/KeyVisual/KeyVisual.xaml" />
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/KeyVisual/KeyCharPresenter.xaml" />
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/ShortcutWithTextLabelControl/ShortcutWithTextLabelControl.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>

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

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
-  <Import Project="$(RepoRoot)src\Common.Dotnet.AotCompatibility.props" />
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
 
   <PropertyGroup>
     <UseWPF>true</UseWPF>

src/common/Common.UI/SettingsDeepLink.cs

@@ -45,7 +45,6 @@ namespace Common.UI
             NewPlus,
             CmdPal,
             ZoomIt,
-            PowerDisplay,
         }
 
         private static string SettingsWindowNameToString(SettingsWindow value)
@@ -116,8 +115,6 @@ namespace Common.UI
                     return "CmdPal";
                 case SettingsWindow.ZoomIt:
                     return "ZoomIt";
-                case SettingsWindow.PowerDisplay:
-                    return "PowerDisplay";
                 default:
                     {
                         return string.Empty;