update spelling-check code

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] Closes: #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

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

@@ -94,7 +94,6 @@ onefuzzingestionpreparationtool
 OTP
 Yubi
 Yubico
-Perplexity
 svgl
 
 # KEYS
@@ -320,4 +319,4 @@ MRUINFO
 REGSTR
 
 # Misc Win32 APIs and PInvokes
-INVOKEIDLIST
+INVOKEIDLIST

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

@@ -29,8 +29,6 @@ shortcutguide
 
 # 8LWXpg is user name but user folder causes a flag
 LWXpg
-# 0x6f677548 is user name but user folder causes a flag
-x6f677548
 Adoumie
 Advaith
 alekhyareddy

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

@@ -131,4 +131,3 @@
 ignore$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
 ^src/common/CalculatorEngineCommon/exprtk\.hpp$
-src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs

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

@@ -25,15 +25,11 @@ ADMINS
 adml
 admx
 advancedpaste
-advancedpasteui
-advancedpasteuishortcut
-advapi
 advfirewall
 AFeature
 affordances
 AFX
 AGGREGATABLE
-AHK
 AHybrid
 akv
 ALarger
@@ -44,13 +40,11 @@ ALLINPUT
 Allman
 Allmodule
 ALLOWUNDO
-allpc
 ALLVIEW
 ALPHATYPE
 AModifier
 amr
 ANDSCANS
-animatedvisuals
 Animnate
 ANull
 AOC
@@ -71,7 +65,6 @@ APPMODEL
 APPNAME
 appref
 appsettings
-appsfeatures
 appwindow
 appwiz
 appxpackage
@@ -122,7 +115,6 @@ bigbar
 bigobj
 binlog
 binres
-binskim
 BITMAPFILEHEADER
 bitmapimage
 BITMAPINFO
@@ -160,7 +152,6 @@ BUILDARCH
 BUILDNUMBER
 buildtransitive
 builttoroam
-BUNDLEINFO
 BVal
 BValue
 byapp
@@ -172,7 +163,6 @@ callbackptr
 calpwstr
 Cangjie
 CANRENAME
-Canvascustomlayout
 CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
@@ -249,7 +239,6 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
-coreclr
 constexpr
 contentdialog
 contentfiles
@@ -266,13 +255,10 @@ Corpor
 cotaskmem
 COULDNOT
 countof
-covrun
 cpcontrols
 cph
 cplusplus
 CPower
-cpptools
-cppvsdbg
 cppwinrt
 createdump
 CREATEPROCESS
@@ -284,7 +270,6 @@ CRH
 critsec
 cropandlock
 Crossdevice
-csdevkit
 CSearch
 CSettings
 cso
@@ -312,7 +297,6 @@ CXVIRTUALSCREEN
 CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
-Czechia
 cziplib
 Dac
 dacl
@@ -337,7 +321,6 @@ Deact
 debugbreak
 decryptor
 Dedup
-Deduplicator
 Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
@@ -394,7 +377,6 @@ DNLEN
 DONOTROUND
 DONTVALIDATEPATH
 dotnet
-downscale
 DPICHANGED
 DPIs
 DPSAPI
@@ -411,7 +393,6 @@ DString
 DSVG
 DTo
 DUMMYUNIONNAME
-dutil
 DVASPECT
 DVASPECTINFO
 DVD
@@ -444,7 +425,6 @@ EDITSHORTCUTS
 EDITTEXT
 EFile
 ekus
-emojis
 ENABLEDELAYEDEXPANSION
 ENABLEDPOPUP
 ENABLETAB
@@ -484,7 +464,6 @@ examplehandler
 examplepowertoy
 EXAND
 EXCLUDEFROMCAPTURE
-EXECUTEDEFAULT
 executionpolicy
 exename
 exf
@@ -589,7 +568,6 @@ GPOCA
 gpp
 gpu
 gradians
-Gridcustomlayout
 GSM
 gtm
 guiddata
@@ -649,7 +627,6 @@ HKCU
 hkey
 HKLM
 HKM
-hkmng
 HKPD
 HKU
 HMD
@@ -658,7 +635,6 @@ hmodule
 hmonitor
 homies
 homljgmgpmcbpjbnjpfijnhipfkiclkd
-HOOKPROC
 HORZRES
 HORZSIZE
 Hostbackdropbrush
@@ -667,11 +643,7 @@ Hostx
 hotfixes
 hotkeycontrol
 HOTKEYF
-hotkeylockmachine
-hotkeyreconnect
 hotkeys
-hotkeyswitch
-hotkeytoggleeasymouse
 hotlight
 hotspot
 HPAINTBUFFER
@@ -684,7 +656,6 @@ HROW
 hsb
 HSCROLL
 hsi
-HSpeed
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
@@ -730,12 +701,9 @@ IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
 imageresizerinput
 imageresizersettings
-imagetotext
-imagetotextshortcut
 imagingdevices
 ime
 imgflip
-inapp
 inbox
 INCONTACT
 Indo
@@ -789,7 +757,6 @@ istep
 ith
 ITHUMBNAIL
 IUI
-IUWP
 IWIC
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
@@ -810,7 +777,6 @@ KEYBOARDMANAGEREDITORLIBRARYWRAPPER
 keyboardmanagerstate
 keyboardmanagerui
 keyboardtester
-keycap
 KEYEVENTF
 KEYIMAGE
 keynum
@@ -820,7 +786,6 @@ keyvault
 KILLFOCUS
 killrunner
 kmph
-kvp
 Kybd
 lastcodeanalysissucceeded
 LASTEXITCODE
@@ -859,12 +824,10 @@ localappdata
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
-LOCKMACHINE
 LOCKTYPE
 LOGFONT
 LOGFONTW
 logon
-LOGMSG
 LOGPIXELSX
 LOGPIXELSY
 LOn
@@ -922,7 +885,6 @@ LWA
 lwin
 LZero
 MAGTRANSFORM
-MAJORMINOR
 MAKEINTRESOURCE
 MAKEINTRESOURCEA
 MAKEINTRESOURCEW
@@ -947,7 +909,6 @@ MDL
 mdtext
 mdtxt
 mdwn
-measuretool
 meme
 memicmp
 MENUITEMINFO
@@ -997,13 +958,9 @@ MOUSEHWHEEL
 MOUSEINPUT
 mousejump
 mousepointer
-mousepointercrosshairs
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
-muxx
-muxxc
-muxxh
 MRM
 MRT
 mru
@@ -1012,7 +969,6 @@ msc
 mscorlib
 msctls
 msdata
-msdia
 MSDL
 MSGFLT
 MSHCTX
@@ -1030,7 +986,6 @@ Mso
 msrc
 msstore
 msvcp
-MT
 MTND
 MULTIPLEUSE
 multizone
@@ -1042,7 +997,6 @@ MWBEx
 MYICON
 NAMECHANGE
 namespaceanddescendants
-Namotion
 nao
 NCACTIVATE
 ncc
@@ -1080,7 +1034,6 @@ NEWPLUSSHELLEXTENSIONWIN
 newrow
 nicksnettravels
 NIF
-NJson
 NLog
 NLSTEXT
 NMAKE
@@ -1143,7 +1096,6 @@ NOTSRCCOPY
 NOTSRCERASE
 notwindows
 NOTXORPEN
-nowarn
 NOZORDER
 NPH
 npmjs
@@ -1205,18 +1157,6 @@ PARENTRELATIVEFORADDRESSBAR
 PARENTRELATIVEPARSING
 parray
 PARTIALCONFIRMATIONDIALOGTITLE
-pasteashtmlfile
-pasteashtmlfileshortcut
-pasteasjson
-pasteasjsonshortcut
-pasteasmarkdown
-pasteasmarkdownshortcut
-pasteasplaintext
-pasteasplaintextshortcut
-pasteaspngfile
-pasteaspngfileshortcut
-pasteastxtfile
-pasteastxtfileshortcut
 PATCOPY
 PATHMUSTEXIST
 PATINVERT
@@ -1284,7 +1224,6 @@ Pomodoro
 Popups
 POPUPWINDOW
 POSITIONITEM
-powerocr
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1335,7 +1274,6 @@ PRODUCTVERSION
 Progman
 programdata
 projectname
-projitems
 PROPERTYKEY
 Propset
 PROPVARIANT
@@ -1384,7 +1322,7 @@ QUNS
 RAII
 RAlt
 randi
-rasterization
+Rasterization
 Rasterize
 RAWINPUTDEVICE
 RAWINPUTHEADER
@@ -1415,7 +1353,6 @@ regkey
 regroot
 regsvr
 REINSTALLMODE
-releaseblog
 reloadable
 Relogger
 remappings
@@ -1427,7 +1364,6 @@ Removelnk
 renamable
 RENAMEONCOLLISION
 reparented
-reparenthotkey
 reparenting
 reportfileaccesses
 requery
@@ -1466,6 +1402,7 @@ rstringalnum
 rstringalpha
 rstringdigit
 rtb
+RTB
 RTLREADING
 rtm
 runas
@@ -1503,7 +1440,6 @@ secpol
 securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
-selfhost
 SENDCHANGE
 sendvirtualinput
 serverside
@@ -1523,7 +1459,6 @@ SETRULES
 SETSCREENSAVEACTIVE
 SETSTICKYKEYS
 SETTEXT
-settingscard
 SETTINGCHANGE
 SETTINGSCHANGED
 settingsheader
@@ -1677,7 +1612,6 @@ STYLECHANGED
 STYLECHANGING
 subkeys
 sublang
-Subdomain
 SUBMODULEUPDATE
 subresource
 Superbar
@@ -1748,7 +1682,6 @@ THH
 THICKFRAME
 THISCOMPONENT
 throughs
-thumbnailhotkey
 TILEDWINDOW
 TILLSON
 timedate
@@ -1763,7 +1696,6 @@ tlb
 tlbimp
 tlc
 TNP
-TOGGLEEASYMOUSE
 Toolhelp
 toolkitconverters
 toolwindow
@@ -1777,17 +1709,14 @@ tracelogging
 tracerpt
 trackbar
 trafficmanager
-transcodetomp
 transicc
 TRAYMOUSEMESSAGE
 triaging
-Tru
 trl
 trx
 tsa
 tskill
 tstoi
-tweakable
 TWF
 tymed
 TYPEKEYBOARD
@@ -1798,13 +1727,10 @@ UACUI
 UAL
 uap
 UBR
-UBreak
-ubrk
 UCallback
 ucrt
 ucrtd
 uefi
-UError
 uesc
 UFlags
 UHash
@@ -1812,15 +1738,12 @@ UIA
 UIEx
 uild
 uitests
-UITo
 ULONGLONG
 ums
 uncompilable
 UNCPRIORITY
-undefining
 UNDNAME
 UNICODETEXT
-unins
 uninstalls
 Uniquifies
 unitconverter
@@ -1876,7 +1799,6 @@ VFT
 vget
 vgetq
 viewmodels
-virama
 VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY
@@ -1901,7 +1823,6 @@ VSINSTALLDIR
 VSM
 vso
 vsonline
-VSpeed
 vstemplate
 vstest
 VSTHRD
@@ -1958,7 +1879,6 @@ winexe
 winforms
 winget
 wingetcreate
-wingetpkgs
 Winhook
 WINL
 winlogon
@@ -2028,7 +1948,6 @@ XButton
 xclip
 xcopy
 XDeployment
-xdf
 XDocument
 XElement
 xfd
@@ -2039,13 +1958,10 @@ XNamespace
 Xoshiro
 XPels
 XPixel
-XPos
 XResource
 xsi
-XSpeed
 XStr
 xstyler
-XTimer
 XUP
 XVIRTUALSCREEN
 xxxxxx
@@ -2055,10 +1971,7 @@ YIncrement
 yinle
 yinyue
 YPels
-YPos
 YResolution
-YSpeed
-YTimer
 YStr
 YVIRTUALSCREEN
 ZEROINIT

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

@@ -260,7 +260,3 @@ Process Process
 # ZoomIt menu items with accelerator keys
 E&xit
 St&yle
-
-# This matches a relative clause where the relative pronoun "that" is omitted.
-# Example: "Gets or sets the window the TitleBar should configure."
-\bthe\s+\w+\s+the\b

.github/copilot-instructions.md

@@ -1,43 +0,0 @@
-# PowerToys – Copilot guide (concise)
-
-This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
-
-Repo map (1‑line per area)
-- Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
-- Shared libs: `src/common/**`
-- Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
-- Build tools/docs: `tools/**`, `doc/devdocs/**`
-
-Build and test (defaults)
-- Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
-- Build discipline:
-  - One terminal per operation (build → test). Don’t switch/open new ones mid-flow.
-  - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
-  - Use script(s) to build, synchronously block and wait in foreground for it to finish: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages)
-  - Treat build **exit code 0** as success; any non-zero exit code is a failure, have Copilot read the errors log in the build folder (e.g., `build.*.*.errors.log`) and surface problems.
-  - Don’t start tests or launch Runner until the previous step succeeded.
-- Tests (fast + targeted):
-  - Find the test project by product code prefix (e.g., FancyZones, AdvancedPaste). Look for a sibling folder or 1–2 levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
-  - Build the test project, wait for **exit**, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
-  - Add/adjust tests when changing behavior; if skipped, state why (e.g., comment-only, string rename).
-
-Pull requests (expectations)
-- Atomic: one logical change; no drive‑by refactors.
-- Describe: problem / approach / risk / test evidence.
-- List: touched paths if not obvious.
-
-When to ask for clarification
-- Ambiguous spec after scanning relevant docs (see below).
-- Cross-module impact (shared enum/struct) not clear.
-- Security / elevation / installer changes.
-
-Logging (use existing stacks)
-- C++: `src/common/logger/**` (`Logger::info|warn|error|debug`). Keep hot paths quiet (hooks, tight loops).
-- C#: `ManagedCommon.Logger` (`LogInfo|LogWarning|LogError|LogDebug|LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
-
-Docs to consult
-- `tools/build/BUILD-GUIDELINES.md`
-- `doc/devdocs/core/architecture.md`, `doc/devdocs/core/runner.md`, `doc/devdocs/core/settings/readme.md`, `doc/devdocs/modules/readme.md`
-
-Done checklist (self review before finishing)
-- Build clean? Tests updated/passed? No unintended formatting? Any new dependency? Documented skips?

.github/workflows/automatic-issue-deduplication.yml

@@ -1,19 +0,0 @@
-name: Automatic New Issue Deduplication
-on:
-  issues:
-    types: [opened, reopened]
-permissions:
-  models: read
-  issues: write
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
-  cancel-in-progress: true
-jobs:
-  deduplicate:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Deduplicate Action
-        uses: pelikhan/action-genai-issue-dedup@v0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          label_as_duplicate: true

.github/workflows/manual-batch-issue-deduplication.yml

@@ -1,38 +0,0 @@
-name: Manual Batch Issue Deduplication
-
-on:
-  workflow_dispatch:
-    inputs:
-      issue_numbers:
-        description: "JSON array of issue numbers to deduplicate (e.g. [101,102,103])"
-        required: true
-      since:
-        description: "Only compare against issues created after this date (ISO 8601, e.g. 2019-05-05T00:00:00Z)"
-        required: false
-        default: "2019-05-05T00:00:00Z"
-      label_as_duplicate:
-        description: "Apply duplicate label if duplicates are found (true/false)"
-        required: false
-        default: "true"
-
-permissions:
-  models: read
-  issues: write
-
-jobs:
-  deduplicate:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Run GenAI Issue Deduplicator
-        uses: pelikhan/action-genai-issue-dedup@v0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_issue: ${{ matrix.issue }}
-          label_as_duplicate: ${{ github.event.inputs.label_as_duplicate }}
-          

.github/workflows/msstore-submissions.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: BODGY - Set up Gnome Keyring for future Cert Auth
         run: |-
-          sudo apt-get update && sudo apt-get install -y gnome-keyring
+          sudo apt-get install -y gnome-keyring
           export $(dbus-launch --sh-syntax)
           export $(echo 'anypass_just_to_unlock' | gnome-keyring-daemon --unlock)
           export $(echo 'anypass_just_to_unlock' | gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)

.gitignore

@@ -350,15 +350,10 @@ src/common/Telemetry/*.etl
 
 # Generated installer file for Monaco source files.
 /installer/PowerToysSetup/MonacoSRC.wxs
-/installer/PowerToysSetup/DscResources.wxs
 /installer/PowerToysSetupVNext/MonacoSRC.wxs
-/installer/PowerToysSetupVNext/DscResources.wxs
 
 # MSBuildCache
 /MSBuildCacheLogs/
 
-# PowerToys Settings generated search index (legacy location) and obj outputs
-/src/settings-ui/Settings.UI/Assets/Settings/search.index.json
-
 # PowerToysInstaller Build Temp Files
-installer/*/*.wxs.bk
+installer/*/*.wxs.bk

.pipelines/ESRPSigning_core.json

@@ -28,8 +28,6 @@
             "PowerToys.GPOWrapperProjection.dll",
             "PowerToys.AllExperiments.dll",
 
-            "Common.Search.dll",
-
             "PowerToys.AlwaysOnTop.exe",
             "PowerToys.AlwaysOnTopModuleInterface.dll",
 
@@ -55,6 +53,7 @@
             "PowerToys.Awake.exe",
             "PowerToys.Awake.dll",
 
+
             "PowerToys.FancyZonesEditor.exe",
             "PowerToys.FancyZonesEditor.dll",
             "PowerToys.FancyZonesEditorCommon.dll",
@@ -229,10 +228,7 @@
 
             "PowerToys.CmdPalModuleInterface.dll",
             "CmdPalKeyboardService.dll",
-            "*Microsoft.CmdPal.UI_*.msix",
-
-            "PowerToys.DSC.dll",
-            "PowerToys.DSC.exe"
+            "*Microsoft.CmdPal.UI_*.msix"
           ],
             "SigningInfo": {
                 "Operations": [
@@ -284,7 +280,6 @@
                 "Mono.Cecil.Pdb.dll",
                 "Mono.Cecil.Rocks.dll",
                 "Newtonsoft.Json.dll",
-                "CommunityToolkit.WinUI.Controls.TitleBar.dll",
 
                 "NLog.dll",
                 "HtmlAgilityPack.dll",
@@ -299,9 +294,6 @@
                 "msvcp140_1_app.dll",
                 "msvcp140_2_app.dll",
                 "msvcp140_app.dll",
-                "Namotion.Reflection.dll",
-                "NJsonSchema.Annotations.dll",
-                "NJsonSchema.dll",
                 "vcamp140_app.dll",
                 "vccorlib140_app.dll",
                 "vcomp140_app.dll",

.pipelines/ESRPSigning_installer.json

@@ -6,9 +6,11 @@
             "MatchedPath": [
                 "PowerToysSetupCustomActions.dll",
                 "PowerToysSetupCustomActionsVNext.dll",
-                "SilentFilesInUseBAFunction.dll",
                 "PowerToys*Setup-*.exe",
-                "PowerToys*Setup-*.msi"
+                "PowerToys*Setup-*.msi",
+                "PowerToys*Setup-*.msi",
+                "PowerToys*SetupVNext-*.exe",
+                "PowerToys*SetupVNext-*.msi"
             ],
             "SigningInfo": {
                 "Operations": [

.pipelines/generateDscManifests.ps1

@@ -1,88 +0,0 @@
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory = $true)]
-    [string]$BuildPlatform,
-
-    [Parameter(Mandatory = $true)]
-    [string]$BuildConfiguration,
-
-    [Parameter()]
-    [string]$RepoRoot = (Get-Location).Path
-)
-
-$ErrorActionPreference = 'Stop'
-
-function Resolve-PlatformDirectory {
-    param(
-        [string]$Root,
-        [string]$Platform
-    )
-
-    $normalized = $Platform.Trim()
-    $candidates = @()
-    $candidates += Join-Path $Root $normalized
-    $candidates += Join-Path $Root ($normalized.ToUpperInvariant())
-    $candidates += Join-Path $Root ($normalized.ToLowerInvariant())
-    $candidates = $candidates | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique
-
-    foreach ($candidate in $candidates) {
-        if (Test-Path $candidate) {
-            return $candidate
-        }
-    }
-
-    return $candidates[0]
-}
-
-Write-Host "Repo root: $RepoRoot"
-Write-Host "Requested build platform: $BuildPlatform"
-Write-Host "Requested configuration: $BuildConfiguration"
-
-# Always use x64 PowerToys.DSC.exe since CI/CD machines are x64
-$exePlatform = 'x64'
-$exeRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $exePlatform
-$exeOutputDir = Join-Path $exeRoot $BuildConfiguration
-$exePath = Join-Path $exeOutputDir 'PowerToys.DSC.exe'
-
-Write-Host "Using x64 PowerToys.DSC.exe to generate DSC manifests for $BuildPlatform build"
-
-if (-not (Test-Path $exePath)) {
-    throw "PowerToys.DSC.exe not found at '$exePath'. Make sure it has been built first."
-}
-
-Write-Host "Using PowerToys.DSC.exe at '$exePath'."
-
-# Output DSC manifests to the target build platform directory (x64, ARM64, etc.)
-$outputRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $BuildPlatform
-if (-not (Test-Path $outputRoot)) {
-    Write-Host "Creating missing platform output root at '$outputRoot'."
-    New-Item -Path $outputRoot -ItemType Directory -Force | Out-Null
-}
-
-$outputDir = Join-Path $outputRoot $BuildConfiguration
-if (-not (Test-Path $outputDir)) {
-    Write-Host "Creating missing configuration output directory at '$outputDir'."
-    New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
-}
-
-Write-Host "DSC manifests will be generated to: '$outputDir'"
-
-Write-Host "Cleaning previously generated DSC manifest files from '$outputDir'."
-Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
-
-$arguments = @('manifest', '--resource', 'settings', '--outputDir', $outputDir)
-Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
-& $exePath @arguments
-if ($LASTEXITCODE -ne 0) {
-    throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
-}
-
-$generatedFiles = Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
-if ($generatedFiles.Count -eq 0) {
-    throw "No DSC manifest files were generated in '$outputDir'."
-}
-
-Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"
-foreach ($file in $generatedFiles) {
-    Write-Host "  - $($file.FullName)"
-}

.pipelines/v2/ci-nightly.yml

@@ -1,38 +0,0 @@
-# .pipelines/v2/nightly-prewarm.yml
-# Nightly pre-warm that reuses your existing ci.yml as-is
-
-trigger: none
-pr: none
-
-# (18:00 UTC) — adjust as you like
-schedules:
-  - cron: "0 18 * * *"   # UTC
-    displayName: Nightly pre-warm (main)
-    branches:
-      include:
-        - main
-    always: true
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-parameters:
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - arm64
-  - name: enableMsBuildCaching
-    type: boolean
-    displayName: "Enable MSBuild Caching"
-    default: true
-  - name: msBuildCacheIsReadOnly
-    type: boolean
-    displayName: "MSBuild Cache Read Only"
-    default: false
-
-extends:
-  template: templates/pipeline-ci-build.yml
-  parameters:
-    buildPlatforms: ${{ parameters.buildPlatforms }}
-    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-    msBuildCacheIsReadOnly: ${{ parameters.msBuildCacheIsReadOnly }}

.pipelines/v2/ci.yml

@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: false
+    default: true
   - name: runTests
     type: boolean
     displayName: "Run Tests"

.pipelines/v2/release.yml

@@ -20,11 +20,6 @@ parameters:
     type: string
     default: '0.0.1'
 
-  - name: installerSuffix
-    type: string
-    displayName: "WiX5 installer suffix (e.g., 'wix5', 'vnext', etc.)"
-    default: "wix5"
-
   - name: buildConfigurations
     displayName: "Build Configurations"
     type: object
@@ -43,6 +38,11 @@ parameters:
     displayName: "Build Using Visual Studio Preview"
     default: false
 
+  - name: enableAOT
+    type: boolean
+    displayName: "Enable AOT (Ahead-of-Time) Compilation for CmdPal"
+    default: true
+
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 
 variables:
@@ -64,10 +64,6 @@ extends:
       tsa:
         enabled: true
         configFile: '$(Build.SourcesDirectory)\.pipelines\tsa.json'
-      binskim:
-        enabled: true
-        # Exclude every dll/exe in tests/*, as well as all msdia*, covrun* and vcruntime*
-        analyzeTargetGlob: +:file|$(Build.ArtifactStagingDirectory)/**/*.dll;+:file|$(Build.ArtifactStagingDirectory)/**/*.exe;-:file:regex|tests.*\.(dll|exe)$;-:file:regex|(covrun.*)\.dll$;-:file:regex|(msdia.*)\.dll$;-:file:regex|(vcruntime.*)\.dll$
 
     stages:
       - stage: Build
