expect

<!-- 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/expect.txt

@@ -25,14 +25,11 @@ ADMINS
 adml
 admx
 advancedpaste
-advancedpasteui
-advancedpasteuishortcut
 advfirewall
 AFeature
 affordances
 AFX
 AGGREGATABLE
-AHK
 AHybrid
 akv
 ALarger
@@ -43,13 +40,11 @@ ALLINPUT
 Allman
 Allmodule
 ALLOWUNDO
-allpc
 ALLVIEW
 ALPHATYPE
 AModifier
 amr
 ANDSCANS
-animatedvisuals
 Animnate
 ANull
 AOC
@@ -120,7 +115,6 @@ bigbar
 bigobj
 binlog
 binres
-binskim
 BITMAPFILEHEADER
 bitmapimage
 BITMAPINFO
@@ -169,7 +163,6 @@ callbackptr
 calpwstr
 Cangjie
 CANRENAME
-Canvascustomlayout
 CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
@@ -262,7 +255,6 @@ Corpor
 cotaskmem
 COULDNOT
 countof
-covrun
 cpcontrols
 cph
 cplusplus
@@ -577,7 +569,6 @@ GPOCA
 gpp
 gpu
 gradians
-Gridcustomlayout
 GSM
 gtm
 guiddata
@@ -637,7 +628,6 @@ HKCU
 hkey
 HKLM
 HKM
-hkmng
 HKPD
 HKU
 HMD
@@ -646,7 +636,6 @@ hmodule
 hmonitor
 homies
 homljgmgpmcbpjbnjpfijnhipfkiclkd
-HOOKPROC
 HORZRES
 HORZSIZE
 Hostbackdropbrush
@@ -655,11 +644,7 @@ Hostx
 hotfixes
 hotkeycontrol
 HOTKEYF
-hotkeylockmachine
-hotkeyreconnect
 hotkeys
-hotkeyswitch
-hotkeytoggleeasymouse
 hotlight
 hotspot
 HPAINTBUFFER
@@ -672,7 +657,6 @@ HROW
 hsb
 HSCROLL
 hsi
-HSpeed
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
@@ -718,12 +702,9 @@ IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
 imageresizerinput
 imageresizersettings
-imagetotext
-imagetotextshortcut
 imagingdevices
 ime
 imgflip
-inapp
 inbox
 INCONTACT
 Indo
@@ -777,7 +758,6 @@ istep
 ith
 ITHUMBNAIL
 IUI
-IUWP
 IWIC
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
@@ -807,7 +787,6 @@ keyvault
 KILLFOCUS
 killrunner
 kmph
-kvp
 Kybd
 lastcodeanalysissucceeded
 LASTEXITCODE
@@ -846,7 +825,6 @@ localappdata
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
-LOCKMACHINE
 LOCKTYPE
 LOGFONT
 LOGFONTW
@@ -932,7 +910,6 @@ MDL
 mdtext
 mdtxt
 mdwn
-measuretool
 meme
 memicmp
 MENUITEMINFO
@@ -982,7 +959,6 @@ MOUSEHWHEEL
 MOUSEINPUT
 mousejump
 mousepointer
-mousepointercrosshairs
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
@@ -994,7 +970,6 @@ msc
 mscorlib
 msctls
 msdata
-msdia
 MSDL
 MSGFLT
 MSHCTX
@@ -1012,7 +987,6 @@ Mso
 msrc
 msstore
 msvcp
-MT
 MTND
 MULTIPLEUSE
 multizone
@@ -1025,8 +999,6 @@ MYICON
 NAMECHANGE
 namespaceanddescendants
 nao
-Navigatable
-NavigatablePage
 NCACTIVATE
 ncc
 NCCALCSIZE
@@ -1125,7 +1097,6 @@ NOTSRCCOPY
 NOTSRCERASE
 notwindows
 NOTXORPEN
-nowarn
 NOZORDER
 NPH
 npmjs
@@ -1187,18 +1158,6 @@ PARENTRELATIVEFORADDRESSBAR
 PARENTRELATIVEPARSING
 parray
 PARTIALCONFIRMATIONDIALOGTITLE
-pasteashtmlfile
-pasteashtmlfileshortcut
-pasteasjson
-pasteasjsonshortcut
-pasteasmarkdown
-pasteasmarkdownshortcut
-pasteasplaintext
-pasteasplaintextshortcut
-pasteaspngfile
-pasteaspngfileshortcut
-pasteastxtfile
-pasteastxtfileshortcut
 PATCOPY
 PATHMUSTEXIST
 PATINVERT
@@ -1266,7 +1225,6 @@ Pomodoro
 Popups
 POPUPWINDOW
 POSITIONITEM
-powerocr
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1407,7 +1365,6 @@ Removelnk
 renamable
 RENAMEONCOLLISION
 reparented
-reparenthotkey
 reparenting
 reportfileaccesses
 requery
@@ -1484,7 +1441,6 @@ secpol
 securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
-selfhost
 SENDCHANGE
 sendvirtualinput
 serverside
@@ -1504,7 +1460,6 @@ SETRULES
 SETSCREENSAVEACTIVE
 SETSTICKYKEYS
 SETTEXT
-settingscard
 SETTINGCHANGE
 SETTINGSCHANGED
 settingsheader
@@ -1658,7 +1613,6 @@ STYLECHANGED
 STYLECHANGING
 subkeys
 sublang
-Subdomain
 SUBMODULEUPDATE
 subresource
 Superbar
@@ -1729,7 +1683,6 @@ THH
 THICKFRAME
 THISCOMPONENT
 throughs
-thumbnailhotkey
 TILEDWINDOW
 TILLSON
 timedate
@@ -1744,7 +1697,6 @@ tlb
 tlbimp
 tlc
 TNP
-TOGGLEEASYMOUSE
 Toolhelp
 toolkitconverters
 toolwindow
@@ -1758,17 +1710,14 @@ tracelogging
 tracerpt
 trackbar
 trafficmanager
-transcodetomp
 transicc
 TRAYMOUSEMESSAGE
 triaging
-Tru
 trl
 trx
 tsa
 tskill
 tstoi
-tweakable
 TWF
 tymed
 TYPEKEYBOARD
@@ -1876,7 +1825,6 @@ VSINSTALLDIR
 VSM
 vso
 vsonline
-VSpeed
 vstemplate
 vstest
 VSTHRD
@@ -1933,7 +1881,6 @@ winexe
 winforms
 winget
 wingetcreate
-wingetpkgs
 Winhook
 WINL
 winlogon
@@ -2013,13 +1960,10 @@ XNamespace
 Xoshiro
 XPels
 XPixel
-XPos
 XResource
 xsi
-XSpeed
 XStr
 xstyler
-XTimer
 XUP
 XVIRTUALSCREEN
 xxxxxx
@@ -2029,10 +1973,7 @@ YIncrement
 yinle
 yinyue
 YPels
-YPos
 YResolution
-YSpeed
-YTimer
 YStr
 YVIRTUALSCREEN
 ZEROINIT

.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

@@ -355,8 +355,5 @@ src/common/Telemetry/*.etl
 # 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",
 
@@ -282,7 +280,6 @@
                 "Mono.Cecil.Pdb.dll",
                 "Mono.Cecil.Rocks.dll",
                 "Newtonsoft.Json.dll",
-                "CommunityToolkit.WinUI.Controls.TitleBar.dll",
 
                 "NLog.dll",
                 "HtmlAgilityPack.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/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
@@ -69,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
@@ -109,8 +100,7 @@ extends:
                 useManagedIdentity: $(SigningUseManagedIdentity)
                 clientId: $(SigningOriginalClientId)
               # Have msbuild use the release nuget config profile
-              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:EnableCmdPalAOT=${{ parameters.enableAOT }} /p:InstallerSuffix=${{ parameters.installerSuffix }}
-              installerSuffix: ${{ parameters.installerSuffix }}
+              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

@@ -62,9 +62,6 @@ parameters:
   - name: versionNumber
     type: string
     default: '0.0.1'
-  - name: installerSuffix
-    type: string
-    default: "wix5"
   - name: useLatestWinAppSDK
     type: boolean
     default: false
@@ -485,7 +482,6 @@ jobs:
       signingIdentity: ${{ parameters.signingIdentity }}
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      installerSuffix: ${{ parameters.installerSuffix }}
 
   - template: steps-build-installer-vnext.yml
     parameters:
@@ -493,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.
@@ -513,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)
 
@@ -532,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-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,13 +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
   #### BOOTSTRAP BUILDING AND SIGNING
+
   - task: VSBuild@1
     displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext Bootstrapper
     inputs:
@@ -142,7 +129,6 @@ steps:
         -restore
         /t:PowerToysBootstrapperVNext
         /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
         /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
         -restore -graph
         ${{ parameters.additionalBuildOptions }}
@@ -155,7 +141,7 @@ steps:
   # 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
@@ -191,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
@@ -199,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/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

Directory.Packages.props

@@ -34,22 +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.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.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. -->
     <!-- 
@@ -65,8 +65,7 @@
     <!-- 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="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" />
@@ -79,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" />
@@ -122,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
-- CommunityToolkit.WinUI.UI.Controls.Markdown
-- ControlzEx
-- HelixToolkit
-- HelixToolkit.Core.Wpf
-- hyjiacan.pinyin4net
-- Interop.Microsoft.Office.Interop.OneNote
-- LazyCache
-- Mages
-- Markdig.Signed
-- MessagePack
-- ModernWpfUI
-- Moq
-- MSTest
-- 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

@@ -262,7 +262,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\EventLocker.h = src\common\utils\EventLocker.h
 		src\common\utils\EventWaiter.h = src\common\utils\EventWaiter.h
 		src\common\utils\excluded_apps.h = src\common\utils\excluded_apps.h
-		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\exec.h = src\common\utils\exec.h
 		src\common\utils\game_mode.h = src\common\utils\game_mode.h
 		src\common\utils\gpo.h = src\common\utils\gpo.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}"
@@ -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}"
@@ -791,16 +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("{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
@@ -1869,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
@@ -2711,30 +2686,6 @@ Global
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.Build.0 = Release|ARM64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.ActiveCfg = Release|x64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.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
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2879,46 +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
-		{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
@@ -2928,7 +2839,6 @@ Global
 		{D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{1AFB6476-670D-4E80-A464-657E01DFF482} = {557C4636-D7E1-4838-A504-7D19B725EE95}
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
@@ -3078,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}
@@ -3196,8 +3105,6 @@ Global
 		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
-		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{9D3F3793-EFE3-4525-8782-238015DABA62} = {66E1534A-1587-42B2-912F-45C994D32904}
@@ -3210,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}
@@ -3227,16 +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}
-		{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

@@ -14,7 +14,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [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) |
+| [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) |
@@ -35,19 +35,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 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.94%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.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.93.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.93.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.93.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.93.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] |
 
 This is our preferred method.
 
@@ -93,119 +93,139 @@ For guidance on developing for PowerToys, please read the [developer docs](./doc
 
 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
 
-### 0.93 - Aug 2025 Update
+### 0.92 - June 2025 Update
 
 In this release, we focused on new features, stability, optimization improvements, and automation.
 
 **✨Highlights**
 
- - PowerToys settings debuts a modern, card-based dashboard with clearer descriptions and faster navigation for a streamlined user experience.
- - Command Palette had over 99 issues resolved, including bringing back Clipboard History, adding context menu shortcuts, pinning favorite apps, and supporting history in Run.
- - Command Palette reduced its startup memory usage by ~15%, load time by ~40%, built-in extensions loading time by ~70%, and installation size by ~55%—all due to using the full Ahead-of-Time (AOT) compilation mode in Windows App SDK.
- - Peek now supports instant previews and embedded thumbnails for Binary G-code (.bgcode) 3D printing files, making it easy to inspect models at a glance. Thanks [@pedrolamas](https://github.com/pedrolamas)!
- - Mouse Utilities introduces a new spotlight highlighting mode that dims the screen and draws attention to your cursor, perfect for presentations.
- - Test coverage improvements for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename — ensuring better reliability and quality, with over 600 new unit tests (mostly for Command Palette) and doubled UI automation coverage.
+ - 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
 
- - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
- - Fixed command title changes not being properly notified to screen readers. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made icon controls excluded from keyboard navigation by default for better accessibility. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved UI design with better text sizing and alignment.
- - Fixed keyboard shortcuts to work better in text boxes and context menus.
- - Added right-click context menus with critical command styling and separators.
- - Improved various context menu issues, improving item selection, handling of long titles, search bar text scaling, initial item behavior, and primary button functionality.
- - Fixed context menu crashes with better type handling.
- - Fixed "Reload" command to work with both uppercase and lowercase letters.
- - Added mouse back button support for easier navigation. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Updated back button tooltip to show keyboard shortcut information. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Command Palette window not appearing properly when activated. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Command Palette window staying hidden from taskbar after File Explorer restarts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed window focus not returning to previous app properly.
- - Fixed Command Palette window to always appear on top when shown and move to bottom when hidden. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed window hiding to properly work on UI thread. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed crashes and improved stability with better synchronization of Command list updates. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved extension disposal with better error handling to prevent crashes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved stability by fixing a UI threading issue when loading more results, preventing possible crashes and ensuring the loading state resets if loading fails. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Enhanced icon loading stability with better exception handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added thread safety to recent commands to prevent crashes. Thanks [@MaoShengelia](https://github.com/MaoShengelia)!
- - Fixed acrylic (frosted glass) system backdrop display issues by ensuring proper UI thread handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - 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 settings to each provider to control which fallback commands are enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)! for fixing a regression in this feature.
- - Added sample code showing how Command Palette extensions can track when their pages are loaded or unloaded. [Check it out here](./src/modules/cmdpal/ext/SamplePagesExtension/OnLoadPage.cs).
- - Fixed *Calculator* to accept regular spaces in numbers that use space separators. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Added a new setting to *Calculator* to make "Copy" the primary button (replacing “Save”) and enable "Close on Enter", streamlining the workflow. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Improved *Apps* indexing error handling and removed obsolete code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Prevented apps from showing in search when the *Apps* extension is disabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added ability to pin/unpin *Apps* using Ctrl+P shortcut.
- - Added keyboard shortcuts to the *Apps* context menu items for faster access. 
- - Added all file context menu options to the *Apps* items context menu, making all file actions available there for better functionality.
- - Streamlined All *Apps* extension settings by removing redundant descriptions, making the UI clearer.
- - Added command history to the *Run* page for easier access to previous commands.
- - Fixed directory path handling in *Run* fallback for better file navigation.
- - Fixed URL fallback item hiding properly in *Web Search* extension when search query becomes invalid. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added proper empty state message for *Web Search* extension when no results found. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added fallback command to *Windows Settings* extension for better search results.
- - Re-enabled *Clipboard History* feature with proper window handling.
- - Improved *Add Bookmark* extension to automatically detect file, folder, or URL types without manual input.
- - Updated terminology from "Kill process" to "End task" in *Window Walker* for consistency with Windows.
- - Fixed minor grammar error in SamplePagesExtension code comments. Thanks [@purofle](https://github.com/purofle)!
+ - 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)!
 
-### Mouse Utilities
+### Command Palette Ahead-of-Time (AOT) readiness
 
- - Added a new spotlight highlighting mode that creates a large transparent circle around your cursor with a backdrop effect, providing an alternative to the traditional circle highlight. Perfect for presentations where you want to focus attention on a specific area while dimming the rest of the screen.
+ - 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
 
- - Added preview and thumbnail support for Binary G-code (.bgcode) files used in 3D printing. You can now see embedded thumbnails and preview these compressed 3D printing files directly in Peek and File Explorer. Thanks [@pedrolamas](https://github.com/pedrolamas)!
+ - 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.
 
-### Quick Accent
+### PowerRename
 
- - Added Vietnamese language support to Quick Accent, mappings for Vietnamese vowels (a, e, i, o, u, y) and the letter d. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
+ - 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
 
- - Completely redesigned the Settings dashboard with a modern card-based layout featuring organized sections for quick actions and shortcuts overview, replacing the old module list.
- - Rewrote setting descriptions to be more concise and follow Windows writing style guidelines, making them easier to understand.
- - Improved formatting and readability of release notes in the "What's New" section with better typography and spacing.
- - Added missing deep link support for various settings pages (Peek, Quick Accent, PowerToys Run, etc.) so you can jump directly to specific settings.
- - Resolved an issue where the settings page header would drift away from its position when resizing the settings window.
- - Resolved a settings crash related to incompatible property names in ZoomIt configuration.
+ - 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 detailed step-by-step instructions for first-time developers building the Command Palette module, including prerequisites and Visual Studio setup guidance. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - **Fixed Broken SDK Link**: Corrected a broken markdown link in the Command Palette SDK README that was pointing to an incorrect directory path. Thanks [@ChrisGuzak](https://github.com/ChrisGuzak)!
- - Added documentation for the "Open With Cursor" plugin that enables opening Visual Studio and VS Code recent files using Cursor AI. Thanks [@VictorNoxx](https://github.com/VictorNoxx)!
- - Added documentation for two new community plugins - Hotkeys plugin for creating custom keyboard shortcuts, and RandomGen plugin for generating random data like passwords, colors, and placeholder text. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - 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.8 for performance and security. Thanks [@snickler](https://github.com/snickler)!
- - Updated the spell check system to version 0.0.25 with better GitHub integration and SARIF reporting, plus fixed numerous spelling errors throughout the codebase including property names and documentation. Thanks [@jsoref](https://github.com/jsoref)!
- - Cleaned up spelling check configuration to eliminate false positives and excessive noise that was appearing in every pull request, making the development process smoother.
- - Replaced NuGet feed with Azure Artifacts for better package management.
- - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours.
- - Replaced brittle pixel-by-pixel image comparison with perceptual hash (pHash) technology that's more robust to minor rendering differences - no more test failures due to anti-aliasing or compression artifacts.
- - Reduced CI/fuzzing/UI test timeouts from 4 hours to 90 minutes, dramatically improving developer feedback loops and preventing long waits when builds get stuck.
- - Standardized test project naming across the entire codebase and improved pipeline result identification by adding platform/install mode context to test run titles. Thanks [@khmyznikov](https://github.com/khmyznikov)!
- - Added comprehensive UI test suites for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename - ensuring better reliability and quality.
- - Enhanced UI test automation with command-line argument support, better session management, and improved element location methods using pattern matching to avoid failures from minor differences in exact matches.
+ - 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.
 
-### What is being planned over the next few releases
+### General
 
-For [v0.94][github-next-release-work], we'll work on the items below:
+- 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
- - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
- - Working on upgrading the installer to WiX 5
- - Working on shortcut conflict detection
- - Working on setting search
- - Upgrading Keyboard Manager's editor UI
  - New UI automation tests
+ - Working on installer upgrades
+ - Working on shortcut conflict detection
+ - Upgrading Keyboard Manager's editor UI
  - Stability, bug fixes
 
 ## PowerToys Community

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/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.

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

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/Product.wxs

@@ -176,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>
@@ -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/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

@@ -1153,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;

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

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

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/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/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,6 +26,7 @@
             <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" />
 
       <!-- 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) -->

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. -->
@@ -17,7 +17,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </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)\..
@@ -77,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>

installer/PowerToysSetupVNext/Product.wxs

@@ -132,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;)" />
@@ -230,14 +226,6 @@
 
     <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" />

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/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/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;
 

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/FuzzSearch/StringMatcher.cs

@@ -1,272 +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.Globalization;
-
-namespace Common.Search.FuzzSearch;
-
-public class StringMatcher
-{
-    public StringMatcher()
-    {
-    }
-
-    private static readonly char[] Separator = [' '];
-
-    /// <summary>
-    /// Current method:
-    /// Character matching + substring matching;
-    /// 1. Query search string is split into substrings, separator is whitespace.
-    /// 2. Check each query substring's characters against full compare string,
-    /// 3. if a character in the substring is matched, loop back to verify the previous character.
-    /// 4. If previous character also matches, and is the start of the substring, update list.
-    /// 5. Once the previous character is verified, move on to the next character in the query substring.
-    /// 6. Move onto the next substring's characters until all substrings are checked.
-    /// 7. Consider success and move onto scoring if every char or substring without whitespaces matched
-    /// </summary>
-    public static MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption opt = null)
-    {
-        opt = opt ?? new MatchOption();
-
-        if (string.IsNullOrEmpty(stringToCompare))
-        {
-            return new MatchResult(false, SearchPrecisionScore.Regular);
-        }
-
-        SearchPrecisionScore score = SearchPrecisionScore.Regular;
-
-        var bestResult = new MatchResult(false, score);
-
-        for (int startIndex = 0; startIndex < stringToCompare.Length; startIndex++)
-        {
-            MatchResult result = FuzzyMatch(query, stringToCompare, opt, startIndex);
-            if (result.Success && (!bestResult.Success || result.Score > bestResult.Score))
-            {
-                bestResult = result;
-            }
-        }
-
-        return bestResult;
-    }
-
-    private static MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption opt, int startIndex)
-    {
-        if (string.IsNullOrEmpty(stringToCompare) || string.IsNullOrEmpty(query))
-        {
-            return new MatchResult(false, SearchPrecisionScore.Regular);
-        }
-
-        ArgumentNullException.ThrowIfNull(opt);
-
-        query = query.Trim();
-
-        // Using InvariantCulture since this is internal
-        var fullStringToCompareWithoutCase = opt.IgnoreCase ? stringToCompare.ToUpper(CultureInfo.InvariantCulture) : stringToCompare;
-        var queryWithoutCase = opt.IgnoreCase ? query.ToUpper(CultureInfo.InvariantCulture) : query;
-
-        var querySubstrings = queryWithoutCase.Split(Separator, StringSplitOptions.RemoveEmptyEntries);
-        int currentQuerySubstringIndex = 0;
-        var currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
-        var currentQuerySubstringCharacterIndex = 0;
-
-        var firstMatchIndex = -1;
-        var firstMatchIndexInWord = -1;
-        var lastMatchIndex = 0;
-        bool allQuerySubstringsMatched = false;
-        bool matchFoundInPreviousLoop = false;
-        bool allSubstringsContainedInCompareString = true;
-
-        var indexList = new List<int>();
-        List<int> spaceIndices = new List<int>();
-
-        for (var compareStringIndex = startIndex; compareStringIndex < fullStringToCompareWithoutCase.Length; compareStringIndex++)
-        {
-            // To maintain a list of indices which correspond to spaces in the string to compare
-            // To populate the list only for the first query substring
-            if (fullStringToCompareWithoutCase[compareStringIndex].Equals(' ') && currentQuerySubstringIndex == 0)
-            {
-                spaceIndices.Add(compareStringIndex);
-            }
-
-            bool compareResult;
-            if (opt.IgnoreCase)
-            {
-                var fullStringToCompare = fullStringToCompareWithoutCase[compareStringIndex].ToString();
-                var querySubstring = currentQuerySubstring[currentQuerySubstringCharacterIndex].ToString();
-#pragma warning disable CA1309 // Use ordinal string comparison (We are looking for a fuzzy match here)
-                compareResult = string.Compare(fullStringToCompare, querySubstring, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace) != 0;
-#pragma warning restore CA1309 // Use ordinal string comparison
-            }
-            else
-            {
-                compareResult = fullStringToCompareWithoutCase[compareStringIndex] != currentQuerySubstring[currentQuerySubstringCharacterIndex];
-            }
-
-            if (compareResult)
-            {
-                matchFoundInPreviousLoop = false;
-                continue;
-            }
-
-            if (firstMatchIndex < 0)
-            {
-                // first matched char will become the start of the compared string
-                firstMatchIndex = compareStringIndex;
-            }
-
-            if (currentQuerySubstringCharacterIndex == 0)
-            {
-                // first letter of current word
-                matchFoundInPreviousLoop = true;
-                firstMatchIndexInWord = compareStringIndex;
-            }
-            else if (!matchFoundInPreviousLoop)
-            {
-                // we want to verify that there is not a better match if this is not a full word
-                // in order to do so we need to verify all previous chars are part of the pattern
-                var startIndexToVerify = compareStringIndex - currentQuerySubstringCharacterIndex;
-
-                if (AllPreviousCharsMatched(startIndexToVerify, currentQuerySubstringCharacterIndex, fullStringToCompareWithoutCase, currentQuerySubstring))
-                {
-                    matchFoundInPreviousLoop = true;
-
-                    // if it's the beginning character of the first query substring that is matched then we need to update start index
-                    firstMatchIndex = currentQuerySubstringIndex == 0 ? startIndexToVerify : firstMatchIndex;
-
-                    indexList = GetUpdatedIndexList(startIndexToVerify, currentQuerySubstringCharacterIndex, firstMatchIndexInWord, indexList);
-                }
-            }
-
-            lastMatchIndex = compareStringIndex + 1;
-            indexList.Add(compareStringIndex);
-
-            currentQuerySubstringCharacterIndex++;
-
-            // if finished looping through every character in the current substring
-            if (currentQuerySubstringCharacterIndex == currentQuerySubstring.Length)
-            {
-                // if any of the substrings was not matched then consider as all are not matched
-                allSubstringsContainedInCompareString = matchFoundInPreviousLoop && allSubstringsContainedInCompareString;
-
-                currentQuerySubstringIndex++;
-
-                allQuerySubstringsMatched = AllQuerySubstringsMatched(currentQuerySubstringIndex, querySubstrings.Length);
-                if (allQuerySubstringsMatched)
-                {
-                    break;
-                }
-
-                // otherwise move to the next query substring
-                currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
-                currentQuerySubstringCharacterIndex = 0;
-            }
-        }
-
-        // proceed to calculate score if every char or substring without whitespaces matched
-        if (allQuerySubstringsMatched)
-        {
-            var nearestSpaceIndex = CalculateClosestSpaceIndex(spaceIndices, firstMatchIndex);
-            var score = CalculateSearchScore(query, stringToCompare, firstMatchIndex - nearestSpaceIndex - 1, lastMatchIndex - firstMatchIndex, allSubstringsContainedInCompareString);
-
-            return new MatchResult(true, SearchPrecisionScore.Regular, indexList, score);
-        }
-
-        return new MatchResult(false, SearchPrecisionScore.Regular);
-    }
-
-    // To get the index of the closest space which precedes the first matching index
-    private static int CalculateClosestSpaceIndex(List<int> spaceIndices, int firstMatchIndex)
-    {
-        if (spaceIndices.Count == 0)
-        {
-            return -1;
-        }
-        else
-        {
-            return spaceIndices.OrderBy(item => firstMatchIndex - item).Where(item => firstMatchIndex > item).FirstOrDefault(-1);
-        }
-    }
-
-    private static bool AllPreviousCharsMatched(int startIndexToVerify, int currentQuerySubstringCharacterIndex, string fullStringToCompareWithoutCase, string currentQuerySubstring)
-    {
-        var allMatch = true;
-        for (int indexToCheck = 0; indexToCheck < currentQuerySubstringCharacterIndex; indexToCheck++)
-        {
-            if (fullStringToCompareWithoutCase[startIndexToVerify + indexToCheck] !=
-                currentQuerySubstring[indexToCheck])
-            {
-                allMatch = false;
-            }
-        }
-
-        return allMatch;
-    }
-
-    private static List<int> GetUpdatedIndexList(int startIndexToVerify, int currentQuerySubstringCharacterIndex, int firstMatchIndexInWord, List<int> indexList)
-    {
-        var updatedList = new List<int>();
-
-        indexList.RemoveAll(x => x >= firstMatchIndexInWord);
-
-        updatedList.AddRange(indexList);
-
-        for (int indexToCheck = 0; indexToCheck < currentQuerySubstringCharacterIndex; indexToCheck++)
-        {
-            updatedList.Add(startIndexToVerify + indexToCheck);
-        }
-
-        return updatedList;
-    }
-
-    private static bool AllQuerySubstringsMatched(int currentQuerySubstringIndex, int querySubstringsLength)
-    {
-        return currentQuerySubstringIndex >= querySubstringsLength;
-    }
-
-    private static int CalculateSearchScore(string query, string stringToCompare, int firstIndex, int matchLen, bool allSubstringsContainedInCompareString)
-    {
-        // A match found near the beginning of a string is scored more than a match found near the end
-        // A match is scored more if the characters in the patterns are closer to each other,
-        // while the score is lower if they are more spread out
-
-        // The length of the match is assigned a larger weight factor.
-        const int matchLenWeightFactor = 2;
-
-        var score = 100 * (query.Length + 1) * matchLenWeightFactor / (1 + firstIndex + (matchLenWeightFactor * (matchLen + 1)));
-
-        // A match with less characters assigning more weights
-        if (stringToCompare.Length - query.Length < 5)
-        {
-            score += 20;
-        }
-        else if (stringToCompare.Length - query.Length < 10)
-        {
-            score += 10;
-        }
-
-        if (allSubstringsContainedInCompareString)
-        {
-            int count = query.Count(c => !char.IsWhiteSpace(c));
-            int threshold = 4;
-            if (count <= threshold)
-            {
-                score += count * 10;
-            }
-            else
-            {
-                score += (threshold * 10) + ((count - threshold) * 5);
-            }
-        }
-
-#pragma warning disable CA1309 // Use ordinal string comparison (Using CurrentCultureIgnoreCase since this relates to queries input by user)
-        if (string.Equals(query, stringToCompare, StringComparison.CurrentCultureIgnoreCase))
-        {
-            var bonusForExactMatch = 10;
-            score += bonusForExactMatch;
-        }
-#pragma warning restore CA1309 // Use ordinal string comparison
-
-        return score;
-    }
-}

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/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;
-    }
-}

src/common/UITestAutomation/ModuleConfigData.cs

@@ -92,7 +92,9 @@ namespace Microsoft.PowerToys.UITest
         private ModuleConfigData()
         {
             // Check if we should use installer paths from environment variable
-            UseInstallerForTest = EnvironmentConfig.UseInstallerForTest;
+            string? useInstallerForTestEnv =
+                            Environment.GetEnvironmentVariable("useInstallerForTest") ?? Environment.GetEnvironmentVariable("USEINSTALLERFORTEST");
+            UseInstallerForTest = !string.IsNullOrEmpty(useInstallerForTestEnv) && bool.TryParse(useInstallerForTestEnv, out bool result) && result;
 
             // Module information including executable name, window name, and optional subdirectory
             ModuleInfo = new Dictionary<PowerToysModule, ModuleInfo>

src/common/UITestAutomation/SessionHelper.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -38,9 +37,6 @@ namespace Microsoft.PowerToys.UITest
         private PowerToysModule scope;
         private string[]? commandLineArgs;
 
-        /// <summary>
-        /// Gets a value indicating whether to use installer paths for testing.
-        /// </summary>
         private bool UseInstallerForTest { get; }
 
         [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
@@ -49,7 +45,9 @@ namespace Microsoft.PowerToys.UITest
             this.scope = scope;
             this.commandLineArgs = commandLineArgs;
             this.sessionPath = ModuleConfigData.Instance.GetModulePath(scope);
-            UseInstallerForTest = EnvironmentConfig.UseInstallerForTest;
+            string? useInstallerForTestEnv =
+                Environment.GetEnvironmentVariable("useInstallerForTest") ?? Environment.GetEnvironmentVariable("USEINSTALLERFORTEST");
+            UseInstallerForTest = !string.IsNullOrEmpty(useInstallerForTestEnv) && bool.TryParse(useInstallerForTestEnv, out bool result) && result;
             this.locationPath = UseInstallerForTest ? string.Empty : Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
             CheckWinAppDriverAndRoot();
@@ -138,10 +136,6 @@ namespace Microsoft.PowerToys.UITest
             {
                 TryLaunchPowerToysSettings(opts);
             }
-            else if (scope == PowerToysModule.CommandPalette && UseInstallerForTest)
-            {
-                TryLaunchCommandPalette(opts);
-            }
             else
             {
                 opts.AddAdditionalCapability("app", appPath);
@@ -169,77 +163,48 @@ namespace Microsoft.PowerToys.UITest
 
         private void TryLaunchPowerToysSettings(AppiumOptions opts)
         {
-            try
+            CheckWinAppDriverAndRoot();
+
+            var runnerProcessInfo = new ProcessStartInfo
             {
-                var runnerProcessInfo = new ProcessStartInfo
-                {
-                    FileName = locationPath + runnerPath,
-                    Verb = "runas",
-                    Arguments = "--open-settings",
-                };
+                FileName = locationPath + runnerPath,
+                Verb = "runas",
+                Arguments = "--open-settings",
+            };
 
-                ExitExe(runnerProcessInfo.FileName);
-                runner = Process.Start(runnerProcessInfo);
+            ExitExe(runnerProcessInfo.FileName);
+            runner = Process.Start(runnerProcessInfo);
+            Thread.Sleep(5000);
 
-                WaitForWindowAndSetCapability(opts, "PowerToys Settings", 5000, 5);
+            // Exit CmdPal UI before launching new process if use installer for test
+            ExitExeByName("Microsoft.CmdPal.UI");
 
-                // Exit CmdPal UI before launching new process if use installer for test
-                ExitExeByName("Microsoft.CmdPal.UI");
-            }
-            catch (Exception ex)
+            if (root != null)
             {
-                throw new InvalidOperationException($"Failed to launch PowerToys Settings: {ex.Message}", ex);
-            }
-        }
+                const int maxRetries = 5;
+                const int delayMs = 5000;
+                var windowName = "PowerToys Settings";
 
-        private void TryLaunchCommandPalette(AppiumOptions opts)
-        {
-            try
-            {
-                // Exit any existing CmdPal UI process
-                ExitExeByName("Microsoft.CmdPal.UI");
-
-                var processStartInfo = new ProcessStartInfo
+                for (int attempt = 1; attempt <= maxRetries; attempt++)
                 {
-                    FileName = "cmd.exe",
-                    Arguments = "/c start shell:appsFolder\\Microsoft.CommandPalette_8wekyb3d8bbwe!App",
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden,
-                };
+                    var settingsWindow = ApiHelper.FindDesktopWindowHandler(
+                        [windowName, AdministratorPrefix + windowName]);
 
-                var process = Process.Start(processStartInfo);
-                process?.WaitForExit();
+                    if (settingsWindow.Count > 0)
+                    {
+                        var hexHwnd = settingsWindow[0].HWnd.ToString("x");
+                        opts.AddAdditionalCapability("appTopLevelWindow", hexHwnd);
+                        return;
+                    }
 
-                WaitForWindowAndSetCapability(opts, "Command Palette", 5000, 10);
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Failed to launch Command Palette: {ex.Message}", ex);
-            }
-        }
-
-        private void WaitForWindowAndSetCapability(AppiumOptions opts, string windowName, int delayMs, int maxRetries)
-        {
-            for (int attempt = 1; attempt <= maxRetries; attempt++)
-            {
-                var window = ApiHelper.FindDesktopWindowHandler(
-                    [windowName, AdministratorPrefix + windowName]);
-
-                if (window.Count > 0)
-                {
-                    var hexHwnd = window[0].HWnd.ToString("x");
-                    opts.AddAdditionalCapability("appTopLevelWindow", hexHwnd);
-                    return;
-                }
-
-                if (attempt < maxRetries)
-                {
-                    Thread.Sleep(delayMs);
-                }
-                else
-                {
-                    throw new TimeoutException($"Failed to find {windowName} window after multiple attempts.");
+                    if (attempt < maxRetries)
+                    {
+                        Thread.Sleep(delayMs);
+                    }
+                    else
+                    {
+                        throw new TimeoutException("Failed to find PowerToys Settings window after multiple attempts.");
+                    }
                 }
             }
         }

src/common/UITestAutomation/UITestBase.cs

@@ -5,7 +5,6 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
 
@@ -21,9 +20,6 @@ namespace Microsoft.PowerToys.UITest
 
         public required Session Session { get; set; }
 
-        /// <summary>
-        /// Gets a value indicating whether the tests are running in a CI/CD pipeline.
-        /// </summary>
         public bool IsInPipeline { get; }
 
         public string? ScreenshotDirectory { get; set; }
@@ -38,8 +34,8 @@ namespace Microsoft.PowerToys.UITest
 
         public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings, WindowSize size = WindowSize.UnSpecified, string[]? commandLineArgs = null)
         {
-            this.IsInPipeline = EnvironmentConfig.IsInPipeline;
-            Console.WriteLine($"Running tests on platform: {EnvironmentConfig.Platform}");
+            this.IsInPipeline = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("platform"));
+            Console.WriteLine($"Running tests on platform: {Environment.GetEnvironmentVariable("platform")}");
             if (IsInPipeline)
             {
                 NativeMethods.ChangeDisplayResolution(1920, 1080);
@@ -60,7 +56,6 @@ namespace Microsoft.PowerToys.UITest
         [TestInitialize]
         public void TestInit()
         {
-            KeyboardHelper.SendKeys(Key.Win, Key.M);
             CloseOtherApplications();
             if (IsInPipeline)
             {
@@ -252,174 +247,6 @@ namespace Microsoft.PowerToys.UITest
             return this.Session.Has<Element>(name, timeoutMS, global);
         }
 
-        /// <summary>
-        /// Finds an element using partial name matching (contains).
-        /// Useful for finding windows with variable titles like "filename.txt - Notepad" or "filename - Notepad".
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="partialName">Part of the name to search for.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByPartialName<T>(string partialName, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return Session.Find<T>(By.XPath($"//*[contains(@Name, '{partialName}')]"), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element using partial name matching (contains).
-        /// </summary>
-        /// <param name="partialName">Part of the name to search for.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByPartialName(string partialName, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByPartialName<Element>(partialName, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Base method for finding elements by selector and filtering by name pattern.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="selector">The selector to find initial candidates.</param>
-        /// <param name="namePattern">Pattern to match against the Name attribute. Supports regex patterns.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <param name="errorMessage">Custom error message when no element is found.</param>
-        /// <returns>The found element.</returns>
-        private T FindByNamePattern<T>(By selector, string namePattern, int timeoutMS = 5000, bool global = false, string? errorMessage = null)
-            where T : Element, new()
-        {
-            var elements = Session.FindAll<T>(selector, timeoutMS, global);
-            var regex = new Regex(namePattern, RegexOptions.IgnoreCase);
-
-            foreach (var element in elements)
-            {
-                var name = element.GetAttribute("Name");
-                if (!string.IsNullOrEmpty(name) && regex.IsMatch(name))
-                {
-                    return element;
-                }
-            }
-
-            throw new NoSuchElementException(errorMessage ?? $"No element found matching pattern: {namePattern}");
-        }
-
-        /// <summary>
-        /// Finds an element using regular expression pattern matching.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="pattern">Regular expression pattern to match against the Name attribute.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByPattern<T>(string pattern, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return FindByNamePattern<T>(By.XPath("//*[@Name]"), pattern, timeoutMS, global, $"No element found matching pattern: {pattern}");
-        }
-
-        /// <summary>
-        /// Finds an element using regular expression pattern matching.
-        /// </summary>
-        /// <param name="pattern">Regular expression pattern to match against the Name attribute.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByPattern(string pattern, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByPattern<Element>(pattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName only.
-        /// Returns the first element found with the specified ClassName.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByClassName<T>(string className, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return Session.Find<T>(By.ClassName(className), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName only.
-        /// Returns the first element found with the specified ClassName.
-        /// </summary>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByClassName(string className, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByClassName<Element>(className, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName and matches its Name attribute using regex pattern matching.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="namePattern">Pattern to match against the Name attribute. Supports regex patterns.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByClassNameAndNamePattern<T>(string className, string namePattern, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return FindByNamePattern<T>(By.ClassName(className), namePattern, timeoutMS, global, $"No element with ClassName '{className}' found matching name pattern: {namePattern}");
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName and matches its Name attribute using regex pattern matching.
-        /// </summary>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="namePattern">Pattern to match against the Name attribute. Supports regex patterns.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByClassNameAndNamePattern(string className, string namePattern, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByClassNameAndNamePattern<Element>(className, namePattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds a Notepad window regardless of whether the file extension is shown in the title.
-        /// Handles both "filename.txt - Notepad" and "filename - Notepad" formats.
-        /// Uses ClassName to efficiently find Notepad windows first, then matches the filename.
-        /// </summary>
-        /// <param name="baseFileName">The base filename without extension (e.g., "test" for "test.txt").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found Notepad window element.</returns>
-        protected Element FindNotepadWindow(string baseFileName, int timeoutMS = 5000, bool global = false)
-        {
-            string pattern = $@"^{Regex.Escape(baseFileName)}(\.\w+)?(\s*-\s*|\s+)Notepad$";
-            return FindByClassNameAndNamePattern("Notepad", pattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an Explorer window regardless of the folder or file name display format.
-        /// Handles various Explorer window title formats like "FolderName", "FileName", "FolderName - File Explorer", etc.
-        /// Uses ClassName to efficiently find Explorer windows first, then matches the folder or file name.
-        /// </summary>
-        /// <param name="folderName">The folder or file name to search for (e.g., "Documents", "Desktop", "test.txt").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found Explorer window element.</returns>
-        protected Element FindExplorerWindow(string folderName, int timeoutMS = 5000, bool global = false)
-        {
-            string pattern = $@"^{Regex.Escape(folderName)}(\s*-\s*(File\s+Explorer|Windows\s+Explorer))?$";
-            return FindByClassNameAndNamePattern("CabinetWClass", pattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an Explorer window by partial folder path.
-        /// Useful when the full path might be displayed in the title.
-        /// </summary>
-        /// <param name="partialPath">Part of the folder path to search for.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found Explorer window element.</returns>
-        protected Element FindExplorerByPartialPath(string partialPath, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByPartialName(partialPath, timeoutMS, global);
-        }
-
         /// <summary>
         /// Finds all elements by selector.
         /// Shortcut for this.Session.FindAll<T>(by, timeoutMS)

src/common/UITestAutomation/VisualAssert.cs

@@ -27,8 +27,10 @@ namespace Microsoft.PowerToys.UITest
         [RequiresUnreferencedCode("This method uses reflection which may not be compatible with trimming.")]
         public static void AreEqual(TestContext? testContext, Element element, string scenarioSubname = "")
         {
+            var pipelinePlatform = Environment.GetEnvironmentVariable("platform");
+
             // Perform visual validation only in the pipeline
-            if (!EnvironmentConfig.IsInPipeline)
+            if (string.IsNullOrEmpty(pipelinePlatform))
             {
                 Console.WriteLine("Skip visual validation in the local run.");
                 return;
@@ -53,11 +55,11 @@ namespace Microsoft.PowerToys.UITest
 
             if (string.IsNullOrWhiteSpace(scenarioSubname))
             {
-                scenarioSubname = string.Join("_", callerClassName, callerName, EnvironmentConfig.Platform);
+                scenarioSubname = string.Join("_", callerClassName, callerName, pipelinePlatform);
             }
             else
             {
-                scenarioSubname = string.Join("_", callerClassName, callerName, scenarioSubname.Trim(), EnvironmentConfig.Platform);
+                scenarioSubname = string.Join("_", callerClassName, callerName, scenarioSubname.Trim(), pipelinePlatform);
             }
 
             var baselineImageResourceName = callerMethod!.DeclaringType!.Assembly.GetManifestResourceNames().Where(name => name.Contains(scenarioSubname)).FirstOrDefault();

src/common/utils/shell_ext_registration.h

@@ -1,266 +0,0 @@
-// Shared runtime shell extension registration utility for PowerToys modules.
-// Provides a generic EnsureRegistered function so individual modules only need
-// to supply a specification (CLSID, sentinel, handler key paths, etc.).
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include <windows.h>
-#include <shlwapi.h>
-
-#include "../logger/logger.h"
-
-namespace runtime_shell_ext
-{
-    struct Spec
-    {
-        // Mandatory
-        std::wstring clsid;                 // e.g. {GUID}
-        std::wstring sentinelKey;           // e.g. Software\\Microsoft\\PowerToys\\ModuleName
-        std::wstring sentinelValue;         // e.g. ContextMenuRegistered
-        std::vector<std::wstring> dllFileCandidates; // relative filenames (pick first existing)
-        std::vector<std::wstring> contextMenuHandlerKeyPaths; // full HKCU relative paths where default value = CLSID
-
-        // Optional
-        std::wstring friendlyName;          // if non-empty written as default under CLSID root
-        bool writeOptInEmptyValue = true;   // write ContextMenuOptIn="" under CLSID root (legacy pattern)
-        bool writeThreadingModel = true;    // write Apartment threading model
-        std::vector<std::wstring> extraAssociationPaths; // additional key paths (DragDropHandlers etc.) default=CLSID
-        std::vector<std::wstring> systemFileAssocExtensions; // e.g. .png -> Software\\Classes\\SystemFileAssociations\\.png\\ShellEx\\ContextMenuHandlers\\<HandlerName>
-        std::wstring systemFileAssocHandlerName; // e.g. ImageResizer
-        std::wstring representativeSystemExt;    // used to decide if associations need repair (.png)
-        bool logRepairs = true;
-    };
-
-    namespace detail
-    {
-        // Minimal RAII wrapper for HKEY
-        struct unique_hkey
-        {
-            HKEY h{ nullptr };
-            unique_hkey() = default;
-            explicit unique_hkey(HKEY handle) : h(handle) {}
-            ~unique_hkey() { if (h) RegCloseKey(h); }
-            unique_hkey(const unique_hkey&) = delete;
-            unique_hkey& operator=(const unique_hkey&) = delete;
-            unique_hkey(unique_hkey&& other) noexcept : h(other.h) { other.h = nullptr; }
-            unique_hkey& operator=(unique_hkey&& other) noexcept { if (this != &other) { if (h) RegCloseKey(h); h = other.h; other.h = nullptr; } return *this; }
-            HKEY get() const { return h; }
-            HKEY* put() { if (h) { RegCloseKey(h); h = nullptr; } return &h; }
-        };
-        inline std::wstring base_dir_from_module(HMODULE h)
-        {
-            wchar_t buf[MAX_PATH];
-            if (GetModuleFileNameW(h, buf, MAX_PATH))
-            {
-                PathRemoveFileSpecW(buf);
-                return buf;
-            }
-            return L"";
-        }
-
-        inline std::wstring pick_existing_dll(const std::wstring& base, const std::vector<std::wstring>& candidates)
-        {
-            for (const auto& rel : candidates)
-            {
-                std::wstring full = base + L"\\" + rel;
-                if (GetFileAttributesW(full.c_str()) != INVALID_FILE_ATTRIBUTES)
-                {
-                    return full;
-                }
-            }
-            if (!candidates.empty())
-            {
-                return base + L"\\" + candidates.front();
-            }
-            return L"";
-        }
-
-        inline bool sentinel_exists(const Spec& spec)
-        {
-            unique_hkey key;
-            if (RegOpenKeyExW(HKEY_CURRENT_USER, spec.sentinelKey.c_str(), 0, KEY_READ, key.put()) != ERROR_SUCCESS)
-                return false;
-            DWORD v = 0; DWORD sz = sizeof(v);
-            return RegQueryValueExW(key.get(), spec.sentinelValue.c_str(), nullptr, nullptr, reinterpret_cast<LPBYTE>(&v), &sz) == ERROR_SUCCESS && v == 1;
-        }
-
-        inline void write_sentinel(const Spec& spec)
-        {
-            unique_hkey key;
-            if (RegCreateKeyExW(HKEY_CURRENT_USER, spec.sentinelKey.c_str(), 0, nullptr, 0, KEY_WRITE, nullptr, key.put(), nullptr) == ERROR_SUCCESS)
-            {
-                DWORD one = 1;
-                RegSetValueExW(key.get(), spec.sentinelValue.c_str(), 0, REG_DWORD, reinterpret_cast<const BYTE*>(&one), sizeof(one));
-            }
-        }
-
-        inline void write_inproc_server(const Spec& spec, const std::wstring& dllPath)
-        {
-            using namespace std::string_literals;
-            std::wstring clsidRoot = L"Software\\Classes\\CLSID\\"s + spec.clsid;
-            std::wstring inprocKey = clsidRoot + L"\\InprocServer32";
-            {
-                unique_hkey key;
-                if (RegCreateKeyExW(HKEY_CURRENT_USER, clsidRoot.c_str(), 0, nullptr, 0, KEY_WRITE, nullptr, key.put(), nullptr) == ERROR_SUCCESS)
-                {
-                    if (!spec.friendlyName.empty())
-                    {
-                        RegSetValueExW(key.get(), nullptr, 0, REG_SZ, reinterpret_cast<const BYTE*>(spec.friendlyName.c_str()), static_cast<DWORD>((spec.friendlyName.size() + 1) * sizeof(wchar_t)));
-                    }
-                    if (spec.writeOptInEmptyValue)
-                    {
-                        const wchar_t* optIn = L"ContextMenuOptIn";
-                        const wchar_t empty = L'\0';
-                        RegSetValueExW(key.get(), optIn, 0, REG_SZ, reinterpret_cast<const BYTE*>(&empty), sizeof(empty));
-                    }
-                }
-            }
-            unique_hkey key;
-            if (RegCreateKeyExW(HKEY_CURRENT_USER, inprocKey.c_str(), 0, nullptr, 0, KEY_WRITE, nullptr, key.put(), nullptr) == ERROR_SUCCESS)
-            {
-                RegSetValueExW(key.get(), nullptr, 0, REG_SZ, reinterpret_cast<const BYTE*>(dllPath.c_str()), static_cast<DWORD>((dllPath.size() + 1) * sizeof(wchar_t)));
-                if (spec.writeThreadingModel)
-                {
-                    const wchar_t* tm = L"Apartment";
-                    RegSetValueExW(key.get(), L"ThreadingModel", 0, REG_SZ, reinterpret_cast<const BYTE*>(tm), static_cast<DWORD>((wcslen(tm) + 1) * sizeof(wchar_t)));
-                }
-            }
-        }
-
-        inline std::wstring read_inproc_server(const Spec& spec)
-        {
-            using namespace std::string_literals;
-            std::wstring inprocKey = L"Software\\Classes\\CLSID\\"s + spec.clsid + L"\\InprocServer32";
-            unique_hkey key;
-            if (RegOpenKeyExW(HKEY_CURRENT_USER, inprocKey.c_str(), 0, KEY_READ, key.put()) != ERROR_SUCCESS)
-                return L"";
-            wchar_t buf[MAX_PATH]; DWORD sz = sizeof(buf);
-            if (RegQueryValueExW(key.get(), nullptr, nullptr, nullptr, reinterpret_cast<LPBYTE>(buf), &sz) == ERROR_SUCCESS)
-                return std::wstring(buf);
-            return L"";
-        }
-
-        inline void write_default_value_key(const std::wstring& keyPath, const std::wstring& value)
-        {
-            unique_hkey key;
-            if (RegCreateKeyExW(HKEY_CURRENT_USER, keyPath.c_str(), 0, nullptr, 0, KEY_WRITE, nullptr, key.put(), nullptr) == ERROR_SUCCESS)
-            {
-                RegSetValueExW(key.get(), nullptr, 0, REG_SZ, reinterpret_cast<const BYTE*>(value.c_str()), static_cast<DWORD>((value.size() + 1) * sizeof(wchar_t)));
-            }
-        }
-
-        inline bool representative_association_exists(const Spec& spec)
-        {
-            using namespace std::string_literals;
-            if (spec.representativeSystemExt.empty() || spec.systemFileAssocHandlerName.empty())
-                return true;
-            std::wstring keyPath = L"Software\\Classes\\SystemFileAssociations\\"s + spec.representativeSystemExt + L"\\ShellEx\\ContextMenuHandlers\\" + spec.systemFileAssocHandlerName;
-            unique_hkey key;
-            return RegOpenKeyExW(HKEY_CURRENT_USER, keyPath.c_str(), 0, KEY_READ, key.put()) == ERROR_SUCCESS;
-        }
-    }
-
-    inline bool EnsureRegistered(const Spec& spec, HMODULE moduleInstance)
-    {
-        using namespace std::string_literals;
-        auto base = detail::base_dir_from_module(moduleInstance);
-        auto dllPath = detail::pick_existing_dll(base, spec.dllFileCandidates);
-        if (dllPath.empty())
-        {
-            Logger::error(L"Runtime registration: cannot locate dll path for CLSID {}", spec.clsid);
-            return false;
-        }
-        bool exists = detail::sentinel_exists(spec);
-        bool repaired = false;
-        if (exists)
-        {
-            auto current = detail::read_inproc_server(spec);
-            if (_wcsicmp(current.c_str(), dllPath.c_str()) != 0)
-            {
-                detail::write_inproc_server(spec, dllPath);
-                repaired = true;
-            }
-            if (!detail::representative_association_exists(spec))
-            {
-                repaired = true;
-            }
-        }
-        if (!exists)
-        {
-            detail::write_inproc_server(spec, dllPath);
-        }
-        if (!exists || repaired)
-        {
-            for (const auto& path : spec.contextMenuHandlerKeyPaths)
-            {
-                detail::write_default_value_key(path, spec.clsid);
-            }
-            for (const auto& path : spec.extraAssociationPaths)
-            {
-                detail::write_default_value_key(path, spec.clsid);
-            }
-            if (!spec.systemFileAssocExtensions.empty() && !spec.systemFileAssocHandlerName.empty())
-            {
-                for (const auto& ext : spec.systemFileAssocExtensions)
-                {
-                    std::wstring path = L"Software\\Classes\\SystemFileAssociations\\"s + ext + L"\\ShellEx\\ContextMenuHandlers\\" + spec.systemFileAssocHandlerName;
-                    detail::write_default_value_key(path, spec.clsid);
-                }
-            }
-        }
-        if (!exists)
-        {
-            detail::write_sentinel(spec);
-            Logger::info(L"Runtime registration completed for CLSID {}", spec.clsid);
-        }
-        else if (repaired && spec.logRepairs)
-        {
-            Logger::info(L"Runtime registration repaired for CLSID {}", spec.clsid);
-        }
-        return true;
-    }
-
-    inline bool Unregister(const Spec& spec)
-    {
-        using namespace std::string_literals;
-        // Remove handler key paths
-        for (const auto& path : spec.contextMenuHandlerKeyPaths)
-        {
-            RegDeleteTreeW(HKEY_CURRENT_USER, path.c_str());
-        }
-        // Remove extra association paths (e.g., drag & drop handlers)
-        for (const auto& path : spec.extraAssociationPaths)
-        {
-            RegDeleteTreeW(HKEY_CURRENT_USER, path.c_str());
-        }
-        // Remove per-extension system file association handler keys
-        if (!spec.systemFileAssocExtensions.empty() && !spec.systemFileAssocHandlerName.empty())
-        {
-            for (const auto& ext : spec.systemFileAssocExtensions)
-            {
-                std::wstring keyPath = L"Software\\Classes\\SystemFileAssociations\\"s + ext + L"\\ShellEx\\ContextMenuHandlers\\" + spec.systemFileAssocHandlerName;
-                RegDeleteTreeW(HKEY_CURRENT_USER, keyPath.c_str());
-            }
-        }
-        // Remove CLSID branch
-        if (!spec.clsid.empty())
-        {
-            std::wstring clsidRoot = L"Software\\Classes\\CLSID\\"s + spec.clsid;
-            RegDeleteTreeW(HKEY_CURRENT_USER, clsidRoot.c_str());
-        }
-        // Remove sentinel value (not deleting entire key to avoid disturbing other values)
-        if (!spec.sentinelKey.empty() && !spec.sentinelValue.empty())
-        {
-            HKEY hKey{};
-            if (RegOpenKeyExW(HKEY_CURRENT_USER, spec.sentinelKey.c_str(), 0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS)
-            {
-                RegDeleteValueW(hKey, spec.sentinelValue.c_str());
-                RegCloseKey(hKey);
-            }
-        }
-        Logger::info(L"Successfully unregistered CLSID {}", spec.clsid);
-        return true;
-    }
-}

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp

@@ -112,7 +112,7 @@ private:
         return {};
     }
 
-    static Hotkey parse_single_hotkey(const winrt::Windows::Data::Json::JsonObject& jsonHotkeyObject, bool isShown = true)
+    static Hotkey parse_single_hotkey(const winrt::Windows::Data::Json::JsonObject& jsonHotkeyObject)
     {
         try
         {
@@ -122,7 +122,6 @@ private:
             hotkey.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
             hotkey.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
             hotkey.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
-            hotkey.isShown = isShown;
             return hotkey;
         }
         catch (...)
@@ -232,10 +231,8 @@ private:
         return false;
     }
 
-    void process_additional_action(const winrt::hstring& actionName, const winrt::Windows::Data::Json::IJsonValue& actionValue, bool actionsGroupIsShown = true)
+    void process_additional_action(const winrt::hstring& actionName, const winrt::Windows::Data::Json::IJsonValue& actionValue)
     {
-        bool actionIsShown = true;
-
         if (actionValue.ValueType() != winrt::Windows::Data::Json::JsonValueType::Object)
         {
             return;
@@ -243,9 +240,9 @@ private:
 
         const auto action = actionValue.GetObjectW();
 
-        if (!action.GetNamedBoolean(JSON_KEY_IS_SHOWN, false) || !actionsGroupIsShown)
+        if (!action.GetNamedBoolean(JSON_KEY_IS_SHOWN, false))
         {
-            actionIsShown = false;
+            return;
         }
 
         if (action.HasKey(JSON_KEY_SHORTCUT))
@@ -253,7 +250,7 @@ private:
             const AdditionalAction additionalAction
             {
                 actionName.c_str(),
-                parse_single_hotkey(action.GetNamedObject(JSON_KEY_SHORTCUT), actionIsShown)
+                parse_single_hotkey(action.GetNamedObject(JSON_KEY_SHORTCUT))
             };
 
             m_additional_actions.push_back(additionalAction);
@@ -262,12 +259,12 @@ private:
         {
             for (const auto& [subActionName, subAction] : action)
             {
-                process_additional_action(subActionName, subAction, actionIsShown);
+                process_additional_action(subActionName, subAction);
             }
         }
     }
 
-        void read_settings(PowerToysSettings::PowerToyValues& settings)
+    void read_settings(PowerToysSettings::PowerToyValues& settings)
     {
         const auto settingsObject = settings.get_raw_json();
 
@@ -320,21 +317,9 @@ private:
                     {
                         const auto additionalActions = propertiesObject.GetNamedObject(JSON_KEY_ADDITIONAL_ACTIONS);
 
-                        // Define the expected order to ensure consistent hotkey ID assignment
-                        const std::vector<winrt::hstring> expectedOrder = {
-                            L"image-to-text",
-                            L"paste-as-file",
-                            L"transcode"
-                        };
-
-                        // Process actions in the predefined order
-                        for (auto& actionKey : expectedOrder)
+                        for (const auto& [actionName, additionalAction] : additionalActions)
                         {
-                            if (additionalActions.HasKey(actionKey))
-                            {
-                                const auto actionValue = additionalActions.GetNamedValue(actionKey);
-                                process_additional_action(actionKey, actionValue);
-                            }
+                            process_additional_action(actionName, additionalAction);
                         }
                     }
 
@@ -346,14 +331,17 @@ private:
                             for (const auto& customAction : customActions)
                             {
                                 const auto object = customAction.GetObjectW();
-                                bool actionIsShown = object.GetNamedBoolean(JSON_KEY_IS_SHOWN, false);
 
-                                const CustomAction customActionData{
-                                    static_cast<int>(object.GetNamedNumber(JSON_KEY_ID)),
-                                    parse_single_hotkey(object.GetNamedObject(JSON_KEY_SHORTCUT), actionIsShown)
-                                };
+                                if (object.GetNamedBoolean(JSON_KEY_IS_SHOWN, false))
+                                {
+                                    const CustomAction customActionData
+                                    {
+                                        static_cast<int>(object.GetNamedNumber(JSON_KEY_ID)),
+                                        parse_single_hotkey(object.GetNamedObject(JSON_KEY_SHORTCUT))
+                                    };
 
-                                m_custom_actions.push_back(customActionData);
+                                    m_custom_actions.push_back(customActionData);
+                                }
                             }
                         }
                     }

src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj

@@ -73,7 +73,6 @@
     <ClInclude Include="ClassFactory.h" />
     <ClInclude Include="dllmain.h" />
     <ClInclude Include="ExplorerCommand.h" />
-    <ClInclude Include="RuntimeRegistration.h" />
     <ClInclude Include="pch.h" />
     <None Include="packages.config" />
     <None Include="resource.base.h" />

src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj.filters

@@ -27,9 +27,6 @@
     <ClInclude Include="dllmain.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RuntimeRegistration.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">

src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp

@@ -12,33 +12,12 @@
 #include "FileLocksmithLib/Constants.h"
 #include "FileLocksmithLib/Settings.h"
 #include "FileLocksmithLib/Trace.h"
-#include "RuntimeRegistration.h"
 
 #include "dllmain.h"
 #include "Generated Files/resource.h"
 
 class FileLocksmithModule : public PowertoyModuleIface
 {
-private:
-    // Update registration based on enabled state
-    void UpdateRegistration(bool enabled)
-    {
-        if (enabled)
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            FileLocksmithRuntimeRegistration::EnsureRegistered();
-            Logger::info(L"File Locksmith context menu registered");
-#endif
-        }
-        else
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            FileLocksmithRuntimeRegistration::Unregister();
-            Logger::info(L"File Locksmith context menu unregistered");
-#endif
-        }
-    }
-
 public:
     FileLocksmithModule()
     {
@@ -103,6 +82,7 @@ public:
         {
             std::wstring path = get_module_folderpath(globals::instance);
             std::wstring packageUri = path + L"\\FileLocksmithContextMenuPackage.msix";
+
             if (!package::IsPackageRegisteredWithPowerToysVersion(constants::nonlocalizable::ContextMenuPackageName))
             {
                 package::RegisterSparsePackage(path, packageUri);
@@ -110,14 +90,12 @@ public:
         }
 
         m_enabled = true;
-        UpdateRegistration(m_enabled);
     }
 
     virtual void disable() override
     {
         Logger::info(L"File Locksmith disabled");
         m_enabled = false;
-        UpdateRegistration(m_enabled);
     }
 
     virtual bool is_enabled() override
@@ -150,7 +128,6 @@ private:
     {
         m_enabled = FileLocksmithSettingsInstance().GetEnabled();
         m_extended_only = FileLocksmithSettingsInstance().GetShowInExtendedContextMenu();
-        UpdateRegistration(m_enabled);
         Trace::EnableFileLocksmith(m_enabled);
     }
 

src/modules/FileLocksmith/FileLocksmithExt/RuntimeRegistration.h

@@ -1,36 +0,0 @@
-// Header-only runtime registration for FileLocksmith context menu extension.
-#pragma once
-
-#include <common/utils/shell_ext_registration.h>
-
-namespace globals { extern HMODULE instance; }
-
-namespace FileLocksmithRuntimeRegistration
-{
-    namespace
-    {
-        inline runtime_shell_ext::Spec BuildSpec()
-        {
-            runtime_shell_ext::Spec spec;
-            spec.clsid = L"{84D68575-E186-46AD-B0CB-BAEB45EE29C0}";
-            spec.sentinelKey = L"Software\\Microsoft\\PowerToys\\FileLocksmith";
-            spec.sentinelValue = L"ContextMenuRegistered";
-            spec.dllFileCandidates = { L"PowerToys.FileLocksmithExt.dll" };
-            spec.contextMenuHandlerKeyPaths = {
-                L"Software\\Classes\\AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt",
-                L"Software\\Classes\\Drive\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt" };
-            spec.friendlyName = L"File Locksmith Shell Extension";
-            return spec;
-        }
-    }
-
-    inline bool EnsureRegistered()
-    {
-        return runtime_shell_ext::EnsureRegistered(BuildSpec(), globals::instance);
-    }
-
-    inline void Unregister()
-    {
-        runtime_shell_ext::Unregister(BuildSpec());
-    }
-}

src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs

@@ -298,34 +298,5 @@ namespace Hosts.Tests
             var hidden = fileSystem.FileInfo.New(service.HostsFilePath).Attributes.HasFlag(FileAttributes.Hidden);
             Assert.IsTrue(hidden);
         }
-
-        [TestMethod]
-        public async Task NoLeadingSpaces_Disabled_RemovesIndent()
-        {
-            var content =
-        @"10.1.1.1 host host.local # comment
-10.1.1.2 host2 host2.local # another comment
-";
-
-            var expected =
-        @"10.1.1.1  host host.local     # comment
-10.1.1.2  host2 host2.local   # another comment
-# 10.1.1.30 host30 host30.local # new entry
-";
-
-            var fs = new CustomMockFileSystem();
-            var settings = new Mock<IUserSettings>();
-            settings.Setup(s => s.NoLeadingSpaces).Returns(true);
-            var svc = new HostsService(fs, settings.Object, _elevationHelper.Object);
-            fs.AddFile(svc.HostsFilePath, new MockFileData(content));
-
-            var data = await svc.ReadAsync();
-            var entries = data.Entries.ToList();
-            entries.Add(new Entry(0, "10.1.1.30", "host30 host30.local", "new entry", false));
-            await svc.WriteAsync(data.AdditionalLines, entries);
-
-            var result = fs.GetFile(svc.HostsFilePath);
-            Assert.AreEqual(expected, result.TextContents);
-        }
     }
 }

src/modules/Hosts/Hosts/Settings/UserSettings.cs

@@ -26,8 +26,6 @@ namespace Hosts.Settings
 
         private bool _loopbackDuplicates;
 
-        public bool NoLeadingSpaces { get; private set; }
-
         public bool LoopbackDuplicates
         {
             get => _loopbackDuplicates;
@@ -90,7 +88,6 @@ namespace Hosts.Settings
                             AdditionalLinesPosition = (HostsAdditionalLinesPosition)settings.Properties.AdditionalLinesPosition;
                             Encoding = (HostsEncoding)settings.Properties.Encoding;
                             LoopbackDuplicates = settings.Properties.LoopbackDuplicates;
-                            NoLeadingSpaces = settings.Properties.NoLeadingSpaces;
                         }
 
                         retry = false;

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

@@ -157,7 +157,7 @@ namespace HostsUILib.Helpers
                         {
                             lineBuilder.Append('#').Append(' ');
                         }
-                        else if (anyDisabled && !_userSettings.NoLeadingSpaces)
+                        else if (anyDisabled)
                         {
                             lineBuilder.Append(' ').Append(' ');
                         }

src/modules/Hosts/HostsUILib/Settings/IUserSettings.cs

@@ -19,7 +19,5 @@ namespace HostsUILib.Settings
         event EventHandler LoopbackDuplicatesChanged;
 
         public delegate void OpenSettingsFunction();
-
-        public bool NoLeadingSpaces { get; }
     }
 }

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp

@@ -5,7 +5,6 @@
 #include "MouseHighlighter.h"
 #include "trace.h"
 #include <cmath>
-#include <algorithm>
 
 #ifdef COMPOSITION
 namespace winrt
@@ -50,9 +49,6 @@ private:
     void BringToFront();
     HHOOK m_mouseHook = NULL;
     static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) noexcept;
-    // Helpers for spotlight overlay
-    float GetDpiScale() const;
-    void UpdateSpotlightMask(float cx, float cy, float radius, bool show);
 
     static constexpr auto m_className = L"MouseHighlighter";
     static constexpr auto m_windowTitle = L"PowerToys Mouse Highlighter";
@@ -71,14 +67,7 @@ private:
     winrt::CompositionSpriteShape m_leftPointer{ nullptr };
     winrt::CompositionSpriteShape m_rightPointer{ nullptr };
     winrt::CompositionSpriteShape m_alwaysPointer{ nullptr };
-    // Spotlight overlay (mask with soft feathered edge)
-    winrt::SpriteVisual m_overlay{ nullptr };
-    winrt::CompositionMaskBrush m_spotlightMask{ nullptr };
-    winrt::CompositionRadialGradientBrush m_spotlightMaskGradient{ nullptr };
-    winrt::CompositionColorBrush m_spotlightSource{ nullptr };
-    winrt::CompositionColorGradientStop m_maskStopCenter{ nullptr };
-    winrt::CompositionColorGradientStop m_maskStopInner{ nullptr };
-    winrt::CompositionColorGradientStop m_maskStopOuter{ nullptr };
+    winrt::CompositionSpriteShape m_spotlightPointer{ nullptr };
 
     bool m_leftPointerEnabled = true;
     bool m_rightPointerEnabled = true;
@@ -134,35 +123,6 @@ bool Highlighter::CreateHighlighter()
         m_shape.RelativeSizeAdjustment({ 1.0f, 1.0f });
         m_root.Children().InsertAtTop(m_shape);
 
-        // Create spotlight overlay (soft feather, DPI-aware)
-        m_overlay = m_compositor.CreateSpriteVisual();
-        m_overlay.RelativeSizeAdjustment({ 1.0f, 1.0f });
-        m_spotlightSource = m_compositor.CreateColorBrush(m_alwaysColor);
-        m_spotlightMaskGradient = m_compositor.CreateRadialGradientBrush();
-        m_spotlightMaskGradient.MappingMode(winrt::CompositionMappingMode::Absolute);
-        // Center region fully transparent
-        m_maskStopCenter = m_compositor.CreateColorGradientStop();
-        m_maskStopCenter.Offset(0.0f);
-        m_maskStopCenter.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
-        // Inner edge of feather (still transparent)
-        m_maskStopInner = m_compositor.CreateColorGradientStop();
-        m_maskStopInner.Offset(0.995f); // will be updated per-radius
-        m_maskStopInner.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
-        // Outer edge (opaque mask -> overlay visible)
-        m_maskStopOuter = m_compositor.CreateColorGradientStop();
-        m_maskStopOuter.Offset(1.0f);
-        m_maskStopOuter.Color(winrt::Windows::UI::ColorHelper::FromArgb(255, 255, 255, 255));
-        m_spotlightMaskGradient.ColorStops().Append(m_maskStopCenter);
-        m_spotlightMaskGradient.ColorStops().Append(m_maskStopInner);
-        m_spotlightMaskGradient.ColorStops().Append(m_maskStopOuter);
-
-        m_spotlightMask = m_compositor.CreateMaskBrush();
-        m_spotlightMask.Source(m_spotlightSource);
-        m_spotlightMask.Mask(m_spotlightMaskGradient);
-        m_overlay.Brush(m_spotlightMask);
-        m_overlay.IsVisible(false);
-        m_root.Children().InsertAtTop(m_overlay);
-
         return true;
     }
     catch (...)
@@ -205,8 +165,12 @@ void Highlighter::AddDrawingPoint(MouseButton button)
         // always
         if (m_spotlightMode)
         {
-            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
-            return;
+            float borderThickness = static_cast<float>(std::hypot(GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)));
+            circleGeometry.Radius({ static_cast<float>(borderThickness / 2.0 + m_radius), static_cast<float>(borderThickness / 2.0 + m_radius) });
+            circleShape.FillBrush(nullptr);
+            circleShape.StrokeBrush(m_compositor.CreateColorBrush(m_alwaysColor));
+            circleShape.StrokeThickness(borderThickness);
+            m_spotlightPointer = circleShape;
         }
         else
         {
@@ -245,14 +209,20 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button)
     }
     else
     {
-        // always / spotlight idle
+        // always
         if (m_spotlightMode)
         {
-            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
+            if (m_spotlightPointer)
+            {
+                m_spotlightPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+            }
         }
-        else if (m_alwaysPointer)
+        else
         {
-            m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+            if (m_alwaysPointer)
+            {
+                m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+            }
         }
     }
 }
@@ -296,9 +266,9 @@ void Highlighter::ClearDrawingPoint()
 {
     if (m_spotlightMode)
     {
-        if (m_overlay)
+        if (m_spotlightPointer)
         {
-            m_overlay.IsVisible(false);
+            m_spotlightPointer.StrokeBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
         }
     }
     else
@@ -451,10 +421,7 @@ void Highlighter::StopDrawing()
     m_leftPointer = nullptr;
     m_rightPointer = nullptr;
     m_alwaysPointer = nullptr;
-    if (m_overlay)
-    {
-        m_overlay.IsVisible(false);
-    }
+    m_spotlightPointer = nullptr;
     ShowWindow(m_hwnd, SW_HIDE);
     UnhookWindowsHookEx(m_mouseHook);
     ClearDrawing();
@@ -485,16 +452,6 @@ void Highlighter::ApplySettings(MouseHighlighterSettings settings)
         m_rightPointerEnabled = false;
     }
 
-    // Keep spotlight overlay color updated
-    if (m_spotlightSource)
-    {
-        m_spotlightSource.Color(m_alwaysColor);
-    }
-    if (!m_spotlightMode && m_overlay)
-    {
-        m_overlay.IsVisible(false);
-    }
-
     if (instance->m_visible)
     {
         instance->StopDrawing();
@@ -606,43 +563,6 @@ void Highlighter::Terminate()
     }
 }
 
-float Highlighter::GetDpiScale() const
-{
-    return static_cast<float>(GetDpiForWindow(m_hwnd)) / 96.0f;
-}
-
-// Update spotlight radial mask center/radius with DPI-aware feather
-void Highlighter::UpdateSpotlightMask(float cx, float cy, float radius, bool show)
-{
-    if (!m_spotlightMaskGradient)
-    {
-        return;
-    }
-
-    m_spotlightMaskGradient.EllipseCenter({ cx, cy });
-    m_spotlightMaskGradient.EllipseRadius({ radius, radius });
-
-    const float dpiScale = GetDpiScale();
-    // Target a very fine edge: ~1 physical pixel, convert to DIPs: 1 / dpiScale
-    const float featherDip = 1.0f / (dpiScale > 0.0f ? dpiScale : 1.0f);
-    const float safeRadius = (std::max)(radius, 1.0f);
-    const float featherRel = (std::min)(0.25f, featherDip / safeRadius);
-
-    if (m_maskStopInner)
-    {
-        m_maskStopInner.Offset((std::max)(0.0f, 1.0f - featherRel));
-    }
-
-    if (m_spotlightSource)
-    {
-        m_spotlightSource.Color(m_alwaysColor);
-    }
-    if (m_overlay)
-    {
-        m_overlay.IsVisible(show);
-    }
-}
-
 #pragma region MouseHighlighter_API
 
 void MouseHighlighterApplySettings(MouseHighlighterSettings settings)

src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp

@@ -27,73 +27,6 @@ struct InclusiveCrosshairs
     void SwitchActivationMode();
     void ApplySettings(InclusiveCrosshairsSettings& settings, bool applyToRuntimeObjects);
 
-public:
-    // Allow external callers to request a position update (thread-safe enqueue)
-    static void RequestUpdatePosition()
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([]() {
-                if (instance != nullptr)
-                {
-                    instance->UpdateCrosshairsPosition();
-                }
-            });
-        }
-    }
-
-    static void EnsureOn()
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([]() {
-                if (instance != nullptr && !instance->m_drawing)
-                {
-                    instance->StartDrawing();
-                }
-            });
-        }
-    }
-
-    static void EnsureOff()
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([]() {
-                if (instance != nullptr && instance->m_drawing)
-                {
-                    instance->StopDrawing();
-                }
-            });
-        }
-    }
-
-    static void SetExternalControl(bool enabled)
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([enabled]() {
-                if (instance != nullptr)
-                {
-                    instance->m_externalControl = enabled;
-                    if (enabled && instance->m_mouseHook)
-                    {
-                        UnhookWindowsHookEx(instance->m_mouseHook);
-                        instance->m_mouseHook = NULL;
-                    }
-                    else if (!enabled && instance->m_drawing && !instance->m_mouseHook)
-                    {
-                        instance->m_mouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseHookProc, instance->m_hinstance, 0);
-                    }
-                }
-            });
-        }
-    }
-
 private:
     enum class MouseButton
     {
@@ -136,7 +69,6 @@ private:
     bool m_drawing = false;
     bool m_destroyed = false;
     bool m_hiddenCursor = false;
-    bool m_externalControl = false;
     void SetAutoHideTimer() noexcept;
 
     // Configurable Settings
@@ -332,12 +264,9 @@ LRESULT CALLBACK InclusiveCrosshairs::MouseHookProc(int nCode, WPARAM wParam, LP
     if (nCode >= 0)
     {
         MSLLHOOKSTRUCT* hookData = reinterpret_cast<MSLLHOOKSTRUCT*>(lParam);
-        if (instance && !instance->m_externalControl)
+        if (wParam == WM_MOUSEMOVE)
         {
-            if (wParam == WM_MOUSEMOVE)
-            {
-                instance->UpdateCrosshairsPosition();
-            }
+            instance->UpdateCrosshairsPosition();
         }
     }
     return CallNextHookEx(0, nCode, wParam, lParam);
@@ -598,26 +527,6 @@ bool InclusiveCrosshairsIsEnabled()
     return (InclusiveCrosshairs::instance != nullptr);
 }
 
-void InclusiveCrosshairsRequestUpdatePosition()
-{
-    InclusiveCrosshairs::RequestUpdatePosition();
-}
-
-void InclusiveCrosshairsEnsureOn()
-{
-    InclusiveCrosshairs::EnsureOn();
-}
-
-void InclusiveCrosshairsEnsureOff()
-{
-    InclusiveCrosshairs::EnsureOff();
-}
-
-void InclusiveCrosshairsSetExternalControl(bool enabled)
-{
-    InclusiveCrosshairs::SetExternalControl(enabled);
-}
-
 int InclusiveCrosshairsMain(HINSTANCE hInstance, InclusiveCrosshairsSettings& settings)
 {
     Logger::info("Starting a crosshairs instance.");

src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.h

@@ -31,7 +31,3 @@ void InclusiveCrosshairsDisable();
 bool InclusiveCrosshairsIsEnabled();
 void InclusiveCrosshairsSwitch();
 void InclusiveCrosshairsApplySettings(InclusiveCrosshairsSettings& settings);
-void InclusiveCrosshairsRequestUpdatePosition();
-void InclusiveCrosshairsEnsureOn();
-void InclusiveCrosshairsEnsureOff();
-void InclusiveCrosshairsSetExternalControl(bool enabled);

src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp

@@ -4,15 +4,6 @@
 #include "trace.h"
 #include "InclusiveCrosshairs.h"
 #include "common/utils/color.h"
-#include <atomic>
-#include <thread>
-#include <chrono>
-#include <memory>
-
-extern void InclusiveCrosshairsRequestUpdatePosition();
-extern void InclusiveCrosshairsEnsureOn();
-extern void InclusiveCrosshairsEnsureOff();
-extern void InclusiveCrosshairsSetExternalControl(bool enabled);
 
 // Non-Localizable strings
 namespace
@@ -20,7 +11,6 @@ namespace
     const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
     const wchar_t JSON_KEY_VALUE[] = L"value";
     const wchar_t JSON_KEY_ACTIVATION_SHORTCUT[] = L"activation_shortcut";
-    const wchar_t JSON_KEY_GLIDING_ACTIVATION_SHORTCUT[] = L"gliding_cursor_activation_shortcut";
     const wchar_t JSON_KEY_CROSSHAIRS_COLOR[] = L"crosshairs_color";
     const wchar_t JSON_KEY_CROSSHAIRS_OPACITY[] = L"crosshairs_opacity";
     const wchar_t JSON_KEY_CROSSHAIRS_RADIUS[] = L"crosshairs_radius";
@@ -31,15 +21,13 @@ namespace
     const wchar_t JSON_KEY_CROSSHAIRS_IS_FIXED_LENGTH_ENABLED[] = L"crosshairs_is_fixed_length_enabled";
     const wchar_t JSON_KEY_CROSSHAIRS_FIXED_LENGTH[] = L"crosshairs_fixed_length";
     const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
-    const wchar_t JSON_KEY_GLIDE_TRAVEL_SPEED[] = L"gliding_travel_speed";
-    const wchar_t JSON_KEY_GLIDE_DELAY_SPEED[] = L"gliding_delay_speed";
 }
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 HMODULE m_hModule;
 
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
     m_hModule = hModule;
     switch (ul_reason_for_call)
@@ -69,46 +57,8 @@ private:
     // The PowerToy state.
     bool m_enabled = false;
 
-    // Additional hotkeys (legacy API) to support multiple shortcuts
-    Hotkey m_activationHotkey{};    // Crosshairs toggle
-    Hotkey m_glidingHotkey{};       // Gliding cursor state machine
-
-    // Shared state for worker threads (decoupled from this lifetime)
-    struct State
-    {
-        std::atomic<bool> stopX{ false };
-        std::atomic<bool> stopY{ false };
-
-        // positions and speeds
-        int currentXPos{ 0 };
-        int currentYPos{ 0 };
-        int currentXSpeed{ 0 }; // pixels per base window
-        int currentYSpeed{ 0 }; // pixels per base window
-        int xPosSnapshot{ 0 };  // xPos captured at end of horizontal scan
-
-        // Fractional accumulators to spread movement across 10ms ticks
-        double xFraction{ 0.0 };
-        double yFraction{ 0.0 };
-
-        // Speeds represent pixels per 200ms (min 5, max 60 enforced by UI/settings)
-        int fastHSpeed{ 30 }; // pixels per base window
-        int slowHSpeed{ 5 };  // pixels per base window
-        int fastVSpeed{ 30 }; // pixels per base window
-        int slowVSpeed{ 5 };  // pixels per base window
-    };
-
-    std::shared_ptr<State> m_state;
-
-    // Worker threads
-    std::thread m_xThread;
-    std::thread m_yThread;
-
-    // Gliding cursor state machine
-    std::atomic<int> m_glideState{ 0 }; // 0..4 like the AHK script
-
-    // Timer configuration: 10ms tick, speeds are defined per 200ms base window
-    static constexpr int kTimerTickMs = 10;
-    static constexpr int kBaseSpeedTickMs = 200; // mapping period for configured pixel counts
+    // Hotkey to invoke the module
+    HotkeyEx m_hotkey;
 
     // Mouse Pointer Crosshairs specific settings
     InclusiveCrosshairsSettings m_inclusiveCrosshairsSettings;
@@ -118,17 +68,12 @@ public:
     MousePointerCrosshairs()
     {
         LoggerHelpers::init_logger(MODULE_NAME, L"ModuleInterface", LogSettings::mousePointerCrosshairsLoggerName);
-        m_state = std::make_shared<State>();
         init_settings();
     };
 
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
-        StopXTimer();
-        StopYTimer();
-        // Release shared state so worker threads (if any) exit when weak_ptr lock fails
-        m_state.reset();
         delete this;
     }
 
@@ -162,7 +107,9 @@ public:
 
     // Signal from the Settings editor to call a custom action.
     // This can be used to spawn more complex editors.
-    virtual void call_custom_action(const wchar_t* /*action*/) override {}
+    virtual void call_custom_action(const wchar_t* action) override
+    {
+    }
 
     // Called by the runner to pass the updated settings values as a serialized JSON.
     virtual void set_config(const wchar_t* config) override