@@ -104,8 +100,7 @@ extends:
                 useManagedIdentity: $(SigningUseManagedIdentity)
                 clientId: $(SigningOriginalClientId)
               # Have msbuild use the release nuget config profile
-              installerSuffix: ${{ parameters.installerSuffix }}
-              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:InstallerSuffix=${{ parameters.installerSuffix }}  /p:EnableCmdPalAOT=true
+              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:EnableCmdPalAOT=${{ parameters.enableAOT }}
               beforeBuildSteps:
                 # Sets versions for all PowerToy created DLLs
                 - pwsh: |-

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

@@ -50,9 +50,6 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     default: false
-  - name: msBuildCacheIsReadOnly
-    type: boolean
-    default: true
   - name: runTests
     type: boolean
     default: true
@@ -65,9 +62,6 @@ parameters:
   - name: versionNumber
     type: string
     default: '0.0.1'
-  - name: installerSuffix
-    type: string
-    default: "wix5"
   - name: useLatestWinAppSDK
     type: boolean
     default: false
@@ -157,11 +151,6 @@ jobs:
         $MSBuildCacheParameters += " -reportfileaccesses"
         $MSBuildCacheParameters += " -p:MSBuildCacheEnabled=true"
         $MSBuildCacheParameters += " -p:MSBuildCacheLogDirectory=$(LogOutputDirectory)\MSBuildCacheLogs"
-        # Cache read-only policy controlled by parameter
-        $cacheIsReadOnly = "${{ parameters.msBuildCacheIsReadOnly }}"
-        if ($cacheIsReadOnly -eq "True") {
-          $MSBuildCacheParameters += " /p:MSBuildCacheRemoteCacheIsReadOnly=true"
-        }
         Write-Host "MSBuildCacheParameters: $MSBuildCacheParameters"
         Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
       displayName: Prepare MSBuildCache variables
@@ -271,23 +260,6 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
-  # Build PowerToys.DSC.exe for ARM64 (x64 uses existing binary from previous build)
-  - task: VSBuild@1
-    displayName: Build PowerToys.DSC.exe (x64 for generating manifests)
-    condition: ne(variables['BuildPlatform'], 'x64')
-    inputs:
-      solution: src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
-      msbuildArgs: /t:Build /m /restore
-      platform: x64
-      configuration: $(BuildConfiguration)
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  # Generate DSC manifests using PowerToys.DSC.exe
-  - pwsh: |-
-      & '.pipelines/generateDscManifests.ps1' -BuildPlatform '$(BuildPlatform)' -BuildConfiguration '$(BuildConfiguration)' -RepoRoot '$(Build.SourcesDirectory)'
-    displayName: Generate DSC manifests
-
   - task: CopyFiles@2
     displayName: Stage SDK/build
     inputs:
@@ -436,28 +408,9 @@ jobs:
           !**\obj\**
 
   - pwsh: |-
-      $Packages = Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix"
-      Write-Host "Found $($Packages.Count) CmdPal MSIX package(s):"
-      foreach ($pkg in $Packages) {
-          Write-Host "  - $($pkg.FullName)"
-      }
-      
-      if ($Packages.Count -gt 0) {
-          # Priority: Look for platform-specific MSIX (x64/arm64) first, then fall back to any
-          $PlatformPackage = $Packages | Where-Object { $_.Name -match "Microsoft\.CmdPal\.UI_.*_(x64|arm64)\.msix$" } | Select-Object -First 1
-          if ($PlatformPackage) {
-              $Package = $PlatformPackage
-              Write-Host "Using platform-specific package: $($Package.FullName)"
-          } else {
-              $Package = $Packages | Select-Object -First 1
-              Write-Host "Using first available package: $($Package.FullName)"
-          }
-          
-          $PackageFilename = $Package.FullName
-          Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
-      } else {
-          Write-Warning "No CmdPal MSIX packages found!"
-      }
+      $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
+      $PackageFilename = $Package.FullName
+      Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
     displayName: Locate the CmdPal MSIX
 
   - ${{ if eq(parameters.codeSign, true) }}:
@@ -529,7 +482,6 @@ jobs:
       signingIdentity: ${{ parameters.signingIdentity }}
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      installerSuffix: ${{ parameters.installerSuffix }}
 
   - template: steps-build-installer-vnext.yml
     parameters:
@@ -537,7 +489,6 @@ jobs:
       signingIdentity: ${{ parameters.signingIdentity }}
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      installerSuffix: ${{ parameters.installerSuffix }}
       buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
 
   # This saves ~1GiB per architecture. We won't need these later.
@@ -557,10 +508,17 @@ jobs:
 
   - task: CopyFiles@2
     displayName: Stage Installers
+    inputs:
+      contents: "**/PowerToys*Setup-*.exe"
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)
+
+  - task: CopyFiles@2
+    displayName: Stage VNext Installers
     inputs:
       contents: |-
-        **/PowerToys*Setup-*.exe
-        !**/PowerToysSetupVNext/obj/**
+        installer/PowerToysSetupVNext/**/PowerToys*SetupVNext-*.exe
+        !installer/PowerToysSetupVNext/obj/**
       flattenFolders: True
       targetFolder: $(JobOutputDirectory)
 
@@ -576,48 +534,48 @@ jobs:
 
   - pwsh: |-
       $p = "$(JobOutputDirectory)\"
-      $installerSuffix = "${{ parameters.installerSuffix }}"
+      $userHash = ((Get-Item $p\PowerToysUserSetup*.exe | Get-FileHash).Hash);
+      $machineHash = ((Get-Item $p\PowerToysSetup*.exe | Get-FileHash).Hash);
+      $userPlat = "hash_user_$(BuildPlatform).txt";
+      $machinePlat = "hash_machine_$(BuildPlatform).txt";
+      $combinedUserPath = $p + $userPlat;
+      $combinedMachinePath = $p + $machinePlat;
+
+      echo $p
+
+      echo $userPlat
+      echo $userHash
+      echo $combinedUserPath
+
+      echo $machinePlat
+      echo $machineHash
+      echo $combinedMachinePath
+
+      $userHash | out-file -filepath $combinedUserPath
+      $machineHash | out-file -filepath $combinedMachinePath
+    displayName: Calculate file hashes
+
+  # Output config for installer vnext
+  - pwsh: |-
+      $p = "$(JobOutputDirectory)\"
+      $userHash = ((Get-Item $p\PowerToysUserSetupVNext*.exe | Get-FileHash).Hash);
+      $machineHash = ((Get-Item $p\PowerToysSetupVNext*.exe | Get-FileHash).Hash);
+      $userPlat = "hash_user_$(BuildPlatform).txt";
+      $machinePlat = "hash_machine_$(BuildPlatform).txt";
+      $combinedUserPath = $p + $userPlat;
+      $combinedMachinePath = $p + $machinePlat;
       
-      # Calculate hashes for regular installers (without custom suffix)
-      $userSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*.exe" | Where-Object { $_.Name -notmatch "-$installerSuffix-" }
-      $machineSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*.exe" | Where-Object { $_.Name -notmatch "-$installerSuffix-" -and $_.Name -notmatch "PowerToysUserSetup" }
+      echo $p
+      echo $userPlat
+      echo $userHash
+      echo $combinedUserPath
+      echo $machinePlat
+      echo $machineHash
+      echo $combinedMachinePath
       
-      if ($userSetupFiles.Count -gt 0) {
-          $userHash = ($userSetupFiles[0] | Get-FileHash).Hash;
-          $userPlat = "hash_user_$(BuildPlatform).txt";
-          $combinedUserPath = $p + $userPlat;
-          echo "Regular User: $userHash"
-          $userHash | out-file -filepath $combinedUserPath
-      }
-      
-      if ($machineSetupFiles.Count -gt 0) {
-          $machineHash = ($machineSetupFiles[0] | Get-FileHash).Hash;
-          $machinePlat = "hash_machine_$(BuildPlatform).txt";
-          $combinedMachinePath = $p + $machinePlat;
-          echo "Regular Machine: $machineHash"
-          $machineHash | out-file -filepath $combinedMachinePath
-      }
-      
-      # Calculate hashes for VNext installers (with custom suffix)
-      $userVNextFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*-$installerSuffix-*.exe"
-      $machineVNextFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*-$installerSuffix-*.exe" | Where-Object { $_.Name -notmatch "PowerToysUserSetup" }
-      
-      if ($userVNextFiles.Count -gt 0) {
-          $userVNextHash = ($userVNextFiles[0] | Get-FileHash).Hash;
-          $userVNextPlat = "hash_user_vnext_$(BuildPlatform).txt";
-          $combinedUserVNextPath = $p + $userVNextPlat;
-          echo "VNext User: $userVNextHash"
-          $userVNextHash | out-file -filepath $combinedUserVNextPath
-      }
-      
-      if ($machineVNextFiles.Count -gt 0) {
-          $machineVNextHash = ($machineVNextFiles[0] | Get-FileHash).Hash;
-          $machineVNextPlat = "hash_machine_vnext_$(BuildPlatform).txt";
-          $combinedMachineVNextPath = $p + $machineVNextPlat;
-          echo "VNext Machine: $machineVNextHash"
-          $machineVNextHash | out-file -filepath $combinedMachineVNextPath
-      }
-    displayName: Calculate file hashes for all installers
+      $userHash | out-file -filepath $combinedUserPath
+      $machineHash | out-file -filepath $combinedMachinePath
+    displayName: Calculate file hashes
 
   # Publishing the GPO files
   - pwsh: |-

.pipelines/v2/templates/job-build-ui-tests.yml

@@ -123,7 +123,7 @@ jobs:
     displayName: Stage UI Test Build Outputs
     inputs:
       sourceFolder: '$(Build.SourcesDirectory)'
-      contents: '**/$(BuildPlatform)/$(BuildConfiguration)/tests/**/*'
+      contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
       targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
 
   - publish: $(JobOutputDirectory)

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

@@ -11,14 +11,12 @@ parameters:
   - name: useLatestWebView2
     type: boolean
     default: false
-  - name: buildSource
-    type: string
-    default: "latestMainOfficialBuild"
-    displayName: "Build Source"
-  - name: specificBuildId
-    type: string
-    default: "xxxx"
-    displayName: "Build ID (for specific builds)"
+  - name: useLatestOfficialBuild
+    type: boolean
+    default: true
+  - name: useCurrentBranchBuild
+    type: boolean
+    default: false
   - name: uiTestModules
     type: object
     default: []
@@ -115,17 +113,16 @@ jobs:
       & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
     displayName: Download and install WinAppDriver
 
-  - ${{ if ne(parameters.buildSource, 'buildNow') }}:
+  - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
     - task: DownloadPipelineArtifact@2
       inputs:
         buildType: 'specific'
         project: 'Dart'
         definition: '76541'
-        ${{ if eq(parameters.buildSource, 'specificBuildId') }}:
-          buildVersionToDownload: 'specific'
-          buildId: '${{ parameters.specificBuildId }}'
+        buildVersionToDownload: 'latestFromBranch'
+        ${{ if eq(parameters.useCurrentBranchBuild, true) }}:
+          branchName: '$(Build.SourceBranch)'
         ${{ else }}:
-          buildVersionToDownload: 'latestFromBranch'
           branchName: 'refs/heads/main'
         artifactName: 'build-$(BuildPlatform)-Release'
         targetPath: '$(Build.ArtifactStagingDirectory)'
@@ -136,7 +133,7 @@ jobs:
           patterns: |
             **/PowerToysSetup*.exe
 
-  - ${{ if ne(parameters.buildSource, 'buildNow') }}:
+  - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
     - ${{ if eq(parameters.installMode, 'peruser') }}:
       - pwsh: |-
           & "$(build.sourcesdirectory)\.pipelines\installPowerToys.ps1" -InstallMode "PerUser"
@@ -172,7 +169,7 @@ jobs:
           !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
       env:
         platform: '$(TestPlatform)'
-        useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
+        useInstallerForTest: ${{ parameters.useLatestOfficialBuild }}
 
   - ${{ if ne(length(parameters.uiTestModules), 0) }}:
     - ${{ each module in parameters.uiTestModules }}:
@@ -194,4 +191,4 @@ jobs:
             !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
         env:
           platform: '$(TestPlatform)'
-          useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
+          useInstallerForTest: ${{ parameters.useLatestOfficialBuild }}

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

@@ -13,9 +13,6 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     default: false
-  - name: msBuildCacheIsReadOnly
-    type: boolean
-    default: true
   - name: runTests
     type: boolean
     default: true
@@ -55,7 +52,6 @@ stages:
             buildConfigurations: [Release]
             enablePackageCaching: true
             enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-            msBuildCacheIsReadOnly: ${{ parameters.msBuildCacheIsReadOnly }}
             runTests: ${{ parameters.runTests }}
             useVSPreview: ${{ parameters.useVSPreview }}
             useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}

.pipelines/v2/templates/pipeline-ui-tests-automation.yml

@@ -19,40 +19,155 @@ parameters:
   - name: useLatestWebView2
     type: boolean
     default: false
-  - name: buildSource
-    type: string
-    default: "latestMainOfficialBuild"
-    displayName: "Build Source"
-    values:
-      - latestMainOfficialBuild
-      - buildNow
-      - specificBuildId
-  - name: specificBuildId
-    type: string
-    default: 'xxxx'
-    displayName: "Build ID (only used when Build Source = specificBuildId)"
+  - name: useLatestOfficialBuild
+    type: boolean
+    default: true
+  - name: testBothInstallModes
+    type: boolean
+    default: true
+  - name: useCurrentBranchBuild
+    type: boolean
+    default: false
   - name: uiTestModules
     type: object
     default: []
 
 stages:
   - ${{ each platform in parameters.buildPlatforms }}:
-    # Full build path: build PowerToys + UI tests + run tests
-    - ${{ if eq(parameters.buildSource, 'buildNow') }}:
-      - template: pipeline-ui-tests-full-build.yml
-        parameters:
-          platform: ${{ platform }}
-          enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-          useVSPreview: ${{ parameters.useVSPreview }}
-          useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-          uiTestModules: ${{ parameters.uiTestModules }}
+    - ${{ if eq(parameters.useLatestOfficialBuild, false) }}:
+      - stage: Build_${{ platform }}
+        displayName: Build ${{ platform }}
+        dependsOn: []
+        jobs:
+          - template: job-build-project.yml
+            parameters:
+              pool:
+                ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+                  name: SHINE-INT-L
+                ${{ else }}:
+                  name: SHINE-OSS-L
+                ${{ if eq(parameters.useVSPreview, true) }}:
+                  demands: ImageOverride -equals SHINE-VS17-Preview
+              buildPlatforms:
+                - ${{ platform }}
+              buildConfigurations: [Release]
+              enablePackageCaching: true
+              enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+              runTests: false
+              buildTests: true
+              useVSPreview: ${{ parameters.useVSPreview }}
+              timeoutInMinutes: 90
 
-    # Official build path: build UI tests only + download official build + run tests  
-    - ${{ if ne(parameters.buildSource, 'buildNow') }}:
-      - template: pipeline-ui-tests-official-build.yml
-        parameters:
-          platform: ${{ platform }}
-          buildSource: ${{ parameters.buildSource }}
-          specificBuildId: ${{ parameters.specificBuildId }}
-          useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-          uiTestModules: ${{ parameters.uiTestModules }}
+    - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+      - stage: BuildUITests_${{ platform }}
+        displayName: Build UI Tests Only
+        dependsOn: []
+        jobs:
+          - template: job-build-ui-tests.yml
+            parameters:
+              pool:
+                ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+                  name: SHINE-INT-L
+                ${{ else }}:
+                  name: SHINE-OSS-L
+                ${{ if eq(parameters.useVSPreview, true) }}:
+                  demands: ImageOverride -equals SHINE-VS17-Preview
+              buildPlatforms:
+                - ${{ platform }}
+              uiTestModules: ${{ parameters.uiTestModules }}
+
+    - ${{ if eq(platform, 'x64') }}:
+      - stage: Test_x64Win10
+        displayName: Test x64Win10
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+          dependsOn:
+            - BuildUITests_${{ platform }}
+        ${{ else }}:
+          dependsOn:
+            - Build_${{ platform }}
+        jobs:
+            - template: job-test-project.yml
+              parameters:
+                platform: x64Win10
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                uiTestModules: ${{ parameters.uiTestModules }}
+
+            # Additional per-user installation test (when both modes are enabled)
+            - ${{ if and(eq(parameters.useLatestOfficialBuild, true), eq(parameters.testBothInstallModes, true)) }}:
+              - template: job-test-project.yml
+                parameters:
+                  platform: x64Win10
+                  configuration: Release
+                  useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                  useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                  useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                  uiTestModules: ${{ parameters.uiTestModules }}
+                  installMode: 'peruser'
+                  jobSuffix: '_PerUser'
+
+    - ${{ if eq(platform, 'x64') }}:
+      - stage: Test_x64Win11
+        displayName: Test x64Win11
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+          dependsOn:
+            - BuildUITests_${{ platform }}
+        ${{ else }}:
+          dependsOn:
+            - Build_${{ platform }}
+        jobs:
+            - template: job-test-project.yml
+              parameters:
+                platform: x64Win11
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                uiTestModules: ${{ parameters.uiTestModules }}
+
+            # Additional per-user installation test (when both modes are enabled)
+            - ${{ if and(eq(parameters.useLatestOfficialBuild, true), eq(parameters.testBothInstallModes, true)) }}:
+              - template: job-test-project.yml
+                parameters:
+                  platform: x64Win11
+                  configuration: Release
+                  useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                  useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                  useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                  uiTestModules: ${{ parameters.uiTestModules }}
+                  installMode: 'peruser'
+                  jobSuffix: '_PerUser'
+
+    - ${{ if ne(platform, 'x64') }}:
+      - stage: Test_${{ platform }}
+        displayName: Test ${{ platform }}
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+          dependsOn:
+            - BuildUITests_${{ platform }}
+        ${{ else }}:
+          dependsOn:
+            - Build_${{ platform }}
+        jobs:
+          - template: job-test-project.yml
+            parameters:
+              platform: ${{ platform }}
+              configuration: Release
+              useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+              useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+              useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+              uiTestModules: ${{ parameters.uiTestModules }}
+
+          # Additional per-user installation test (when both modes are enabled)
+          - ${{ if and(eq(parameters.useLatestOfficialBuild, true), eq(parameters.testBothInstallModes, true)) }}:
+            - template: job-test-project.yml
+              parameters:
+                platform: ${{ platform }}
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                uiTestModules: ${{ parameters.uiTestModules }}
+                installMode: 'peruser'
+                jobSuffix: '_PerUser'

.pipelines/v2/templates/pipeline-ui-tests-full-build.yml