@@ -196,9 +143,6 @@ public:
     {
         m_enabled = false;
         Trace::EnableMousePointerCrosshairs(false);
-        StopXTimer();
-        StopYTimer();
-        m_glideState = 0;
         InclusiveCrosshairsDisable();
     }
 
@@ -214,249 +158,15 @@ public:
         return false;
     }
 
-    // Legacy multi-hotkey support (like CropAndLock)
-    virtual size_t get_hotkeys(Hotkey* buffer, size_t buffer_size) override
+    virtual std::optional<HotkeyEx> GetHotkeyEx() override
     {
-        if (buffer && buffer_size >= 2)
-        {
-            buffer[0] = m_activationHotkey; // Crosshairs toggle
-            buffer[1] = m_glidingHotkey;    // Gliding cursor toggle
-        }
-        return 2;
+        return m_hotkey;
     }
 
-    virtual bool on_hotkey(size_t hotkeyId) override
+    virtual void OnHotkeyEx() override
     {
-        if (!m_enabled)
-        {
-            return false;
-        }
-
-        if (hotkeyId == 0)
-        {
-            InclusiveCrosshairsSwitch();
-            return true;
-        }
-        if (hotkeyId == 1)
-        {
-            HandleGlidingHotkey();
-            return true;
-        }
-        return false;
+        InclusiveCrosshairsSwitch();
     }