@@ -1,80 +0,0 @@
-# Template for full build path: Build PowerToys + Build UI Tests + Run Tests
-parameters:
-  - name: platform
-    type: string
-  - name: enableMsBuildCaching
-    type: boolean
-    default: false
-  - name: useVSPreview
-    type: boolean
-    default: false
-  - name: useLatestWebView2
-    type: boolean
-    default: false
-  - name: uiTestModules
-    type: object
-    default: []
-
-stages:
-  # Stage 1: Build full PowerToys project
-  - stage: Build_${{ parameters.platform }}
-    displayName: Build PowerToys ${{ parameters.platform }}
-    dependsOn: []
-    jobs:
-      - template: job-build-project.yml
-        parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-              name: SHINE-INT-L
-            ${{ else }}:
-              name: SHINE-OSS-L
-            ${{ if eq(parameters.useVSPreview, true) }}:
-              demands: ImageOverride -equals SHINE-VS17-Preview
-          buildPlatforms:
-            - ${{ parameters.platform }}
-          buildConfigurations: [Release]
-          enablePackageCaching: true
-          enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-          runTests: false
-          buildTests: true
-          useVSPreview: ${{ parameters.useVSPreview }}
-          timeoutInMinutes: 90
-
-  # Stage 2: Run UI Tests
-  - ${{ if eq(parameters.platform, 'x64') }}:
-    - stage: Test_x64Win10_FullBuild
-      displayName: Test x64Win10 (Full Build)
-      dependsOn: Build_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win10
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: 'buildNow'
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-    - stage: Test_x64Win11_FullBuild
-      displayName: Test x64Win11 (Full Build)
-      dependsOn: Build_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win11
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: 'buildNow'
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-  - ${{ if ne(parameters.platform, 'x64') }}:
-    - stage: Test_${{ parameters.platform }}_FullBuild
-      displayName: Test ${{ parameters.platform }} (Full Build)
-      dependsOn: Build_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: ${{ parameters.platform }}
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: 'buildNow'
-            uiTestModules: ${{ parameters.uiTestModules }}

.pipelines/v2/templates/pipeline-ui-tests-official-build.yml

@@ -1,110 +0,0 @@
-# Template for official build path: Download Official Build + Build UI Tests Only + Run Tests
-parameters:
-  - name: platform
-    type: string
-  - name: buildSource
-    type: string
-  - name: specificBuildId
-    type: string
-    default: 'xxxx'
-  - name: useLatestWebView2
-    type: boolean
-    default: false
-  - name: uiTestModules
-    type: object
-    default: []
-
-stages:
-  # Stage 1: Build UI Tests Only
-  - stage: BuildUITests_${{ parameters.platform }}
-    displayName: Build UI Tests Only ${{ parameters.platform }}
-    dependsOn: []
-    jobs:
-      - template: job-build-ui-tests.yml
-        parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-              name: SHINE-INT-L
-            ${{ else }}:
-              name: SHINE-OSS-L
-          buildPlatforms:
-            - ${{ parameters.platform }}
-          uiTestModules: ${{ parameters.uiTestModules }}
-
-  # Stage 2: Run UI Tests with Official Build
-  - ${{ if eq(parameters.platform, 'x64') }}:
-    - stage: Test_x64Win10_OfficialBuild
-      displayName: Test x64Win10 (Official Build)
-      dependsOn: BuildUITests_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win10
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-        # Additional per-user installation test
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win10
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-            installMode: 'peruser'
-            jobSuffix: '_PerUser'
-
-    - stage: Test_x64Win11_OfficialBuild
-      displayName: Test x64Win11 (Official Build)
-      dependsOn: BuildUITests_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win11
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-        # Additional per-user installation test
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win11
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-            installMode: 'peruser'
-            jobSuffix: '_PerUser'
-
-  - ${{ if ne(parameters.platform, 'x64') }}:
-    - stage: Test_${{ parameters.platform }}_OfficialBuild
-      displayName: Test ${{ parameters.platform }} (Official Build)
-      dependsOn: BuildUITests_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: ${{ parameters.platform }}
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-        # Additional per-user installation test
-        - template: job-test-project.yml
-          parameters:
-            platform: ${{ parameters.platform }}
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-            installMode: 'peruser'
-            jobSuffix: '_PerUser'

.pipelines/v2/templates/steps-build-installer-vnext.yml

@@ -14,9 +14,6 @@ parameters:
   - name: additionalBuildOptions
     type: string
     default: ''
-  - name: installerSuffix
-    type: string
-    default: "wix5"
 
 steps:
   # Install WiX 5.0.2 tools needed for VNext installer (matching project SDK)
@@ -32,26 +29,17 @@ steps:
     displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
 
   - pwsh: |-
-      # Determine whether this is a per-user build
       $IsPerUser = $${{ parameters.buildUserInstaller }}
-
-      # Build slug used to locate the artifacts
-      $InstallerBuildSlug = if ($IsPerUser) { 'UserSetup' } else { 'MachineSetup' }
-
-      # VNext bundle folder; base name intentionally omits the VNext suffix
-      $InstallerFolder = 'PowerToysSetupVNext'
-      if ($IsPerUser) {
-        $InstallerBasename = "PowerToysUserSetup-${{ parameters.versionNumber }}-${{ parameters.installerSuffix }}-$(BuildPlatform)"
+      $InstallerBuildSlug = "MachineSetup"
+      $InstallerBasename = "PowerToysSetupVNext"
+      If($IsPerUser) {
+        $InstallerBuildSlug = "UserSetup"
+        $InstallerBasename = "PowerToysUserSetupVNext"
       }
-      else {
-        $InstallerBasename = "PowerToysSetup-${{ parameters.versionNumber }}-${{ parameters.installerSuffix }}-$(BuildPlatform)"
-      }
-
-      # Export variables for downstream steps
+      $InstallerBasename += "-${{ parameters.versionNumber }}-$(BuildPlatform)"
       Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
       Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
       Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
-      Write-Host "##vso[task.setvariable variable=InstallerFolder]$InstallerFolder"
     displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
 
   # This dll needs to be built and signed before building the MSI.
@@ -63,7 +51,6 @@ steps:
       msbuildArgs: >-
         /t:PowerToysSetupCustomActionsVNext
         /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         -restore -graph
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
         ${{ parameters.additionalBuildOptions }}
@@ -95,7 +82,6 @@ steps:
         -restore
         /t:PowerToysInstallerVNext
         /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
@@ -105,7 +91,7 @@ steps:
       maximumCpuCount: true
 
   - script: |-
-      wix msi decompile installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
+      wix msi decompile installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
       dir $(build.sourcesdirectory)\extractedMsi
     displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract and verify MSI"
 
@@ -126,46 +112,14 @@ steps:
         displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign VNext MSI
         signingIdentity: ${{ parameters.signingIdentity }}
         inputs:
-          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
+          FolderPath: 'installer/PowerToysSetupVNext/$(InstallerRelativePath)'
           signType: batchSigning
           batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
           ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
   #### END MSI
-  
-  #### BUILDING AND SIGNING SilentFilesInUseBAFunction DLL
-  - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build SilentFilesInUseBAFunction
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:SilentFilesInUseBAFunction
-        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
-        -restore -graph
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-SilentFilesInUseBAFunction.binlog
-        ${{ parameters.additionalBuildOptions }}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the msi
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign SilentFilesInUseBAFunction
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/$(BuildPlatform)/$(BuildConfiguration)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  #### END BUILDING AND SIGNING SilentFilesInUseBAFunction DLL
-  
   #### BOOTSTRAP BUILDING AND SIGNING
+
   - task: VSBuild@1
     displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext Bootstrapper
     inputs:
@@ -175,20 +129,19 @@ steps:
         -restore
         /t:PowerToysBootstrapperVNext
         /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
         -restore -graph
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the MSI nor SilentFilesInUseBAFunction
+      clean: false # don't undo our hard work above by deleting the MSI
       msbuildArchitecture: x64
       maximumCpuCount: true
 
   # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
   - ${{ if eq(parameters.codeSign, true) }}:
     - script: |-
-        wix burn detach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
+        wix burn detach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
       displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract Engine from Bundle"
 
     - template: steps-esrp-signing.yml
@@ -224,7 +177,7 @@ steps:
             ]
 
     - script: |-
-        wix burn reattach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe
+        wix burn reattach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe
       displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Reattach Engine to Bundle"
 
     - template: steps-esrp-signing.yml
@@ -232,7 +185,7 @@ steps:
         displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
         signingIdentity: ${{ parameters.signingIdentity }}
         inputs:
-          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
+          FolderPath: 'installer/PowerToysSetupVNext/$(InstallerRelativePath)'
           signType: batchSigning
           batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
           ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'

.pipelines/verifyCommonProps.ps1

@@ -39,11 +39,6 @@ foreach ($csprojFile in $csprojFilesArray) {
     if ($csprojFile -like '*TemplateCmdPalExtension.csproj') {
         continue
     }
-    
-    # The CmdPal.Core projects use a common shared props file, so skip them
-    if ($csprojFile -like '*Microsoft.CmdPal.Core.*.csproj') {
-        continue
-    }
 
     $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
     if (!$importExists) {

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -57,19 +57,12 @@ $totalList = $projFiles | ForEach-Object -Parallel {
 
             $p = -split $p
             $p = $p[1, 2]
-            $tempString = $p[0]
+            $tempString = $p[0] + " " + $p[1]
 
-            if([string]::IsNullOrWhiteSpace($tempString))
+            if(![string]::IsNullOrWhiteSpace($tempString))
             {
-                Continue
+		   echo "- $tempString";
             }
-
-            if($tempString.StartsWith("Microsoft.") -Or $tempString.StartsWith("System."))
-            {
-                Continue
-            }
-
-            echo "- $tempString"
         }
 	$csproj = $null;
     }

.pipelines/verifyNugetPackages.ps1

@@ -21,13 +21,4 @@ if (-not $?)
     exit 1
 }
 
-# Ignore NU1503 on vcxproj files 
-dotnet restore $solution /nowarn:NU1503 
-if ($lastExitCode -ne 0)
-{
-    $result = $lastExitCode
-    Write-Error "Error running dotnet restore, with the exit code $lastExitCode. Please verify logs on the nuget package versions."
-    exit $result
-}
-
 exit 0

.vscode/launch.json

@@ -1,43 +0,0 @@
-{
-    "version": "0.2.0",
-    "inputs": [
-        {
-            "id": "arch",
-            "type": "pickString",
-            "description": "Select target architecture",
-            "options": ["x64", "arm64"],
-            "default": "x64"
-        }
-    ],
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\${input:arch}\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build, ARCH configurable)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}

Directory.Build.props

@@ -30,6 +30,7 @@
     <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
     <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
   </PropertyGroup>
+
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <PackageReference Include="StyleCop.Analyzers">
       <PrivateAssets>all</PrivateAssets>

Directory.Build.targets

@@ -3,9 +3,4 @@
 
   <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
   <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
-
-  <!-- Override ManifestTool to the x64 host tool under WindowsSdkDir for all projects once the SDK path is known. -->
-  <PropertyGroup Label="ManifestToolOverride">
-    <ManifestTool Condition="Exists('$(WindowsSdkDir)bin\x64\mt.exe')">$(WindowsSdkDir)bin\x64\mt.exe</ManifestTool>
-  </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
@@ -22,11 +21,11 @@
     <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250910-build.2249" />
+    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250703-build.2173" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="HelixToolkit" Version="2.24.0" />
     <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.12.3" />
     <PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
     <PackageVersion Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0.2" />
     <PackageVersion Include="LazyCache" Version="2.4.0" />
@@ -35,23 +34,22 @@
     <!-- 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.Data.Sqlite" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.7" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.7" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.7" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.7" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.7" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -59,17 +57,15 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
     <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="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" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
     <PackageVersion Include="OpenAI" Version="2.0.0" />
@@ -82,32 +78,32 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.8" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.7" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.8" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.8" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.8" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.7" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.7" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.7" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.7" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.7" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.7" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.8" />
+    <PackageVersion Include="System.Management" Version="9.0.7" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.8" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.7" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
-    <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
+    <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
     <PackageVersion Include="WinUIEx" Version="2.2.0" />
     <PackageVersion Include="WPF-UI" Version="3.0.5" />
     <PackageVersion Include="WyHash" Version="1.0.5" />
@@ -125,4 +121,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -1491,50 +1491,93 @@ SOFTWARE.
 
 ## NuGet Packages used by PowerToys
 
-- AdaptiveCards.ObjectModel.WinUI3
-- AdaptiveCards.Rendering.WinUI3
-- AdaptiveCards.Templating
-- Appium.WebDriver
-- Azure.AI.OpenAI
-- CoenM.ImageSharp.ImageHash
-- CommunityToolkit.Common
-- CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
-- CommunityToolkit.Mvvm
-- CommunityToolkit.WinUI.Animations
-- CommunityToolkit.WinUI.Collections
-- CommunityToolkit.WinUI.Controls.Primitives
-- CommunityToolkit.WinUI.Controls.Segmented
-- CommunityToolkit.WinUI.Controls.SettingsControls
-- CommunityToolkit.WinUI.Controls.Sizers
-- CommunityToolkit.WinUI.Converters
-- CommunityToolkit.WinUI.Extensions
-- CommunityToolkit.WinUI.UI.Controls.DataGrid
-- ControlzEx
-- HelixToolkit
-- HelixToolkit.Core.Wpf
-- hyjiacan.pinyin4net
-- Interop.Microsoft.Office.Interop.OneNote
-- LazyCache
-- Mages
-- Markdig.Signed
-- MessagePack
-- ModernWpfUI
-- Moq
-- MSTest
-- NJsonSchema
-- NLog
-- NLog.Extensions.Logging
-- NLog.Schema
-- OpenAI
-- ReverseMarkdown
-- ScipBe.Common.Office.OneNote
-- SharpCompress
-- SkiaSharp.Views.WinUI
-- StreamJsonRpc
-- StyleCop.Analyzers
-- UnicodeInformation
-- UnitsNet
-- UTF.Unknown
-- WinUIEx
-- WPF-UI
-- WyHash
+- AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
+- AdaptiveCards.Rendering.WinUI3 2.1.0-beta
+- AdaptiveCards.Templating 2.0.5
+- Appium.WebDriver 4.4.5
+- Azure.AI.OpenAI 1.0.0-beta.17
+- CoenM.ImageSharp.ImageHash 1.3.6
+- CommunityToolkit.Common 8.4.0
+- CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock 0.1.250703-build.2173
+- CommunityToolkit.Mvvm 8.4.0
+- CommunityToolkit.WinUI.Animations 8.2.250402
+- CommunityToolkit.WinUI.Collections 8.2.250402
+- CommunityToolkit.WinUI.Controls.Primitives 8.2.250402
+- CommunityToolkit.WinUI.Controls.Segmented 8.2.250402
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250402
+- CommunityToolkit.WinUI.Controls.Sizers 8.2.250402
+- CommunityToolkit.WinUI.Converters 8.2.250402
+- CommunityToolkit.WinUI.Extensions 8.2.250402
+- CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
+- CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
+- ControlzEx 6.0.0
+- HelixToolkit 2.24.0
+- HelixToolkit.Core.Wpf 2.24.0
+- hyjiacan.pinyin4net 4.1.1
+- Interop.Microsoft.Office.Interop.OneNote 1.1.0.2
+- LazyCache 2.4.0
+- Mages 3.0.0
+- Markdig.Signed 0.34.0
+- MessagePack 3.1.3
+- Microsoft.Bcl.AsyncInterfaces 9.0.7
+- Microsoft.Bot.AdaptiveExpressions.Core 4.23.0
+- Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
+- Microsoft.Data.Sqlite 9.0.7
+- Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
+- Microsoft.DotNet.ILCompiler (A)
+- Microsoft.Extensions.DependencyInjection 9.0.7
+- Microsoft.Extensions.Hosting 9.0.7
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.7
+- Microsoft.Extensions.Logging 9.0.7
+- Microsoft.Extensions.Logging.Abstractions 9.0.7
+- Microsoft.NET.ILLink.Tasks (A)
+- Microsoft.SemanticKernel 1.15.0
+- Microsoft.Toolkit.Uwp.Notifications 7.1.2
+- Microsoft.Web.WebView2 1.0.2903.40
+- Microsoft.Win32.SystemEvents 9.0.7
+- Microsoft.Windows.Compatibility 9.0.7
+- Microsoft.Windows.CsWin32 0.3.183
+- Microsoft.Windows.CsWinRT 2.2.0
+- Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
+- Microsoft.WindowsAppSDK 1.7.250513003
+- Microsoft.WindowsPackageManager.ComInterop 1.10.340
+- Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
+- Microsoft.Xaml.Behaviors.Wpf 1.1.39
+- ModernWpfUI 0.9.4
+- Moq 4.18.4
+- MSTest 3.8.3
+- NLog.Extensions.Logging 5.3.8
+- NLog.Schema 5.2.8
+- OpenAI 2.0.0
+- ReverseMarkdown 4.1.0
+- ScipBe.Common.Office.OneNote 3.0.1
+- SharpCompress 0.37.2
+- SkiaSharp.Views.WinUI 2.88.9
+- StreamJsonRpc 2.21.69
+- StyleCop.Analyzers 1.2.0-beta.556
+- System.CodeDom 9.0.7
+- System.CommandLine 2.0.0-beta4.22272.1
+- System.ComponentModel.Composition 9.0.7
+- System.Configuration.ConfigurationManager 9.0.7
+- System.Data.OleDb 9.0.7
+- System.Data.SqlClient 4.9.0
+- System.Diagnostics.EventLog 9.0.7
+- System.Diagnostics.PerformanceCounter 9.0.7
+- System.Drawing.Common 9.0.7
+- System.IO.Abstractions 22.0.13
+- System.IO.Abstractions.TestingHelpers 22.0.13
+- System.Management 9.0.7
+- System.Net.Http 4.3.4
+- System.Private.Uri 4.3.2
+- System.Reactive 6.0.1
+- System.Runtime.Caching 9.0.7
+- System.ServiceProcess.ServiceController 9.0.7
+- System.Text.Encoding.CodePages 9.0.7
+- System.Text.Json 9.0.7
+- System.Text.RegularExpressions 4.3.1
+- UnicodeInformation 2.6.0
+- UnitsNet 5.56.0
+- UTF.Unknown 2.5.1
+- WinUIEx 2.2.0
+- WPF-UI 3.0.5
+- WyHash 1.0.5

PowerToys.sln

@@ -281,7 +281,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\registry.h = src\common\utils\registry.h
 		src\common\utils\resources.h = src\common\utils\resources.h
 		src\common\utils\serialized.h = src\common\utils\serialized.h
-		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\string_utils.h = src\common\utils\string_utils.h
 		src\common\utils\timeutil.h = src\common\utils\timeutil.h
 		src\common\utils\UnhandledExceptionHandler.h = src\common\utils\UnhandledExceptionHandler.h