-
-private:
-    static void LeftClick()
-    {
-        INPUT inputs[2]{};
-        inputs[0].type = INPUT_MOUSE;
-        inputs[0].mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
-        inputs[1].type = INPUT_MOUSE;
-        inputs[1].mi.dwFlags = MOUSEEVENTF_LEFTUP;
-        SendInput(2, inputs, sizeof(INPUT));
-    }
-
-    // Stateless helpers operating on shared State
-    static void PositionCursorX(const std::shared_ptr<State>& s)
-    {
-        int screenW = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-        int screenH = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-        s->currentYPos = screenH / 2;
-
-        // Distribute movement over 10ms ticks to match pixels-per-base-window speeds
-        const double perTick = (static_cast<double>(s->currentXSpeed) * kTimerTickMs) / static_cast<double>(kBaseSpeedTickMs);
-        s->xFraction += perTick;
-        int step = static_cast<int>(s->xFraction);
-        if (step > 0)
-        {
-            s->xFraction -= step;
-            s->currentXPos += step;
-        }
-
-        s->xPosSnapshot = s->currentXPos;
-        if (s->currentXPos >= screenW)
-        {
-            s->currentXPos = 0;
-            s->currentXSpeed = s->fastHSpeed;
-            s->xPosSnapshot = 0;
-            s->xFraction = 0.0; // reset fractional remainder on wrap
-        }
-        SetCursorPos(s->currentXPos, s->currentYPos);
-        // Ensure overlay crosshairs follow immediately
-        InclusiveCrosshairsRequestUpdatePosition();
-    }
-
-    static void PositionCursorY(const std::shared_ptr<State>& s)
-    {
-        int screenH = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-        // Keep X at snapshot
-        // Use s->xPosSnapshot captured during X pass
-
-        // Distribute movement over 10ms ticks to match pixels-per-base-window speeds
-        const double perTick = (static_cast<double>(s->currentYSpeed) * kTimerTickMs) / static_cast<double>(kBaseSpeedTickMs);
-        s->yFraction += perTick;
-        int step = static_cast<int>(s->yFraction);
-        if (step > 0)
-        {
-            s->yFraction -= step;
-            s->currentYPos += step;
-        }
-
-        if (s->currentYPos >= screenH)
-        {
-            s->currentYPos = 0;
-            s->currentYSpeed = s->fastVSpeed;
-            s->yFraction = 0.0; // reset fractional remainder on wrap
-        }
-        SetCursorPos(s->xPosSnapshot, s->currentYPos);
-        // Ensure overlay crosshairs follow immediately
-        InclusiveCrosshairsRequestUpdatePosition();
-    }
-
-    void StartXTimer()
-    {
-        auto s = m_state;
-        if (!s)
-        {
-            return;
-        }
-        s->stopX = false;
-        std::weak_ptr<State> wp = s;
-        m_xThread = std::thread([wp]() {
-            while (true)
-            {
-                auto sp = wp.lock();
-                if (!sp || sp->stopX.load())
-                {
-                    break;
-                }
-                PositionCursorX(sp);
-                std::this_thread::sleep_for(std::chrono::milliseconds(kTimerTickMs));
-            }
-        });
-    }
-
-    void StopXTimer()
-    {
-        auto s = m_state;
-        if (s)
-        {
-            s->stopX = true;
-        }
-        if (m_xThread.joinable())
-        {
-            m_xThread.join();
-        }
-    }
-
-    void StartYTimer()
-    {
-        auto s = m_state;
-        if (!s)
-        {
-            return;
-        }
-        s->stopY = false;
-        std::weak_ptr<State> wp = s;
-        m_yThread = std::thread([wp]() {
-            while (true)
-            {
-                auto sp = wp.lock();
-                if (!sp || sp->stopY.load())
-                {
-                    break;
-                }
-                PositionCursorY(sp);
-                std::this_thread::sleep_for(std::chrono::milliseconds(kTimerTickMs));
-            }
-        });
-    }
-
-    void StopYTimer()
-    {
-        auto s = m_state;
-        if (s)
-        {
-            s->stopY = true;
-        }
-        if (m_yThread.joinable())
-        {
-            m_yThread.join();
-        }
-    }
-
-    void HandleGlidingHotkey()
-    {
-        auto s = m_state;
-        if (!s)
-        {
-            return;
-        }
-        // Simulate the AHK state machine
-        int state = m_glideState.load();
-        switch (state)
-        {
-        case 0:
-        {
-            // Ensure crosshairs on (do not toggle off if already on)
-            InclusiveCrosshairsEnsureOn();
-            // Disable internal mouse hook so we control position updates explicitly
-            InclusiveCrosshairsSetExternalControl(true);
-
-            s->currentXPos = 0;
-            s->currentXSpeed = s->fastHSpeed;
-            s->xFraction = 0.0;
-            s->yFraction = 0.0;
-            int y = GetSystemMetrics(SM_CYVIRTUALSCREEN) / 2;
-            SetCursorPos(0, y);
-            InclusiveCrosshairsRequestUpdatePosition();
-            m_glideState = 1;
-            StartXTimer();
-            break;
-        }
-        case 1:
-        {
-            // Slow horizontal
-            s->currentXSpeed = s->slowHSpeed;
-            m_glideState = 2;
-            break;
-        }
-        case 2:
-        {
-            // Stop horizontal, start vertical (fast)
-            StopXTimer();
-            s->currentYSpeed = s->fastVSpeed;
-            s->currentYPos = 0;
-            s->yFraction = 0.0;
-            SetCursorPos(s->xPosSnapshot, s->currentYPos);
-            InclusiveCrosshairsRequestUpdatePosition();
-            m_glideState = 3;
-            StartYTimer();
-            break;
-        }
-        case 3:
-        {
-            // Slow vertical
-            s->currentYSpeed = s->slowVSpeed;
-            m_glideState = 4;
-            break;
-        }
-        case 4:
-        default:
-        {
-            // Stop vertical, click, turn crosshairs off, re-enable internal tracking, reset state
-            StopYTimer();
-            m_glideState = 0;
-            LeftClick();
-            InclusiveCrosshairsEnsureOff();
-            InclusiveCrosshairsSetExternalControl(false);
-            s->xFraction = 0.0;
-            s->yFraction = 0.0;
-            break;
-        }
-        }
-    }
-
     // Load the settings file.
     void init_settings()
     {
@@ -482,44 +192,37 @@ private:
         {
             try
             {
-                // Parse primary activation HotKey (for centralized hook)
+                // Parse HotKey
                 auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ACTIVATION_SHORTCUT);
                 auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonPropertiesObject);
+                m_hotkey = HotkeyEx();
+                if (hotkey.win_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_WIN;
+                }
 
-                // Map to legacy Hotkey for multi-hotkey API
-                m_activationHotkey.win = hotkey.win_pressed();
-                m_activationHotkey.ctrl = hotkey.ctrl_pressed();
-                m_activationHotkey.shift = hotkey.shift_pressed();
-                m_activationHotkey.alt = hotkey.alt_pressed();
-                m_activationHotkey.key = static_cast<unsigned char>(hotkey.get_code());
+                if (hotkey.ctrl_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_CONTROL;
+                }
+
+                if (hotkey.shift_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_SHIFT;
+                }
+
+                if (hotkey.alt_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_ALT;
+                }
+
+                m_hotkey.vkCode = hotkey.get_code();
             }
             catch (...)
             {
                 Logger::warn("Failed to initialize Mouse Pointer Crosshairs activation shortcut");
             }
             try
-            {
-                // Parse Gliding Cursor HotKey
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDING_ACTIVATION_SHORTCUT);
-                auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonPropertiesObject);
-                m_glidingHotkey.win = hotkey.win_pressed();
-                m_glidingHotkey.ctrl = hotkey.ctrl_pressed();
-                m_glidingHotkey.shift = hotkey.shift_pressed();
-                m_glidingHotkey.alt = hotkey.alt_pressed();
-                m_glidingHotkey.key = static_cast<unsigned char>(hotkey.get_code());
-            }
-            catch (...)
-            {
-                // note that this is also defined in src\settings-ui\Settings.UI.Library\MousePointerCrosshairsProperties.cs, DefaultGlidingCursorActivationShortcut
-                // both need to be kept in sync!
-                Logger::warn("Failed to initialize Gliding Cursor activation shortcut. Using default Win+Alt+.");
-                m_glidingHotkey.win = true;
-                m_glidingHotkey.alt = true;
-                m_glidingHotkey.ctrl = false;
-                m_glidingHotkey.shift = false;
-                m_glidingHotkey.key = VK_OEM_PERIOD;
-            }
-            try
             {
                 // Parse Opacity
                 auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_OPACITY);
@@ -569,6 +272,7 @@ private:
                 {
                     throw std::runtime_error("Invalid Radius value");
                 }