@@ -462,8 +461,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.Common", "src\modules\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.FilePreviewer", "src\modules\peek\Peek.FilePreviewer\Peek.FilePreviewer.csproj", "{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Peek.UITests", "src\modules\peek\Peek.UITests\Peek.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MarkdownPreviewHandlerCpp", "src\modules\previewpane\MarkdownPreviewHandlerCpp\MarkdownPreviewHandlerCpp.vcxproj", "{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GcodePreviewHandlerCpp", "src\modules\previewpane\GcodePreviewHandlerCpp\GcodePreviewHandlerCpp.vcxproj", "{5A5DD09D-723A-44D3-8F2B-293584C3D731}"
@@ -638,7 +635,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.CommandPalette.Ex
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CommandPalette.Extensions.Toolkit", "src\modules\cmdpal\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj", "{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Core.Common", "src\modules\cmdpal\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj", "{14E62033-58D0-4A7D-8990-52F50A08BBBD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Common", "src\modules\cmdpal\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj", "{14E62033-58D0-4A7D-8990-52F50A08BBBD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\modules\cmdpal\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
 EndProject
@@ -712,10 +709,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodePreviewHandle
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodeThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-BgcodeThumbnailProvider\Preview.BgcodeThumbnailProvider.UnitTests.csproj", "{61CBF221-9452-4934-B685-146285E080D7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Search", "src\common\Common.Search\Common.Search.csproj", "{38F187B2-6638-5A40-072F-DBE5E54070A0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings.UI.XamlIndexBuilder", "src\settings-ui\Settings.UI.XamlIndexBuilder\Settings.UI.XamlIndexBuilder.csproj", "{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseUtils.UITests", "src\modules\MouseUtils\MouseUtils.UITests\MouseUtils.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Workspaces.Editor.UITests", "src\modules\Workspaces\WorkspacesEditorUITest\Workspaces.Editor.UITests.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
@@ -728,7 +721,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerRename.UITests", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Core.ViewModels", "src\modules\cmdpal\Core\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj", "{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Core.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj", "{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0E556541-6A45-42CB-AE49-EE5A9BE05E7C}"
 EndProject
@@ -791,26 +784,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WindowWalker.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.WindowWalker.UnitTests\Microsoft.CmdPal.Ext.WindowWalker.UnitTests.csproj", "{E816D7B0-4688-4ECB-97CC-3D8E798F3829}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.UnitTestBase", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj", "{00D8659C-2068-40B6-8B86-759CD6284BBB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E11826E1-76DF-42AC-985C-164CC2EE57A1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenRuler.UITests", "src\modules\MeasureTool\Tests\ScreenRuler.UITests\ScreenRuler.UITests.csproj", "{66C069F8-C548-4CA6-8CDE-239104D68E88}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v3", "v3", "{9605B84E-FAC4-477B-B9EC-0753177EE6A8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerToys.DSC", "src\dsc\v3\PowerToys.DSC\PowerToys.DSC.csproj", "{94CDC147-6137-45E9-AEDE-17FF809607C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerToys.DSC.UnitTests", "src\dsc\v3\PowerToys.DSC.UnitTests\PowerToys.DSC.UnitTests.csproj", "{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Apps.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Apps.UnitTests\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj", "{E816D7B1-4688-4ECB-97CC-3D8E798F3830}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Bookmarks.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj", "{E816D7B3-4688-4ECB-97CC-3D8E798F3832}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.WebSearch.UnitTests\Microsoft.CmdPal.Ext.WebSearch.UnitTests.csproj", "{E816D7B2-4688-4ECB-97CC-3D8E798F3831}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Shell.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Shell.UnitTests\Microsoft.CmdPal.Ext.Shell.UnitTests.csproj", "{E816D7B4-4688-4ECB-97CC-3D8E798F3833}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -1879,14 +1852,6 @@ Global
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|ARM64.Build.0 = Release|ARM64
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.ActiveCfg = Release|x64
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.Build.0 = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|x64.ActiveCfg = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|x64.Build.0 = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|ARM64.Build.0 = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|x64.ActiveCfg = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|x64.Build.0 = Release|x64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.Build.0 = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|x64.ActiveCfg = Debug|x64
@@ -2705,22 +2670,6 @@ Global
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|ARM64.Build.0 = Release|ARM64
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|x64.ActiveCfg = Release|x64
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|x64.Build.0 = Release|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.ActiveCfg = Debug|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.Build.0 = Debug|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.Build.0 = Release|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.ActiveCfg = Release|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.Build.0 = Release|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.ActiveCfg = Debug|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.Build.0 = Debug|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.Build.0 = Release|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.ActiveCfg = Release|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.Build.0 = Release|x64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.ActiveCfg = Debug|x64
@@ -2881,70 +2830,6 @@ Global
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|ARM64.Build.0 = Release|ARM64
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|x64.ActiveCfg = Release|x64
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|x64.Build.0 = Release|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|x64.ActiveCfg = Debug|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|x64.Build.0 = Debug|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.Build.0 = Release|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.ActiveCfg = Release|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.Build.0 = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.Build.0 = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.ActiveCfg = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.Build.0 = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.ActiveCfg = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.Build.0 = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.ActiveCfg = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.Build.0 = Release|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|x64.ActiveCfg = Debug|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|x64.Build.0 = Debug|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|ARM64.Build.0 = Release|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|x64.ActiveCfg = Release|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|x64.Build.0 = Release|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|x64.ActiveCfg = Debug|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|x64.Build.0 = Debug|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|ARM64.Build.0 = Release|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|x64.ActiveCfg = Release|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|x64.Build.0 = Release|x64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.Build.0 = Debug|x64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|x64.ActiveCfg = Release|x64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|x64.Build.0 = Release|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|x64.Build.0 = Debug|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|x64.ActiveCfg = Release|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|x64.Build.0 = Release|x64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Debug|x64.Build.0 = Debug|x64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Release|x64.ActiveCfg = Release|x64
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831}.Release|x64.Build.0 = Release|x64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Debug|x64.Build.0 = Debug|x64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.ActiveCfg = Release|x64
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3103,7 +2988,6 @@ Global
 		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{5A5DD09D-723A-44D3-8F2B-293584C3D731} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{B3E869C4-8210-4EBD-A621-FF4C4AFCBFA9} = {2F305555-C296-497E-AC20-5FA1B237996A}
@@ -3182,7 +3066,7 @@ Global
 		{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{305DD37E-C85D-4B08-AAFE-7381FA890463} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
 		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{14E62033-58D0-4A7D-8990-52F50A08BBBD} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
 		{071E18A4-A530-46B8-AB7D-B862EE55E24E} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{C846F7A7-792A-47D9-B0CB-417C900EE03D} = {071E18A4-A530-46B8-AB7D-B862EE55E24E}
@@ -3219,8 +3103,6 @@ Global
 		{9BC1C986-1E97-4D07-A7B1-CE226C239EFA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
 		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
@@ -3235,6 +3117,11 @@ Global
 		{D9BD324E-1D80-44AA-8E7B-73EB00944434} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{8EF25507-2575-4ADE-BF7E-D23376903AB8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{070AC093-C9F2-20AD-0BCD-F318FC2761EA} = {B1234567-1234-1234-1234-123456789ABC}
+		{E816D7AC-4688-4ECB-97CC-3D8E798F3825} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7AD-4688-4ECB-97CC-3D8E798F3826} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7AE-4688-4ECB-97CC-3D8E798F3827} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{2C318EC3-BA86-4372-B1BC-DB0F33C208B2} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{BFFB607F-7C78-434B-86B9-DA4C8196A1B5} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{66E1534A-1587-42B2-912F-45C994D32904} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
@@ -3252,21 +3139,6 @@ Global
 		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
 		{F93C2817-C846-4259-84D8-B39A6B57C8DE} = {3527BF37-DFC5-4309-A032-29278CA21328}
 		{8131151D-B0E9-4E18-84A5-E5F946C4480A} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{00D8659C-2068-40B6-8B86-759CD6284BBB} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E11826E1-76DF-42AC-985C-164CC2EE57A1} = {7AC943C9-52E8-44CF-9083-744D8049667B}
-		{66C069F8-C548-4CA6-8CDE-239104D68E88} = {E11826E1-76DF-42AC-985C-164CC2EE57A1}
-		{9605B84E-FAC4-477B-B9EC-0753177EE6A8} = {557C4636-D7E1-4838-A504-7D19B725EE95}
-		{94CDC147-6137-45E9-AEDE-17FF809607C0} = {9605B84E-FAC4-477B-B9EC-0753177EE6A8}
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78} = {9605B84E-FAC4-477B-B9EC-0753177EE6A8}
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7B2-4688-4ECB-97CC-3D8E798F3831} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7B4-4688-4ECB-97CC-3D8E798F3833} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -1,253 +1,81 @@
-<p align="center">
-    <picture>
-      <source media="(prefers-color-scheme: light)" srcset="./doc/images/readme/pt-hero.light.png" />
-      <img src="./doc/images/readme/pt-hero.dark.png" />
-  </picture>
-</p>
-<h1 align="center">
-  <span>Microsoft PowerToys</span>
-</h1>
+# Microsoft PowerToys
 
-<h3 align="center">
-  <a href="#-installation">Installation</a>
-  <span> · </span>
-  <a href="https://aka.ms/powertoys-docs">Documentation</a>
-  <span> · </span>
-  <a href="https://aka.ms/powertoys-releaseblog">Blog</a>
-  <span> · </span>
-  <a href="#-whats-new">Release notes</a>
-</h3>
-<br/><br/>
-Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.
-<br/><br/>
+![Hero image for Microsoft PowerToys](doc/images/overview/PT_hero_image.png)
 
-|   |   |   |
-|---|---|---|
-| [<img src="doc/images/icons/AdvancedPaste.png" alt="Advanced Paste icon" height="16"> Advanced Paste](https://aka.ms/PowerToysOverview_AdvancedPaste) | [<img src="doc/images/icons/Always%20On%20Top.png" alt="Always on Top icon" height="16"> Always on Top](https://aka.ms/PowerToysOverview_AoT) | [<img src="doc/images/icons/Awake.png" alt="Awake icon" height="16"> Awake](https://aka.ms/PowerToysOverview_Awake) |
-| [<img src="doc/images/icons/Color%20Picker.png" alt="Color Picker icon" height="16"> Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [<img src="doc/images/icons/Command%20Not%20Found.png" alt="Command Not Found icon" height="16"> Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [<img src="doc/images/icons/Command Palette.png" alt="Command Palette icon" height="16"> Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
-| [<img src="doc/images/icons/Crop%20And%20Lock.png" alt="Crop and Lock icon" height="16"> Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [<img src="doc/images/icons/Environment%20Manager.png" alt="Environment Variables icon" height="16"> Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [<img src="doc/images/icons/FancyZones.png" alt="FancyZones icon" height="16"> FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
-| [<img src="doc/images/icons/File%20Explorer%20Preview.png" alt="File Explorer Add-ons icon" height="16"> File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [<img src="doc/images/icons/File%20Locksmith.png" alt="File Locksmith icon" height="16"> File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [<img src="doc/images/icons/Host%20File%20Editor.png" alt="Hosts File Editor icon" height="16"> Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
-| [<img src="doc/images/icons/Image%20Resizer.png" alt="Image Resizer icon" height="16"> Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [<img src="doc/images/icons/Keyboard%20Manager.png" alt="Keyboard Manager icon" height="16"> Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [<img src="doc/images/icons/Find My Mouse.png" alt="Mouse Utilities icon" height="16"> Mouse Utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
-| [<img src="doc/images/icons/MouseWithoutBorders.png" alt="Mouse Without Borders icon" height="16"> Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [<img src="doc/images/icons/NewPlus.png" alt="New+ icon" height="16"> New+](https://aka.ms/PowerToysOverview_NewPlus) | [<img src="doc/images/icons/Peek.png" alt="Peek icon" height="16"> Peek](https://aka.ms/PowerToysOverview_Peek) |
-| [<img src="doc/images/icons/PowerRename.png" alt="PowerRename icon" height="16"> PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [<img src="doc/images/icons/PowerToys%20Run.png" alt="PowerToys Run icon" height="16"> PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [<img src="doc/images/icons/PowerAccent.png" alt="Quick Accent icon" height="16"> Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) |
-| [<img src="doc/images/icons/Registry%20Preview.png" alt="Registry Preview icon" height="16"> Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [<img src="doc/images/icons/MeasureTool.png" alt="Screen Ruler icon" height="16"> Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [<img src="doc/images/icons/Shortcut%20Guide.png" alt="Shortcut Guide icon" height="16"> Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
-| [<img src="doc/images/icons/PowerOCR.png" alt="Text Extractor icon" height="16"> Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [<img src="doc/images/icons/Workspaces.png" alt="Workspaces icon" height="16"> Workspaces](https://aka.ms/PowerToysOverview_Workspaces) | [<img src="doc/images/icons/ZoomIt.png" alt="ZoomIt icon" height="16"> ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |
+[How to use PowerToys][usingPowerToys-docs-link] | [Downloads & Release notes][github-release-link] | [Contributing to PowerToys](#contributing) | [What's Happening](#whats-happening) | [Roadmap](#powertoys-roadmap)
 
+## About
 
-## 📋 Installation
+Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity. For more info on [PowerToys overviews and how to use the utilities][usingPowerToys-docs-link], or any other tools and resources for [Windows development environments](https://learn.microsoft.com/windows/dev-environment/overview), head over to [learn.microsoft.com][usingPowerToys-docs-link]!
 
-For detailed installation instructions, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
+|              | Current utilities: |              |
+|--------------|--------------------|--------------|
+| [Advanced Paste](https://aka.ms/PowerToysOverview_AdvancedPaste) | [Always on Top](https://aka.ms/PowerToysOverview_AoT) | [PowerToys Awake](https://aka.ms/PowerToysOverview_Awake) |
+| [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
+| [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
+| [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
+| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
+| [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
+| [Peek](https://aka.ms/PowerToysOverview_Peek) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
+| [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
+| [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
+| [ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |
 
-Before you begin, make sure your device meets the system requirements:
+## Installing and running Microsoft PowerToys
 
-> [!NOTE]
-> - Windows 11 or Windows 10 version 2004 (20H1 / build 19041) or newer
-> - 64-bit processor: x64 or ARM64
-> - Latest stable version of [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) is installed via the bootstrapper during setup
+### Requirements
 
-Choose one of the installation methods below:
+- Windows 11 or Windows 10 version 2004 (code name 20H1 / build number 19041) or newer.
+- x64 or ARM64 processor
+- Our installer will install the following items:
+   - [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) bootstrapper. This will install the latest version.
 
-<details>
-<summary>Download .exe from GitHub</summary>
+### Via GitHub with EXE [Recommended]
 
-Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
+Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
 <!-- 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.95%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.92%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.94.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.94.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.94.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.94.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.92.1-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.92.1-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.92.1-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.92.1-arm64.exe][ptMachineArm64] |
 
-</details>
+This is our preferred method.
 
-<details>
-<summary>Microsoft Store</summary>
-You can easily install PowerToys from the Microsoft Store:
-<p>
-  <a style="text-decoration:none" href="https://aka.ms/getPowertoys">
-    <picture>
-      <source media="(prefers-color-scheme: light)" srcset="doc/images/readme/StoreBadge-dark.png" width="148" />
-      <img src="doc/images/readme/StoreBadge-light.png" width="148" />
-  </picture></a>
-</p>
-</details>
+### Via Microsoft Store
 
+Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/), which is available for both Windows 11 and Windows 10.
 
-<details>
-<summary>WinGet</summary>
-
+### Via WinGet
 Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
-*User scope installer [default]*
+#### User scope installer [default]
 ```powershell
 winget install Microsoft.PowerToys -s winget
 ```
 
-*Machine-wide scope installer*
+#### Machine-wide scope installer
+
 ```powershell
 winget install --scope machine Microsoft.PowerToys -s winget
 ```
-</details>
 
-<details>
-<summary>Other methods</summary>
+### Other install methods
 
 There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
-</details>
 
-## ✨ What's new
-**Version 0.94 (September 2025)**
+## Third-Party Run Plugins
 
-For an in-depth look at the latest changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
-
-**✨ Highlights**
-
- - PowerToys Settings added a Settings search with fuzzy matching, suggestions, a results page, and UX polish to make finding options faster.
- - A comprehensive hotkey conflict detection system was introduced in Settings to surface and help resolve conflicting shortcuts. Note that the default hotkey settings (Win+Ctrl+Shift+T, Win+Ctrl+V, Win+Ctrl+T, Win+Shift+T) may overlap with existing Windows system shortcuts. This is expected. You can resolve the conflict by assigning different hotkeys.
- - Mouse Utilities added a “Gliding cursor” accessibility feature to Mouse Pointer Crosshairs for single‑button cursor movement and clicking. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - The installer was upgraded to WiX 5 after WiX 3 reached end-of-life; this move improved installer security, reliability, and community support.
- - Tons of bug fixes and improvements for Command Palette, including visual updates and new support for filters on ListPages (handy for extension developers).
- - Hosts Editor now has a “No leading spaces” option so active host entries can start at column 0 even if others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Context menu registration was moved from the installer to runtime to avoid loading disabled modules (runtime registrations).
- - Quick Accent now supports Maltese, and frequently used accents appear first (and are remembered across sessions). Thanks [@rovercoder](https://github.com/rovercoder)! [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Always On Top
-
- - Fixed the border hover cursor so it shows the arrow instead of the wait cursor. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Command Palette
-
- - Applied single-click activation only to pointer input; keyboard always activates immediately. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Let context menus open at the cursor by removing window-bound constraints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made error messages clearer with timestamps, HRESULTs, and full details for easier diagnosis. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented crashes and improved robustness when updating providers without commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured the Settings window reliably comes to the front when opened. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Replaced the Clipboard History icon with a colorful Fluent icon. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Hardened ContentIcon to avoid duplicate parenting and improve diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Standardized null checks using C# pattern matching for safer behavior.
- - Improved accessibility by focusing the activation shortcut dialog and making text reachable. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Moved the extension SDK to a stable Windows SDK and cleaned up message namespaces.
- - Added path shortcuts: ~ to home, and / or \\ to system root, plus UNC support. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed a race in cancellation handling to avoid InvalidOperationException. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Aligned separator styling with WinUI 3 for consistent visuals. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added ARM64 PDBs to the Extensions SDK NuGet for better debugging.
- - Added single-select filters to DynamicListPage and updated Windows Services sample.
- - Updated main page placeholder text to better describe what can be searched. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Removed explicit WinAppSDK/WebView2 dependencies from toolkit and API. Thanks [@rluengen](https://github.com/rluengen)!
- - Added a local keyboard hook to handle the GoBack key reliably. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Propagated alias changes safely and resolved conflicts across view models.
- - Allowed providers to override Dispose with a virtual method.
- - Fixed memory leaks by cleaning up removed or cancelled list items.
- - Sorted DateTime extension results by relevance for better usability.
- - Reduced search text "jiggling" by avoiding redundant change notifications.
- - Centralized automation notifications in a UIHelper for better accessibility. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Preserved Adaptive Card action types during trimming via DynamicDependency.
- - Added an acrylic backdrop and refined styling to the context menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented disposed pages and Settings windows from handling stale messages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made the extension API easier to evolve without breaking clients.
- - Added "evil" sample pages to help reproduce tricky bugs.
- - Fixed WinGet trim-safety issues by replacing LINQ with manual iteration.
- - Cancelled stale list fetches to avoid older results overwriting newer ones in CmdPal.
-
-### Command Palette extensions
-
- - Improved empty states and ranking logic for multiple extensions. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added app icons to the All Apps "Run" context command when available.
- - Restored missing builtin icons by standardizing extension dependencies.
- - Unblocked local deployment by adding WinAppSDK to two sample extensions.
-
-### Hosts File Editor
-
- - Added a "No leading spaces" option so active hosts entries can start at column 0 even when others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
-
-### Image Resizer
-
- - Fixed Image Resizer localization by installing satellite resources under the WinUI 3 apps culture path.
-
-### Mouse Utilities
-
- - Introduced "Gliding cursor" to control the pointer and click with a single hotkey for better accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-
-### Mouse Without Borders
-
- - Blocked Easy Mouse from switching machines during fullscreen apps, with an allow-list for exceptions. Thanks [@dot-tb](https://github.com/dot-tb)!
-
-### Peek
-
- - Added Visual Studio shared project file types to XML preview and fixed bgcode handler registration. Thanks [@rezanid](https://github.com/rezanid)!
- - Fixes bgcode preview handler registration and events for reliable previews. Thanks [@pedrolamas](https://github.com/pedrolamas)!
-
-### PowerRename
-
- - Changed the Explorer accelerator key to PowErRename to avoid clashing with the New menu. Thanks [@aaron-ni](https://github.com/aaron-ni)!
-
-### Quick Accent
-
- - Remembered character usage across sessions so frequently used accents appear first. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Added Maltese language support with specific characters and the Euro symbol. Thanks [@rovercoder](https://github.com/rovercoder)!
- - Reduced GPU usage issues by making the window Topmost only when the picker is visible. Thanks [@daverayment](https://github.com/daverayment)!
-
-### Settings
-
- - Added telemetry to track usage of the new shortcut conflict detection workflow.
- - Moved the shutdown action from the title bar to a footer menu item with confirmation. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Implemented comprehensive hotkey conflict detection with a dedicated resolution dialog.
- - Added branded visuals for Office and Copilot keys in the KeyVisual control.
- - Introduced Settings search with fuzzy matching and navigation to specific controls.
- - Corrected Spanish localization so product names like Awake remain in English across Settings and OOBE.
- - Simplified the Advanced Paste description in Settings for quicker reading and consistent capitalization. Thanks [@OldUser101](https://github.com/OldUser101)!
- - Localized conflict messages in the conflict window and dialog.
-
-### Installer
-
- - Upgraded the installer to WiX 5 with silent "Files in Use" handling for smoother winget installs.
- - Switched Win10 context menu modules to runtime registration and added cleanup on uninstall to avoid stale entries.
-
-### Documentation
-
- - Adds docs for building the installer locally and testing winget installs.
- - Fixed a broken style guide link in developer documentation. Thanks [@denizmaral](https://github.com/denizmaral)!
-
-### Development
-
- - Excluded test and coverage DLLs from BinSkim scans to cut false positives and speed up security analysis.
- - Simplified NOTICE maintenance by removing version numbers and filtering out Microsoft/System packages.
- - Improved NuGet dependency validation to prevent package downgrades and catch issues during restore.
- - Updated UTF.Unknown to a modern version to improve compatibility without breaking changes. Thanks [@304NotModified](https://github.com/304NotModified)!
- - Refreshed package catalog in CI before installing dependencies to prevent Linux workflow failures.
- - Refactored CmdPal tests with dependency injection and added coverage for queries and settings.
- - Added unit tests to verify Close on Enter swaps Copy/Save as expected. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Added accessibility IDs to CmdPal UI for stable UI tests.
- - Rewrote system command tests with a new test base and cleaner patterns.
- - Added unit tests for WebSearch and Shell extensions with mockable settings.
- - Added unit tests and abstractions for Apps and Bookmarks extensions.
- - Cleans up AI-generated tests; adds meaningful query tests across extensions.
- - Removed the obsolete debug dialog from Settings for a smoother developer loop.
-
-## 🛣️ Roadmap
-
-For [v0.95][github-next-release-work], we'll work on the items below:
-
- - Continued Command Palette polish
- - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
- - Upgrading Keyboard Manager's editor UI
- - UI tweaking utility with day/night theme switcher
- - DSC v3 support for top utilities
- - New UI automation tests
- - Stability, bug fixes
-
-## ❤️ 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!
+There is a collection of [third-party plugins](./doc/thirdPartyRunPlugins.md) created by the community that aren't distributed with PowerToys.
 
 ## Contributing
 
@@ -259,6 +87,151 @@ Most contributions require you to agree to a [Contributor License Agreement (CLA
 
 For guidance on developing for PowerToys, please read the [developer docs](./doc/devdocs) for a detailed breakdown. This includes how to setup your computer to compile.
 
+## What's Happening
+
+### PowerToys Roadmap
+
+Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
+
+### 0.92 - June 2025 Update
+
+In this release, we focused on new features, stability, optimization improvements, and automation.
+
+**✨Highlights**
+
+ - PowerToys settings now has a toggle for the system tray icon, giving users control over its visibility based on personal preference. Thanks [@BLM16](https://github.com/BLM16)!  
+ - Command Palette now has Ahead-of-Time ([AOT](https://learn.microsoft.com/en-us/dotnet/core/deploying/native-aot)) compatibility for all first-party extensions, improved extensibility, and core UX fixes, resulting in better performance and stability across commands.
+ - Color Picker now has customizable mouse button actions, enabling more personalized workflows by assigning functions to left, right, and middle clicks. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Bug Report Tool now has a faster and clearer reporting process, with progress indicators, improved compression, auto-cleanup of old trace logs, and inclusion of MSIX installer logs for more efficient diagnostics.
+ - File Explorer add-ons now have improved rendering stability, resolving issues with PDF previews, blank thumbnails, and text file crashes during file browsing.
+
+### Color Picker
+
+ - Added mouse button actions so you can choose what left, right, or middle click does. Thanks [@PesBandi](https://github.com/PesBandi)!  
+
+### Crop & Lock
+
+ - Aligned window styling with current Windows theme for a cleaner look. Thanks [@sadirano](https://github.com/sadirano)!  
+
+### Command Palette
+
+ - Enhanced performance by resolving a regression in page loading.
+ - Applied consistent hotkey handling across all Command Palette commands for a smoother user experience.
+ - Improved graceful closing of Command Palette. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed consistency issue for extensions' alias with "Direct" setting and enabled localization for "Direct" and "Indirect" for better user understanding. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Improved visual clarity by styling critical context items correctly.
+ - Automatically focused the field when only one is present on the content page.
+ - Improved stability and efficiency when loading file icons in SDK ThumbnailHelper.cs by removing unnecessary operations. Thanks [@OldUser101](https://github.com/OldUser101)!
+ - Enhanced details view with commands implementation. (See [Extension sample](./src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs))
+
+### Command Palette extensions
+
+ - Added "Copy Path" command to *App* search results for convenience. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Improved *Calculator* input experience by ignoring leading equal signs. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Corrected input handling in the *Calculator* extension to avoid showing errors for input with only leading whitespace.
+ - Improved *New Extension* wizard by validating names to prevent namespace errors.
+ - Ensured consistent context items display for the *Run* extension between fallback and top-level results.
+ - Fixed missing *Time & Date* commands in fallback results. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed outdated results in the *Time & Date* extension. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed an issue where *Web Search* always opened Microsoft Edge instead of the user's default browser on Windows 11 24H2 and later. Thanks [@RuggMatt](https://github.com/RuggMatt)!
+ - Improved ordering of *Windows Settings* extension search results from alphabetical to relevance-based for quicker access.
+ - Added "Restart Windows Explorer" command to the *Windows System Commands* provider for gracefully terminate and relaunch explorer.exe. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+
+### Command Palette Ahead-of-Time (AOT) readiness
+
+ - We’ve made foundational changes to prepare the Command Palette for future Ahead-of-Time (AOT) publishing. This includes replacing the calculator library with ExprTk, improving COM object handling, refining Win32 interop, and correcting trimming behavior—all to ensure compatibility, performance, and reliability under AOT constraints. All first-party extensions are now AOT-compatible. These improvements lay the groundwork for publishing Command Palette as an AOT application in the next release.
+ - Special thanks to [@Sergio0694](https://github.com/Sergio0694) for guidance on making COM APIs AOT-compatible, [@jtschuster](https://github.com/jtschuster) for fixing COM object handling, [@ArashPartow](https://github.com/ArashPartow) from ExprTk for integration suggestions, and [@tian-lt](https://github.com/tian-lt) from the Windows Calculator team for valuable suggestion throughout the migration journey and review.
+ - As part of the upcoming release, we’re also enabling AOT compatibility for key dependencies, including markdown rendering, Adaptive Cards, internal logging and telemetry library, and the core Command Palette UX.
+
+### FancyZones
+
+ - Fixed DPI-scaling issues to ensure FancyZones Editor displays crisply on high-resolution monitors. Thanks [@HO-COOH](https://github.com/HO-COOH)! This inspired us a broader review across other PowerToys modules, leading to DPI display optimizations in Awake, Color Picker, PowerAccent, and more.
+
+### File Explorer add-ons
+
+ - Fixed potential failures in PDF previewer and thumbnail generation, improving reliability when browsing PDF files. Thanks [@mohiuddin-khan-shiam](https://github.com/mohiuddin-khan-shiam)!  
+ - Prevented Monaco Preview Handler crash when opening UTF-8-BOM text files.  
+
+### Hosts File Editor
+
+ - Added an in-app *“Learn more”* link to warning dialogs for quick guidance. Thanks [@PesBandi](https://github.com/PesBandi)!  
+
+### Mouse Without Borders
+
+ - Fixed firewall rule so MWB now accepts connections from IPs outside your local subnet.
+ - Cleaned legacy logs to reduce disk usage and noise.  
+
+### Peek
+
+ - Updated QOI reader so 3-channel QOI images preview correctly in Peek and File Explorer. Thanks [@mbartlett21](https://github.com/mbartlett21)!  
+ - Added codec detection with a clear warning when a video can’t be previewed, along with a link to the Microsoft Store to download the required codec.
+
+### PowerRename
+
+ - Added support for $YY-$MM-$DD in ModificationTime and AccessTime to enable flexible date-based renaming.
+
+### PowerToys Run
+
+ - Suppressed error UI for known WPF-related crashes to reduce user confusion, while retaining diagnostic logging for analysis. This targets COMException 0xD0000701 and 0x80263001 caused by temporary DWM unavailability.
+
+### Registry Preview
+
+ - Added "Extended data preview" via magnifier icon and context menu in the Data Grid, enabled easier inspection of complex registry types like REG_BINARY, REG_EXPAND_SZ, and REG_MULTI_SZ, etc. Thanks [@htcfreek](https://github.com/htcfreek)! 
+ - Improved file-saving experience in Registry Preview by aligning with Notepad-like behavior, enhancing user prompts, error handling, and preventing crashes during unsaved or interrupted actions. Thanks [@htcfreek](https://github.com/htcfreek)!  
+
+### Settings
+
+ - Added an option to hide or show the PowerToys system tray icon. Thanks [@BLM16](https://github.com/BLM16)!
+ - Improved settings to show progress while a bug report package is being generated.
+
+### Workspaces
+
+ - Stored Workspaces icons in user AppData to ensure profile portability and prevent loss during temporary folder cleanup.
+ - Enabled capture and launch of PWAs on non-default Edge or Chrome profiles, ensuring consistent behavior during creation and execution.
+
+### Documentation
+
+ - Added SpeedTest and Dictionary Definition to the third-party plugins documentation for PowerToys Run. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - Corrected sample links and typo in Command Palette documentation. Thanks [@daverayment](https://github.com/daverayment) and [@roycewilliams](https://github.com/roycewilliams)!
+
+### Development
+
+ - Updated .NET libraries to 9.0.6 for performance and security. Thanks [@snickler](https://github.com/snickler)!  
+ - Updated WinAppSDK to 1.7.2 for better stability and Windows support.  
+ - Introduced a one-step local build script that generates a signed installer, enhancing developer productivity.
+ - Generated portable PDBs so cross-platform debuggers can read symbol files, improving debugging experience in VSCode and other tools.
+ - Simplified WinGet configuration files by using the [Microsoft.Windows.Settings](https://www.powershellgallery.com/packages/Microsoft.Windows.Settings) module to enable Developer Mode. Thanks [@mdanish-kh](https://github.com/mdanish-kh)! 
+ - Adjusted build scripts for the latest Az.Accounts module to keep CI green.
+ - Streamlined release pipeline by removing hard-coded telemetry version numbers, and unified Command Palette versioning with Windows Terminal's versioning method for consistent updates.
+ - Enhanced the build validation step to show detailed differences between NOTICE.md and actual package dependencies and versions.
+ - Improved spell-checking accuracy across the repo. Thanks [@rovercoder](https://github.com/rovercoder)!  
+ - Upgraded CI to TouchdownBuild v5 for faster pipelines.  
+ - Added context comments to *Resources.resw* to help translators.
+ - Expanded fuzz testing coverage to include FancyZones.
+ - Integrated all unit tests into the CI pipeline, increasing from ~3,000 to ~5,000 tests.
+ - Enabled daily UI test automation on the main branch, now covering over 370 UI tests for end-to-end validation.
+ - Newly added unit tests for WorkspacesLib to improve reliability and maintainability.
+
+### General
+
+- Updated bug report compression library (cziplib 0.3.3) for faster and more reliable package creation. Thanks [@Chubercik](https://github.com/Chubercik)!
+- Included App Installer (“AppX Deployment Server”) event logs in bug reports for more thorough diagnostics.  
+
+### What is being planned for version 0.93
+
+For [v0.93][github-next-release-work], we'll work on the items below:
+
+ - Continued Command Palette polish
+ - New UI automation tests
+ - Working on installer upgrades
+ - Working on shortcut conflict detection
+ - Upgrading Keyboard Manager's editor UI
+ - Stability, bug fixes
+
+## 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.  Month by month, you directly help make PowerToys a better piece of software.
+
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct-code].

doc/devdocs/UITests.md

@@ -22,23 +22,23 @@ The PowerToys UI test pipeline provides flexible options for building and testin
 
 ### Pipeline Options
 
-- **buildSource**: Select the build type for testing:
-  - `latestMainOfficialBuild`: Downloads and uses the latest official PowerToys build from main branch
-  - `buildNow`: Builds PowerToys from current source code and uses it for testing
-  - `specificBuildId`: Downloads a specific PowerToys build using the build ID specified in `specificBuildId` parameter
+- **useLatestOfficialBuild**: When checked, downloads the latest official PowerToys build and installs it for testing. This skips the full solution build and only builds UI test projects.
 
-  **Default value**: `latestMainOfficialBuild`
+- **useCurrentBranchBuild**: When checked along with `useLatestOfficialBuild`, downloads the official build from the current branch instead of main.
 
-- **specificBuildId**: When `buildSource` is set to `specificBuildId`, specify the exact PowerToys build ID to download and test against.
-
-  **Default value**: `"xxxx"` (placeholder, enter actual build ID when using specificBuildId option)
+  **Default value**: `false` (downloads from main branch)
   
   **When to use this**:
-  - Testing against a specific known build for reproducibility
-  - Regression testing against a particular build version
-  - Validating fixes in a specific build before release
+  - **Default scenario**: The pipeline tests against the latest signed PowerToys build from the `main` branch, regardless of which branch your test code changes are from
+  - **Custom branch testing**: Only specify `true` when:
+    - Your branch has produced its own signed PowerToys build via the official build pipeline
+    - You want to test against that specific branch's PowerToys build instead of main
+    - You are testing PowerToys functionality changes that are only available in your branch's build
   
-  **Usage**: Enter the build ID number (e.g., `12345`) to download that specific build. Only used when `buildSource` is set to `specificBuildId`.
+  **Important notes**:
+  - The test pipeline itself runs from your specified branch, but by default tests against the main branch's PowerToys build
+  - Not all branches have signed builds available - only use this if you're certain your branch has a signed build
+  - If enabled but no build exists for your branch, the pipeline may fail or fall back to main
 
 - **uiTestModules**: Specify which UI test modules to build and run. This parameter controls both the `.csproj` projects to build and the `.dll` test assemblies to execute. Examples:
   - `['UITests-FancyZones']` - Only FancyZones UI tests
@@ -50,19 +50,19 @@ The PowerToys UI test pipeline provides flexible options for building and testin
 
 ### Build Modes
 
-1. **Official Build Testing** (`buildSource = latestMainOfficialBuild` or `specificBuildId`)
-   - Downloads and installs official PowerToys build (latest from main or specific build ID)
-   - Builds only UI test projects (all or specific based on `uiTestModules`)
-   - Runs UI tests against installed PowerToys
-   - Tests both machine-level and per-user installation modes automatically
+1. **Official Build + Selective Testing** (`useLatestOfficialBuild = true`)
+   - Downloads and installs official PowerToys build
+   - Builds only specified UI test projects
+   - Runs specified UI tests against installed PowerToys
+   - Controlled by `uiTestModules` parameter
 
-2. **Current Source Build Testing** (`buildSource = buildNow`)
-   - Builds entire PowerToys solution from current source code
+2. **Full Build + Testing** (`useLatestOfficialBuild = false`)
+   - Builds entire PowerToys solution
    - Builds UI test projects (all or specific based on `uiTestModules`)
-   - Runs UI tests against freshly built PowerToys
-   - Uses artifacts from current pipeline build
+   - Runs UI tests (all or specific based on `uiTestModules`)
+   - Uses freshly built PowerToys for testing
 
-> **Note**: All modes support the `uiTestModules` parameter to control which specific UI test modules to build and run. Both machine-level and per-user installation modes are tested automatically when using official builds.
+> **Note**: Both modes support the `uiTestModules` parameter to control which specific UI test modules to build and run.
 
 ### Pipeline Access
 - Pipeline: https://microsoft.visualstudio.com/Dart/_build?definitionId=161438&_a=summary

doc/devdocs/core/installer.md

@@ -87,13 +87,6 @@
 
 ### Building PowerToys Locally
 
-#### One stop script for building installer
-1. Open developer powershell for vs 2022
-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.
-
-The following manual steps will not install the MSIX apps (such as Command Palette) on your local installer.
-
 #### Prerequisites for building the MSI installer
 
 1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).

doc/devdocs/core/settings/settings-implementation.md

@@ -71,41 +71,6 @@ When the user changes settings in the UI:
 3. The runner calls the `set_config` function on the appropriate module
 4. The module parses the JSON and applies the new settings
 
-# Shortcut Conflict Detection
-
-Steps to enable conflict detection for a hotkey:
-
-### 1. Implement module interface for hotkeys
-Ensure the module interface provides either `size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size)` or `std::optional<HotkeyEx> GetHotkeyEx()`.
-
-- If not yet implemented, you need to add it so that it returns all hotkeys used by the module.
-- **Important**: The order of the returned hotkeys matters. This order is used as an index to uniquely identify each hotkey for conflict detection and lookup.
-- For reference, see: `src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp`
-
-### 2. Implement IHotkeyConfig in the module settings (UI side)
-Make sure the module’s settings file inherits from `IHotkeyConfig` and implements `HotkeyAccessor[] GetAllHotkeyAccessors()`.
-
-- This method should return all hotkeys used in the module.
-- **Important**: The order of the returned hotkeys must be consistent with step 1 (`get_hotkeys()` or `GetHotkeyEx()`).
-- For reference, see: `src/settings-ui/Settings.UI.Library/AdvancedPasteSettings.cs`
-- **_Note:_** `HotkeyAccessor` is a wrapper around HotkeySettings. 
-It provides both `getter` and `setter` methods to read and update the corresponding hotkey.
-Additionally, each `HotkeyAccessor` requires a resource string that describes the purpose of the hotkey.
-This string is typically defined in: `src/settings-ui/Settings.UI/Strings/en-us/Resources.resw`
-
-### 3. Update the module’s ViewModel
-The corresponding ViewModel should inherit from `PageViewModelBase` and implement `Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()`.
-
-- This method should return all hotkeys, maintaining the same order as in steps 1 and 2.
-- For reference, see: `src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs`
-
-### 4. Ensure the module’s Views call `OnPageLoaded()`
-Once the module’s view is loaded, make sure to invoke the ViewModel’s `OnPageLoaded()` method:
-```cs
-Loaded += (s, e) => ViewModel.OnPageLoaded();
-```
-- For reference, see: `src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml.cs`
-
 ## Debugging Settings
 
 To debug settings issues:

doc/devdocs/development/debugging.md

@@ -18,8 +18,8 @@ You can build the entire solution from the command line, which is sometimes fast
 1. Open Developer Command Prompt for VS 2022
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
-   ```pwsh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln /tl /p:NuGetInteractive="true"
+   ```
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
    ```
 4. This process should complete in approximately 13-14 minutes for a full build
 

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

@@ -1,128 +0,0 @@
-## Developing PowerToys with Visual Studio Code
-
-This guide shows how to build, debug, and contribute to PowerToys using VS Code instead of (or alongside) full Visual Studio. It focuses on common inner‑loop tasks for C++, .NET, and mixed scenarios present in the solution.
-
-> PowerToys is a large mixed C++ / C# / WinAppSDK solution. VS Code works well for incremental development and quick module iterations, but occasionally you may still prefer full Visual Studio for designer tooling or specialized diagnostics.
-
----
-VS Code extensions Needed:
-
-| Area | Extension | Notes |
-|------|-----------|-------|
-| C++ | ms-vscode.cpptools | IntelliSense, debugging (cppvsdbg) |
-| C# | ms-dotnettools.csdevkit (or C#) | Language service / test explorer |
-
----
-
-## Building in VS Code
-### Configure developer powershell for vs2022 for more convenient dev in vscode.
-1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
-2. Add below config as entry:
-```json
-    "Developer PowerShell for VS 2022": {
-		// 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;",
-            // Configure based on your environment
-            "& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
-            "Set-Location $orig",
-            "}"
-        ]
-    },
-```
-3. [Optional] Set Developer PowerShell for VS 2022 as your default profile, 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
-Or reach out to "tools\build\BUILD-GUIDELINES.md"
-
-### Sample plain msbuild command
-```powershell
-# Restore:
-msbuild powertoys.sln -t:restore -p:configuration=debug -p:platform=x64 -m
-
-# Build powertoys sln
-msbuild powertoys.sln -p:configuration=debug -p:platform=x64 -m
-
-# dotnet project
-msbuild src\settings-ui\Settings.UI\PowerToys.Settings.csproj -p:Platform=x64 -p:Configuration=Debug -m
-
-# native project
-msbuild "src\modules\MouseUtils\FindMyMouse\FindMyMouse.vcxproj" -p:Configuration=Debug -p:Platform=x64 -m
-```
-
----
-
-## Debugging
-
-### Existing launch configuration
-
-The repo provides `.vscode/launch.json` with:
-
-- `Run PowerToys.exe (no build)`: Launches the already-built executable at `x64/Debug/PowerToys.exe` using `cppvsdbg`.
-
-Build first, then press F5. To switch configuration (Release / ARM64) either edit the path or create additional launch entries.
-
-### Attaching to a running instance
-
-If PowerToys is already running, you can attach to that process:
-
-2. VS Code command palette: “C/C++: (Windows) Attach to Process”.
-3. Filter for `PowerToys.exe` / module-specific processes.
-
-### Debugging managed components
-
-Many modules have a managed component loaded into the PowerToys process. `cppvsdbg` can debug mixed mode, but if you need richer .NET inspection you can create a second configuration using `type: coreclr` and `processId` attachment after the native launch, or just attach separately:
-
-Similar for attach to managed code.
-> Note: In arm64 machine, can only debug arm64 code.
-
-```jsonc
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\x64\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\x64\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\arm64\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}
-```
----
-
-## 6. Common tasks & tips
-
-| Task | Command / Action | Notes |
-|------|------------------|-------|
-| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.sln` | Deep clean removes packages & build outputs |
-| Rebuild single project | `msbuild path\to\proj.vcxproj /t:Rebuild -p:Platform=x64 -p:Configuration=Debug` | Faster than whole solution |
-| Generate installer (rare in inner loop) | See `tools\build\build-installer.ps1` | Usually not needed for local debug |
-| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |

doc/devdocs/development/test-winget-install-locally.md

@@ -1,33 +0,0 @@
-## If for any reason, you'd like to test winget install scenario, you can follow this doc:
-
-### Powertoys winget manifest definition:
-[winget repository](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys)
-
-### How to test a winget installation locally:
-1. Get artifacts from release CI pipeline  Pipelines - Runs for PowerToys Signed YAML Release Build, or you can build one yourself by execute the 
- 'tools\build\build-installer.ps1' script
-
-2. Get the artifact hash, this is required to define winget manifest
-```powershell
-cd /path/to/your/directory/contains/installer
-Get-FileHash -Path ".\<Installer-name>.exe" -Algorithm SHA256
-```
- 3.  Host your installer.exe - Attention: staged github release artifacts or artifacts in release pipeline is not OK in this step
-You can self-host it or you can upload to a publicly available endpoint  
-**How to selfhost it** (A extremely simple way):
-```powershell
-python -m http.server 8000
-```
-
-4. Download a version folder from wingetpkgs like: [version 0.92.1](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys/0.92.1)
-and you get **a folder contains 3 yml files**
->note: Do not put any files other than these three in this folder
-
-5. Modify the yml files based on your version and the self hosted artifact link, and modify the sha256 hash for the installer you'd like to use
-
-6. Start winget install:
-```powershell
-#execute as admin
-winget settings --enable LocalManifestFiles
-winget install --manifest "<folder_path_of_manifest_files>" --architecture x64 --scope user
-```

doc/devdocs/readme.md

@@ -52,7 +52,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 ## Rules
 
 - **Follow the pattern of what you already see in the code.**
-- [Coding style](style.md).
+- [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.
@@ -76,7 +76,6 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 1. Windows 10 April 2018 Update (version 1803) or newer
 1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer
 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)
 
 ### Install Visual Studio dependencies
 

doc/dsc/Settings.md

@@ -1,83 +0,0 @@
-# Settings resource
-Manage the settings for PowerToys modules
-
-## Commands
-
-### ✨ Modules
-List all the modules supported by the settings resource.
-```shell
-PS C:\> PowerToys.DSC.exe modules --resource 'settings'
-AdvancedPaste
-AlwaysOnTop
-App
-Awake
-ColorPicker
-CropAndLock
-EnvironmentVariables
-FancyZones
-FileLocksmith
-FindMyMouse
-Hosts
-ImageResizer
-KeyboardManager
-MeasureTool
-MouseHighlighter
-MouseJump
-MousePointerCrosshairs
-Peek
-PowerAccent
-PowerOCR
-PowerRename
-RegistryPreview
-ShortcutGuide
-Workspaces
-ZoomIt
-```
-
-### 📄 Get
-Get the settings for a specific module.
-```shell
-PS C:\> PowerToys.DSC.exe get --resource 'settings' --module EnvironmentVariables
-{"settings":{"properties":{"LaunchAdministrator":{"value":true}},"name":"EnvironmentVariables","version":"1.0"}}
-```
-
-### 🖨️ Export
-Export the settings for a specific module.
-
-ℹ️ Settings resource Get and Export operation output states are identical.
-```shell
-PS C:\> PowerToys.DSC.exe get --resource 'settings' --module EnvironmentVariables
-{"settings":{"properties":{"LaunchAdministrator":{"value":true}},"name":"EnvironmentVariables","version":"1.0"}}
-```
-
-### 📝 Set
-Set the settings for a specific module. This command will update the settings to the specified values.
-```shell
-PS C:\> PowerToys.DSC.exe set --resource 'settings' --module Awake --input '{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}'
-{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}
-["settings"]
-```
-
-### 🧪 Test
-Test the settings for a specific module. This command will check if the current settings match the desired state.
-```shell
-PS C:\> PowerToys.DSC.exe test --resource 'settings' --module Awake --input '{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000002-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}'
-{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"},"_inDesiredState":false}
-["settings"]
-```
-
-### 🛠️ Schema
-Generates the JSON schema for the settings resource of a specific module.
-```shell
-PS C:\> PowerToys.DSC.exe schema --resource 'settings' --module Awake
-{"$schema":"http://json-schema.org/draft-04/schema#","title":"SettingsResourceObjectOfAwakeSettings","type":"object","additionalProperties":false,"required":["settings"],"properties":{"_inDesiredState":{"type":["boolean","null"],"description":"Indicates whether an instance is in the desired state"},"settings":{"description":"The settings content for the module."}}}
-PS E:\src\powertoys> PowerToys.DSC.exe schema --resource 'settings' --module Awake | Format-Json
-```
-
-### 📦 Manifest
-Generates a manifest dsc resource JSON file for the specified module.
-- If the module is not specified, it will generate a manifest for all modules.
-- If the output directory is not specified, it will print the manifest to the console.
-```shell
-PS C:\> PowerToys.DSC.exe manifest --resource settings --module 'Awake' --outputDir "C:\manifests"
-```

doc/specs/settings-search.md

@@ -1,233 +0,0 @@
-# PowerToys Settings – Search Index (Hard-sealed)
-
-## 1. What to index
-
-This section describes the current structure of the settings pages in PowerToys. All user-facing settings are contained in the content of <controls:SettingsPageControl>. The logical and visual structure of settings follows a nested layout as shown below:
-
-```css
-SettingsPageControl
- └─ SettingsGroup
-     └─ [SettingsExpander]
-         └─ SettingsCard
-```
-* Each SettingsGroup defines a functional section within a settings page.
-
-* An optional SettingsExpander may be used to further organize related settings inside a group.
-
-* Each actual setting is represented by a SettingsCard, which contains one user-tweakable control or a group of closely related controls.
-
->Note: Not all SettingsCard are necessarily wrapped in a SettingsExpander; they can exist directly under a SettingsGroup. 
-
-> For indexing purposes, we are specifically targeting all SettingsCard elements. These are the smallest units of user interaction and correspond to individual configurable settings.
-
-> There could be setting item in expander, so we also need to index expander items as well.
-
-### Module
-Module is a primary type that needs to be indexed, for modules, we need to index the 'ModuleTitle' and the 'ModuleDescription'. 
-So these two should be passed in by x:Uid and binding with a key. 
-
-
-### SettingsCard/SettingsExpander
-
-Each SettingsCard/SettingsExpander should have an x:Uid for localization and indexing. The associated display strings are defined in the .resw files:
-
-{x:Uid}.Header – The visible label/title of the setting.
-{x:Uid}.Description – (optional) The tooltip or explanatory text.
-
-The index should be built around these SettingsCard elements and their x:Uid-bound resources, as they represent the actual settings users will search for.
-
----
-
-## 2. How to Navigate
-
-### Entry
-```csharp
-enum EntryType
-{
-    SettingsPage,
-    SettingsCard,
-    SettingsExpander,
-}
-
-public class SearchableElementMetadata
-{
-    public string PageName { get; set; }    // Used to navigate to a specific page
-    public EntryType Type { get; set; }     // Used to know how should we navigate(As a page, a settingscard or an expander?)
-    public string ParentElementName { get; set; }
-    public string ElementName { get; set; }
-    public string ElementUid { get; set; }
-    public string Icon { get; set; }
-}
-```
-
-### Navigation
-The steps for navigate to an item:
-* Navigate among pages
-* [optional] Expand the expander if setting entry is inside an expander
-* [optional] Navigate within page
-
-> Use page name for navigation:
-```csharp
-Type GetPageTypeFromPageName(string PageName)
-{
-    var assembly = typeof(GeneralPage).Assembly;
-    return assembly.GetType($"Microsoft.PowerToys.Settings.UI.Views.{PageName}");
-}
-
-NavigationService.Navigate(PageType, ElementName，ParentElementName);
-```
-
-> Use ElementName and ParentElementName for in page navigation:
-```csharp
-Page.OnNavigateTo(ElementName， ParentElementName){
-    var element = this.FindName(name) as FrameworkElement;
-    var parentElement = this.FindName(ParentElementName) as FrameworkElement;
-
-    if(parentElement) {
-        expander = (Expander)parentElement;
-        if(expander){
-            expander.Expand();
-        }
-
-        // https://learn.microsoft.com/en-us/uwp/api/windows.ui.xaml.uielement.startbringintoview?view=winrt-26100        
-        element.StartBringIntoView();
-    }
-}
-```
-
-## 3. Runtime Search
-When user start typing for an entry, e.g. shortcut or 快捷键(cn version of shortcut),
-we need to go through all the entries to see if an entry matches the search text.
-
-A naive approach will be try to match all the localized text one by one and see if they match.
-Total entry is within thousand(To fill in an exact number), performance is acceptable now.
-```csharp
-// Match
-query = UserInput();
-matched = {};
-
-indexes = BuildIndex();
-
-foreach(var entry in indexes) {
-    if(entry.Match(query)) {
-        matched.Add(entry);
-    }
-}
-```
-
-And we don't intend to introduce complexity on the match algorithm discussion, so let's use powertoys FuzzMatch impl for now.
-```csharp
-MatchResult Match(this Entry entry, string query) {
-    return FuzzMatch(entry.DisplayedText, query);
-}
-
-struct MatchResult{
-    int Score;
-    bool Result;
-}
-```
-
-## 4. Search Result Page
-![search result page](./search-result.png)
-After we got matched items, map these items to a search result page according to spec.
-```c#
-ObservableCollection<SettingEntry> ModuleResult;
-ObservableCollection<SettingsGroup> GroupedSettingsResults;
-
-public class SettingsGroup : INotifyPropertyChanged
-{
-    private string _groupName;
-    private ObservableCollection<SettingEntry> _settings;
-    public string GroupName
-    {
-        get => _groupName;
-        set
-        {
-            _groupName = value;
-            OnPropertyChanged();
-        }
-    }
-    public ObservableCollection<SettingEntry> Settings
-    {
-        get => _settings;
-        set
-        {
-            _settings = value;
-            OnPropertyChanged();
-        }
-    }
-    public event PropertyChangedEventHandler PropertyChanged;
-    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
-}
-```
-
-## 5. How to do Index
-### Runtime index or build time index?
-Now We need to build all the entries in our settings.
-
-Most of the entry properties are static, and in runtime, the `SettingsCard` is compiled into native winUI3 controls <small>(I suppose, please correct here if it's wrong)</small>, it's hard to locate all the `SettingsCard`, and performance is terrible if we do search for all the pages' elements.
-
-### Build time indexing
-We can rely on xaml file parsing to get all the SettingsCard Entries. 
-And we don't want xaml file to be brought into production bundle.
-Use a project for parsing and bring that index file into production bundle is a solution.
-```csproj
-  <Target Name="GenerateSearchIndex" BeforeTargets="BeforeBuild">
-    <PropertyGroup>
-      <BuilderExe>$(MSBuildProjectDirectory)\..\Settings.UI.XamlIndexBuilder\bin\$(Configuration)\net8.0\XamlIndexBuilder.exe</BuilderExe>
-      <XamlDir>$(MSBuildProjectDirectory)\Views</XamlDir>
-      <GeneratedJson>$(MSBuildProjectDirectory)\Services\searchable_elements.json</GeneratedJson>
-    </PropertyGroup>
-    <Exec Command="&quot;$(BuilderExe)&quot; &quot;$(XamlDir)&quot; &quot;$(GeneratedJson)&quot;" />
-  </Target>
-```
-```csharp
-for(xamlFile in xamlFiles){
-    var doc = Load(xamlFile);
-    var elements = doc.Descendants();
-
-    foreach(var element in elements){
-        if(element.Name == "SettingsCard") {
-            var entry = new Entry{
-                ElementName = element.Attribute["Name"],
-                PageName = FileName,
-                Type = "SettingsCard",
-                ElementUid = element.Attribute["Uid"],
-                DisplayedText = "",
-            }
-
-            var parent = element.GetParent();
-            if(parent.Name == "SettingsExpander"){
-                entry.ParentElementName = parent.Attribute["Name"];
-            }
-        }
-    }
-}
-```
-Runtime index loading:
-```
-var entries = LoadEntriesFromFile();
-foreach(var entry in entries){
-    entry.DisplayedText = ResourceLoader.GetString(entry.Uid);
-}
-```
-So now we have all the entries and entry properties.
-
-## Overall flow:
-
-![search workflow](./workflow.png)
-
-
-## 6. Corner cases - that have not addressed yet
-
-1. CmdPal page is not in scope of this effort, that needs additional effort&design to launch and search within cmdpal settings page.
-
-2. Go back button
-
-3. Dynamic constructed settings page
- - Shortcut guide,  with visibility converter
- - advanced paste dynamically configured setting items
- - powertoys run's extensions

doc/thirdPartyRunPlugins.md

@@ -73,5 +73,4 @@ Below are community created plugins that target a website or software.  They are
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
 | [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
-| [PerplexitySearchShortcut](https://github.com/0x6f677548/PowerToys-Run-PerplexitySearchShortcut) | [0x6f677548](https://github.com/0x6f677548) | Search Perplexity |
 | [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |

installer/PowerToysSetup/CmdPal.wxs

@@ -9,6 +9,13 @@
   <Fragment>
     <DirectoryRef Id="WinUI3AppsInstallFolder">
       <Directory Id="CmdPalInstallFolder" Name="CmdPal">
+        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
+        <?else ?>
+          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
+        <?endif ?>
+        </Directory>
       </Directory>
     </DirectoryRef>
 
@@ -26,14 +33,41 @@
       </Component>
     </DirectoryRef>
 
+    <?if $(sys.BUILDARCH) = x64 ?>
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?else ?>
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?endif ?>
+
     <ComponentGroup Id="CmdPalComponentGroup">
       <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
         <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall"/>
+    <?if $(sys.BUILDARCH) = x64 ?>
+        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall"/>
+    <?else ?>
+        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall"/>
+    <?endif ?>
       </Component>
       <ComponentRef Id="Module_CmdPal" />
+      <ComponentRef Id="Module_CmdPal_Deps" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/FileLocksmith.wxs

@@ -14,6 +14,21 @@
     <DirectoryRef Id="FileLocksmithAssetsInstallFolder" FileSource="$(var.FileLocksmithAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--FileLocksmithAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_FileLocksmith" Guid="108D3EC1-E6E0-4E81-88EF-25966133CB41" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
+          <RegistryValue Type="string" Value="File Locksmith Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.FileLocksmithExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
+        </RegistryKey>
+      </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="FileLocksmithComponentGroup">
@@ -23,6 +38,7 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderFileLocksmithAssetsFolder" Directory="FileLocksmithAssetsInstallFolder" On="uninstall"/>
       </Component>
+      <ComponentRef Id="Module_FileLocksmith" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/ImageResizer.wxs

@@ -16,6 +16,71 @@
     <!-- Generated by generateFileComponents.ps1 -->
     <!--ImageResizerAssetsFiles_Component_Def-->
 
+      <Component Id="Module_ImageResizer_Registry" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
+          <RegistryValue Value="[WinUI3AppsInstallFolder]PowerToys.ImageResizerExt.dll" Type="string" />
+          <RegistryValue Name="ThreadingModel" Value="Apartment" Type="string" />
+        </RegistryKey>
+
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <!-- Registry Keys for the context menu handler for each of the following image formats: bmp, dib, gif, jfif, jpe, jpeg, jpg, jxr, png, rle, tif, tiff, wdp  -->
+        <RegistryValue Root="$(var.RegistryScope)"
+                          Key="SOFTWARE\Classes\SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer"
+                          Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                          Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+      </Component>
+
     </DirectoryRef>
 
     <ComponentGroup Id="ImageResizerComponentGroup">
@@ -25,6 +90,7 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderImageResizerAssetsFolder" Directory="ImageResizerAssetsFolder" On="uninstall"/>
       </Component>
+      <ComponentRef Id="Module_ImageResizer_Registry" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetup/NewPlus.wxs

@@ -18,6 +18,19 @@
       <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
          <!-- Generated by generateFileComponents.ps1 -->
          <!--NewPlusAssetsFiles_Component_Def-->
+         
+         <!-- NewPlus Shell Extension for Win10 registration -->
+         <Component Id="NewPlus_ShellExtension_win10" Guid="D5456D4A-6EEC-4B85-944D-6A6A4A74FFA6" Win64="yes">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{FF90D477-E32A-4BE8-8CC5-A502A97F5401}">
+               <RegistryValue Type="string" Value="NewPlus Shell Extension Win10" />
+               <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+               <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.NewPlus.ShellExtension.win10.dll" />
+               <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+            </RegistryKey>
+            <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\NewPlusShellExtensionWin10">
+               <RegistryValue Type="string" Value="{FF90D477-E32A-4BE8-8CC5-A502A97F5401}"/>
+            </RegistryKey>
+         </Component>
       </DirectoryRef>
 
       <ComponentGroup Id="NewPlusComponentGroup">
@@ -27,7 +40,8 @@
             </RegistryKey>
             <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
          </Component>
-    </ComponentGroup>
+         <ComponentRef Id="NewPlus_ShellExtension_win10" />
+      </ComponentGroup>
 
       
       <!-- Example templates -->
@@ -67,7 +81,7 @@
          </Component>
          <ComponentRef Id="NewPlusTemplateFiles_Component" />
          <ComponentRef Id="NewPlusTemplateSubFiles_Component" />
-    </ComponentGroup>
+      </ComponentGroup>
 
    </Fragment>
 </Wix>

installer/PowerToysSetup/PowerRename.wxs

@@ -14,6 +14,22 @@
     <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.PowerRenameAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--PowerRenameAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_PowerRename" Guid="40D43079-240E-402D-8CE8-571BFFA71175" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
+          <RegistryValue Type="string" Value="PowerRename Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.PowerRenameExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
+        </RegistryKey>
+
+      </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="PowerRenameComponentGroup">
@@ -23,6 +39,7 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderPowerRenameAssetsFolder" Directory="PowerRenameAssetsFolder" On="uninstall"/>
       </Component>
+      <ComponentRef Id="Module_PowerRename" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -16,7 +16,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
@@ -27,7 +26,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -123,7 +121,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="Hosts.wxs" />
     <Compile Include="ImageResizer.wxs" />
     <Compile Include="KeyboardManager.wxs" />
-    <Compile Include="DscResources.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
     <Compile Include="RegistryPreview.wxs" />

installer/PowerToysSetup/Product.wxs

@@ -75,7 +75,6 @@
       <ComponentGroupRef Id="NewPlusComponentGroup" />
       <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
-      <ComponentGroupRef Id="DscResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
@@ -177,18 +176,6 @@
       <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")
       </Custom>
-      <Custom Action="CleanImageResizerRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanFileLocksmithRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanPowerRenameRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanNewPlusRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
       <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles">
         Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
       </Custom>
@@ -325,6 +312,7 @@
                   BinaryKey="PTCustomActions"
                   DllEntry="UninstallDSCModuleCA"
                    />
+
       <CustomAction Id="UninstallServicesTask"
                     Return="ignore"
                     Impersonate="yes"
@@ -449,35 +437,6 @@
                 Execute="deferred"
                 BinaryKey="PTCustomActions"
                 DllEntry="UnRegisterContextMenuPackagesCA"
-                />
-
-    <CustomAction Id="CleanImageResizerRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanImageResizerRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanFileLocksmithRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanFileLocksmithRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanPowerRenameRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanPowerRenameRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanNewPlusRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanNewPlusRuntimeRegistryCA"
                   />
 
     <CustomAction Id="UnRegisterCmdPalPackage"

installer/PowerToysSetup/Resources.wxs

@@ -11,7 +11,7 @@
   <Fragment>
     <!-- Resource directories should be added only if the installer is built on the build farm -->
     <?ifdef env.IsPipeline?>
-      <?foreach ParentDirectory in INSTALLFOLDER;WinUI3AppsInstallFolder;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
+      <?foreach ParentDirectory in INSTALLFOLDER;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
         <DirectoryRef Id="$(var.ParentDirectory)">
           <!-- Resource file directories -->
           <?foreach Language in $(var.LocLanguageList)?>
@@ -181,7 +181,7 @@
       </Component>
       <Component
           Id="ImageResizer_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
           Guid="$(var.CompGUIDPrefix)02">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="ImageResizer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
@@ -553,7 +553,6 @@
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)HistoryPluginFolder" Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder" On="uninstall"/>
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)PowerToysPluginFolder" Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder" On="uninstall"/>
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
       <?undef IdSafeLanguage?>
         <?endforeach?>
       </Component>

installer/PowerToysSetup/generateDscResourcesWxs.ps1

@@ -1,87 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True)]
-    [string]$dscWxsFile,
-    [Parameter(Mandatory = $True)]
-    [string]$Platform,
-    [Parameter(Mandatory = $True)]
-    [string]$Configuration
-)
-
-$ErrorActionPreference = 'Stop'
-$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
-
-if (-not (Test-Path $buildOutputDir)) {
-    Write-Error "Build output directory not found: '$buildOutputDir'"
-    exit 1
-}
-
-$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
-
-if (-not $dscFiles) {
-    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
-    $wxsContent = @"
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-    Set-Content -Path $dscWxsFile -Value $wxsContent
-    exit 0
-}
-
-Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
-
-$wxsContent = @"
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-  <Fragment>
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-"@
-
-$componentRefs = @()
-foreach ($file in $dscFiles) {
-    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
-    $fileId = $componentId + "_File"
-    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
-    $componentRefs += $componentId
-    
-    $wxsContent += @"
-
-      <Component Id="$componentId" Guid="{$guid}">
-        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
-      </Component>
-"@
-}
-
-$wxsContent += @"
-
-    </DirectoryRef>
-  </Fragment>
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-"@
-
-foreach ($componentId in $componentRefs) {
-    $wxsContent += @"
-
-      <ComponentRef Id="$componentId"/>
-"@
-}
-
-$wxsContent += @"
-
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-
-Set-Content -Path $dscWxsFile -Value $wxsContent
-Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

installer/PowerToysSetupCustomActions/CustomAction.cpp

@@ -1153,113 +1153,6 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
-UINT __stdcall CleanImageResizerRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanImageResizerRuntimeRegistryCA");
-
-    try
-    {
-        const wchar_t* CLSID_STR = L"{51B4D7E5-7568-4234-B4BB-47FB3C016A69}";
-        const wchar_t* exts[] = { L".bmp", L".dib", L".gif", L".jfif", L".jpe", L".jpeg", L".jpg", L".jxr", L".png", L".rle", L".tif", L".tiff", L".wdp" };
-
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring &path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-
-        // InprocServer32 chain root CLSID
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        // DragDrop handler
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\ShellEx\\DragDropHandlers\\ImageResizer");
-        // Extensions
-        for (auto ext : exts)
-        {
-            deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\SystemFileAssociations\\" + std::wstring(ext) + L"\\ShellEx\\ContextMenuHandlers\\ImageResizer");
-        }
-        // Sentinel
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\ImageResizer");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanFileLocksmithRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanFileLocksmithRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{84D68575-E186-46AD-B0CB-BAEB45EE29C0}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt");
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Drive\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\FileLocksmith");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanPowerRenameRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanPowerRenameRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{0440049F-D1DC-4E46-B27B-98393D79486B}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\PowerRenameExt");
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\background\\ShellEx\\ContextMenuHandlers\\PowerRenameExt");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\PowerRename");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanNewPlusRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanNewPlusRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{FF90D477-E32A-4BE8-8CC5-A502A97F5401}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\background\\ShellEx\\ContextMenuHandlers\\NewPlusShellExtensionWin10");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\NewPlus");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
 UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;

installer/PowerToysSetupCustomActions/CustomAction.def

@@ -28,7 +28,3 @@ EXPORTS
 	UninstallCommandNotFoundModuleCA
 	UpgradeCommandNotFoundModuleCA
 	UnsetAdvancedPasteAPIKeyCA
-	CleanImageResizerRuntimeRegistryCA
-	CleanFileLocksmithRuntimeRegistryCA
-	CleanPowerRenameRuntimeRegistryCA
-	CleanNewPlusRuntimeRegistryCA

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -3,7 +3,6 @@
 #include "RcResource.h"
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
-#include <filesystem>
 
 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -233,9 +232,7 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
 
         auto action = [&commandLine](HANDLE userToken)
         {
-            STARTUPINFO startupInfo = { 0 };
-            startupInfo.cb = sizeof(STARTUPINFO);
-            startupInfo.wShowWindow = SW_SHOWNORMAL;
+            STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
             PROCESS_INFORMATION processInformation;
 
             PVOID lpEnvironment = NULL;
@@ -274,9 +271,7 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
     }
     else
     {
-        STARTUPINFO startupInfo = { 0 };
-        startupInfo.cb = sizeof(STARTUPINFO);
-        startupInfo.wShowWindow = SW_SHOWNORMAL;
+        STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
 
         PROCESS_INFORMATION processInformation;
 
@@ -429,7 +424,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
         const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / (get_product_version(false) + L".0");
 
         std::error_code errorCode;
-        std::filesystem::create_directories(modulesPath, errorCode);
+        fs::create_directories(modulesPath, errorCode);
         if (errorCode)
         {
             hr = E_FAIL;
@@ -438,7 +433,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            std::filesystem::copy_file(std::filesystem::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, std::filesystem::copy_options::overwrite_existing, errorCode);
+            fs::copy_file(fs::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, fs::copy_options::overwrite_existing, errorCode);
 
             if (errorCode)
             {
@@ -486,7 +481,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            std::filesystem::remove(versionedModulePath / filename, errorCode);
+            fs::remove(versionedModulePath / filename, errorCode);
 
             if (errorCode)
             {
@@ -497,7 +492,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *modulePath : {&versionedModulePath, &powerToysModulePath})
         {
-            std::filesystem::remove(*modulePath, errorCode);
+            fs::remove(*modulePath, errorCode);
 
             if (errorCode)
             {
@@ -1158,114 +1153,6 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
-
-UINT __stdcall CleanImageResizerRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanImageResizerRuntimeRegistryCA");
-
-    try
-    {
-        const wchar_t* CLSID_STR = L"{51B4D7E5-7568-4234-B4BB-47FB3C016A69}";
-        const wchar_t* exts[] = { L".bmp", L".dib", L".gif", L".jfif", L".jpe", L".jpeg", L".jpg", L".jxr", L".png", L".rle", L".tif", L".tiff", L".wdp" };
-
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring &path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-
-        // InprocServer32 chain root CLSID
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        // DragDrop handler
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\ShellEx\\DragDropHandlers\\ImageResizer");
-        // Extensions
-        for (auto ext : exts)
-        {
-            deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\SystemFileAssociations\\" + std::wstring(ext) + L"\\ShellEx\\ContextMenuHandlers\\ImageResizer");
-        }
-        // Sentinel
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\ImageResizer");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanFileLocksmithRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanFileLocksmithRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{84D68575-E186-46AD-B0CB-BAEB45EE29C0}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt");
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Drive\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\FileLocksmith");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanPowerRenameRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanPowerRenameRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{0440049F-D1DC-4E46-B27B-98393D79486B}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\PowerRenameExt");
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\background\\ShellEx\\ContextMenuHandlers\\PowerRenameExt");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\PowerRename");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanNewPlusRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanNewPlusRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{FF90D477-E32A-4BE8-8CC5-A502A97F5401}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\background\\ShellEx\\ContextMenuHandlers\\NewPlusShellExtensionWin10");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\NewPlus");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
 UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;
@@ -1380,120 +1267,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
-UINT __stdcall SetBundleInstallLocationCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    
-    // Declare all variables at the beginning to avoid goto issues
-    std::wstring customActionData;
-    std::wstring installationFolder;
-    std::wstring bundleUpgradeCode;
-    std::wstring installScope;
-    bool isPerUser = false;
-    size_t pos1 = std::wstring::npos;
-    size_t pos2 = std::wstring::npos;
-    std::vector<HKEY> keysToTry;
-
-    hr = WcaInitialize(hInstall, "SetBundleInstallLocationCA");
-    ExitOnFailure(hr, "Failed to initialize");
-    
-    // Parse CustomActionData: "installFolder;upgradeCode;installScope"
-    hr = getInstallFolder(hInstall, customActionData);
-    ExitOnFailure(hr, "Failed to get CustomActionData.");
-    
-    pos1 = customActionData.find(L';');
-    if (pos1 == std::wstring::npos) 
-    {
-        hr = E_INVALIDARG;
-        ExitOnFailure(hr, "Invalid CustomActionData format - missing first semicolon");
-    }
-    
-    pos2 = customActionData.find(L';', pos1 + 1);
-    if (pos2 == std::wstring::npos) 
-    {
-        hr = E_INVALIDARG;
-        ExitOnFailure(hr, "Invalid CustomActionData format - missing second semicolon");
-    }
-    
-    installationFolder = customActionData.substr(0, pos1);
-    bundleUpgradeCode = customActionData.substr(pos1 + 1, pos2 - pos1 - 1);
-    installScope = customActionData.substr(pos2 + 1);
-    
-    isPerUser = (installScope == L"perUser");
-    
-    // Use the appropriate registry based on install scope
-    HKEY targetKey = isPerUser ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
-    const wchar_t* keyName = isPerUser ? L"HKCU" : L"HKLM";
-    
-    WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Searching for Bundle in %ls registry", keyName);
-    
-    HKEY uninstallKey;
-    LONG openResult = RegOpenKeyExW(targetKey, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &uninstallKey);
-    if (openResult != ERROR_SUCCESS)
-    {
-        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to open uninstall key, error: %ld", openResult);
-        goto LExit;
-    }
-    
-    DWORD index = 0;
-    wchar_t subKeyName[256];
-    DWORD subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
-    
-    while (RegEnumKeyExW(uninstallKey, index, subKeyName, &subKeyNameSize, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
-    {
-        HKEY productKey;
-        if (RegOpenKeyExW(uninstallKey, subKeyName, 0, KEY_READ | KEY_WRITE, &productKey) == ERROR_SUCCESS)
-        {
-            wchar_t upgradeCode[256];
-            DWORD upgradeCodeSize = sizeof(upgradeCode);
-            DWORD valueType;
-            
-            if (RegQueryValueExW(productKey, L"BundleUpgradeCode", nullptr, &valueType, 
-                               reinterpret_cast<LPBYTE>(upgradeCode), &upgradeCodeSize) == ERROR_SUCCESS)
-            {
-                // Remove brackets from registry upgradeCode for comparison (bundleUpgradeCode doesn't have brackets)
-                std::wstring regUpgradeCode = upgradeCode;
-                if (!regUpgradeCode.empty() && regUpgradeCode.front() == L'{' && regUpgradeCode.back() == L'}')
-                {
-                    regUpgradeCode = regUpgradeCode.substr(1, regUpgradeCode.length() - 2);
-                }
-                
-                if (_wcsicmp(regUpgradeCode.c_str(), bundleUpgradeCode.c_str()) == 0)
-                {
-                    // Found matching Bundle, set InstallLocation
-                    LONG setResult = RegSetValueExW(productKey, L"InstallLocation", 0, REG_SZ,
-                                 reinterpret_cast<const BYTE*>(installationFolder.c_str()),
-                                 static_cast<DWORD>((installationFolder.length() + 1) * sizeof(wchar_t)));
-                    
-                    if (setResult == ERROR_SUCCESS)
-                    {
-                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: InstallLocation set successfully");
-                    }
-                    else
-                    {
-                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to set InstallLocation, error: %ld", setResult);
-                    }
-                    
-                    RegCloseKey(productKey);
-                    RegCloseKey(uninstallKey);
-                    goto LExit;
-                }
-            }
-            RegCloseKey(productKey);
-        }
-        
-        index++;
-        subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
-    }
-    
-    RegCloseKey(uninstallKey);
-    
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
 void initSystemLogger()
 {
     static std::once_flag initLoggerFlag;

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

@@ -28,8 +28,3 @@ EXPORTS
 	UninstallCommandNotFoundModuleCA
 	UpgradeCommandNotFoundModuleCA
 	UnsetAdvancedPasteAPIKeyCA
-	CleanImageResizerRuntimeRegistryCA
-	CleanFileLocksmithRuntimeRegistryCA
-	CleanPowerRenameRuntimeRegistryCA
-	CleanNewPlusRuntimeRegistryCA
-	SetBundleInstallLocationCA

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -56,7 +56,7 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\AdvancedPaste.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\AdvancedPaste.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Awake.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\BaseApplications.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk""""

installer/PowerToysSetupVNext/CmdPal.wxs

@@ -4,6 +4,13 @@
   <Fragment>
     <DirectoryRef Id="WinUI3AppsInstallFolder">
       <Directory Id="CmdPalInstallFolder" Name="CmdPal">
+        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
+        <?else?>
+          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
+        <?endif?>
+        </Directory>
       </Directory>
     </DirectoryRef>
     <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
@@ -18,14 +25,40 @@
         <?endif?>
       </Component>
     </DirectoryRef>
+    <?if $(sys.BUILDARCH) = x64 ?>
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="Microsoft.VCLibs.x64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?else?>
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="Microsoft.VCLibs.ARM64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?endif?>
     <ComponentGroup Id="CmdPalComponentGroup">
       <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes" />
         </RegistryKey>
         <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall" />
+    <?if $(sys.BUILDARCH) = x64 ?>
+        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall" />
+    <?else?>
+        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall" />
+    <?endif?>
       </Component>
       <ComponentRef Id="Module_CmdPal" />
+      <ComponentRef Id="Module_CmdPal_Deps" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetupVNext/Common.wxi

@@ -37,7 +37,7 @@
   <?if $(var.PerUser) = "true"?>
         <?define PerMachineYesNo="no"?>
         <?define MSIPath="UserSetup"?>
-        <?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.InstallerSuffix)-$(var.PowerToysPlatform).msi"?>
+        <?define MSIName="PowerToysUserSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
         <?define DefaultInstallDir="LocalAppDataFolder" ?>
         <?define RegistryScope="HKCU" ?>
         <?define InstallScope="perUser" ?>
@@ -46,7 +46,7 @@
    <?else?>
         <?define PerMachineYesNo="yes"?>
         <?define MSIPath="MachineSetup"?>
-        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.InstallerSuffix)-$(var.PowerToysPlatform).msi"?>
+        <?define MSIName="PowerToysSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
         <?define DefaultInstallDir="ProgramFiles64Folder" ?>
         <?define RegistryScope="HKLM" ?>
         <?define InstallScope="perMachine" ?>

installer/PowerToysSetupVNext/Core.wxs

@@ -9,25 +9,6 @@
           <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
         </RegistryKey>
       </Component>
-      <?if $(var.PerUser) = "true" ?>
-      <Component Id="powertoys_env_path_user" Bitness="always64">
-        <!-- Anchor registry for component key path -->
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="powertoys_env_path_user" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <!-- Append install folder to current user's PATH -->
-        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[INSTALLFOLDER]" />
-      </Component>
-      <?else?>
-      <Component Id="powertoys_env_path_machine" Bitness="always64">
-        <!-- Anchor registry for component key path -->
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="powertoys_env_path_machine" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <!-- Append install folder to machine PATH -->
-        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[INSTALLFOLDER]" />
-      </Component>
-      <?endif?>
       <Component Id="powertoys_toast_clsid" Bitness="always64">
         <RemoveFolder Id="Remove_powertoys_toast_clsid" On="uninstall" />
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
@@ -128,11 +109,6 @@
       <ComponentRef Id="powertoys_exe" />
       <ComponentRef Id="PowerToysStartMenuShortcut" />
       <ComponentRef Id="powertoys_per_machine_comp" />
-  <?if $(var.PerUser) = "true" ?>
-  <ComponentRef Id="powertoys_env_path_user" />
-  <?else?>
-  <ComponentRef Id="powertoys_env_path_machine" />
-  <?endif?>
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />

installer/PowerToysSetupVNext/FileLocksmith.wxs

@@ -12,6 +12,21 @@
     <DirectoryRef Id="FileLocksmithAssetsInstallFolder" FileSource="$(var.FileLocksmithAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--FileLocksmithAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_FileLocksmith" Guid="108D3EC1-E6E0-4E81-88EF-25966133CB41" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
+          <RegistryValue Type="string" Value="File Locksmith Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.FileLocksmithExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}" />
+        </RegistryKey>
+      </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="FileLocksmithComponentGroup">
@@ -21,6 +36,7 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderFileLocksmithAssetsFolder" Directory="FileLocksmithAssetsInstallFolder" On="uninstall" />
       </Component>
+      <ComponentRef Id="Module_FileLocksmith" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetupVNext/ImageResizer.wxs

@@ -13,6 +13,30 @@
     <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--ImageResizerAssetsFiles_Component_Def-->
+
+      <Component Id="Module_ImageResizer_Registry" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
+          <RegistryValue Value="[WinUI3AppsInstallFolder]PowerToys.ImageResizerExt.dll" Type="string" />
+          <RegistryValue Name="ThreadingModel" Value="Apartment" Type="string" />
+        </RegistryKey>
+
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <!-- Registry Keys for the context menu handler for each of the following image formats: bmp, dib, gif, jfif, jpe, jpeg, jpg, jxr, png, rle, tif, tiff, wdp  -->
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer" Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}" Type="string" />
+      </Component>
+
     </DirectoryRef>
 
     <ComponentGroup Id="ImageResizerComponentGroup">
@@ -22,6 +46,7 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderImageResizerAssetsFolder" Directory="ImageResizerAssetsFolder" On="uninstall" />
       </Component>
+      <ComponentRef Id="Module_ImageResizer_Registry" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetupVNext/NewPlus.wxs

@@ -16,6 +16,19 @@
       <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
          <!-- Generated by generateFileComponents.ps1 -->
          <!--NewPlusAssetsFiles_Component_Def-->
+         
+         <!-- NewPlus Shell Extension for Win10 registration -->
+         <Component Id="NewPlus_ShellExtension_win10" Guid="D5456D4A-6EEC-4B85-944D-6A6A4A74FFA6" Bitness="always64">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{FF90D477-E32A-4BE8-8CC5-A502A97F5401}">
+               <RegistryValue Type="string" Value="NewPlus Shell Extension Win10" />
+               <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+               <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.NewPlus.ShellExtension.win10.dll" />
+               <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+            </RegistryKey>
+            <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\NewPlusShellExtensionWin10">
+               <RegistryValue Type="string" Value="{FF90D477-E32A-4BE8-8CC5-A502A97F5401}" />
+            </RegistryKey>
+         </Component>
       </DirectoryRef>
 
       <ComponentGroup Id="NewPlusComponentGroup">
@@ -25,6 +38,7 @@
             </RegistryKey>
             <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall" />
          </Component>
+         <ComponentRef Id="NewPlus_ShellExtension_win10" />
       </ComponentGroup>
 
       

installer/PowerToysSetupVNext/PowerRename.wxs

@@ -12,6 +12,22 @@
     <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.PowerRenameAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--PowerRenameAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_PowerRename" Guid="40D43079-240E-402D-8CE8-571BFFA71175" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
+          <RegistryValue Type="string" Value="PowerRename Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.PowerRenameExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}" />
+        </RegistryKey>
+
+      </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="PowerRenameComponentGroup">
@@ -21,6 +37,7 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderPowerRenameAssetsFolder" Directory="PowerRenameAssetsFolder" On="uninstall" />
       </Component>
+      <ComponentRef Id="Module_PowerRename" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetupVNext/PowerToys.wxs

@@ -26,11 +26,9 @@
             <Variable Name="InstallFolder" Type="formatted" Value="$(var.PlatformProgramFiles)PowerToys" bal:Overridable="yes" />
         <?endif?>
 
+        <Variable Name="MsiLogFolder" Type="formatted" Value="[LocalAppDataFolder]\Microsoft\PowerToys\" /> 
         <Log Disable="no" Prefix="powertoys-bootstrapper-msi-$(var.Version)" Extension=".log" />
 
-        <!-- Store Bundle UpgradeCode for CustomAction -->
-        <Variable Name="BundleUpgradeCode" Type="string" Value="$(var.UpgradeCode)" />
-
       <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
       <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
       <Variable Name="MinimumVersion" Type="version" Value="0.0.0.0" />
@@ -61,7 +59,6 @@
             <MsiPackage DisplayName="PowerToys MSI" SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)" Compressed="yes" bal:DisplayInternalUICondition="false">
                 <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
                 <MsiProperty Name="MSIRESTARTMANAGERCONTROL" Value="Disable" />
-                <MsiProperty Name="BUNDLEINFO" Value="[BundleUpgradeCode]" />
             </MsiPackage>
         </Chain>
     </Bundle>

installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj

@@ -3,7 +3,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>Version=$(Version);InstallerSuffix=$(InstallerSuffix)</DefineConstants>
+    <DefineConstants>Version=$(Version)</DefineConstants>
     <Name>PowerToysVNextBootstrapper</Name>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
@@ -22,12 +22,11 @@
     <Configuration>Release</Configuration>
     <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
     <Platform Condition="'$(Platform)'!='x64'">arm64</Platform>
-    <InstallerSuffix Condition="'$(InstallerSuffix)'==''">wix5</InstallerSuffix>
-    <OutputName>PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName>PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
     <OutputType>Bundle</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
     <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
     <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
     <IntermediateOutputPath Condition=" '$(PerUser)' != 'true' ">$(BaseIntermediateOutputPath)$(Platform)\$(Configuration)\MachineSetup</IntermediateOutputPath>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -4,7 +4,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
-  <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);InstallerSuffix=$(InstallerSuffix)</DefineConstants>    <!-- THIS IS AN INNER LOOP OPTIMIZATION
+  <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</DefineConstants>    <!-- THIS IS AN INNER LOOP OPTIMIZATION
     The build pipeline builds the Settings and Launcher projects for Publication
     using a specific profile. If you're doing local installer builds, this will
     simulate the build pipeline doing that for you. -->
@@ -14,18 +14,16 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);InstallerSuffix=$(InstallerSuffix)</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);</DefineConstants>
     <PreBuildEvent>IF NOT DEFINED IsPipeline (
 call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
 SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -79,9 +77,8 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>{b6e94700-df38-41f6-a3fd-18b69674ab1e}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <InstallerSuffix Condition="'$(InstallerSuffix)'==''">wix5</InstallerSuffix>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
     <OutputType>Package</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
     <NuGetPackageImportStamp>
@@ -117,7 +114,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
-    <Compile Include="DscResources.wxs" />
     <Compile Include="RegistryPreview.wxs" />
     <Compile Include="Run.wxs" />
     <Compile Include="Settings.wxs" />

installer/PowerToysSetupVNext/Product.wxs

@@ -62,7 +62,6 @@
       <ComponentGroupRef Id="NewPlusComponentGroup" />
       <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
-      <ComponentGroupRef Id="DscResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
@@ -70,8 +69,8 @@
       <ComponentGroupRef Id="CmdPalComponentGroup" />
     </Feature>
 
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" Sequence="execute" />
-    
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
+
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
 
     <UI>
@@ -118,8 +117,6 @@
 
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
       <Custom Action="CheckGPO" After="InstallInitialize" Condition="NOT Installed" />
-      <Custom Action="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed" />
-      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
@@ -135,10 +132,6 @@
       <Custom Action="TelemetryLogUninstallSuccess" After="InstallFinalize" Condition="Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UnApplyModulesRegistryChangeSets" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
-      <Custom Action="CleanImageResizerRuntimeRegistry" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
-      <Custom Action="CleanFileLocksmithRuntimeRegistry" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
-      <Custom Action="CleanPowerRenameRuntimeRegistry" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
-      <Custom Action="CleanNewPlusRuntimeRegistry" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UnsetAdvancedPasteAPIKey" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <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;)" />
@@ -163,9 +156,6 @@
 
     <CustomAction Id="SetInstallCmdPalPackageParam" Property="InstallCmdPalPackage" Value="[INSTALLFOLDER]" />
 
-    <!-- Set InstallLocation for Bundle entry as well -->
-    <CustomAction Id="SetBundleInstallLocationData" Property="SetBundleInstallLocation" Value="[INSTALLFOLDER];[BUNDLEINFO];[InstallScope]" />
-
     <CustomAction Id="LaunchPowerToys" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="LaunchPowerToysCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="TerminateProcesses" Return="ignore" Execute="immediate" DllEntry="TerminateProcessesCA" BinaryRef="PTCustomActions" />
@@ -236,22 +226,12 @@
 
     <CustomAction Id="UnRegisterContextMenuPackages" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="UnRegisterContextMenuPackagesCA" BinaryRef="PTCustomActions" />
 
-    <CustomAction Id="CleanImageResizerRuntimeRegistry" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="CleanImageResizerRuntimeRegistryCA" BinaryRef="PTCustomActions" />
-
-    <CustomAction Id="CleanFileLocksmithRuntimeRegistry" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="CleanFileLocksmithRuntimeRegistryCA" BinaryRef="PTCustomActions" />
-
-    <CustomAction Id="CleanPowerRenameRuntimeRegistry" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="CleanPowerRenameRuntimeRegistryCA" BinaryRef="PTCustomActions" />
-
-    <CustomAction Id="CleanNewPlusRuntimeRegistry" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="CleanNewPlusRuntimeRegistryCA" BinaryRef="PTCustomActions" />
-
     <CustomAction Id="UnRegisterCmdPalPackage" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="UnRegisterCmdPalPackageCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="CheckGPO" Return="check" Impersonate="yes" DllEntry="CheckGPOCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="InstallCmdPalPackage" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallCmdPalPackageCA" BinaryRef="PTCustomActions" />
 
-    <CustomAction Id="SetBundleInstallLocation" Return="ignore" Impersonate="no" Execute="deferred" DllEntry="SetBundleInstallLocationCA" BinaryRef="PTCustomActions" />
-
     <!-- Close 'PowerToys.exe' before uninstall-->
     <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
     <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />

installer/PowerToysSetupVNext/Resources.wxs

@@ -9,7 +9,7 @@
   <Fragment>
     <!-- Resource directories should be added only if the installer is built on the build farm -->
     <?ifdef env.IsPipeline?>
-      <?foreach ParentDirectory in INSTALLFOLDER;WinUI3AppsInstallFolder;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
+      <?foreach ParentDirectory in INSTALLFOLDER;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
         <DirectoryRef Id="$(var.ParentDirectory)">
           <!-- Resource file directories -->
           <?foreach Language in $(var.LocLanguageList)?>
@@ -171,7 +171,7 @@
         </RegistryKey>
         <File Id="FancyZonesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.FancyZonesEditor.resources.dll" />
       </Component>
-      <Component Id="ImageResizer_$(var.IdSafeLanguage)_Component" Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Guid="$(var.CompGUIDPrefix)02">
+      <Component Id="ImageResizer_$(var.IdSafeLanguage)_Component" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" Guid="$(var.CompGUIDPrefix)02">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="ImageResizer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes" />
         </RegistryKey>
@@ -453,7 +453,6 @@
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)HistoryPluginFolder" Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder" On="uninstall" />
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)PowerToysPluginFolder" Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder" On="uninstall" />
           <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" On="uninstall" />
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
       <?undef IdSafeLanguage?>
         <?endforeach?>
       </Component>

installer/PowerToysSetupVNext/SilentFilesInUseBA/Readme.txt

@@ -0,0 +1,85 @@
+
+This is a sample project showing how to create a BA function assembly.
+
+The four interfaces are in the WixSampleBAFunctions.cpp file.
+
+
+Example code:
+~~~~~~~~~~~~~
+
+
+        HRESULT hr = S_OK;
+        HKEY hkKey = NULL;
+        LPWSTR sczValue = NULL;
+        LPWSTR sczFormatedValue = NULL;
+
+
+        //---------------------------------------------------------------------------------------------
+        // Example of BA function failure
+        hr = E_NOTIMPL;
+        BalExitOnFailure(hr, "Test failure.");
+        //---------------------------------------------------------------------------------------------
+
+        //---------------------------------------------------------------------------------------------
+        // Example of setting a variables
+        hr = m_pEngine->SetVariableString(L"Variable1", L"String value");
+        BalExitOnFailure(hr, "Failed to set variable.");
+        hr = m_pEngine->SetVariableNumeric(L"Variable2", 1234);
+        BalExitOnFailure(hr, "Failed to set variable.");
+        //---------------------------------------------------------------------------------------------
+
+        //---------------------------------------------------------------------------------------------
+        // Example of reading burn variable.
+        BalGetStringVariable(L"WixBundleName", &sczValue);
+        BalExitOnFailure(hr, "Failed to get variable.");
+
+        hr = m_pEngine->SetVariableString(L"Variable4", sczValue);
+        BalExitOnFailure(hr, "Failed to set variable.");
+        //---------------------------------------------------------------------------------------------
+
+        ReleaseNullStr(sczValue); // Release string so it can be re-used
+
+        //---------------------------------------------------------------------------------------------
+        // Examples of reading burn variable and formatting it.
+        BalGetStringVariable(L"InstallFolder", &sczValue);
+        BalExitOnFailure(hr, "Failed to get variable.");
+
+        hr = m_pEngine->SetVariableString(L"Variable5", sczValue);
+        BalExitOnFailure(hr, "Failed to set variable.");
+
+        BalFormatString(sczValue, &sczFormatedValue);
+        BalExitOnFailure(hr, "Failed to format variable.");
+
+        hr = m_pEngine->SetVariableString(L"Variable6", sczFormatedValue);
+        BalExitOnFailure(hr, "Failed to set variable.");
+        //---------------------------------------------------------------------------------------------
+
+        ReleaseNullStr(sczValue); // Release string so it can be re-used
+
+        //---------------------------------------------------------------------------------------------
+        // Example of reading 64 bit registry and setting the InstallFolder variable to the value read.
+        hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v3.5", KEY_READ | KEY_WOW64_64KEY, &hkKey);
+        BalExitOnFailure(hr, "Failed to open registry key.");
+
+        hr = RegReadString(hkKey, L"InstallPath", &sczValue);
+        BalExitOnFailure(hr, "Failed to read registry value.");
+
+        // Example of function call
+        PathBackslashTerminate(&sczValue);
+
+        hr = m_pEngine->SetVariableString(L"InstallFolder", sczValue);
+        BalExitOnFailure(hr, "Failed to set variable.");
+        //---------------------------------------------------------------------------------------------
+
+        ReleaseNullStr(sczValue); // Release string so it can be re-used
+
+        //---------------------------------------------------------------------------------------------
+        // Example of calling a function that return HRESULT
+        hr = GetFileVersion();
+        BalExitOnFailure(hr, "Failed to get version.");
+        //---------------------------------------------------------------------------------------------
+
+    LExit:
+        ReleaseRegKey(hkKey);
+        ReleaseStr(sczValue);
+        ReleaseStr(sczFormatedValue);

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj

@@ -26,7 +26,6 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <TargetName>SilentFilesInUseBAFunction</TargetName>
-    <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
     <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
@@ -92,31 +91,5 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!-- C++ source compile-specific things for Debug/Release configurations -->
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp

@@ -18,6 +18,11 @@ public: // IBootstrapperApplication
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running detect begin BA function. fCached=%d, registrationType=%d, cPackages=%u, fCancel=%d", fCached, registrationType, cPackages, *pfCancel);
 
+        //-------------------------------------------------------------------------------------------------
+        // YOUR CODE GOES HERE
+        // BalExitOnFailure(hr, "Change this message to represent real error handling.");
+        //-------------------------------------------------------------------------------------------------
+
     LExit:
         return hr;
     }
@@ -72,16 +77,7 @@ public: // IBAFunctions
             BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** FILE IN USE [%u]: %ls", i, rgwzFiles[i]);
         }
 
-    /*
-     * Summary: Why we return IDIGNORE here
-     *
-     * - Goal: Keep behavior consistent with our previous WiX 3 installer to avoid "files in use / close apps" prompts and preserve silent installs (e.g., winget).
-     * - WiX 5 change: We can no longer suppress that dialog the same way. Combined with winget adding /silent, this BAFunction returns IDIGNORE to continue without prompts.
-     * - Main trigger: Win10-style context menu uses registry + DLL; Explorer/dllhost.exe (COM Surrogate) often holds locks. Killing them is disruptive; this is a pragmatic trade-off.
-     * - Trade-off: Some file replacements may defer until reboot (PendingFileRename), but installation remains non-interruptive.
-     * - Full fix: Rewrite a custom Bootstrapper Application if we need complete control over prompts and behavior.
-     * - Note: Even with this handler, a full-UI install (e.g., double-clicking the installer) can still show a FilesInUse dialog; this primarily targets silent installs.
-     */
+        // Always return IDIGNORE to silently ignore files in use
         *pResult = IDIGNORE;
         
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** BA FUNCTION RETURNING IDIGNORE - SILENTLY CONTINUING ***");

installer/PowerToysSetupVNext/SilentFilesInUseBA/precomp.h

@@ -19,10 +19,19 @@
 
 // Standard WiX header files, include as required
 #include "dutil.h"
+//#include "memutil.h"
 #include "dictutil.h"
+//#include "dirutil.h"
 #include "fileutil.h"
+//#include "locutil.h"
+//#include "logutil.h"
 #include "pathutil.h"
+//#include "resrutil.h"
+//#include "shelutil.h"
 #include "strutil.h"
+//#include "thmutil.h"
+//#include "uriutil.h"
+//#include "xmlutil.h"
 #include "regutil.h"
 
 #include "BootstrapperApplicationBase.h"

installer/PowerToysSetupVNext/generateDscResourcesWxs.ps1

@@ -1,102 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True)]
-    [string]$dscWxsFile,
-    [Parameter(Mandatory = $True)]
-    [string]$Platform,
-    [Parameter(Mandatory = $True)]
-    [string]$Configuration
-)
-
-$ErrorActionPreference = 'Stop'
-
-$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-# Find build output directory
-$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
-
-if (-not (Test-Path $buildOutputDir)) {
-    Write-Error "Build output directory not found: '$buildOutputDir'"
-    exit 1
-}
-
-# Find all DSC manifest JSON files
-$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
-
-if (-not $dscFiles) {
-    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
-    # Create empty component group
-    $wxsContent = @"
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-    Set-Content -Path $dscWxsFile -Value $wxsContent
-    exit 0
-}
-
-Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
-
-# Generate WiX fragment
-$wxsContent = @"
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-"@
-
-$componentRefs = @()
-
-foreach ($file in $dscFiles) {
-    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
-    $fileId = $componentId + "_File"
-    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
-    
-    $componentRefs += $componentId
-    
-    $wxsContent += @"
-
-      <Component Id="$componentId" Guid="{$guid}" Directory="DSCModulesReferenceFolder">
-        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
-      </Component>
-"@
-}
-
-$wxsContent += @"
-
-    </DirectoryRef>
-  </Fragment>
-
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-"@
-
-foreach ($componentId in $componentRefs) {
-    $wxsContent += @"
-
-      <ComponentRef Id="$componentId"/>
-"@
-}
-
-$wxsContent += @"
-
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-
-# Write the WiX file
-Set-Content -Path $dscWxsFile -Value $wxsContent
-
-Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

installer/PowerToysSetupVNext/generateMonacoWxs.ps1

@@ -16,20 +16,13 @@ if ($platform -eq "x64") {
     $HeatPath = Join-Path $nugetHeatPath "tools\net472\x86"
 }
 
-# Validate heat.exe exists at the resolved path; fail fast if not found.
-$heatExe = Join-Path $HeatPath "heat.exe"
-if (-not (Test-Path $heatExe)) {
-    Write-Error "heat.exe not found at '$heatExe'. Ensure the WixToolset.Heat package (5.0.2) is restored under '$nugetHeatPath'."
-    exit 1
-}
-
 $SourceDir = Join-Path $scriptDir "..\..\src\Monaco\monacoSRC"  # Now relative to script location
 $OutputFile = Join-Path $scriptDir "MonacoSRC.wxs"
 $ComponentGroup = "MonacoSRCHeatGenerated"
 $DirectoryRef = "MonacoPreviewHandlerMonacoSRCFolder"
 $Variable = "var.MonacoSRCHarvestPath"
 
-& $heatExe dir "$SourceDir" -out "$OutputFile" -cg "$ComponentGroup" -dr "$DirectoryRef" -var "$Variable" -gg -srd -nologo
+& "$HeatPath\heat.exe" dir "$SourceDir" -out "$OutputFile" -cg "$ComponentGroup" -dr "$DirectoryRef" -var "$Variable" -gg -srd -nologo
 
 $fileWxs = Get-Content $monacoWxsFile;
 

nuget.config

@@ -9,4 +9,4 @@
 			<package pattern="*" />
 		</packageSource>
 	</packageSourceMapping>
-</configuration>
+</configuration>

src/Monaco/monacoSpecialLanguages.js

@@ -7,7 +7,7 @@ import { srtDefinition } from './customLanguages/srt.js';
 export async function registerAdditionalLanguages(monaco){
     await languageDefinitions();
     registerAdditionalLanguage("cppExt", [".ino", ".pde"], "cpp", monaco);
-    registerAdditionalLanguage("xmlExt", [".wsdl", ".projitems", ".csproj", ".fsproj", ".shproj", ".vcxproj", ".vbproj", ".resx", ".resw"], "xml", monaco);
+    registerAdditionalLanguage("xmlExt", [".wsdl", ".csproj", ".vcxproj", ".vbproj", ".fsproj", ".resx", ".resw"], "xml", monaco);
     registerAdditionalLanguage("txtExt", [".sln", ".log", ".vsconfig", ".env", ".ahk", ".ion"], "txt", monaco);
     registerAdditionalLanguage("razorExt", [".razor"], "razor", monaco);
     registerAdditionalLanguage("vbExt", [".vbs"], "vb", monaco);

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

@@ -1,8 +0,0 @@
-<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>
-  </PropertyGroup>
-</Project>

src/common/Common.Search/FuzzSearch/MatchOption.cs

@@ -1,10 +0,0 @@
-// 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.
-
-namespace Common.Search.FuzzSearch;
-
-public class MatchOption
-{
-    public bool IgnoreCase { get; set; } = true;
-}

src/common/Common.Search/FuzzSearch/MatchResult.cs

@@ -1,67 +0,0 @@
-// 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.
-
-namespace Common.Search.FuzzSearch;
-
-public class MatchResult
-{
-    /// <summary>
-    /// The raw calculated search score without any search precision filtering applied.
-    /// </summary>
-    private int _rawScore;
-
-    public MatchResult(bool success, SearchPrecisionScore searchPrecision)
-    {
-        Success = success;
-        SearchPrecision = searchPrecision;
-    }
-
-    public MatchResult(bool success, SearchPrecisionScore searchPrecision, List<int> matchData, int rawScore)
-    {
-        Success = success;
-        SearchPrecision = searchPrecision;
-        MatchData = matchData;
-        RawScore = rawScore;
-    }
-
-    public bool Success { get; set; }
-
-    /// <summary>
-    /// Gets the final score of the match result with search precision filters applied.
-    /// </summary>
-    public int Score { get; private set; }
-
-    public int RawScore
-    {
-        get => _rawScore;
-
-        set
-        {
-            _rawScore = value;
-            Score = ScoreAfterSearchPrecisionFilter(_rawScore);
-        }
-    }
-
-    /// <summary>
-    /// Gets matched data to highlight.
-    /// </summary>
-    public List<int> MatchData { get; private set; } = new();
-
-    public SearchPrecisionScore SearchPrecision { get; set; }
-
-    public bool IsSearchPrecisionScoreMet()
-    {
-        return IsSearchPrecisionScoreMet(_rawScore);
-    }
-
-    private bool IsSearchPrecisionScoreMet(int rawScore)
-    {
-        return rawScore >= (int)SearchPrecision;
-    }
-
-    private int ScoreAfterSearchPrecisionFilter(int rawScore)
-    {
-        return IsSearchPrecisionScoreMet(rawScore) ? rawScore : 0;
-    }
-}

src/common/Common.Search/FuzzSearch/SearchPrecisionScore.cs

@@ -1,12 +0,0 @@
-// 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.
-
-namespace Common.Search.FuzzSearch;
-
-public enum SearchPrecisionScore
-{
-    Regular = 50,
-    Low = 20,
-    None = 0,
-}

src/common/Common.Search/GlobalSuppressions.cs

@@ -1,24 +0,0 @@
-// 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.
-
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.MatchResult._rawScore")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._defaultMatchOption")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.MatchResult.#ctor(System.Boolean,Common.Search.SearchPrecisionScore)")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.MatchResult.#ctor(System.Boolean,Common.Search.SearchPrecisionScore,System.Collections.Generic.List{System.Int32},System.Int32)")]
-[assembly: SuppressMessage("Compiler", "CS8618:Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.", Justification = "Coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher.Separator")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.StringMatcher.#ctor")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.StringMatcher.FuzzyMatch(System.String,System.String)~Common.Search.MatchResult")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.StringMatcher.FuzzyMatch(System.String,System.String,Common.Search.MatchOption)~Common.Search.MatchResult")]
-[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1407:Arithmetic expressions should declare precedence", Justification = "migrate from stable code", Scope = "member", Target = "~M:Common.Search.StringMatcher.CalculateSearchScore(System.String,System.String,System.Int32,System.Int32,System.Boolean)~System.Int32")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "migrate from stable code", Scope = "member", Target = "~M:Common.Search.StringMatcher.FuzzyMatch(System.String,System.String,Common.Search.MatchOption,System.Int32)~Common.Search.MatchResult")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1204:Static elements should appear before instance elements", Justification = "migrate from stable code", Scope = "member", Target = "~M:Common.Search.StringMatcher.CalculateClosestSpaceIndex(System.Collections.Generic.List{System.Int32},System.Int32)~System.Int32")]

src/common/Common.Search/stylecop.json

@@ -1,22 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
-  "settings": {
-    "documentationRules": {
-      "companyName": "Microsoft Corporation",
-      "copyrightText": "Copyright (c) {companyName}\r\nThe {companyName} licenses this file to you under the MIT license.\r\nSee the LICENSE file in the project root for more information.",
-      "xmlHeader": false,
-      "headerDecoration": "",
-      "fileNamingConvention": "metadata",
-      "documentInterfaces": false,
-      "documentExposedElements": false,
-      "documentInternalElements": false
-    },
-    "layoutRules": {
-      "newlineAtEndOfFile": "require"
-    },
-    "orderingRules": {
-      "usingDirectivesPlacement": "outsideNamespace",
-      "systemUsingDirectivesFirst": true
-    }
-  }
-}

src/common/ManagedCommon/Logger.cs

@@ -19,9 +19,7 @@ namespace ManagedCommon
         private static readonly string Error = "Error";
         private static readonly string Warning = "Warning";
         private static readonly string Info = "Info";
-#if DEBUG
         private static readonly string Debug = "Debug";
-#endif
         private static readonly string TraceFlag = "Trace";
 
         private static readonly string Version = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version ?? "Unknown";
@@ -34,8 +32,17 @@ namespace ManagedCommon
         /// <param name="isLocalLow">If the process using Logger is a low-privilege process.</param>
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
-            string versionedPath = LogDirectoryPath(applicationLogPath, isLocalLow);
-            string basePath = Path.GetDirectoryName(versionedPath);
+            string basePath;
+            if (isLocalLow)
+            {
+                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
+            }
+            else
+            {
+                basePath = Constants.AppDataPath() + applicationLogPath;
+            }
+
+            string versionedPath = Path.Combine(basePath, Version);
 
             if (!Directory.Exists(versionedPath))
             {
@@ -52,22 +59,6 @@ namespace ManagedCommon
             Task.Run(() => DeleteOldVersionLogFolders(basePath, versionedPath));
         }
 
-        public static string LogDirectoryPath(string applicationLogPath, bool isLocalLow = false)
-        {
-            string basePath;
-            if (isLocalLow)
-            {
-                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
-            }
-            else
-            {
-                basePath = Constants.AppDataPath() + applicationLogPath;
-            }
-
-            string versionedPath = Path.Combine(basePath, Version);
-            return versionedPath;
-        }
-
         /// <summary>
         /// Deletes old version log folders, keeping only the current version's folder.
         /// </summary>
@@ -124,13 +115,13 @@ namespace ManagedCommon
             {
                 var exMessage =
                     message + Environment.NewLine +
-                    ex.GetType() + " (" + ex.HResult + "): " + ex.Message + Environment.NewLine;
+                    ex.GetType() + ": " + ex.Message + Environment.NewLine;
 
                 if (ex.InnerException != null)
                 {
                     exMessage +=
                         "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + ": " + ex.InnerException.Message + Environment.NewLine;
                 }
 
                 exMessage +=
@@ -153,9 +144,7 @@ namespace ManagedCommon
 
         public static void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
         {
-#if DEBUG
             Log(message, Debug, memberName, sourceFilePath, sourceLineNumber);
-#endif
         }
 
         public static void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)

src/common/UITestAutomation/Element/TextBox.cs

@@ -2,8 +2,6 @@
 // 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.Threading.Tasks;
-
 namespace Microsoft.PowerToys.UITest
 {
     /// <summary>
@@ -27,9 +25,8 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <param name="value">The text to set.</param>
         /// <param name="clearText">A value indicating whether to clear the text before setting it. Default value is true</param>
-        /// <param name="charDelayMS">Delay in milliseconds between each character. Default is 0 (no delay).</param>
         /// <returns>The current TextBox instance.</returns>
-        public TextBox SetText(string value, bool clearText = true, int charDelayMS = 0)
+        public TextBox SetText(string value, bool clearText = true)
         {
             if (clearText)
             {
@@ -42,36 +39,10 @@ namespace Microsoft.PowerToys.UITest
                 Task.Delay(500).Wait();
             }
 
-            // TODO: CmdPal bug – when inputting text, characters are swallowed too quickly.
-            // This should be fixed within CmdPal itself.
-            // Temporary workaround: introduce a delay between character inputs to avoid the issue
-            if (charDelayMS > 0 || EnvironmentConfig.IsInPipeline)
+            PerformAction((actions, windowElement) =>
             {
-                // Send text character by character with delay (if specified or in pipeline)
-                PerformAction((actions, windowElement) =>
-                {
-                    foreach (char c in value)
-                    {
-                        windowElement.SendKeys(c.ToString());
-                        if (charDelayMS > 0)
-                        {
-                            Task.Delay(charDelayMS).Wait();
-                        }
-                        else if (EnvironmentConfig.IsInPipeline)
-                        {
-                            Task.Delay(50).Wait();
-                        }
-                    }
-                });
-            }
-            else
-            {
-                // No character delay - send all text at once (original behavior)
-                PerformAction((actions, windowElement) =>
-                {
-                    windowElement.SendKeys(value);
-                });
-            }
+                windowElement.SendKeys(value);
+            });
 
             return this;
         }

src/common/UITestAutomation/EnvironmentConfig.cs

@@ -1,45 +0,0 @@
-// 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;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Centralized configuration for all environment variables used in UI tests.
-    /// </summary>
-    public static class EnvironmentConfig
-    {
-        private static readonly Lazy<bool> _isInPipeline = new(() =>
-            !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("platform")));
-
-        private static readonly Lazy<bool> _useInstallerForTest = new(() =>
-        {
-            string? envValue = Environment.GetEnvironmentVariable("useInstallerForTest") ??
-                              Environment.GetEnvironmentVariable("USEINSTALLERFORTEST");
-            return !string.IsNullOrEmpty(envValue) && bool.TryParse(envValue, out bool result) && result;
-        });
-
-        private static readonly Lazy<string?> _platform = new(() =>
-            Environment.GetEnvironmentVariable("platform"));
-
-        /// <summary>
-        /// Gets a value indicating whether the tests are running in a CI/CD pipeline.
-        /// Determined by the presence of the "platform" environment variable.
-        /// </summary>
-        public static bool IsInPipeline => _isInPipeline.Value;
-
-        /// <summary>
-        /// Gets a value indicating whether to use installer paths for testing.
-        /// Checks both "useInstallerForTest" and "USEINSTALLERFORTEST" environment variables.
-        /// </summary>
-        public static bool UseInstallerForTest => _useInstallerForTest.Value;
-
-        /// <summary>
-        /// Gets the platform name from the environment variable.
-        /// Typically used in CI/CD pipelines to identify the build platform.
-        /// </summary>
-        public static string? Platform => _platform.Value;
-    }
-}