+                
             }
             catch (...)
             {
@@ -587,6 +291,7 @@ private:
                 {
                     throw std::runtime_error("Invalid Thickness value");
                 }
+                
             }
             catch (...)
             {
@@ -615,7 +320,7 @@ private:
             {
                 // Parse border size
                 auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_BORDER_SIZE);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
+                int value = static_cast <int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
                 if (value >= 0)
                 {
                     inclusiveCrosshairsSettings.crosshairsBorderSize = value;
@@ -678,86 +383,20 @@ private:
             {
                 Logger::warn("Failed to initialize auto activate from settings. Will use default value");
             }
-            try
-            {
-                // Parse Travel speed (fast speed mapping)
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDE_TRAVEL_SPEED);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 5 && value <= 60)
-                {
-                    m_state->fastHSpeed = value;
-                    m_state->fastVSpeed = value;
-                }
-                else if (value < 5)
-                {
-                    m_state->fastHSpeed = 5; m_state->fastVSpeed = 5;
-                }
-                else
-                {
-                    m_state->fastHSpeed = 60; m_state->fastVSpeed = 60;
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize gliding travel speed from settings. Using default 25.");
-                if (m_state)
-                {
-                    m_state->fastHSpeed = 25;
-                    m_state->fastVSpeed = 25;
-                }
-            }
-            try
-            {
-                // Parse Delay speed (slow speed mapping)
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDE_DELAY_SPEED);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 5 && value <= 60)
-                {
-                    m_state->slowHSpeed = value;
-                    m_state->slowVSpeed = value;
-                }
-                else if (value < 5)
-                {
-                    m_state->slowHSpeed = 5; m_state->slowVSpeed = 5;
-                }
-                else
-                {
-                    m_state->slowHSpeed = 60; m_state->slowVSpeed = 60;
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize gliding delay speed from settings. Using default 5.");
-                if (m_state)
-                {
-                    m_state->slowHSpeed = 5;
-                    m_state->slowVSpeed = 5;
-                }
-            }
         }
         else
         {
             Logger::info("Mouse Pointer Crosshairs settings are empty");
         }
-        
-        if (m_activationHotkey.key == 0)
+        if (!m_hotkey.modifiersMask)
         {
-            m_activationHotkey.win = true;
-            m_activationHotkey.alt = true;
-            m_activationHotkey.ctrl = false;
-            m_activationHotkey.shift = false;
-            m_activationHotkey.key = 'P';
-        }
-        if (m_glidingHotkey.key == 0)
-        {
-            m_glidingHotkey.win = true;
-            m_glidingHotkey.alt = true;
-            m_glidingHotkey.ctrl = false;
-            m_glidingHotkey.shift = false;
-            m_glidingHotkey.key = VK_OEM_PERIOD;
+            Logger::info("Mouse Pointer Crosshairs  is going to use default shortcut");
+            m_hotkey.modifiersMask = MOD_WIN | MOD_ALT;
+            m_hotkey.vkCode = 0x50; // P key
         }
         m_inclusiveCrosshairsSettings = inclusiveCrosshairsSettings;
     }
+
 };
 
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()

src/modules/MouseWithoutBorders/App/Class/Common.cs

@@ -13,7 +13,6 @@ using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
@@ -1561,98 +1560,5 @@ namespace MouseWithoutBorders
                 }
             }
         }
-
-        private static bool DisableEasyMouseWhenForegroundWindowIsFullscreenSetting()
-        {
-            return Setting.Values.DisableEasyMouseWhenForegroundWindowIsFullscreen;
-        }
-
-        private static bool IsAppIgnoredByEasyMouseFullscreenCheck(IntPtr foregroundWindowHandle)
-        {
-            if (NativeMethods.GetWindowThreadProcessId(foregroundWindowHandle, out var processId) == 0)
-            {
-                Logger.LogDebug($"GetWindowThreadProcessId failed with error : {Marshal.GetLastWin32Error()}");
-                return false;
-            }
-
-            var processHandle = NativeMethods.OpenProcess(0x1000, false, processId);
-            if (processHandle == IntPtr.Zero)
-            {
-                return false;
-            }
-
-            uint maxPath = 260;
-            var nameBuffer = new char[maxPath];
-            if (!NativeMethods.QueryFullProcessImageName(
-                    processHandle, NativeMethods.QUERY_FULL_PROCESS_NAME_FLAGS.DEFAULT, nameBuffer, ref maxPath))
-            {
-                Logger.LogDebug($"QueryFullProcessImageName failed with error : {Marshal.GetLastWin32Error()}");
-                NativeMethods.CloseHandle(processHandle);
-                return false;
-            }
-
-            NativeMethods.CloseHandle(processHandle);
-
-            var name = new string(nameBuffer, 0, (int)maxPath);
-
-            var excludedApps = Setting.Values.EasyMouseFullscreenSwitchBlockExcludedApps;
-
-            return excludedApps.Contains(Path.GetFileNameWithoutExtension(name), StringComparer.OrdinalIgnoreCase)
-                || excludedApps.Contains(Path.GetFileName(name), StringComparer.OrdinalIgnoreCase);
-        }
-
-        internal static bool IsEasyMouseBlockedByFullscreenWindow()
-        {
-            var shellHandle = NativeMethods.GetShellWindow();
-            var desktopHandle = NativeMethods.GetDesktopWindow();
-            var foregroundHandle = NativeMethods.GetForegroundWindow();
-
-            // If the foreground window is either the desktop or the Windows shell, we are not in fullscreen mode.
-            if (foregroundHandle.Equals(shellHandle) || foregroundHandle.Equals(desktopHandle))
-            {
-                return false;
-            }
-
-            if (NativeMethods.SHQueryUserNotificationState(out var userNotificationState) != 0)
-            {
-                Logger.LogDebug($"SHQueryUserNotificationState failed with error : {Marshal.GetLastWin32Error()}");
-                return false;
-            }
-
-            switch (userNotificationState)
-            {
-                // An application running in full screen mode, check if the foreground window is
-                // listed as ignored in the settings.
-                case NativeMethods.USER_NOTIFICATION_STATE.BUSY:
-                case NativeMethods.USER_NOTIFICATION_STATE.RUNNING_D3D_FULL_SCREEN:
-                case NativeMethods.USER_NOTIFICATION_STATE.PRESENTATION_MODE:
-                    return !IsAppIgnoredByEasyMouseFullscreenCheck(foregroundHandle);
-
-                // No full screen app running.
-                case NativeMethods.USER_NOTIFICATION_STATE.NOT_PRESENT:
-                case NativeMethods.USER_NOTIFICATION_STATE.ACCEPTS_NOTIFICATIONS:
-                case NativeMethods.USER_NOTIFICATION_STATE.QUIET_TIME:
-                // Cannot determine
-                case NativeMethods.USER_NOTIFICATION_STATE.APP:
-                default:
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Check if a machine switch triggered by EasyMouse would be allowed to proceed due to other settings.
-        /// </summary>
-        /// <returns>A boolean that tells us if the switch isn't blocked by any other settings</returns>
-        internal static bool IsEasyMouseSwitchAllowed()
-        {
-            // Never prevent a switch if we are not moving out of the host machine.
-            if (!DisableEasyMouseWhenForegroundWindowIsFullscreenSetting() || DesMachineID != MachineID)
-            {
-                return true;
-            }
-
-            // Check if the switch is blocked by a full-screen window running in the foreground
-            return !IsEasyMouseBlockedByFullscreenWindow();
-        }
     }
 }

src/modules/MouseWithoutBorders/App/Class/NativeMethods.cs

@@ -122,16 +122,9 @@ namespace MouseWithoutBorders.Class
         [DllImport("user32.dll", SetLastError = false)]
         internal static extern IntPtr GetDesktopWindow();
 
-        [LibraryImport("user32.dll")]
-        internal static partial IntPtr GetShellWindow();
-
         [DllImport("user32.dll")]
         internal static extern IntPtr GetWindowDC(IntPtr hWnd);
 
-        [LibraryImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool GetWindowRect(IntPtr hWnd, out RECT rect);
-
         [DllImport("user32.dll", CharSet = CharSet.Unicode)]
         internal static extern int DrawText(IntPtr hDC, string lpString, int nCount, ref RECT lpRect, uint uFormat);
 
@@ -298,17 +291,6 @@ namespace MouseWithoutBorders.Class
         [DllImport("user32.dll", SetLastError = true)]
         internal static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
 
-        [LibraryImport("kernel32.dll",
-            EntryPoint = "QueryFullProcessImageNameW",
-            SetLastError = true,
-            StringMarshalling = StringMarshalling.Utf16)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool QueryFullProcessImageName(
-            IntPtr hProcess, QUERY_FULL_PROCESS_NAME_FLAGS dwFlags, [Out] char[] lpExeName, ref uint lpdwSize);
-
-        [LibraryImport("shell32.dll", SetLastError = true)]
-        internal static partial int SHQueryUserNotificationState(out USER_NOTIFICATION_STATE state);
-
         [StructLayout(LayoutKind.Sequential)]
         internal struct POINT
         {
@@ -351,11 +333,11 @@ namespace MouseWithoutBorders.Class
 
         [DllImport("ntdll.dll")]
         internal static extern int NtQueryInformationProcess(
-            IntPtr hProcess,
-            int processInformationClass /* 0 */,
-            ref PROCESS_BASIC_INFORMATION processBasicInformation,
-            uint processInformationLength,
-            out uint returnLength);
+           IntPtr hProcess,
+           int processInformationClass /* 0 */,
+           ref PROCESS_BASIC_INFORMATION processBasicInformation,
+           uint processInformationLength,
+           out uint returnLength);
 #endif
 
 #if USE_GetSecurityDescriptorSacl
@@ -650,14 +632,14 @@ namespace MouseWithoutBorders.Class
         {
             internal int LowPart;
             internal int HighPart;
-        } // end struct
+        }// end struct
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct LUID_AND_ATTRIBUTES
         {
             internal LUID Luid;
             internal int Attributes;
-        } // end struct
+        }// end struct
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct TOKEN_PRIVILEGES
@@ -688,23 +670,23 @@ namespace MouseWithoutBorders.Class
         internal const int TOKEN_ADJUST_SESSIONID = 0x0100;
 
         internal const int TOKEN_ALL_ACCESS_P = STANDARD_RIGHTS_REQUIRED |
-            TOKEN_ASSIGN_PRIMARY |
-            TOKEN_DUPLICATE |
-            TOKEN_IMPERSONATE |
-            TOKEN_QUERY |
-            TOKEN_QUERY_SOURCE |
-            TOKEN_ADJUST_PRIVILEGES |
-            TOKEN_ADJUST_GROUPS |
-            TOKEN_ADJUST_DEFAULT;
+                                      TOKEN_ASSIGN_PRIMARY |
+                                      TOKEN_DUPLICATE |
+                                      TOKEN_IMPERSONATE |
+                                      TOKEN_QUERY |
+                                      TOKEN_QUERY_SOURCE |
+                                      TOKEN_ADJUST_PRIVILEGES |
+                                      TOKEN_ADJUST_GROUPS |
+                                      TOKEN_ADJUST_DEFAULT;
 
         internal const int TOKEN_ALL_ACCESS = TOKEN_ALL_ACCESS_P | TOKEN_ADJUST_SESSIONID;
 
         internal const int TOKEN_READ = STANDARD_RIGHTS_READ | TOKEN_QUERY;
 
         internal const int TOKEN_WRITE = STANDARD_RIGHTS_WRITE |
-            TOKEN_ADJUST_PRIVILEGES |
-            TOKEN_ADJUST_GROUPS |
-            TOKEN_ADJUST_DEFAULT;
+                                      TOKEN_ADJUST_PRIVILEGES |
+                                      TOKEN_ADJUST_GROUPS |
+                                      TOKEN_ADJUST_DEFAULT;
 
         internal const int TOKEN_EXECUTE = STANDARD_RIGHTS_EXECUTE;
 
@@ -958,30 +940,6 @@ namespace MouseWithoutBorders.Class
             NameDnsDomain = 12,
         }
 
-        internal enum MONITOR_FROM_WINDOW_FLAGS : uint
-        {
-            DEFAULT_TO_NULL = 0x00000000,
-            DEFAULT_TO_PRIMARY = 0x00000001,
-            DEFAULT_TO_NEAREST = 0x00000002,
-        }
-
-        internal enum QUERY_FULL_PROCESS_NAME_FLAGS : uint
-        {
-            DEFAULT = 0x00000000,
-            PROCESS_NAME_NATIVE = 0x00000001,
-        }
-
-        internal enum USER_NOTIFICATION_STATE
-        {
-            NOT_PRESENT = 1,
-            BUSY = 2,
-            RUNNING_D3D_FULL_SCREEN = 3,
-            PRESENTATION_MODE = 4,
-            ACCEPTS_NOTIFICATIONS = 5,
-            QUIET_TIME = 6,
-            APP = 7,
-        }
-
         [DllImport("secur32.dll", CharSet = CharSet.Unicode)]
         [return: MarshalAs(UnmanagedType.I1)]
         internal static extern bool GetUserNameEx(int nameFormat, StringBuilder userName, ref uint userNameSize);

src/modules/MouseWithoutBorders/App/Class/Setting.cs

@@ -414,44 +414,6 @@ namespace MouseWithoutBorders.Class
             }
         }
 
-        internal bool DisableEasyMouseWhenForegroundWindowIsFullscreen
-        {
-            get
-            {
-                lock (_loadingSettingsLock)
-                {
-                    return _properties.DisableEasyMouseWhenForegroundWindowIsFullscreen;
-                }
-            }
-
-            set
-            {
-                lock (_loadingSettingsLock)
-                {
-                    _properties.DisableEasyMouseWhenForegroundWindowIsFullscreen = value;
-                }
-            }
-        }
-
-        internal HashSet<string> EasyMouseFullscreenSwitchBlockExcludedApps
-        {
-            get
-            {
-                lock (_loadingSettingsLock)
-                {
-                    return _properties.EasyMouseFullscreenSwitchBlockExcludedApps.Value;
-                }
-            }
-
-            set
-            {
-                lock (_loadingSettingsLock)
-                {
-                    _properties.EasyMouseFullscreenSwitchBlockExcludedApps.Value = value;
-                }
-            }
-        }
-
         internal string Enc(string st, bool dec, DataProtectionScope protectionScope)
         {
             if (st == null || st.Length < 1)

src/modules/MouseWithoutBorders/App/Core/Event.cs

@@ -66,17 +66,13 @@ internal static class Event
         try
         {
             Common.PaintCount = 0;
+            bool switchByMouseEnabled = IsSwitchingByMouseEnabled();
 
-            // Check if easy mouse setting is enabled.
-            bool isEasyMouseEnabled = IsSwitchingByMouseEnabled();
-
-            if (isEasyMouseEnabled && Common.Sk != null && (Common.DesMachineID == Common.MachineID || !Setting.Values.MoveMouseRelatively) && e.dwFlags == Common.WM_MOUSEMOVE)
+            if (switchByMouseEnabled && Common.Sk != null && (Common.DesMachineID == Common.MachineID || !Setting.Values.MoveMouseRelatively) && e.dwFlags == Common.WM_MOUSEMOVE)
             {
                 Point p = MachineStuff.MoveToMyNeighbourIfNeeded(e.X, e.Y, MachineStuff.desMachineID);
 
-                // Check if easy mouse switches are disabled when an application is running in fullscreen mode,
-                // if they are, check that there is no application running in fullscreen mode before switching.
-                if (!p.IsEmpty && Common.IsEasyMouseSwitchAllowed())
+                if (!p.IsEmpty)
                 {
                     Common.HasSwitchedMachineSinceLastCopy = true;
 
@@ -169,8 +165,7 @@ internal static class Event
         string newDesMachineName = MachineStuff.NameFromID(newDesMachineID);
 
         if (!Common.IsConnectedTo(newDesMachineID))
-        {
-            // Connection lost, cancel switching
+        {// Connection lost, cancel switching
             Logger.LogDebug("No active connection found for " + newDesMachineName);
 
             // ShowToolTip("No active connection found for [" + newDesMachineName + "]!", 500);

src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp

@@ -556,61 +556,6 @@ public:
         return m_enabled;
     }
 
-    virtual size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size) override
-    {
-        constexpr size_t num_hotkeys = 4; // We have 4 hotkeys
-
-        if (hotkeys && buffer_size >= num_hotkeys)
-        {
-            PowerToysSettings::PowerToyValues values = PowerToysSettings::PowerToyValues::load_from_settings_file(MODULE_NAME);
-
-            // Cache the raw JSON object to avoid multiple parsing
-            json::JsonObject root_json = values.get_raw_json();
-            json::JsonObject properties_json = root_json.GetNamedObject(L"properties", json::JsonObject{});
-
-            size_t hotkey_index = 0;
-
-            // Helper lambda to extract hotkey from JSON properties
-            auto extract_hotkey = [&](const wchar_t* property_name) -> Hotkey {
-                if (properties_json.HasKey(property_name))
-                {
-                    try
-                    {
-                        json::JsonObject hotkey_json = properties_json.GetNamedObject(property_name);
-
-                        // Extract hotkey properties directly from JSON
-                        bool win = hotkey_json.GetNamedBoolean(L"win", false);
-                        bool ctrl = hotkey_json.GetNamedBoolean(L"ctrl", false);
-                        bool alt = hotkey_json.GetNamedBoolean(L"alt", false);
-                        bool shift = hotkey_json.GetNamedBoolean(L"shift", false);
-                        unsigned char key = static_cast<unsigned char>(
-                            hotkey_json.GetNamedNumber(L"code", 0));
-
-                        return { win, ctrl, shift, alt, key };
-                    }
-                    catch (...)
-                    {
-                        // If parsing individual hotkey fails, use defaults
-                        return { false, false, false, false, 0 };
-                    }
-                }
-                else
-                {
-                    // Property doesn't exist, use defaults
-                    return { false, false, false, false, 0 };
-                }
-            };
-
-            // Extract all hotkeys using the optimized helper
-            hotkeys[hotkey_index++] = extract_hotkey(L"ToggleEasyMouseShortcut"); // [0] Toggle Easy Mouse
-            hotkeys[hotkey_index++] = extract_hotkey(L"LockMachineShortcut");     // [1] Lock Machine
-            hotkeys[hotkey_index++] = extract_hotkey(L"Switch2AllPCShortcut");    // [2] Switch to All PCs
-            hotkeys[hotkey_index++] = extract_hotkey(L"ReconnectShortcut");       // [3] Reconnect
-        }
-
-        return num_hotkeys;
-    }
-
     void launch_add_firewall_process()
     {
         Logger::trace(L"Starting Process to add firewall rule");

src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj

@@ -123,7 +123,6 @@ MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
     <ClInclude Include="settings.h" />
     <ClInclude Include="trace.h" />
     <ClInclude Include="new_utilities.h" />
-    <ClInclude Include="RuntimeRegistration.h" />
     <ClInclude Include="resource.base.h" />
     <ClInclude Include="template_folder.h" />
     <ClInclude Include="pch.h" />

src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj.filters

@@ -84,9 +84,6 @@
     <ClInclude Include="helpers_variables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RuntimeRegistration.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/modules/NewPlus/NewShellExtensionContextMenu/RuntimeRegistration.h

@@ -1,36 +0,0 @@
-// Header-only runtime registration for New+ Win10 context menu.
-#pragma once
-
-#include <windows.h>
-#include <string>
-#include <common/utils/shell_ext_registration.h>
-
-// Provided by dll_main.cpp
-extern HMODULE module_instance_handle;
-
-namespace NewPlusRuntimeRegistration
-{
-    namespace {
-        inline runtime_shell_ext::Spec BuildSpec()
-        {
-            runtime_shell_ext::Spec spec;
-            spec.clsid = L"{FF90D477-E32A-4BE8-8CC5-A502A97F5401}";
-            spec.sentinelKey = L"Software\\Microsoft\\PowerToys\\NewPlus";
-            spec.sentinelValue = L"ContextMenuRegisteredWin10";
-            spec.dllFileCandidates = { L"PowerToys.NewPlus.ShellExtension.win10.dll" };
-            spec.contextMenuHandlerKeyPaths = { L"Software\\Classes\\Directory\\background\\ShellEx\\ContextMenuHandlers\\NewPlusShellExtensionWin10" };
-            spec.friendlyName = L"NewPlus Shell Extension Win10";
-            return spec;
-        }
-    }
-
-    inline bool EnsureRegisteredWin10()
-    {
-        return runtime_shell_ext::EnsureRegistered(BuildSpec(), module_instance_handle);
-    }
-
-    inline void Unregister()
-    {
-        runtime_shell_ext::Unregister(BuildSpec());
-    }
-}

src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp

@@ -16,31 +16,10 @@
 #include "trace.h"
 #include "new_utilities.h"
 #include "Generated Files/resource.h"
-#include "RuntimeRegistration.h"
 
 // Note: Settings are managed via Settings and UI Settings
 class NewModule : public PowertoyModuleIface
 {
-private:
-    // Update registration based on enabled state
-    void UpdateRegistration(bool enabled)
-    {
-        if (enabled)
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            NewPlusRuntimeRegistration::EnsureRegisteredWin10();
-            Logger::info(L"New+ context menu registered");
-#endif
-        }
-        else
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            NewPlusRuntimeRegistration::Unregister();
-            Logger::info(L"New+ context menu unregistered");
-#endif
-        }
-    }
-
 public:
     NewModule()
     {
@@ -114,13 +93,10 @@ public:
 
         // Log telemetry
         Trace::EventToggleOnOff(true);
-        if (package::IsWin11OrGreater())
-        {
-            newplus::utilities::register_msix_package();
-        }
+
+        newplus::utilities::register_msix_package();
 
         powertoy_new_enabled = true;
-        UpdateRegistration(powertoy_new_enabled);
     }
 
     virtual void disable() override
@@ -166,13 +142,11 @@ private:
             Trace::EventToggleOnOff(false);
         }
         powertoy_new_enabled = false;
-        UpdateRegistration(powertoy_new_enabled);
     }
 
     void init_settings()
     {
         powertoy_new_enabled = NewSettingsInstance().GetEnabled();
-        UpdateRegistration(powertoy_new_enabled);
     }
 };
 

src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp

@@ -246,17 +246,9 @@ LRESULT WindowBorder::WndProc(UINT message, WPARAM wparam, LPARAM lparam) noexce
     case WM_ERASEBKGND:
         return TRUE;
 
-    // Prevent from beeping if the border was clicked
+    // prevent from beeping if the border was clicked
     case WM_SETCURSOR:
-    {
-        HCURSOR hCursor = LoadCursorW(nullptr, IDC_ARROW);
-        if (hCursor)
-        {
-            SetCursor(hCursor);
-        }
-
         return TRUE;
-    }
 
     default:
     {

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props

@@ -12,6 +12,6 @@
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
     <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/DiagnosticsHelper.cs

@@ -1,66 +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;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-/// <summary>
-/// Provides utility methods for building diagnostic and error messages.
-/// </summary>
-public static class DiagnosticsHelper
-{
-    /// <summary>
-    /// Builds a comprehensive exception message with timestamp and detailed diagnostic information.
-    /// </summary>
-    /// <param name="exception">The exception that occurred.</param>
-    /// <param name="extensionHint">A hint about which extension caused the exception to help with debugging.</param>
-    /// <returns>A string containing the exception details, timestamp, and source information for diagnostic purposes.</returns>
-    public static string BuildExceptionMessage(Exception exception, string? extensionHint)
-    {
-        var locationHint = string.IsNullOrWhiteSpace(extensionHint) ? "application" : $"'{extensionHint}' extension";
-
-        // let's try to get a message from the exception or inferred it from the HRESULT
-        // to show at least something
-        var message = exception.Message;
-        if (string.IsNullOrWhiteSpace(message))
-        {
-            var temp = Marshal.GetExceptionForHR(exception.HResult)?.Message;
-            if (!string.IsNullOrWhiteSpace(temp))
-            {
-                message = temp + $" (inferred from HRESULT 0x{exception.HResult:X8})";
-            }
-        }
-
-        if (string.IsNullOrWhiteSpace(message))
-        {
-            message = "[No message available]";
-        }
-
-        // note: keep date time kind and format consistent with the log
-        return $"""
-                ============================================================
-                😢 An unexpected error occurred in the {locationHint}.
-
-                Summary:
-                  Message:    {message}
-                  Type:       {exception.GetType().FullName}
-                  Source:     {exception.Source ?? "N/A"}
-                  Time:       {DateTimeOffset.Now:yyyy-MM-dd HH:mm:ss.fffffff}
-                  HRESULT:    0x{exception.HResult:X8} ({exception.HResult})
-
-                Stack Trace:
-                {exception.StackTrace ?? "[No stack trace available]"}
-
-                ------------------ Full Exception Details ------------------
-                {exception}
-
-                ℹ️ If you need further assistance, please include this information in your support request.
-                ℹ️ Before sending, take a quick look to make sure it doesn't contain any personal or sensitive information.
-                ============================================================
-
-                """;
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/ExtensionHostInstance.cs

@@ -24,7 +24,7 @@ public partial class ExtensionHostInstance
     /// <param name="message">The log message to send</param>
     public void LogMessage(ILogMessage message)
     {
-        if (Host is not null)
+        if (Host != null)
         {
             _ = Task.Run(async () =>
             {
@@ -47,7 +47,7 @@ public partial class ExtensionHostInstance
 
     public void ShowStatus(IStatusMessage message, StatusContext context)
     {
-        if (Host is not null)
+        if (Host != null)
         {
             _ = Task.Run(async () =>
             {
@@ -64,7 +64,7 @@ public partial class ExtensionHostInstance
 
     public void HideStatus(IStatusMessage message)
     {
-        if (Host is not null)
+        if (Host != null)
         {
             _ = Task.Run(async () =>
             {

src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/SupersedingAsyncGate.cs

@@ -89,7 +89,7 @@ public class SupersedingAsyncGate : IDisposable
                 }
                 catch (OperationCanceledException)
                 {
-                    CompleteIfCurrent(currentTcs, currentCallId, tcs => tcs.TrySetCanceled(currentCts.Token));
+                    CompleteIfCurrent(currentTcs, currentCallId, tcs => tcs.SetCanceled(currentCts.Token));
                 }
                 catch (Exception ex)
                 {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs

@@ -36,7 +36,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
 
     public IAsyncAction HideStatus(IStatusMessage? message)
     {
-        if (message is null)
+        if (message == null)
         {
             return Task.CompletedTask.AsAsyncAction();
         }
@@ -55,7 +55,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
 
     public IAsyncAction LogMessage(ILogMessage? message)
     {
-        if (message is null)
+        if (message == null)
         {
             return Task.CompletedTask.AsAsyncAction();
         }
@@ -80,7 +80,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
                 try
                 {
                     var vm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
-                    if (vm is not null)
+                    if (vm != null)
                     {
                         StatusMessages.Remove(vm);
                     }
@@ -113,7 +113,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
     {
         // If this message is already in the list of messages, just bring it to the top
         var oldVm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
-        if (oldVm is not null)
+        if (oldVm != null)
         {
             Task.Factory.StartNew(
                 () =>
@@ -142,7 +142,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
 
     public IAsyncAction ShowStatus(IStatusMessage? message, StatusContext context)
     {
-        if (message is null)
+        if (message == null)
         {
             return Task.CompletedTask.AsAsyncAction();
         }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
@@ -34,13 +35,13 @@ public partial class CommandBarViewModel : ObservableObject,
     [NotifyPropertyChangedFor(nameof(HasPrimaryCommand))]
     public partial CommandItemViewModel? PrimaryCommand { get; set; }
 
-    public bool HasPrimaryCommand => PrimaryCommand is not null && PrimaryCommand.ShouldBeVisible;
+    public bool HasPrimaryCommand => PrimaryCommand != null && PrimaryCommand.ShouldBeVisible;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(HasSecondaryCommand))]
     public partial CommandItemViewModel? SecondaryCommand { get; set; }
 
-    public bool HasSecondaryCommand => SecondaryCommand is not null;
+    public bool HasSecondaryCommand => SecondaryCommand != null;
 
     [ObservableProperty]
     public partial bool ShouldShowContextMenu { get; set; } = false;
@@ -57,14 +58,14 @@ public partial class CommandBarViewModel : ObservableObject,
 
     private void SetSelectedItem(ICommandBarContext? value)
     {
-        if (value is not null)
+        if (value != null)
         {
             PrimaryCommand = value.PrimaryCommand;
             value.PropertyChanged += SelectedItemPropertyChanged;
         }
         else
         {
-            if (SelectedItem is not null)
+            if (SelectedItem != null)
             {
                 SelectedItem.PropertyChanged -= SelectedItemPropertyChanged;
             }
@@ -87,7 +88,7 @@ public partial class CommandBarViewModel : ObservableObject,
 
     private void UpdateContextItems()
     {
-        if (SelectedItem is null)
+        if (SelectedItem == null)
         {
             SecondaryCommand = null;
             ShouldShowContextMenu = false;
@@ -126,13 +127,13 @@ public partial class CommandBarViewModel : ObservableObject,
     public ContextKeybindingResult CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
     {
         var keybindings = SelectedItem?.Keybindings();
-        if (keybindings is not null)
+        if (keybindings != null)
         {
             // Does the pressed key match any of the keybindings?
             var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
             if (keybindings.TryGetValue(pressedKeyChord, out var matchedItem))
             {
-                return matchedItem is not null ? PerformCommand(matchedItem) : ContextKeybindingResult.Unhandled;
+                return matchedItem != null ? PerformCommand(matchedItem) : ContextKeybindingResult.Unhandled;
             }
         }
 
@@ -141,7 +142,7 @@ public partial class CommandBarViewModel : ObservableObject,
 
     private ContextKeybindingResult PerformCommand(CommandItemViewModel? command)
     {
-        if (command is null)
+        if (command == null)
         {
             return ContextKeybindingResult.Unhandled;
         }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs

@@ -2,14 +2,11 @@
 // 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.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context), IContextItemViewModel
 {
     private readonly KeyChord nullKeyChord = new(0, 0, 0);
@@ -20,7 +17,7 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
 
     public KeyChord? RequestedShortcut { get; private set; }
 
-    public bool HasRequestedShortcut => RequestedShortcut is not null && (RequestedShortcut.Value != nullKeyChord);
+    public bool HasRequestedShortcut => RequestedShortcut != null && (RequestedShortcut.Value != nullKeyChord);
 
     public override void InitializeProperties()
     {
@@ -32,7 +29,7 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
         base.InitializeProperties();
 
         var contextItem = Model.Unsafe;
-        if (contextItem is null)
+        if (contextItem == null)
         {
             return; // throw?
         }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.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.Diagnostics.CodeAnalysis;
-using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -11,7 +9,6 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBarContext
 {
     public ExtensionObject<ICommandItem> Model => _commandItemModel;
@@ -69,7 +66,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     {
         get
         {
-            List<IContextItemViewModel> l = _defaultCommandContextItem is null ?
+            List<IContextItemViewModel> l = _defaultCommandContextItem == null ?
                 new() :
                 [_defaultCommandContextItem];
 
@@ -101,7 +98,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
@@ -129,7 +126,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
@@ -137,7 +134,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         Command.InitializeProperties();
 
         var listIcon = model.Icon;
-        if (listIcon is not null)
+        if (listIcon != null)
         {
             _listItemIcon = new(listIcon);
             _listItemIcon.InitializeProperties();
@@ -173,24 +170,24 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
         var more = model.MoreCommands;
-        if (more is not null)
+        if (more != null)
         {
             MoreCommands = more
-                .Select<IContextItem, IContextItemViewModel>(item =>
+                .Select(item =>
                 {
                     if (item is ICommandContextItem contextItem)
                     {
-                        return new CommandContextItemViewModel(contextItem, PageContext);
+                        return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                     }
                     else
                     {
-                        return new SeparatorViewModel();
+                        return new SeparatorContextItemViewModel() as IContextItemViewModel;
                     }
                 })
                 .ToList();
@@ -238,9 +235,8 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             FastInitializeProperties();
             return true;
         }
-        catch (Exception ex)
+        catch (Exception)
         {
-            Logger.LogError("error fast initializing CommandItemViewModel", ex);
             Command = new(null, PageContext);
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
@@ -259,10 +255,9 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             SlowInitializeProperties();
             return true;
         }
-        catch (Exception ex)
+        catch (Exception)
         {
             Initialized |= InitializedState.Error;
-            Logger.LogError("error slow initializing CommandItemViewModel", ex);
         }
 
         return false;
@@ -275,9 +270,8 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             InitializeProperties();
             return true;
         }
-        catch (Exception ex)
+        catch (Exception)
         {
-            Logger.LogError("error initializing CommandItemViewModel", ex);
             Command = new(null, PageContext);
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
@@ -304,7 +298,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     protected virtual void FetchProperty(string propertyName)
     {
         var model = this._commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -312,7 +306,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         switch (propertyName)
         {
             case nameof(Command):
-                if (Command is not null)
+                if (Command != null)
                 {
                     Command.PropertyChanged -= Command_PropertyChanged;
                 }
@@ -343,18 +337,18 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
             case nameof(model.MoreCommands):
                 var more = model.MoreCommands;
-                if (more is not null)
+                if (more != null)
                 {
                     var newContextMenu = more
-                        .Select<IContextItem, IContextItemViewModel>(item =>
+                        .Select(item =>
                         {
                             if (item is ICommandContextItem contextItem)
                             {
-                                return new CommandContextItemViewModel(contextItem, PageContext);
+                                return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                             }
                             else
                             {
-                                return new SeparatorViewModel();
+                                return new SeparatorContextItemViewModel() as IContextItemViewModel;
                             }
                         })
                         .ToList();
@@ -398,7 +392,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                 // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
                 // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
                 var model = _commandItemModel.Unsafe;
-                if (model is not null)
+                if (model != null)
                 {
                     _itemTitle = model.Title;
                 }
@@ -434,7 +428,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         Command.SafeCleanup();
 
         var model = _commandItemModel.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.PropChanged -= Model_PropChanged;
         }