update the config

.config/configuration.vsEnterprise.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.config/configuration.vsProfessional.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.config/configuration.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,7 @@ body:
   attributes:
     label: Microsoft PowerToys version
     placeholder: X.XX.X
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
   validations:
     required: true
 
@@ -20,7 +20,7 @@ body:
   type: dropdown
   attributes:
     label: Installation method
-    description: How / where was PowerToys installed from?
+    description: How / Where was PowerToys installed from?
     multiple: true
     options:
       - GitHub

.github/ISSUE_TEMPLATE/documentation-issue.yml

@@ -6,7 +6,7 @@ labels:
 body:
 - type: textarea
   attributes: 
-    label: Describe the requested doc changes
+    label: Provide a description of requested docs changes
     placeholder: Briefly describe which document needs to be corrected and why.
   validations:
     required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -13,7 +13,7 @@ body:
 - type: textarea
   attributes:
     label: Scenario when this would be used?
-    placeholder: What is the scenario this would be used in? Why is this important to your workflow as a power user?
+    placeholder: What is the scenario this would be used? Why is this important to your workflow as a power user?
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -14,7 +14,7 @@ body:
   attributes:
     label: Microsoft PowerToys version
     placeholder: 0.70.0
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
   validations:
     required: true
 - type: dropdown
@@ -65,7 +65,7 @@ body:
 - type: textarea
   attributes: 
     label: ❌ Actual phrase(s)
-    placeholder: What is there? Please include a screenshot, as that is extremely helpful.
+    placeholder: What is there? Please include a screenshot as that is extremely helpful.
   validations:
     required: true
 - type: textarea

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

@@ -271,11 +271,6 @@ mengyuanchen
 
 # DllName
 testhost
-Testably
 
 #Tools
 OIP
-xef
-xes
-PACKAGEVERSIONNUMBER
-APPXMANIFESTVERSION

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

@@ -46,8 +46,8 @@ betsegaw
 bricelam
 bsky
 CCcat
-chemwolf
 chenmy
+chemwolf
 Chinh
 chrdavis
 Chrzan
@@ -65,8 +65,8 @@ Deondre
 DHowett
 ductdo
 Essey
-ethanfangg
 Feng
+ethanfangg
 ferraridavide
 foxmsft
 frankychen
@@ -77,7 +77,6 @@ Galaxi
 Garside
 Gershaft
 Giordani
-Gleb
 Gokce
 gordon
 Griese
@@ -96,7 +95,6 @@ Huynh
 Ionut
 jamrobot
 Jaswal
-Jaylyn
 jefflord
 Jordi
 jyuwono
@@ -107,7 +105,6 @@ Kantarci
 Karthick
 kaylacinnamon
 kevinguo
-Khmyznikov
 Krigun
 Lambson
 Laute
@@ -130,8 +127,6 @@ Naro
 nathancartlidge
 Nemeth
 nielslaute
-Noraa
-noraajunker
 oldnewthing
 onegreatworld
 palenshus
@@ -151,13 +146,11 @@ ricardosantos
 riri
 ritchielawrence
 robmikh
-ruslanlap
 Russinovich
 Rutkas
 ryanbodrug
 saahmedm
 sachaple
-Sameerjs
 Santossio
 Schoen
 Sekan
@@ -176,7 +169,6 @@ TBM
 tilovell
 Triet
 urnotdfs
-vednig
 waaverecords
 wang
 Whuihuan
@@ -195,6 +187,9 @@ zhaopy
 zhaoqpcn
 Zoltan
 Zykova
+Sameerjs
+ruslanlap
+vednig
 
 # OTHERS
 

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

@@ -8,13 +8,11 @@ Acceleratorkeys
 ACCEPTFILES
 ACCESSDENIED
 ACCESSTOKEN
-acfs
 AClient
 AColumn
 acrt
 ACTIVATEAPP
 activationaction
-ACTIVATEOPTIONS
 ACVS
 adaptivecards
 ADate
@@ -199,7 +197,6 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
-clp
 CLSCTX
 clsids
 Clusion
@@ -276,7 +273,6 @@ CURSORINFO
 cursorpos
 customaction
 CUSTOMACTIONTEST
-CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
@@ -316,7 +312,6 @@ debugbreak
 declatory
 decryptor
 Dedup
-Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
@@ -328,7 +323,6 @@ DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
 DEFPUSHBUTTON
-DEFT
 deinitialization
 DELA
 DELETEDKEYIMAGE
@@ -349,7 +343,6 @@ devmgmt
 DEVMODE
 DEVMODEW
 devpal
-DFX
 DIALOGEX
 digicert
 dimm
@@ -530,7 +523,6 @@ FZE
 gacutil
 Gaeilge
 Gaidhlig
-gameid
 GC'ed
 GCLP
 gdi
@@ -721,7 +713,6 @@ INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
 INSTALLDIR
-installdir
 INSTALLFOLDER
 INSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER
 INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
@@ -789,7 +780,6 @@ LCIDTo
 Lclean
 Ldone
 Ldr
-LEFTALIGN
 LEFTSCROLLBAR
 LEFTTEXT
 LError
@@ -1017,7 +1007,6 @@ netsh
 newcolor
 NEWDIALOGSTYLE
 NEWFILE
-NEWFILEHEADER
 newitem
 newpath
 newplus
@@ -1051,7 +1040,6 @@ NOINHERITLAYOUT
 NOINTERFACE
 NOINVERT
 NOLINKINFO
-nologo
 NOMCX
 NOMINMAX
 NOMIRRORBITMAP
@@ -1284,7 +1272,6 @@ pstm
 PStr
 pstream
 pstrm
-pswd
 PSYSTEM
 psz
 ptb
@@ -1315,7 +1302,6 @@ QUNS
 QXZ
 RAII
 RAlt
-Rappl
 randi
 Rasterization
 Rasterize
@@ -1431,7 +1417,6 @@ searchterm
 SEARCHUI
 SECONDARYDISPLAY
 secpol
-securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
 SENDCHANGE
@@ -1537,7 +1522,6 @@ SMALLICON
 smartphone
 SMTO
 SNAPPROCESS
-snk
 snwprintf
 softline
 SOURCECLIENTAREAONLY
@@ -1586,11 +1570,9 @@ stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
-steamapps
 STGC
 STGM
 STGMEDIUM
-STGMREAD
 STICKYKEYS
 sticpl
 storelogo
@@ -1669,7 +1651,6 @@ telephon
 templatenamespace
 testprocess
 TEXCOORD
-TEXTBOXNEWLINE
 TEXTEXTRACTOR
 TEXTINCLUDE
 tfopen
@@ -1695,7 +1676,6 @@ TLayout
 tlb
 tlbimp
 tlc
-TGM
 TNP
 Toolhelp
 toolkitconverters
@@ -1991,23 +1971,3 @@ ZOOMITX
 ZXk
 ZXNs
 zzz
-ACIE
-AOklab
-BCIE
-BOklab
-culori
-Evercoder
-LCh
-CIELCh
-CLSCTXINPROCALL
-IIDI
-irow
-lcid
-OTHERUNZOOM
-OTHERZOOM
-PARENTCLOSING
-PARENTOPENING
-ppwsz
-rguid
-SCROLLCHILDREN
-VARTYPE

.github/pull_request_template.md

@@ -5,9 +5,9 @@
 ## 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
+- [ ] **Communication:** I've discussed this with core contributors already. If 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
+- [ ] **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
@@ -16,7 +16,7 @@
    - [ ] [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 -->
+<!-- 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 -->

.github/workflows/spelling2.yml

@@ -93,7 +93,7 @@ jobs:
     steps:
       - name: check-spelling
         id: spelling
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
@@ -156,7 +156,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           checkout: true
@@ -175,7 +175,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           checkout: true
@@ -202,7 +202,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: apply spelling updates
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
           checkout: true

.pipelines/ESRPSigning_core.json

@@ -220,7 +220,6 @@
                 "WinUI3Apps\\PowerToys.Settings.exe",
 
                 "PowerToys.CmdPalModuleInterface.dll",
-                "CmdPalKeyboardService.dll",
                 "*Microsoft.CmdPal.UI_*.msix"
             ],
             "SigningInfo": {
@@ -331,8 +330,6 @@
                 "TestableIO.System.IO.Abstractions.Wrappers.dll",
                 "WinUI3Apps\\TestableIO.System.IO.Abstractions.Wrappers.dll",
                 "WinUI3Apps\\OpenAI.dll",
-                "Testably.Abstractions.FileSystem.Interface.dll",
-                "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                 "ColorCode.Core.dll", 
                 "ColorCode.UWP.dll",
                 "UnitsNet.dll",

.pipelines/ESRPSigning_sdk.json

@@ -4,66 +4,9 @@
     "SignBatches": [
         {
             "MatchedPath": [
+                "Microsoft.CommandPalette.Extensions.dll",
                 "Microsoft.CommandPalette.Extensions.Toolkit.dll"
             ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-233904-SN",
-                        "OperationSetCode": "StrongNameSign",
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0",
-                        "Parameters": []
-                    },
-                    {
-                        "KeyCode": "CP-233904-SN",
-                        "OperationSetCode": "StrongNameVerify",
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0",
-                        "Parameters": []
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        },
-        {
-            "MatchedPath": [
-                "Microsoft.CommandPalette.Extensions.dll"
-            ],
             "SigningInfo": {
                 "Operations": [
                     {

.pipelines/UpdateVersions.ps1

@@ -1,24 +1,16 @@
 Param(
-  # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
+  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
   [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.7",
+  [string]$winAppSdkVersionNumber = "1.6",
 
   # When the pipeline calls the PS1 file, the passed parameters are converted to string type
   [Parameter(Mandatory=$False,Position=2)]
-  [boolean]$useExperimentalVersion = $False,
-
-  # Root folder Path for processing
-  [Parameter(Mandatory=$False,Position=3)]
-  [string]$rootPath = $(Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path)),
-
-  # Root folder Path for processing
-  [Parameter(Mandatory=$False,Position=4)]
-  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+  [boolean]$useExperimentalVersion = $False
 )
 
 function Update-NugetConfig {
     param (
-        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
+        [string]$filePath = "nuget.config"
     )
 
     Write-Host "Updating nuget.config file"
@@ -43,33 +35,7 @@ function Update-NugetConfig {
     $xml.Save($filePath)
 }
 
-function Read-FileWithEncoding {
-    param (
-        [string]$Path
-    )
-
-    $reader = New-Object System.IO.StreamReader($Path, $true)  # auto-detect encoding
-    $content = $reader.ReadToEnd()
-    $encoding = $reader.CurrentEncoding
-    $reader.Close()
-
-    return [PSCustomObject]@{
-        Content  = $content
-        Encoding = $encoding
-    }
-}
-
-function Write-FileWithEncoding {
-    param (
-        [string]$Path,
-        [string]$Content,
-        [System.Text.Encoding]$Encoding
-    )
-
-    $writer = New-Object System.IO.StreamWriter($Path, $false, $Encoding)
-    $writer.Write($Content)
-    $writer.Close()
-}
+$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 
 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
@@ -113,53 +79,50 @@ if ($latestVersion) {
 }
 
 # Update packages.config files
-Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse packages.config | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
     if ($content -match 'package id="Microsoft.WindowsAppSDK"') {
         $newVersionString = 'package id="Microsoft.WindowsAppSDK" version="' + $WinAppSDKVersion + '"'
         $oldVersionString = 'package id="Microsoft.WindowsAppSDK" version="[-.0-9a-zA-Z]*"'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
         Write-Host "Modified " $_.FullName 
     }
 }
 
 # Update Directory.Packages.props file
-Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+$propsFile = "Directory.Packages.props"
+if (Test-Path $propsFile) {
+    $content = Get-Content $propsFile -Raw
     if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
         $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
         $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
-        Write-Host "Modified " $_.FullName
+        Set-Content -Path $propsFile -Value $content
+        Write-Host "Modified " $propsFile
     }
 }
 
 # Update .vcxproj files
-Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse *.vcxproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
     if ($content -match '\\Microsoft.WindowsAppSDK.') {
-        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion
-        $oldVersionString = '\\Microsoft.WindowsAppSDK.(?=[-.0-9a-zA-Z]*\d)[-.0-9a-zA-Z]*'    #positive lookahead for at least a digit
+        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
+        $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
         Write-Host "Modified " $_.FullName
     }
 }
 
 # Update .csproj files
-Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse *.csproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
     if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
         $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
         $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
         Write-Host "Modified " $_.FullName 
     }
 }

.pipelines/loc/loc.yml

@@ -25,7 +25,7 @@ steps:
   fetchDepth: 1 # Don't need a deep checkout for loc files!
   persistCredentials: true
 
-- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@5
+- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
   displayName: 'Touchdown Build - 37400, PRODEXT'
   inputs:
     teamId: 37400

.pipelines/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.PowerToys.Telemetry" version="2.0.3" />
+  <package id="Microsoft.PowerToys.Telemetry" version="2.0.2" />
 </packages>

.pipelines/tsa.json

@@ -3,5 +3,5 @@
     "notificationAliases": ["powertoys@microsoft.com"],
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys"
 }

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

@@ -33,7 +33,7 @@ parameters:
     default: true
   - name: winAppSDKVersionNumber
     type: string
-    default: 1.7
+    default: 1.6
   - name: useExperimentalVersion
     type: boolean
     default: false

.pipelines/v2/release.yml

@@ -20,6 +20,16 @@ parameters:
     type: string
     default: '0.0.1'
 
+  - name: cmdPalVersionNumber
+    displayName: "Command Palette Version Number"
+    type: string
+    default: '0.0.1'
+
+  - name: cmdPalSdkVersionNumber
+    displayName: "Command Palette SDK Version Number"
+    type: string
+    default: '0.0.1'
+
   - name: buildConfigurations
     displayName: "Build Configurations"
     type: object
@@ -40,9 +50,6 @@ parameters:
 
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 
-variables:
-  - template: templates/variables-nuget-package-version.yml
-
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
@@ -81,8 +88,8 @@ extends:
               buildPlatforms: ${{ parameters.buildPlatforms }}
               buildConfigurations: ${{ parameters.buildConfigurations }}
               versionNumber: ${{ parameters.versionNumber }}
+              cmdPalVersionNumber: ${{ parameters.cmdPalVersionNumber }}
               publishArtifacts: false # 1ES PT handles publication for us.
-              official: true
               codeSign: true
               runTests: false
               signingIdentity:
@@ -99,18 +106,16 @@ extends:
               beforeBuildSteps:
                 # Sets versions for all PowerToy created DLLs
                 - pwsh: |-
-                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
+                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment '' -cmdPalVersionNumber '${{ parameters.cmdPalVersionNumber }}'
                   displayName: Prepare versioning
 
                 # Prepare the localizations and telemetry config before the release build
                 - template: .pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml@self
 
-                - pwsh: |-
-                    $ErrorActionPreference = 'Stop'
-                    $PSNativeCommandUseErrorActionPreference = $true
-                    & nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config
-                    Move-Item -Force -Verbose "Microsoft.PowerToys.Telemetry.*\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h"
-                    Move-Item -Force -Verbose "Microsoft.PowerToys.Telemetry.*\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs"
+                - script: |
+                    call nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config || exit /b 1
+                    move /Y "Microsoft.PowerToys.Telemetry.2.0.2\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
+                    move /Y "Microsoft.PowerToys.Telemetry.2.0.2\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
                   displayName: Emplace telemetry files
 
       - stage: Build_SDK
@@ -123,8 +128,8 @@ extends:
                 name: SHINE-INT-L
                 image: SHINE-VS17-Latest
                 os: windows
-              official: true
               codeSign: true
+              sdkVersionNumber: ${{ parameters.cmdPalSdkVersionNumber }}
               signingIdentity:
                 serviceName: $(SigningServiceName)
                 appId: $(SigningAppId)
@@ -143,7 +148,5 @@ extends:
             parameters:
               versionNumber: ${{ parameters.versionNumber }}
               includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              ${{ if ne(parameters.publishSymbolsToPublic, true) }}:
-                symbolExpiryTime: 10 # For private builds, expire symbols within 10 days. The default is 100 years.
               subscription: $(SymbolPublishingServiceConnection)
               symbolProject: $(SymbolPublishingProject)

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

@@ -11,9 +11,6 @@ parameters:
     default:
       - x64
       - arm64
-  - name: official
-    type: boolean
-    default: false
   - name: codeSign
     type: boolean
     default: false
@@ -59,6 +56,9 @@ parameters:
   - name: versionNumber
     type: string
     default: '0.0.1'
+  - name: cmdPalVersionNumber
+    type: string
+    default: '0.0.1'
   - name: useLatestWinAppSDK
     type: boolean
     default: false
@@ -215,11 +215,6 @@ jobs:
       env:
         VCWhereExtraVersionTarget: '-prerelease'
 
-  - ${{ if eq(parameters.official, true) }}:
-    - template: .\steps-setup-versioning.yml
-      parameters:
-        directory: $(build.sourcesdirectory)\src\modules\cmdpal
-
   - pwsh: |-
       & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
     displayName: Download and install WiX 3.14 development build
@@ -349,11 +344,6 @@ jobs:
       flattenFolders: True
       OverWrite: True
 
-  # Check if all projects (located in src sub-folder) import common props
-  - pwsh: |-
-      & '.pipelines/verifyCommonProps.ps1' -sourceDir '$(build.sourcesdirectory)\src'
-    displayName: Audit shared common props for CSharp projects in src sub-folder
-
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
       & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
@@ -399,13 +389,13 @@ jobs:
           **\UnitTests-FancyZones.dll
           !**\obj\**
 
-  - pwsh: |-
-      $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
-      $PackageFilename = $Package.FullName
-      Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
-    displayName: Locate the CmdPal MSIX
-
   - ${{ if eq(parameters.codeSign, true) }}:
+    - pwsh: |-
+        $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
+        $PackageFilename = $Package.FullName
+        Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
+      displayName: Locate the MSIX
+
     - pwsh: |-
         & "$(MakeAppxPath)" unpack /p "$(CmdPalPackagePath)" /d "$(JobOutputDirectory)/CmdPalPackageContents"
       displayName: Unpack the MSIX for signing
@@ -425,8 +415,6 @@ jobs:
         $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(CmdPalPackagePath)")
         & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(JobOutputDirectory)/CmdPalPackageContents"
         Copy-Item -Force $PackageFilename "$(CmdPalPackagePath)"
-        Remove-Item -Force -Recurse "$(JobOutputDirectory)/CmdPalPackageContents" -ErrorAction:Ignore
-        Remove-Item -Force -Recurse "$(JobOutputDirectory)/_appx" -ErrorAction:Ignore
       displayName: Re-pack the new CmdPal package after signing
 
     - template: steps-esrp-signing.yml
@@ -449,10 +437,6 @@ jobs:
           batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_DSC.json'
           ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
-  - pwsh: |-
-      Copy-Item -Verbose -Force "$(CmdPalPackagePath)" "$(JobOutputDirectory)"
-    displayName: Stage the final CmdPal package
-
   - template: steps-build-installer.yml
     parameters:
       codeSign: ${{ parameters.codeSign }}

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

@@ -3,9 +3,6 @@ parameters:
     type: object
     default:
       - Release
-  - name: official
-    type: boolean
-    default: false
   - name: codeSign
     type: boolean
     default: false
@@ -15,6 +12,9 @@ parameters:
   - name: signingIdentity
     type: object
     default: {}
+  - name: sdkVersionNumber
+    type: string
+    default: '0.0.1'
 
 jobs:
 - job: "BuildSDK"
@@ -36,17 +36,8 @@ jobs:
     fetchTags: false
     fetchDepth: 1
 
-  - template: .\steps-ensure-nuget-version.yml
-
-  - task: NuGetAuthenticate@1
-
-  - ${{ if eq(parameters.official, true) }}:
-    - template: .\steps-setup-versioning.yml
-      parameters:
-        directory: $(build.sourcesdirectory)\src\modules\cmdpal
-
   - pwsh: |-
-      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -BuildStep "build" -IsAzurePipelineBuild
+      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -VersionOfSDK ${{ parameters.sdkVersionNumber }} -BuildStep "build" -IsAzurePipelineBuild
     displayName: Build SDK
 
   - ${{ if eq(parameters.codeSign, true) }}:
@@ -61,7 +52,7 @@ jobs:
           ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
   - pwsh: |-
-      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -BuildStep "pack" -IsAzurePipelineBuild
+      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -VersionOfSDK ${{ parameters.sdkVersionNumber }} -BuildStep "pack" -IsAzurePipelineBuild
     displayName: Pack SDK
 
   - task: CopyFiles@2

.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml

@@ -4,7 +4,7 @@ parameters:
     default: false
 
 steps:
-  - task: TouchdownBuildTask@5
+  - task: TouchdownBuildTask@3
     displayName: 'Download Localization Files -- PowerToys 37400'
     inputs:
       teamId: 37400

.pipelines/v2/templates/steps-setup-versioning.yml

@@ -1,11 +0,0 @@
-parameters:
-  - name: directory
-    type: string
-    default: $(Build.SourcesDirectory)
-
-steps:
-  - pwsh: |-
-      nuget install Microsoft.Windows.Terminal.Versioning -ConfigFile "$(Build.SourcesDirectory)\.pipelines\release-nuget.config" -OutputDirectory _versioning
-      $VersionRoot = (Get-Item _versioning\Microsoft.Windows.*).FullName
-      & "$VersionRoot\build\Setup.ps1" -ProjectDirectory "${{ parameters.directory }}" -Verbose
-    displayName: Set up versioning for ${{ parameters.directory }} via M.W.T.V

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

@@ -17,7 +17,6 @@ steps:
     arguments: >
       -winAppSdkVersionNumber ${{ parameters.versionNumber }}
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
-      -rootPath "$(build.sourcesdirectory)"
 
 - script: echo $(WinAppSDKVersion)
   displayName: 'Display WinAppSDK Version Found'

.pipelines/v2/templates/variables-nuget-package-version.yml

@@ -1,17 +0,0 @@
-variables:
-  # If we are building a branch called "stable*", hide the NuGet suffix.
-  # If we don't do that, XES will set the suffix to "stable".
-  # main is special, however. XES ignores main. Since we never produce actual
-  # shipping builds from main, we want to force it to have a beta label.
-  #
-  # In effect:
-  # BRANCH / BRANDING | Version                    |
-  # ------------------|----------------------------|
-  # stable            | 0.2.250512001              |
-  # main              | 0.2.250512001-experimental |
-  # all others        | 0.2.250512001-branch       |
-  ${{ if startsWith(variables['Build.SourceBranchName'], 'stable') }}:
-    NoNuGetPackBetaVersion: true
-  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
-    NuGetPackBetaVersion: experimental
-

.pipelines/verifyAndSetLatestVCToolsVersion.ps1

@@ -1,28 +1,7 @@
 $VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
 $VSPackages = $VSInstances.instances.instance.packages.package
-$LatestVCPackage = ($VSPackages | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
+$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
 $LatestVCToolsVersion = $LatestVCPackage.version;
-
-$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
-$VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
-
-# We have observed a few instances where the VC tools package version actually
-# differs from the version on the files themselves. We might as well check
-# whether the version we just found _actually exists_ before we use it.
-# We'll use whichever highest version exists.
-$PackageVCToolPath = Join-Path $VCToolsRoot $LatestVCToolsVersion
-If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
-    $VCToolsVersions = Get-ChildItem $VCToolsRoot | ForEach-Object {
-        [Version]$_.Name
-    } | Sort -Descending
-    $LatestActualVCToolsVersion = $VCToolsVersions | Select -First 1
-
-    If ([Version]$LatestVCToolsVersion -Ne $LatestActualVCToolsVersion) {
-        Write-Output "VC Tools Mismatch: Directory = $LatestActualVCToolsVersion, Package = $LatestVCToolsVersion"
-        $LatestVCToolsVersion = $LatestActualVCToolsVersion.ToString(3)
-    }
-}
-
 Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
 Write-Output "Updating VCToolsVersion environment variable for job"
 Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

.pipelines/verifyCommonProps.ps1

@@ -1,54 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$sourceDir
-)
-
-# scan all csharp project in the source directory
-function Get-CSharpProjects {
-    param (
-        [string]$path
-    )
-
-    # Get all .csproj files under the specified path
-    return Get-ChildItem -Path $path -Recurse -Filter *.csproj | Select-Object -ExpandProperty FullName
-}
-
-# Check if the project file imports 'Common.Dotnet.CsWinRT.props'
-function Test-ImportSharedCsWinRTProps {
-    param (
-        [string]$filePath
-    )
-
-    # Load the XML content of the .csproj file
-    [xml]$csprojContent = Get-Content -Path $filePath
-
-    
-    # Check if the Import element with Project attribute containing 'Common.Dotnet.CsWinRT.props' exists
-    return $csprojContent.Project.Import | Where-Object { $null -ne $_.Project -and $_.Project.EndsWith('Common.Dotnet.CsWinRT.props') }
-}
-
-# Call the function with the provided source directory
-$csprojFilesArray = Get-CSharpProjects -path $sourceDir
-
-$hasInvalidCsProj = $false
-
-# Enumerate the array of file paths and call Validate-ImportSharedCsWinRTProps for each file
-foreach ($csprojFile in $csprojFilesArray) {
-    # Skip if the file ends with 'TemplateCmdPalExtension.csproj'
-    if ($csprojFile -like '*TemplateCmdPalExtension.csproj') {
-        continue
-    }
-
-    $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
-    if (!$importExists) {
-        Write-Output "$csprojFile need to import 'Common.Dotnet.CsWinRT.props'."
-        $hasInvalidCsProj = $true
-    }
-}
-
-if ($hasInvalidCsProj) {
-    exit 1
-}
-
-exit 0

.pipelines/versionSetting.ps1

@@ -5,7 +5,10 @@ Param(
 
   [Parameter(Mandatory=$True,Position=2)]
   [AllowEmptyString()]
-  [string]$DevEnvironment = "Local"
+  [string]$DevEnvironment = "Local",
+
+  [Parameter(Mandatory=$True,Position=3)]
+  [string]$cmdPalVersionNumber = "0.0.1"
 )
 
 Write-Host $PSScriptRoot
@@ -46,6 +49,7 @@ $verProps.Save($verPropWriteFileLocation);
 $verPropWriteFileLocation = $PSScriptRoot + '/../src/CmdPalVersion.props';
 $verPropReadFileLocation = $verPropWriteFileLocation;
 [XML]$verProps = Get-Content $verPropReadFileLocation
+$verProps.Project.PropertyGroup.CmdPalVersion = $cmdPalVersionNumber;
 $verProps.Project.PropertyGroup.DevEnvironment = $DevEnvironment;
 Write-Host "xml" $verProps.Project.PropertyGroup.Version
 $verProps.Save($verPropWriteFileLocation);
@@ -86,3 +90,12 @@ $newPlusContextMenuAppManifestReadFileLocation = $newPlusContextMenuAppManifestW
 $newPlusContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
 Write-Host "NewPlusContextMenu version" $newPlusContextMenuAppManifest.Package.Identity.Version
 $newPlusContextMenuAppManifest.Save($newPlusContextMenuAppManifestWriteFileLocation);
+
+# Set package version in Package.appxmanifest
+$cmdPalAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/cmdpal/Microsoft.CmdPal.UI/Package.appxmanifest';
+$cmdPalAppManifestReadFileLocation = $cmdPalAppManifestWriteFileLocation;
+
+[XML]$cmdPalAppManifest = Get-Content $cmdPalAppManifestReadFileLocation
+$cmdPalAppManifest.Package.Identity.Version = $cmdPalVersionNumber + '.0'
+Write-Host "CmdPal Package version: " $cmdPalAppManifest.Package.Identity.Version
+$cmdPalAppManifest.Save($cmdPalAppManifestWriteFileLocation);

COMMUNITY.md

@@ -6,8 +6,8 @@ Names are in alphabetical order based on first name.
 
 ## High impact community members
 
-### [@Noraa-Junker](https://github.com/Noraa-Junker) - [Noraa Junker](https://noraajunker.ch)
-Noraa has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Noraa was the primary person for helping build the File Explorer preview pane handler for developer files.
+### [@Aaron-Junker](https://github.com/Aaron-Junker) - [Aaron Junker](https://aaron-junker.github.io)
+Aaron has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Aaron was the primary person for helping build the File Explorer preview pane handler for developer files.
 
 ### [@cgaarden](https://github.com/cgaarden) - [Christian Gaarden Gaardmark](https://www.onegreatworld.com) 
 Christian contributed New+ utility
@@ -117,6 +117,10 @@ PowerRename is from Chris's SmartRename and icon rendering for SVGs in File Expl
 
 PowerToys Awake is a tool to keep your computer awake.
 
+### [@Niels9001](https://github.com/niels9001/) - [Niels Laute](https://nielslaute.com/)
+
+Niels has helped drive large sums of our update toward a new [consistent and modern UX](https://github.com/microsoft/PowerToys/issues/891). This includes the [launcher work](https://github.com/microsoft/PowerToys/issues/44), color picker UX update and [icon design](https://github.com/microsoft/PowerToys/issues/1118).
+
 ### [@randyrants](https://github.com/randyrants) - [Randy Santossio](https://www.randyrants.com)
 
 Randy contributed Registry Preview and some very early conversations about keyboard remapping.
@@ -180,10 +184,10 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 
 ## PowerToys core team
 
+- [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Lead
 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
 - [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
-- [@niels9001](https://github.com/niels9001/) - Niels Laute - Product Manager
 - [@zhiwei-ms](https://github.com/zhiwei-ms) - Zhiwei Yu - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
 - [@yeelam-gordon](https://github.com/yeelam-gordon) - Gordon Lam - Dev lead
@@ -200,12 +204,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@zhaopy536](https://github.com/zhaopy536) - Peiyao Zhao - Dev
 - [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
 - [@vanzue](https://github.com/vanzue) - Kai Tao - Dev
-- [@zadjii-msft](https://github.com/zadjii-msft) - Mike Griese - Dev
-- [@khmyznikov](https://github.com/khmyznikov) - Gleb Khmyznikov - Dev
-- [@chatasweetie](https://github.com/chatasweetie) - Jessica Earley-Cha - Dev
-- [@MichaelJolley](https://github.com/MichaelJolley) - Michael Jolley - Dev
-- [@Jaylyn-Barbee](https://github.com/Jaylyn-Barbee) - Jaylyn Barbee - Dev
-- [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Overhead
 
 ## Former PowerToys core team members
 

Directory.Packages.props

@@ -31,22 +31,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.6" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.4" />
     <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.6" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.120-preview" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- 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. -->
     <!-- 
@@ -55,7 +55,7 @@
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
@@ -72,28 +72,28 @@
     <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.6" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.4" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.6" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.6" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.6" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.4" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.4" />
     <!-- 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" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <!-- 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.6" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.4" />
     <!-- 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.6" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.6" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.4" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.4" />
     <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.6" />
+    <PackageVersion Include="System.Management" Version="9.0.4" />
     <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.6" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.4" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.4" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />

NOTICE.md

@@ -75,40 +75,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```
 
-## Utility: Command Palette Built-in Extensions
-
-### Calculator
-
-#### Mages
-
-We use the Mages NuGet package for calculating the result of expression.
-
-**Source**: [https://github.com/FlorianRappl/Mages](https://github.com/FlorianRappl/Mages)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2016 - 2025 Florian Rappl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## Utility: File Explorer Add-ins
 
 ### Monaco Editor
@@ -1453,27 +1419,27 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
-- Microsoft.Bcl.AsyncInterfaces 9.0.6
+- Microsoft.Bcl.AsyncInterfaces 9.0.4
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.6
+- Microsoft.Data.Sqlite 9.0.4
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.6
-- Microsoft.Extensions.Hosting 9.0.6
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.6
-- Microsoft.Extensions.Logging 9.0.6
-- Microsoft.Extensions.Logging.Abstractions 9.0.6
+- Microsoft.Extensions.DependencyInjection 9.0.4
+- Microsoft.Extensions.Hosting 9.0.4
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.4
+- Microsoft.Extensions.Logging 9.0.4
+- Microsoft.Extensions.Logging.Abstractions 9.0.4
 - 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.6
-- Microsoft.Windows.Compatibility 9.0.6
+- Microsoft.Win32.SystemEvents 9.0.4
+- Microsoft.Windows.Compatibility 9.0.4
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.7.250513003
-- Microsoft.WindowsPackageManager.ComInterop 1.10.340
+- Microsoft.WindowsAppSDK 1.6.250205002
+- Microsoft.WindowsPackageManager.ComInterop 1.10.120-preview
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
@@ -1487,25 +1453,25 @@ SOFTWARE.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.6
+- System.CodeDom 9.0.4
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.6
-- System.Configuration.ConfigurationManager 9.0.6
-- System.Data.OleDb 9.0.6
-- System.Data.SqlClient 4.9.0
-- System.Diagnostics.EventLog 9.0.6
-- System.Diagnostics.PerformanceCounter 9.0.6
-- System.Drawing.Common 9.0.6
+- System.ComponentModel.Composition 9.0.4
+- System.Configuration.ConfigurationManager 9.0.4
+- System.Data.OleDb 9.0.4
+- System.Data.SqlClient 4.8.6
+- System.Diagnostics.EventLog 9.0.4
+- System.Diagnostics.PerformanceCounter 9.0.4
+- System.Drawing.Common 9.0.4
 - System.IO.Abstractions 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
-- System.Management 9.0.6
+- System.Management 9.0.4
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.6
-- System.ServiceProcess.ServiceController 9.0.6
-- System.Text.Encoding.CodePages 9.0.6
-- System.Text.Json 9.0.6
+- System.Runtime.Caching 9.0.4
+- System.ServiceProcess.ServiceController 9.0.4
+- System.Text.Encoding.CodePages 9.0.4
+- System.Text.Json 9.0.4
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

PowerToys.sln

@@ -706,8 +706,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{0217E86E-3476-9946-DE8E-9D200CEBD47A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
@@ -2598,14 +2596,6 @@ Global
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2876,7 +2866,6 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection

README.md

@@ -35,28 +35,28 @@ 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.92%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.91%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysUserSetup-0.91.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysUserSetup-0.91.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.91%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.90%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.90.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.90.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.90.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.90.0-arm64.exe
  
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.91.1-x64.exe][ptUserX64] | 42EA4A3E8C79A5456476D19E72B3E2AB9393A89C4DC7442EB7EE5A1E3490D38A |
-| Per user - ARM64     | [PowerToysUserSetup-0.91.1-arm64.exe][ptUserArm64] | F3F433FE04049F9197411D792AADEBF34E3BE7FE16327BD8B73D2A046ED8BAF6 |
-| Machine wide - x64   | [PowerToysSetup-0.91.1-x64.exe][ptMachineX64] | EC4BC3A8625775866B0ED4577CCF83E6EC7B1A0AD267379DDBAF4FE49C7B5BDD |
-| Machine wide - ARM64 | [PowerToysSetup-0.91.1-arm64.exe][ptMachineArm64] | 9CB8911008420D0E446AE3D5CE365E447FA4DF9DCF9337F3A80F933C00FC3689 |
+| Per user - x64       | [PowerToysUserSetup-0.90.0-x64.exe][ptUserX64] | 2A6036F5B2D454084E55816C306E1E57EF1D14C916691CBDA42B469797605CE0 |
+| Per user - ARM64     | [PowerToysUserSetup-0.90.0-arm64.exe][ptUserArm64] | AB2E4DC87A9D764BE897C5170E2890E174C89CA912A1916FA3AE1E427536EA4A |
+| Machine wide - x64   | [PowerToysSetup-0.90.0-x64.exe][ptMachineX64] | 12801C44F43D0CC61E90DF1EFDC40E4F3C88341E0199D5B20791042D9B173DCF |
+| Machine wide - ARM64 | [PowerToysSetup-0.90.0-arm64.exe][ptMachineArm64] | 2998007C8FCD7BD2770767C6502AAA2CC75B85EC30DE62986EC7005EB0014EDB |
 
 This is our preferred method.
 
 ### Via Microsoft Store
 
-Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/), which is available for both Windows 11 and Windows 10.
+Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/) which is available for both Windows 11 and Windows 10.
 
 ### Via WinGet
-Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
+Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
 #### User scope installer [default]
 ```powershell
@@ -79,7 +79,7 @@ There is a collection of [third-party plugins](./doc/thirdPartyRunPlugins.md) cr
 
 ## Contributing
 
-This project welcomes contributions of all types. Besides coding features / bug fixes, other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
+This project welcomes contributions of all types.  Besides  coding features / bug fixes,  other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
 
 We ask that **before you start work on a feature that you would like to contribute**, please read our [Contributor's Guide](CONTRIBUTING.md). We would be happy to work with you to figure out the best approach, provide guidance and mentorship throughout feature development, and help avoid any wasted or duplicate effort.
 
@@ -93,168 +93,96 @@ 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.91 - May 2025 Update
+### 0.90 - March 2025 Update
 
 In this release, we focused on new features, stability, and automation.
 
 **✨Highlights**
 
- - We focused on greatly improving the Command Palette's performance and fixing a large number of bugs. Some new features we've added are:
- - Added the ability for Command Palette to search any file using a fallback command.
- - Added the ability to make the Command Palette global hotkey a low-level keyboard hook.
- - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette.
- - You can now define custom formats in the Date and Time plugins of PT Run and Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
+![Gif for Command Palette](doc/images/overview/CmdPal_Hero.gif)
 
-### Advanced Paste
-
- - Fixed an issue where Advanced Paste failed to create the OCR engine for certain English language tags (e.g., en-CA) by initializing the OCR engine with the user profile language. Thanks [@cryolithic](https://github.com/cryolithic)!
+- New module: Command Palette ("CmdPal") -  Created as the evolution of PowerToys Run with extensibility at the forefront, Command Palette is a quick launcher with a richer display and additional capabilities without sacrificing performance, allowing you to start anything with the shortcut **Win+Alt+Space**! Thanks [@zadjii-msft](https://github.com/zadjii-msft), [@niels9001](https://github.com/niels9001), [@michael-hawker](https://github.com/michael-hawker), [@joadoumie](https://github.com/joadoumie), [@plante-msft](https://github.com/plante-msft), [@ethanfangg](https://github.com/ethanfangg) and [@krschau](https://github.com/krschau)!
+ - Enhanced the Color Picker by switching from WPF UI to .NET WPF, resulting in improved themes and visual consistency across different modes. Thanks [@mantaionut](https://github.com/mantaionut)! Thanks [@Jay-o-Way](https://github.com/Jay-o-Way) and [@niels9001](https://github.com/niels9001) for helping with the review!
+ - Added the ability to delete files directly from Peek, enhancing file management efficiency. Thanks [@daverayment](https://github.com/daverayment) and thanks [@htcfreek](https://github.com/htcfreek) for the review!
+ - Added support for variables in template filenames, enabling dynamic elements like date components and environment variables for enhanced customization in New+. Thanks [@cgaarden](https://github.com/cgaarden)!
 
 ### Color Picker
 
- - Fixed an issue where a resource leak caused hangs or crashes by properly disposing of the Graphics object. Thanks [@dcog989](https://github.com/dcog989)!
- - Fixed an issue where Color Picker exited on Backspace keypress by ensuring it only closes when focused and aligning Escape/Backspace behavior. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Added support for Oklab and Oklch color formats in Color Picker. Thanks [@lemonyte](https://github.com/lemonyte)!
-
-### Command Not Found
-
- - Updated the WinGet Command Not Found script to only enable the experimental features if they exist.
+ - Replaced WPF UI with .NET WPF for the Color Picker, enhancing compatibility and improving theme support. Thanks [@mantaionut](https://github.com/mantaionut)! Thanks [@Jay-o-Way](https://github.com/Jay-o-Way) and [@niels9001](https://github.com/niels9001) for helping with the review!
 
 ### Command Palette
 
- - Updated bug template to include Command Palette module.
- - Fixed an issue where the toast window was not scaled for DPI, causing layout issues under display scaling.
- - Fixed an issue where Up/Down keyboard navigation didn't move selection when the caret was at position 0, and added continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Updated the Time and Date extension code to simplify it and improve clarity.
- - Fixed an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
- - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from the Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added setting to enable/disable system tray icon in CmdPal and aligned terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed an alias update issue by removing the old alias when a new one is set.
- - Resolved GitHub casing conflict by migrating Exts and exts into a new ext directory, ensuring consistent structure across platforms and preventing path fragmentation.
- - Fix an issue where the 'Create New Extension' command generated empty file names.
- - Added the ability to make the global hotkey a low-level keyboard hook.
- - Added support for JUMBO thumbnails, enabling access to high-resolution icons.
- - Fixed crashes when CmdPal auto-hid itself while an MSAL dialog was opened, by preventing CmdPal from hiding if it's disabled.
- - Added support for immediately selecting search text when a page is loaded.
- - Fixed a bug where extension settings pages failed to reload on reopen by updating the settings form when extension settings are saved.
- - Fixed an issue where the Command Palette failed to launch from the runner.
- - Refactored and ported the PowerToys Run v1 calculator logic into Command Palette, added settings support, and improved fallback behavior.
- - Re-added support for list item keyboard shortcuts.
- - Enhanced accessibility in Command Palette by adding proper labels, refining animations, improving localization, and fixed a11y related issues.
- - Ported custom format support to the Time and Date plugin, reordered and cleaned up settings, improved error messaging, and fixed edge-case crashes for more robust and user-friendly behavior. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added fallback item for system command.
- - Fixed a bug in Windows System Command where the key prompt incorrectly displayed "Empty" for the "Open Recycle Bin" action. Thanks [@jironemo](https://github.com/jironemo)!
- - Fixed an issue where the 'more commands' list showed commands that shouldn't be visible. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed an issue where the details view in Command Palette displayed an oversized icon and misaligned text, aligning it with Windows Search behavior.
- - Fixed a bug where empty screen content and command bar commands were cut off when using long labels, ensuring proper layout and visibility.
- - Improved CmdPal’s WinGet integration by fixing version display for installed packages, enabling updates with icons, and migrating the preview winget API to a stable version.
- - Fixed a bug where commands for ContentPage didn't update until after exit, by ensuring context menus are fully initialized when they change.
- - Added fallback support to the TimeDate extension, enabling direct date/time queries without pre-selecting the command.
- - Added import of Common.Dotnet.AotCompatibility.props across multiple CmdPal project files to enhance AOT compilation support.
- - Fixed a crash in CmdPal settings caused by a null HotKey when settings.json is missing or lacks a defined hotkey. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Added support for filterable, nested context menus in CmdPal, including a search box to maintain focus behavior.
- - Refactored CmdPal classes to improve JSON serialization and introduced new serialization contexts for better performance and maintainability.
- - Added support for ahead-of-time (AoT) compilation.
- - Added retry mechanism for CmdPal launch.
- - Removed some unused files from CmdPal.Common to simplify the codebase and facilitate marking it as AoT-compatible.
- - Fixed a bug where a race condition in the update of SearchText caused the cursor in the input box to automatically jump to the end of the line, ensuring SearchText is only updated after it has actually been changed.
- - Added support for searching any file in the fallback command.
- - Cleaned up AoT-related code to prevent duplicate operations during testing.
- - Reduced CmdPal load time by parallelizing extension startup and adding timeouts to prevent misbehaving extensions from blocking others.
- - Enhanced UI behavior by dismissing the details pane when the list gets emptied, avoiding inconsistent visual states.
- - Added support to unset the fallback command in CmdPal when no matching command is found, ensuring cleaner reload behavior.
- - Fixed a leak in the CmdPal extension template by addressing improper ComServer use.
- - Prevented CmdPal window from maximizing on title bar double-click to maintain intended window behavior. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed an issue where the Settings UI launched too small by making window dimensions DPI-aware and enforcing minimum width and height using WinUIEx.
- - Fixed white flash and one-time animation issues in CmdPal by cloaking the window instead of hiding it.
- - Fixed a bug where all extension settings were fetched on startup by lazy-loading extension settings, reducing initialization overhead.
- - Added support for protecting CmdPal from crashes on Adaptive Card parse failure.
- - Replaced shell:AppsFolder with URI activation in CmdPal to improve reliability.
- - Added ability to open CmdPal settings from PowerToys Settings.
- - Added ability for CmdPal to observe and dynamically update extension details by tracking property changes on the selected item.
- - Bumped the toolkit version used in the CmdPal extension template to 0.2.0.
+- Introduced the Windows Command Palette ("CmdPal"), the next iteration of PowerToys Run, designed with extensibility at its core. CmdPal includes features such as searching for installed apps, shell commands, files and WinGet package installation. This module aims to provide a more powerful and flexible launcher experience. Thanks [@zadjii-msft](https://github.com/zadjii-msft), [@niels9001](https://github.com/niels9001), [@michael-hawker](https://github.com/michael-hawker), [@joadoumie](https://github.com/joadoumie), [@plante-msft](https://github.com/plante-msft), and the whole team!
+
+### FancyZones
+
+ - Fixed a bug where deleting a layout resulted in incorrect data being written to the JSON file.
+ - Fixed a bug where layout hotkeys were displayed incorrectly, ensuring the hotkey list does not include invalid entries.
+ - Fixed an issue where the "None" option was missing in the editor layout.
 
 ### Image Resizer
 
- - Fixed an issue where deleting an Image Resizer preset removed the wrong preset.
+ - Fixed warnings in ImageResizer regarding the use of variables "shellItem" and "itemName" without being initialized.
 
-### Keyboard Manager
+### Mouse Without Borders
 
- - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!
+ - Enhanced the logger to properly track the file path for easier debugging.
+ - Refactored the "Common" class into distinct individual classes to enhance maintainability, and updated all references and unit tests to reflect these changes. Thanks [@mikeclayton](https://github.com/mikeclayton) for this!
 
-### PowerRename
+### New+
 
- - Enhanced PowerRename's time formatting capabilities by adding 12-hour time format patterns with AM/PM support. Thanks [@bitmap4](https://github.com/bitmap4)!
+ - Added support for variables in template filenames, including date/time components, parent folder name, and environment variables. Thanks [@cgaarden](https://github.com/cgaarden)!
+
+### Peek
+
+ - Added the ability to delete the file currently being previewed in Peek, including navigation updates and handling for deleted items. Thanks [@daverayment](https://github.com/daverayment) and thanks [@htcfreek](https://github.com/htcfreek) for your help reviewing this!
 
 ### PowerToys Run
 
- - Added support for custom formats in the "Time and Date" plugin and improved error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fix two crashes: one for WFT on very early dates and another for calculating the week of the month on very late dates (e.g., 31.12.9999), and reorder UI settings. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fix an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
- - Added version details to plugin error messages for 'Loading error' and 'Init error'. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Enhanced result model by adding support for preventing usage-based ordering, giving plugin developers greater control over sorting behavior. Thanks [@CoreyHayward](https://github.com/CoreyHayward) and [@htcfreek](https://github.com/htcfreek)!
-
-### Quick Accent
-
- - Updated the letter mapping in GetDefaultLetterKeyEPO, replacing "ǔ" with "ŭ" for the VK_U key to accurately reflect Esperanto phonetics. Thanks [@OlegKharchevkin](https://github.com/OlegKharchevkin)!
- - Fixed an issue where Quick Accent did not work properly when using the on-screen keyboard. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Registry Preview
-
- - Enhanced Registry Preview to support pasting registry keys and values without manually writing the file header, and added a new button for resetting the app. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed an issue where duplicated applications were shown by ensuring the shell link helper opens .ink files non-exclusively and correctly retrieves the "FullPath". Thanks [@htcfreek](https://github.com/htcfreek) and [@davidegiacometti](https://github.com/davidegiacometti) for review!
+ - Fixed an issue where applying round corners on Windows 11 build 22000 caused crashes.
+ - Async the OnRename method to unblock the thread. Thanks [@davidegiacometti](https://github.com/davidegiacometti) for review!
+ - Added support for using `sq` instead of `^2` in the Unit Converter. Thanks [@PesBandi](https://github.com/PesBandi)!
 
 ### Settings
 
- - Fix an issue where the Settings app randomly showed a blank icon in the taskbar by deferring icon assignment until the window is activated.
- - Added the ability to maximize the "What's New" window for a more comfortable reading experience.
+ - Disabled the spell check feature in the text boxes of plugin settings for PowerToys Run. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed an issue where InfoBars for release notes errors were not displayed properly, and added a retry button. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
 
 ### Workspaces
 
- - Fixed bugs where Steam games were not captured or launched correctly by updating window filtering and integrating Steam URL protocol handling.
+ - Fixed an issue where some minimized packaged apps (e.g., Microsoft ToDo, Settings) were not snapshotted.
 
 ### Documentation
 
- - Added QuickNotes to the third-party plugins documentation for PowerToys Run. Thanks [@ruslanlap](https://github.com/ruslanlap)!
- - Added Weather and Pomodoro plugins to the PowerToys Run third-party plugin documentation. Thanks [@ruslanlap](https://github.com/ruslanlap)!
- - Added the Linear plugin to PowerToys Run's third-party plugin documentation. Thanks [@vednig](https://github.com/vednig)!
- - Fixed formatting issues in documentation files and updated contributor and team member information. Thanks [@DanielEScherzer](https://github.com/DanielEScherzer) and [@RokyZevon](https://github.com/RokyZevon)!
+ - Added the FirefoxBookmark plugin to the list of Third-Party plugins for PowerToys Run. Thanks [@8LWXpg](https://github.com/8LWXpg)!
+ - Added the SVGL third-party plugin to PowerToys Run, enabling users to search, browse, and copy SVG logos. Thanks [@SameerJS6](https://github.com/SameerJS6)!
+ - Added Monaco usage for the Registry Preview.
 
 ### Development
 
- - Updated GitHub Action to install .NET 9 for MSStore release support.
- - Updated version placeholder in bug_report.yml to prevent incorrect v0.70.0 versioning in issue reports.
- - Updated GitHub Action to upgrade actions/setup-dotnet from version 3 to version 4 for MSStore release.
- - Added securityContext to WinGet configuration files, allowing invocation from user context and prompting a single UAC for elevated resources in a separate process. Thanks [@mdanish-kh](https://github.com/mdanish-kh)!
- - Changed log file extensions from .txt to .log to support proper file associations and tooling compatibility, and added logs for Workspace. Thanks [@benwa](https://github.com/benwa)!
- - Upgraded testing framework dependencies and aligned package versions across components.
- - Upgraded dependencies to fix vulnerabilities.
- - Enhanced repository security by pinning GitHub Actions and Docker tags to immutable full-length commits and integrating automated dependency vulnerability scanning via Dependency Review Workflow. Thanks [@Nick2bad4u](https://github.com/Nick2bad4u)!
- - Upgraded Boost dependencies to a newer version.
- - Upgraded toolkit to the latest version, suppressed AoT-related warnings.
- - Fixed an issue where missing signing for newly added files caused build failures.
- - Update release pipeline to prevent publishing private symbols for 100 years.
- - Introduced fuzzing for PowerRename to improve reliability and added setup guidance for extending fuzzing to other C++ modules.
- - Added centralized pre-creation of generated folders for all .csproj projects to prevent build failures.
- - Updated WinAppSDK to the latest 1.7 version.
- - Upgraded Boost dependencies to the latest version for the PowerRename Fuzzing project.
- - Updated the ADO area path in tsa.json to resolve TSA pipeline errors caused by a deprecated path.
- - Initiated AoT support for CmdPal with foundational work in progress.
-  
-### Tool/General
+ - Updated WinGet configuration file location and extension. Thanks [@mdanish-kh](https://github.com/mdanish-kh)!
+ - Removed the Markdown file bypass to ensure CI runs for commits that only update Markdown files.
+ - Fixed an issue where the default generated file path exceeded the length limit of 260 characters for EnvironmentVariablesUILib.csproj, causing build failures.
+ - Upgraded WindowsAppSDK to 1.6.250205002 and CsWinRT to 2.2.0. Thanks [@htcfreek](https://github.com/htcfreek) for review!
+ - Upgraded XamlStyler to 3.2501.8 and dotnet-consolidate to 4.2.0. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Updated .NET Packages from 9.0.2 to 9.0.3.
+ - Optimized the UI Test Automation Framework and added UI test cases for the Hosts File Editor module.
+ - Added fuzz testing for RegistryPreview.
+ - Added new UI tests for the FancyZones editor, including tests for creating, duplicating, editing, and deleting layouts.
+ - Added telemetry code to measure the module editor open time and evaluate the benefits of applying AOT.
 
- - Added support for automating bug report creation by generating a pre-filled GitHub issue URL with system and diagnostic information. Thanks [@donlaci](https://github.com/donlaci)!
- - Added scripts to locally build the installer, ensuring the CmdPal can also be launched in a local environment.
- - Removed export PFX logic to eliminate hardcoded password usage and resolve PSScriptAnalyzer security warning.
- - Added PowerShell script and CI integration to enforce consistent use of Common.Dotnet.CsWinRT.props across all C# projects under the src folder.
-   
-### What is being planned for version 0.92
 
-For [v0.92][github-next-release-work], we'll work on the items below:
+ 
+### What is being planned for version 0.91
 
- - Continued Command Palette polish
+For [v0.91][github-next-release-work], we'll work on the items below:
+
+ - New module: File Actions Menu
  - New UI Automation tests
  - Working on installer upgrades
  - Upgrading Keyboard Manager's editor UI
- - Stability, bug fixes
+ - Stability / bug fixes
 
 ## PowerToys Community
 
@@ -266,7 +194,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct
 
 ## Privacy Statement
 
-The application logs basic diagnostic data (telemetry). For more privacy information and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
+The application logs basic diagnostic data (telemetry). For more information on privacy and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
 
 [oss-CLA]: https://cla.opensource.microsoft.com
 [oss-conduct-code]: CODE_OF_CONDUCT.md

doc/thirdPartyRunPlugins.md

@@ -46,7 +46,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [QuickNotes](https://github.com/ruslanlap/CommunityPowerToysRunPlugin-QuickNotes) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and search notes directly from PowerToys Run. |
 | [Weather](https://github.com/ruslanlap/PowerToysRun-Weather) | [ruslanlap](https://github.com/ruslanlap) | Get real-time weather information directly from PowerToys Run. |
 | [Pomodoro](https://github.com/ruslanlap/PowerToysRun-Pomodoro) | [ruslanlap](https://github.com/ruslanlap) | Manage Pomodoro productivity sessions directly from PowerToys Run. |
-| [Definition](https://github.com/ruslanlap/PowerToysRun-Definition) | [ruslanlap](https://github.com/ruslanlap) | Lookup word definitions, phonetics, and synonyms directly in PowerToys Run. |
 
 ## Extending software plugins
 
@@ -69,5 +68,4 @@ Below are community created plugins that target a website or software.  They are
 | [Bilibili](https://github.com/Whuihuan/PowerToysRun-Bilibili) | [Whuihuan](https://github.com/Whuihuan) | Use AVID or BVID to parse and jump to Bilibili |
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
-| [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
-| [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |
+[Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |

installer/PowerToysSetup/CmdPal.wxs

@@ -19,36 +19,36 @@
       </Directory>
     </DirectoryRef>
 
-    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
+    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test">
       <Component Id="Module_CmdPal" Win64="yes" Guid="3A4942B2-1A86-4182-B3B4-65157365A980">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes"/>
         </RegistryKey>
         <?if $(sys.BUILDARCH) = x64 ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_x64.msix" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_x64.msix" />
         <?else ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_arm64.msix" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_arm64.msix" />
         <?endif ?>
 
       </Component>
     </DirectoryRef>
 
     <?if $(sys.BUILDARCH) = x64 ?>
-    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\x64">
       <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
       </Component>
     </DirectoryRef>
     <?else ?>
-    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\arm64">
       <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
       </Component>
     </DirectoryRef>
     <?endif ?>

installer/PowerToysSetup/Product.wxs

@@ -79,7 +79,10 @@
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
       <ComponentGroupRef Id="WorkspacesComponentGroup" />
-      <ComponentGroupRef Id="CmdPalComponentGroup" />
+
+      <?if $(var.CIBuild) = "true" ?>
+        <ComponentGroupRef Id="CmdPalComponentGroup" />
+      <?endif?>
     </Feature>
 
     <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />

src/CmdPalVersion.props

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CmdPalVersion Condition="'$(CmdPalVersion)'=='' and '$(XES_APPXMANIFESTVERSION)'!=''">$(XES_APPXMANIFESTVERSION)</CmdPalVersion>
-    <CmdPalVersion Condition="'$(CmdPalVersion)'==''">0.0.1.0</CmdPalVersion>
+    <CmdPalVersion>0.0.1</CmdPalVersion>
     <DevEnvironment>Local</DevEnvironment>
 
     <!-- Forcing for every DLL on by default -->

src/Common.Dotnet.AotCompatibility.props

@@ -7,6 +7,6 @@
     <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
 
     <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081;CsWinRT1028;$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <WarningsNotAsErrors>IL2081</WarningsNotAsErrors>
   </PropertyGroup>
 </Project>

src/Common.Dotnet.CsWinRT.props

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
-
   <PropertyGroup>
     <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
     <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
@@ -16,13 +14,13 @@
     <WarningLevel>4</WarningLevel>
     <NoWarn></NoWarn>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>CA1824;CA1416;CA1720;CA1859;CA2263;CA2022;MVVMTK0045;MVVMTK0049</WarningsNotAsErrors>
+    <WarningsNotAsErrors>CA1720;CA1859;CA2263;CA2022;MVVMTK0045;MVVMTK0049</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
   </PropertyGroup>
 
@@ -43,4 +41,4 @@
       <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
     </ItemGroup>
   </Target>
-</Project>
+</Project>

src/Common.Dotnet.FuzzTest.props

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Some items may be set in Directory.Build.props in root -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- OneFuzz does not currently support testing with .NET 9.
-       As a temporary workaround, create a .NET 8 project and use file links 
-       to include the code that needs testing. -->
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-  </PropertyGroup>
-</Project>

src/Common.Dotnet.PrepareGeneratedFolder.targets

@@ -1,16 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="EnsureGeneratedBaseFolder" BeforeTargets="XamlPreCompile">
-    <PropertyGroup>
-      <!-- Only create the base 'generated' folder -->
-      <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
-    </PropertyGroup>
-
-    <!-- Create 'generated' folder if missing -->
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-
-    <!-- Optional logging for debugging -->
-    <Message Text="Ensured: $(GeneratedBasePath)" Importance="Low" />
-  </Target>
-
-</Project>

src/common/FilePreviewCommon/QoiImage.cs

@@ -92,9 +92,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon
                 var run = 0;
                 var chunksLen = fileSize - QOI_PADDING_LENGTH;
 
-                var x = 0;
-                var rowAdd = bitmapData.Stride - (channels * bitmapData.Width);
-
                 for (var dataIndex = 0; dataIndex < dataLength; dataIndex += channels)
                 {
                     if (run > 0)
@@ -156,14 +153,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon
                             bitmapPixel[3] = pixel.A;
                         }
                     }
-
-                    x++;
-                    if (x == bitmapData.Width)
-                    {
-                        // We align dataIndex with the stride
-                        dataIndex += rowAdd;
-                        x = 0;
-                    }
                 }
 
                 bitmap.UnlockBits(bitmapData);

src/common/ManagedCommon/ColorFormatHelper.cs

@@ -141,40 +141,6 @@ namespace ManagedCommon
             return lab;
         }
 
-        /// <summary>
-        /// Convert a given <see cref="Color"/> to a Oklab color
-        /// </summary>
-        /// <param name="color">The <see cref="Color"/> to convert</param>
-        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
-        public static (double Lightness, double ChromaticityA, double ChromaticityB) ConvertToOklabColor(Color color)
-        {
-            var linear = ConvertSRGBToLinearRGB(color.R / 255d, color.G / 255d, color.B / 255d);
-            var oklab = GetOklabColorFromLinearRGB(linear.R, linear.G, linear.B);
-            return oklab;
-        }
-
-        /// <summary>
-        /// Convert a given <see cref="Color"/> to a Oklch color
-        /// </summary>
-        /// <param name="color">The <see cref="Color"/> to convert</param>
-        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
-        public static (double Lightness, double Chroma, double Hue) ConvertToOklchColor(Color color)
-        {
-            var oklab = ConvertToOklabColor(color);
-            var oklch = GetOklchColorFromOklab(oklab.Lightness, oklab.ChromaticityA, oklab.ChromaticityB);
-
-            return oklch;
-        }
-
-        public static (double R, double G, double B) ConvertSRGBToLinearRGB(double r, double g, double b)
-        {
-            // inverse companding, gamma correction must be undone
-            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
-            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
-            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
-            return (rLinear, gLinear, bLinear);
-        }
-
         /// <summary>
         /// Convert a given <see cref="Color"/> to a CIE XYZ color (XYZ)
         /// The constants of the formula matches this Wikipedia page, but at a higher precision:
@@ -190,7 +156,10 @@ namespace ManagedCommon
             double g = color.G / 255d;
             double b = color.B / 255d;
 
-            (double rLinear, double gLinear, double bLinear) = ConvertSRGBToLinearRGB(r, g, b);
+            // inverse companding, gamma correction must be undone
+            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
+            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
+            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
 
             return (
                 (rLinear * 0.41239079926595948) + (gLinear * 0.35758433938387796) + (bLinear * 0.18048078840183429),
@@ -241,63 +210,6 @@ namespace ManagedCommon
             return (l, a, b);
         }
 
-        /// <summary>
-        /// Convert a linear RGB color <see cref="double"/> to an Oklab color.
-        /// The constants of this formula come from https://github.com/Evercoder/culori/blob/2bedb8f0507116e75f844a705d0b45cf279b15d0/src/oklab/convertLrgbToOklab.js
-        /// and the implementation is based on https://bottosson.github.io/posts/oklab/
-        /// </summary>
-        /// <param name="r">Linear R value</param>
-        /// <param name="g">Linear G value</param>
-        /// <param name="b">Linear B value</param>
-        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
-        private static (double Lightness, double ChromaticityA, double ChromaticityB)
-            GetOklabColorFromLinearRGB(double r, double g, double b)
-        {
-            double l = (0.41222147079999993 * r) + (0.5363325363 * g) + (0.0514459929 * b);
-            double m = (0.2119034981999999 * r) + (0.6806995450999999 * g) + (0.1073969566 * b);
-            double s = (0.08830246189999998 * r) + (0.2817188376 * g) + (0.6299787005000002 * b);
-
-            double l_ = Math.Cbrt(l);
-            double m_ = Math.Cbrt(m);
-            double s_ = Math.Cbrt(s);
-
-            return (
-                (0.2104542553 * l_) + (0.793617785 * m_) - (0.0040720468 * s_),
-                (1.9779984951 * l_) - (2.428592205 * m_) + (0.4505937099 * s_),
-                (0.0259040371 * l_) + (0.7827717662 * m_) - (0.808675766 * s_)
-            );
-        }
-
-        /// <summary>
-        /// Convert an Oklab color <see cref="double"/> from Cartesian form to its polar form Oklch
-        /// https://bottosson.github.io/posts/oklab/#the-oklab-color-space
-        /// </summary>
-        /// <param name="lightness">The <see cref="lightness"/></param>
-        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
-        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
-        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
-        private static (double Lightness, double Chroma, double Hue)
-            GetOklchColorFromOklab(double lightness, double chromaticity_a, double chromaticity_b)
-        {
-            return GetLCHColorFromLAB(lightness, chromaticity_a, chromaticity_b);
-        }
-
-        /// <summary>
-        /// Convert a color in Cartesian form (Lab) to its polar form (LCh)
-        /// </summary>
-        /// <param name="lightness">The <see cref="lightness"/></param>
-        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
-        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
-        /// <returns>The lightness, chroma, and hue angle</returns>
-        private static (double Lightness, double Chroma, double Hue)
-            GetLCHColorFromLAB(double lightness, double chromaticity_a, double chromaticity_b)
-        {
-            // Lab to LCh transformation
-            double chroma = Math.Sqrt(Math.Pow(chromaticity_a, 2) + Math.Pow(chromaticity_b, 2));
-            double hue = Math.Round(chroma, 3) == 0 ? 0.0 : ((Math.Atan2(chromaticity_b, chromaticity_a) * 180d / Math.PI) + 360d) % 360d;
-            return (lightness, chroma, hue);
-        }
-
         /// <summary>
         /// Convert a given <see cref="Color"/> to a natural color (hue, whiteness, blackness)
         /// </summary>
@@ -364,17 +276,12 @@ namespace ManagedCommon
             { "Br", 'p' },   // brightness       percent
             { "In", 'p' },   // intensity        percent
             { "Ll", 'p' },   // lightness (HSL)  percent
+            { "Lc", 'p' },   // lightness(CIELAB)percent
             { "Va", 'p' },   // value            percent
             { "Wh", 'p' },   // whiteness        percent
             { "Bn", 'p' },   // blackness        percent
-            { "Lc", 'p' },   // lightness (CIE)         percent
-            { "Ca", 'p' },   // chromaticityA (CIELAB)  percent
-            { "Cb", 'p' },   // chromaticityB (CIELAB)  percent
-            { "Lo", 'p' },   // lightness (Oklab/Oklch) percent
-            { "Oa", 'p' },   // chromaticityA (Oklab)   percent
-            { "Ob", 'p' },   // chromaticityB (Oklab)   percent
-            { "Oc", 'p' },   // chroma (Oklch)          percent
-            { "Oh", 'p' },   // hue angle (Oklch)       percent
+            { "Ca", 'p' },   // chromaticityA    percent
+            { "Cb", 'p' },   // chromaticityB    percent
             { "Xv", 'i' },   // X value          int
             { "Yv", 'i' },   // Y value          int
             { "Zv", 'i' },   // Z value          int
@@ -517,10 +424,6 @@ namespace ManagedCommon
                     var (lightnessC, _, _) = ConvertToCIELABColor(color);
                     lightnessC = Math.Round(lightnessC, 2);
                     return lightnessC.ToString(CultureInfo.InvariantCulture);
-                case "Lo":
-                    var (lightnessO, _, _) = ConvertToOklabColor(color);
-                    lightnessO = Math.Round(lightnessO, 2);
-                    return lightnessO.ToString(CultureInfo.InvariantCulture);
                 case "Wh":
                     var (_, whiteness, _) = ConvertToHWBColor(color);
                     whiteness = Math.Round(whiteness * 100);
@@ -537,22 +440,6 @@ namespace ManagedCommon
                     var (_, _, chromaticityB) = ConvertToCIELABColor(color);
                     chromaticityB = Math.Round(chromaticityB, 2);
                     return chromaticityB.ToString(CultureInfo.InvariantCulture);
-                case "Oa":
-                    var (_, chromaticityAOklab, _) = ConvertToOklabColor(color);
-                    chromaticityAOklab = Math.Round(chromaticityAOklab, 2);
-                    return chromaticityAOklab.ToString(CultureInfo.InvariantCulture);
-                case "Ob":
-                    var (_, _, chromaticityBOklab) = ConvertToOklabColor(color);
-                    chromaticityBOklab = Math.Round(chromaticityBOklab, 2);
-                    return chromaticityBOklab.ToString(CultureInfo.InvariantCulture);
-                case "Oc":
-                    var (_, chromaOklch, _) = ConvertToOklchColor(color);
-                    chromaOklch = Math.Round(chromaOklch, 2);
-                    return chromaOklch.ToString(CultureInfo.InvariantCulture);
-                case "Oh":
-                    var (_, _, hueOklch) = ConvertToOklchColor(color);
-                    hueOklch = Math.Round(hueOklch, 2);
-                    return hueOklch.ToString(CultureInfo.InvariantCulture);
                 case "Xv":
                     var (x, _, _) = ConvertToCIEXYZColor(color);
                     x = Math.Round(x * 100, 4);
@@ -608,10 +495,8 @@ namespace ManagedCommon
                 case "HSI": return "hsi(%Hu, %Si%, %In%)";
                 case "HWB": return "hwb(%Hu, %Wh%, %Bn%)";
                 case "NCol": return "%Hn, %Wh%, %Bn%";
-                case "CIEXYZ": return "XYZ(%Xv, %Yv, %Zv)";
                 case "CIELAB": return "CIELab(%Lc, %Ca, %Cb)";
-                case "Oklab": return "oklab(%Lo, %Oa, %Ob)";
-                case "Oklch": return "oklch(%Lo, %Oc, %Oh)";
+                case "CIEXYZ": return "XYZ(%Xv, %Yv, %Zv)";
                 case "VEC4": return "(%Reff, %Grff, %Blff, 1f)";
                 case "Decimal": return "%Dv";
                 case "HEX Int": return "0xFF%ReX%GrX%BlX";

src/common/ManagedCommon/IdRecoveryHelper.cs

@@ -1,51 +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.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ManagedCommon
-{
-    public static class IdRecoveryHelper
-    {
-        /// <summary>
-        /// Fixes invalid IDs in the given list by assigning unique values.
-        /// It ensures that all IDs are non-empty and unique, correcting any duplicates or empty IDs.
-        /// </summary>
-        /// <param name="items">The list of items that may contain invalid IDs.</param>
-        public static void RecoverInvalidIds<T>(IEnumerable<T> items)
-            where T : class, IHasId
-        {
-            var idSet = new HashSet<int>();
-            int newId = 0;
-            var sortedItems = items.OrderBy(i => i.Id).ToList(); // Sort items by ID for consistent processing
-
-            // Iterate through the list and fix invalid IDs
-            foreach (var item in sortedItems)
-            {
-                // If the ID is invalid or already exists in the set (duplicate), assign a new unique ID
-                if (!idSet.Add(item.Id))
-                {
-                    // Find the next available unique ID
-                    while (idSet.Contains(newId))
-                    {
-                        newId++;
-                    }
-
-                    item.Id = newId;
-                    idSet.Add(newId); // Add the newly assigned ID to the set
-                }
-            }
-        }
-    }
-
-    public interface IHasId
-    {
-        int Id { get; set; }
-    }
-}

src/common/ManagedCommon/Logger.cs

@@ -6,10 +6,9 @@ using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
+
 using PowerToys.Interop;
 
 namespace ManagedCommon
@@ -41,72 +40,25 @@ namespace ManagedCommon
         /// <param name="isLocalLow">If the process using Logger is a low-privilege process.</param>
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
-            string basePath;
             if (isLocalLow)
             {
-                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
+                applicationLogPath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath + "\\" + Version;
             }
             else
             {
-                basePath = Constants.AppDataPath() + applicationLogPath;
+                applicationLogPath = Constants.AppDataPath() + applicationLogPath + "\\" + Version;
             }
 
-            string versionedPath = Path.Combine(basePath, Version);
-
-            if (!Directory.Exists(versionedPath))
+            if (!Directory.Exists(applicationLogPath))
             {
-                Directory.CreateDirectory(versionedPath);
+                Directory.CreateDirectory(applicationLogPath);
             }
 
-            var logFilePath = Path.Combine(versionedPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 
             Trace.AutoFlush = true;
-
-            // Clean up old version log folders
-            Task.Run(() => DeleteOldVersionLogFolders(basePath, versionedPath));
-        }
-
-        /// <summary>
-        /// Deletes old version log folders, keeping only the current version's folder.
-        /// </summary>
-        /// <param name="basePath">The base path to the log files folder.</param>
-        /// <param name="currentVersionPath">The path to the current version's log folder.</param>
-        private static void DeleteOldVersionLogFolders(string basePath, string currentVersionPath)
-        {
-            try
-            {
-                if (!Directory.Exists(basePath))
-                {
-                    return;
-                }
-
-                var dirs = Directory.GetDirectories(basePath)
-                    .Select(d => new DirectoryInfo(d))
-                    .OrderBy(d => d.CreationTime)
-                    .Where(d => !string.Equals(d.FullName, currentVersionPath, StringComparison.OrdinalIgnoreCase))
-                    .Take(3)
-                    .ToList();
-
-                foreach (var directory in dirs)
-                {
-                    try
-                    {
-                        Directory.Delete(directory.FullName, true);
-                        LogInfo($"Deleted old log directory: {directory.FullName}");
-                        Task.Delay(500).Wait();
-                    }
-                    catch (Exception ex)
-                    {
-                        LogError($"Failed to delete old log directory: {directory.FullName}", ex);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogError("Error cleaning up old log folders", ex);
-            }
         }
 
         public static void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)

src/common/utils/package.h

@@ -301,7 +301,6 @@ namespace package
         if (!std::filesystem::exists(directoryPath))
         {
             Logger::error(L"The directory '" + directoryPath + L"' does not exist.");
-            return {};
         }
 
         const std::regex pattern(R"(^.+\.(appx|msix|msixbundle)$)", std::regex_constants::icase);

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
 	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/OneFuzzConfig.json

@@ -17,7 +17,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "leilzh@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "leilzh@microsoft.com",

src/modules/AdvancedPaste/AdvancedPaste/Helpers/OcrHelpers.cs

@@ -18,19 +18,10 @@ public static class OcrHelpers
 {
     public static async Task<string> ExtractTextAsync(SoftwareBitmap bitmap, CancellationToken cancellationToken)
     {
-        var ocrLanguage = GetOCRLanguage();
+        var ocrLanguage = GetOCRLanguage() ?? throw new InvalidOperationException("Unable to determine OCR language");
         cancellationToken.ThrowIfCancellationRequested();
 
-        OcrEngine ocrEngine;
-        if (ocrLanguage is not null)
-        {
-            ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine from specified language");
-        }
-        else
-        {
-            ocrEngine = OcrEngine.TryCreateFromUserProfileLanguages() ?? throw new InvalidOperationException("Unable to create OCR engine from user profile language");
-        }
-
+        var ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine");
         cancellationToken.ThrowIfCancellationRequested();
 
         var ocrResult = await ocrEngine.RecognizeAsync(bitmap);

src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw

@@ -152,7 +152,6 @@
   </data>
   <data name="ClipboardHistoryImage" xml:space="preserve">
     <value>Image data</value>
-    <comment>Label used to represent an image in the clipboard history</comment>
   </data>
   <data name="ClipboardHistoryItemMoreOptionsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More options</value>
@@ -195,19 +194,15 @@
   </data>
   <data name="TranscodeToMp3" xml:space="preserve">
     <value>Transcode to .mp3</value>
-    <comment>Option to transcode audio files to MP3 format</comment>
   </data>  
   <data name="TranscodeToMp4" xml:space="preserve">
     <value>Transcode to .mp4 (H.264/AAC)</value>
-    <comment>Option to transcode video files to MP4 format with H.264 video codec and AAC audio codec</comment>
   </data>
   <data name="TranscodeErrorGeneral" xml:space="preserve">
     <value>An error occurred while transcoding media file</value>
-    <comment>Error message displayed when media conversion fails for an unknown or general reason</comment>
   </data>
   <data name="TranscodeErrorUnsupportedCodec" xml:space="preserve">
     <value>The media file contains an unsupported codec</value>
-    <comment>Error message displayed when media conversion fails due to an unsupported codec in the source file</comment>
   </data>
   <data name="PasteButtonAutomation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paste</value>

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj

@@ -15,6 +15,8 @@
     <ProjectPriFileName>PowerToys.EnvironmentVariablesUILib.pri</ProjectPriFileName>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <IsPackable>true</IsPackable>
+    <!-- The default generated file path exceeds the length limit 260 on the build agent. Using a shorter path as a workaround. -->
+    <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -54,4 +56,7 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
+  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
+    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
+  </Target>
 </Project>

src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj

@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
-
 	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

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

@@ -17,7 +17,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -58,7 +58,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -99,7 +99,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -140,7 +140,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -158,19 +158,19 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
-        "Castle.Core.dll",
-        "CommunityToolkit.Mvvm.dll",
         "Hosts.FuzzTests.dll",
         "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
+        "WinRT.Runtime.dll",
         "Moq.dll",
+        "testhost.dll",
+        "Castle.Core.dll",
         "System.IO.Abstractions.dll",
+        "CommunityToolkit.Mvvm.dll",
         "System.IO.Abstractions.TestingHelpers.dll",
         "TestableIO.System.IO.Abstractions.dll",
         "TestableIO.System.IO.Abstractions.TestingHelpers.dll",
-        "TestableIO.System.IO.Abstractions.Wrappers.dll",
-        "Testably.Abstractions.FileSystem.Interface.dll",
-        "WinRT.Runtime.dll"
+        "TestableIO.System.IO.Abstractions.Wrappers.dll"
       ],
       "SdlWorkItemId": 49911822
     }

src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
@@ -141,7 +141,7 @@
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -153,7 +153,7 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets'))" />
   </Target>
 </Project>

src/modules/MeasureTool/MeasureToolCore/packages.config

@@ -4,5 +4,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
 </packages>

src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp

@@ -13,7 +13,6 @@
 #include <common/utils/winapi_error.h>
 #include <common/utils/processApi.h>
 #include <common/utils/elevation.h>
-#include <common/utils/logger_helper.h>
 
 HINSTANCE g_hInst_MouseWithoutBorders = 0;
 
@@ -410,12 +409,9 @@ public:
     {
         app_name = L"MouseWithoutBorders";
         app_key = app_name;
-
-        LoggerHelpers::init_logger(app_key, L"ModuleInterface", LogSettings::mouseWithoutBordersLoggerName);
-
-        std::filesystem::path oldLogPath(PTSettingsHelper::get_module_save_folder_location(app_key));
-        oldLogPath.append("LogsModuleInterface");
-        LoggerHelpers::delete_old_log_folder(oldLogPath);
+        std::filesystem::path logFilePath(PTSettingsHelper::get_module_save_folder_location(app_key));
+        logFilePath.append(LogSettings::mouseWithoutBordersLogPath);
+        Logger::init(LogSettings::mouseWithoutBordersLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
 
         try
         {
@@ -571,7 +567,7 @@ public:
         executable_args.append(L"\" & echo \"Adding an inbound firewall rule for PowerToys.MouseWithoutBorders.exe\"");
         executable_args.append(L" & netsh advfirewall firewall add rule name=\"PowerToys.MouseWithoutBorders\" dir=in action=allow program=\"");
         executable_args.append(executable_path);
-        executable_args.append(L"\" enable=yes remoteip=any profile=any protocol=tcp & pause\"");
+        executable_args.append(L"\" enable=yes remoteip=LocalSubnet profile=any protocol=tcp & pause\"");
 
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
         sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };

src/modules/Workspaces/WorkspacesEditor/ViewModels/MainViewModel.cs

@@ -193,29 +193,27 @@ namespace WorkspacesEditor.ViewModels
             ApplyShortcut(editedProject);
         }
 
-        private string GetDesktopShortcutAddress(Project project) => Path.Combine(FolderUtils.Desktop(), project.Name + ".lnk");
-
-        private string GetShortcutStoreAddress(Project project)
-        {
-            var dataFolder = FolderUtils.DataFolder();
-            Directory.CreateDirectory(dataFolder);
-            var shortcutStoreFolder = Path.Combine(dataFolder, "WorkspacesIcons");
-            Directory.CreateDirectory(shortcutStoreFolder);
-            return Path.Combine(shortcutStoreFolder, project.Id + ".ico");
-        }
-
         private void ApplyShortcut(Project project)
         {
+            string basePath = AppDomain.CurrentDomain.BaseDirectory;
+            string shortcutAddress = Path.Combine(FolderUtils.Desktop(), project.Name + ".lnk");
+            string shortcutIconFilename = Path.Combine(FolderUtils.Temp(), project.Id + ".ico");
+
             if (!project.IsShortcutNeeded)
             {
-                RemoveShortcut(project);
+                if (File.Exists(shortcutIconFilename))
+                {
+                    File.Delete(shortcutIconFilename);
+                }
+
+                if (File.Exists(shortcutAddress))
+                {
+                    File.Delete(shortcutAddress);
+                }
+
                 return;
             }
 
-            var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var shortcutAddress = GetDesktopShortcutAddress(project);
-            var shortcutIconFilename = GetShortcutStoreAddress(project);
-
             Bitmap icon = WorkspacesIcon.DrawIcon(WorkspacesIcon.IconTextFromProjectName(project.Name), App.ThemeManager.GetCurrentTheme());
             WorkspacesIcon.SaveIcon(icon, shortcutIconFilename);
 
@@ -362,8 +360,8 @@ namespace WorkspacesEditor.ViewModels
 
         private void RemoveShortcut(Project selectedProject)
         {
-            string shortcutAddress = GetDesktopShortcutAddress(selectedProject);
-            string shortcutIconFilename = GetShortcutStoreAddress(selectedProject);
+            string shortcutAddress = Path.Combine(FolderUtils.Desktop(), selectedProject.Name + ".lnk");
+            string shortcutIconFilename = Path.Combine(FolderUtils.Temp(), selectedProject.Id + ".ico");
 
             if (File.Exists(shortcutIconFilename))
             {

src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp

@@ -25,7 +25,6 @@ namespace AppLauncher
         const std::wstring ChromeFilename = L"chrome.exe";
         const std::wstring ChromePwaFilename = L"chrome_proxy.exe";
         const std::wstring PwaCommandLineAddition = L"--profile-directory=Default --app-id=";
-        const std::wstring SteamProtocolPrefix = L"steam:";
     }
 
     Result<SHELLEXECUTEINFO, std::wstring> LaunchApp(const std::wstring& appPath, const std::wstring& commandLineArgs, bool elevated)
@@ -122,24 +121,9 @@ namespace AppLauncher
         // packaged apps: try launching first by AppUserModel.ID
         // usage example: elevated Terminal
         if (!launched && !app.appUserModelId.empty() && !app.packageFullName.empty())
-        {
-            Logger::trace(L"Launching {} as {} - {app.packageFullName}", app.name, app.appUserModelId, app.packageFullName);
-            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
-            if (res.isOk())
-            {
-                launched = true;
-            }
-            else
-            {
-                launchErrors.push_back({ std::filesystem::path(app.path).filename(), res.error() });
-            }
-        }
-
-        // protocol launch for steam
-        if (!launched && !app.appUserModelId.empty() && app.appUserModelId.contains(NonLocalizable::SteamProtocolPrefix))
         {
             Logger::trace(L"Launching {} as {}", app.name, app.appUserModelId);
-            auto res = LaunchApp(app.appUserModelId, app.commandLineArgs, app.isElevated);
+            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
             if (res.isOk())
             {
                 launched = true;

src/modules/Workspaces/WorkspacesLib/AppUtils.cpp

@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "AppUtils.h"
-#include "SteamHelper.h"
 
 #include <atlbase.h>
 #include <propvarutil.h>
@@ -35,8 +34,6 @@ namespace Utils
 
             constexpr const wchar_t* EdgeFilename = L"msedge.exe";
             constexpr const wchar_t* ChromeFilename = L"chrome.exe";
-
-            constexpr const wchar_t* SteamUrlProtocol = L"steam:";
         }
 
         AppList IterateAppsFolder()
@@ -141,34 +138,6 @@ namespace Utils
                                 else if (prop == NonLocalizable::PackageInstallPathProp || prop == NonLocalizable::InstallPathProp)
                                 {
                                     data.installPath = propVariantString.m_pData;
-
-                                    if (!data.installPath.empty())
-                                    {
-                                        const bool isSteamProtocol = data.installPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
-
-                                        if (isSteamProtocol)
-                                        {
-                                            Logger::info(L"Found steam game: protocol path: {}", data.installPath);
-                                            data.protocolPath = data.installPath;
-
-                                            try
-                                            {
-                                                auto gameId = Steam::GetGameIdFromUrlProtocolPath(data.installPath);
-                                                auto gameFolder = Steam::GetSteamGameInfoFromAcfFile(gameId);
-
-                                                if (gameFolder)
-                                                {
-                                                    data.installPath = gameFolder->gameInstallationPath;
-                                                    Logger::info(L"Found steam game: physical path: {}", data.installPath);
-                                                }
-                                            }
-                                            catch (std::exception ex)
-                                            {
-                                                Logger::error(L"Failed to get installPath for game {}", data.installPath);
-                                                Logger::error("Error: {}", ex.what());
-                                            }
-                                        }
-                                    }
                                 }
                             }
 
@@ -428,10 +397,5 @@ namespace Utils
         {
             return installPath.ends_with(NonLocalizable::ChromeFilename);
         }
-
-        bool AppData::IsSteamGame() const
-        {
-            return protocolPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
-        }
     }
 }

src/modules/Workspaces/WorkspacesLib/AppUtils.h

@@ -13,12 +13,10 @@ namespace Utils
             std::wstring packageFullName;
             std::wstring appUserModelId;
             std::wstring pwaAppId;
-            std::wstring protocolPath;
             bool canLaunchElevated = false;
 
             bool IsEdge() const;
             bool IsChrome() const;
-            bool IsSteamGame() const;
         };
 
         using AppList = std::vector<AppData>;

src/modules/Workspaces/WorkspacesLib/SteamGameHelper.cpp

@@ -1,171 +0,0 @@
-#include "pch.h"
-#include "SteamHelper.h"
-#include <fstream>
-#include <sstream>
-#include <unordered_map>
-#include <filesystem>
-#include <regex>
-#include <string>
-
-namespace Utils
-{
-
-    static std::wstring Utf8ToWide(const std::string& utf8)
-    {
-        if (utf8.empty())
-            return L"";
-
-        int size = MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), nullptr, 0);
-        if (size <= 0)
-            return L"";
-
-        std::wstring wide(size, L'\0');
-        MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), wide.data(), size);
-        return wide;
-    }
-
-    namespace Steam
-    {
-        using namespace std;
-        namespace fs = std::filesystem;
-
-        static std::optional<std::wstring> GetSteamExePathFromRegistry()
-        {
-            static std::optional<std::wstring> cachedPath;
-            if (cachedPath.has_value())
-            {
-                return cachedPath;
-            }
-
-            const std::vector<HKEY> roots = { HKEY_CLASSES_ROOT, HKEY_LOCAL_MACHINE, HKEY_USERS };
-            const std::vector<std::wstring> subKeys = {
-                L"steam\\shell\\open\\command",
-                L"Software\\Classes\\steam\\shell\\open\\command",
-            };
-
-            for (HKEY root : roots)
-            {
-                for (const auto& subKey : subKeys)
-                {
-                    HKEY hKey;
-                    if (RegOpenKeyExW(root, subKey.c_str(), 0, KEY_READ, &hKey) == ERROR_SUCCESS)
-                    {
-                        wchar_t value[512];
-                        DWORD size = sizeof(value);
-                        DWORD type = 0;
-
-                        if (RegQueryValueExW(hKey, nullptr, nullptr, &type, reinterpret_cast<LPBYTE>(value), &size) == ERROR_SUCCESS &&
-                            (type == REG_SZ || type == REG_EXPAND_SZ))
-                        {
-                            std::wregex exeRegex(LR"delim("([^"]+steam\.exe)")delim");
-                            std::wcmatch match;
-                            if (std::regex_search(value, match, exeRegex) && match.size() > 1)
-                            {
-                                RegCloseKey(hKey);
-                                cachedPath = match[1].str();
-                                return cachedPath;
-                            }
-                        }
-
-                        RegCloseKey(hKey);
-                    }
-                }
-            }
-
-            cachedPath = std::nullopt;
-            return std::nullopt;
-        }
-
-        static fs::path GetSteamBasePath()
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return fs::path(*steamFolderOpt).parent_path() / L"steamapps";
-        }
-
-        static fs::path GetAcfFilePath(const std::wstring& gameId)
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return GetSteamBasePath() / (L"appmanifest_" + gameId + L".acf");
-        }
-
-        static fs::path GetGameInstallPath(const std::wstring& gameFolderName)
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return GetSteamBasePath() / L"common" / gameFolderName;
-        }
-
-        static unordered_map<wstring, wstring> ParseAcfFile(const fs::path& acfPath)
-        {
-            unordered_map<wstring, wstring> result;
-
-            ifstream file(acfPath);
-            if (!file.is_open())
-                return result;
-
-            string line;
-            while (getline(file, line))
-            {
-                smatch matches;
-                static const regex pattern(R"delim("([^"]+)"\s+"([^"]+)")delim");
-
-                if (regex_search(line, matches, pattern) && matches.size() == 3)
-                {
-                    wstring key = Utf8ToWide(matches[1].str());
-                    wstring value = Utf8ToWide(matches[2].str());
-                    result[key] = value;
-                }
-            }
-
-            return result;
-        }
-
-        std::unique_ptr<Steam::SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId)
-        {
-            fs::path acfPath = Steam::GetAcfFilePath(gameId);
-
-            if (!fs::exists(acfPath))
-                return nullptr;
-
-            auto kv = ParseAcfFile(acfPath);
-            if (kv.empty() || kv.find(L"installdir") == kv.end())
-                return nullptr;
-
-            fs::path gamePath = Steam::GetGameInstallPath(kv[L"installdir"]);
-            if (!fs::exists(gamePath))
-                return nullptr;
-
-            auto game = std::make_unique<Steam::SteamGame>();
-            game->gameId = gameId;
-            game->gameInstallationPath = gamePath.wstring();
-            return game;
-        }
-
-        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath)
-        {
-            const std::wstring steamGamePrefix = L"steam://rungameid/";
-
-            if (urlPath.rfind(steamGamePrefix, 0) == 0)
-            {
-                return urlPath.substr(steamGamePrefix.length());
-            }
-
-            return L"";
-        }
-
-    }
-}

src/modules/Workspaces/WorkspacesLib/SteamHelper.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include "pch.h"
-
-namespace Utils
-{
-    namespace NonLocalizable
-    {
-        const std::wstring AcfFileNameTemplate = L"appmanifest_<gameid>.acfs";
-    }
-
-    namespace Steam
-    {
-        struct SteamGame
-        {
-            std::wstring gameId;
-            std::wstring gameInstallationPath;
-        };
-
-        std::unique_ptr<SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId);
-
-        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath);
-    }
-}

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj

@@ -41,7 +41,6 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="PwaHelper.h" />
     <ClInclude Include="Result.h" />
-    <ClInclude Include="SteamHelper.h" />
     <ClInclude Include="StringUtils.h" />
     <ClInclude Include="utils.h" />
     <ClInclude Include="WbemHelper.h" />
@@ -58,7 +57,6 @@
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="PwaHelper.cpp" />
-    <ClCompile Include="SteamGameHelper.cpp" />
     <ClCompile Include="two_way_pipe_message_ipc.cpp" />
     <ClCompile Include="WbemHelper.cpp" />
     <ClCompile Include="WorkspacesData.cpp" />

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters

@@ -53,9 +53,6 @@
     <ClInclude Include="StringUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SteamHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -91,9 +88,6 @@
     <ClCompile Include="WbemHelper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SteamGameHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp

@@ -71,8 +71,6 @@ namespace SnapshotUtils
                 continue;
             }
 
-            Logger::info("Try to get window app:{}", reinterpret_cast<void*>(window));
-
             DWORD pid{};
             GetWindowThreadProcessId(window, &pid);
 
@@ -120,19 +118,10 @@ namespace SnapshotUtils
             auto data = Utils::Apps::GetApp(processPath, pid, installedApps);
             if (!data.has_value() || data->name.empty())
             {
-                Logger::info(L"Installed app not found:{},{}", reinterpret_cast<void*>(window), processPath);
+                Logger::info(L"Installed app not found: {}", processPath);
                 continue;
             }
 
-            if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
-            {
-                // Only care about steam games if it has no thick frame to remain consistent with
-                // the behavior as before.
-                continue;
-            }
-
-            Logger::info(L"Found app for window:{},{}", reinterpret_cast<void*>(window), processPath);
-
             auto appData = data.value();
 
             bool isEdge = appData.IsEdge();

src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp

@@ -200,14 +200,6 @@ std::optional<WindowWithDistance> WindowArranger::GetNearestWindow(const Workspa
         }
 
         auto data = Utils::Apps::GetApp(processPath, pid, m_installedApps);
-
-        if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
-        {
-            // Only care about steam games if it has no thick frame to remain consistent with 
-            // the behavior as before.
-            continue;
-        }
-
         if (!data.has_value())
         {
             continue;

src/modules/Workspaces/workspaces-common/WindowFilter.h

@@ -9,12 +9,10 @@ namespace WindowFilter
     {
         auto style = GetWindowLong(window, GWL_STYLE);
         bool isPopup = WindowUtils::HasStyle(style, WS_POPUP);
+        bool hasThickFrame = WindowUtils::HasStyle(style, WS_THICKFRAME);
         bool hasCaption = WindowUtils::HasStyle(style, WS_CAPTION);
         bool hasMinimizeMaximizeButtons = WindowUtils::HasStyle(style, WS_MINIMIZEBOX) || WindowUtils::HasStyle(style, WS_MAXIMIZEBOX);
-
-        Logger::info("Style for window: {}, {:#x}", reinterpret_cast<void*>(window), style);
-
-        if (isPopup && !(hasCaption || hasMinimizeMaximizeButtons))
+        if (isPopup && !(hasThickFrame && (hasCaption || hasMinimizeMaximizeButtons)))
         {
             // popup windows we want to snap: e.g. Calculator, Telegram
             // popup windows we don't want to snap: start menu, notification popup, tray window, etc.

src/modules/Workspaces/workspaces-common/WindowUtils.h

@@ -121,11 +121,4 @@ namespace WindowUtils
 
         return std::wstring(title);
     }
-
-    
-    inline bool HasThickFrame(HWND window)
-    {
-        auto style = GetWindowLong(window, GWL_STYLE);
-        return WindowUtils::HasStyle(style, WS_THICKFRAME);
-    }
 }

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.rc

@@ -0,0 +1,40 @@
+#include <windows.h>
+#include "resource.h"
+#include "../../../common/version/version.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj

@@ -108,6 +108,7 @@
     <ClInclude Include="KeyboardListener.h">
       <DependentUpon>KeyboardListener.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -129,6 +130,9 @@
     <None Include="PropertySheet.props" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ResourceCompile Include="CmdPalKeyboardService.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\..\..\..\deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj.filters

@@ -16,6 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="KeyboardListener.idl" />
@@ -27,4 +28,9 @@
   <ItemGroup>
     <None Include="PropertySheet.props" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <ResourceCompile Include="CmdPalKeyboardService.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

src/modules/cmdpal/CmdPalKeyboardService/resource.h

@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PowerToys.MeasureToolCore.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "CmdPalKeyboardService"
+#define INTERNAL_NAME "CmdPalKeyboardService"
+#define ORIGINAL_FILENAME "CmdPalKeyboardService.dll"
+
+// Non-localizable
+//////////////////////////////

src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.rc

@@ -0,0 +1,40 @@
+#include <windows.h>
+#include "resource.h"
+#include "../../../common/version/version.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj

@@ -2,7 +2,6 @@
 <Project DefaultTargets="Build"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Import Project="..\Microsoft.CmdPal.UI\CmdPal.pre.props" Condition="Exists('..\Microsoft.CmdPal.UI\CmdPal.pre.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -44,25 +43,22 @@
     <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
       <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\common\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>
-        EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;
-        %(PreprocessorDefinitions);
-      </PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'">
-        IS_DEV_BRANDING;%(PreprocessorDefinitions)
-      </PreprocessorDefinitions>
+      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
-
   <ItemGroup>
     <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
@@ -70,6 +66,9 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CmdPalModuleInterface.rc" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
@@ -85,4 +84,4 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-</Project>
+</Project>

src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp

@@ -3,7 +3,6 @@
 
 #include <interface/powertoy_module_interface.h>
 
-#include <atomic>
 #include <common/logger/logger.h>
 #include <common/utils/logger_helper.h>
 #include <common/SettingsAPI/settings_helpers.h>
@@ -11,11 +10,10 @@
 #include <common/utils/resources.h>
 #include <common/utils/package.h>
 #include <common/utils/process_path.h>
-#include <common/utils/winapi_error.h>
 #include <common/interop/shared_constants.h>
 #include <Psapi.h>
 #include <TlHelp32.h>
-#include <thread>
+#include <common/utils/winapi_error.h>
 
 HINSTANCE g_hInst_cmdPal = 0;
 
@@ -39,6 +37,8 @@ BOOL APIENTRY DllMain(HMODULE hInstance,
 class CmdPal : public PowertoyModuleIface
 {
 private:
+    bool m_enabled = false;
+
     std::wstring app_name;
 
     //contains the non localized key of the powertoy
@@ -46,10 +46,7 @@ private:
 
     HANDLE m_hTerminateEvent;
 
-    // Track if this is the first call to enable
-    bool firstEnableCall = true;
-
-    static bool LaunchApp(const std::wstring& appPath, const std::wstring& commandLineArgs, bool elevated, bool silentFail)
+    void LaunchApp(const std::wstring& appPath, const std::wstring& commandLineArgs, bool elevated)
     {
         std::wstring dir = std::filesystem::path(appPath).parent_path();
 
@@ -57,10 +54,6 @@ private:
         sei.cbSize = sizeof(SHELLEXECUTEINFO);
         sei.hwnd = nullptr;
         sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE;
-        if (silentFail)
-        {
-            sei.fMask = sei.fMask | SEE_MASK_FLAG_NO_UI;
-        }
         sei.lpVerb = elevated ? L"runas" : L"open";
         sei.lpFile = appPath.c_str();
         sei.lpParameters = commandLineArgs.c_str();
@@ -71,11 +64,7 @@ private:
         {
             std::wstring error = get_last_error_or_default(GetLastError());
             Logger::error(L"Failed to launch process. {}", error);
-            return false;
         }
-
-        m_launched.store(true);
-        return true;
     }
 
     std::vector<DWORD> GetProcessesIdByName(const std::wstring& processName)
@@ -133,9 +122,6 @@ private:
     }
 
 public:
-    static std::atomic<bool> m_enabled;
-    static std::atomic<bool> m_launched;
-
     CmdPal()
     {
         app_name = L"CmdPal";
@@ -147,7 +133,10 @@ public:
 
     ~CmdPal()
     {
-        CmdPal::m_enabled.store(false);
+        if (m_enabled)
+        {
+        }
+        m_enabled = false;
     }
 
     // Destroy the powertoy and free memory
@@ -214,19 +203,15 @@ public:
     {
         Logger::trace("CmdPal::enable()");
 
-        CmdPal::m_enabled.store(true);
+        m_enabled = true;
 
-        std::wstring packageName = L"Microsoft.CommandPalette";
-        // Launch CmdPal as normal user using explorer
-        std::wstring launchPath = L"explorer.exe";
-        std::wstring launchArgs = L"x-cmdpal://background";
-#ifdef IS_DEV_BRANDING
-        packageName = L"Microsoft.CommandPalette.Dev";
-#endif
-
-        if (!package::GetRegisteredPackage(packageName, false).has_value())
+        try
         {
-            try
+            std::wstring packageName = L"Microsoft.CommandPalette";
+#ifdef _DEBUG
+            packageName = L"Microsoft.CommandPalette.Dev";
+#endif
+            if (!package::GetRegisteredPackage(packageName, false).has_value())
             {
                 Logger::info(L"CmdPal not installed. Installing...");
 
@@ -253,34 +238,19 @@ public:
                     }
                 }
             }
-            catch (std::exception& e)
-            {
-                std::string errorMessage{ "Exception thrown while trying to install CmdPal package: " };
-                errorMessage += e.what();
-                Logger::error(errorMessage);
-            }
+        }
+        catch (std::exception& e)
+        {
+            std::string errorMessage{ "Exception thrown while trying to install CmdPal package: " };
+            errorMessage += e.what();
+            Logger::error(errorMessage);
         }
 
-        if (!package::GetRegisteredPackage(packageName, false).has_value())
-        {
-            Logger::error("Cmdpal is not registered, quit..");
-            return;
-        }
-
-        if (!firstEnableCall)
-        {
-            Logger::trace("Not first attempt, try to launch");
-            LaunchApp(launchPath, launchArgs, false /*no elevated*/, false /*error pop up*/);
-        }
-        else
-        {
-            // If first time enable, do retry launch.
-            Logger::trace("First attempt, try to launch");
-            std::thread launchThread(&CmdPal::RetryLaunch, launchPath, launchArgs);
-            launchThread.detach();
-        }
-
-        firstEnableCall = false;
+#if _DEBUG
+        LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette.Dev_8wekyb3d8bbwe!App", L"RunFromPT", false);
+#else
+        LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette_8wekyb3d8bbwe!App", L"RunFromPT", false);
+#endif
     }
 
     virtual void disable()
@@ -288,44 +258,7 @@ public:
         Logger::trace("CmdPal::disable()");
         TerminateCmdPal();
 
-        CmdPal::m_enabled.store(false);
-    }
-
-    static void RetryLaunch(std::wstring path, std::wstring cmdArgs)
-    {
-        const int base_delay_milliseconds = 1000;
-        int max_retry = 9; // 2**9 - 1 seconds. Control total wait time within 10 min.
-        int retry = 0;
-        do
-        {
-            auto launch_result = LaunchApp(path, cmdArgs, false, retry < max_retry);
-            if (launch_result)
-            {
-                Logger::info(L"CmdPal launched successfully after {} retries.", retry);
-                return;
-            }
-            else
-            {
-                Logger::error(L"Retry {} launch CmdPal launch failed.", retry);
-            }
-
-            // When we got max retry, we don't need to wait for the next retry.
-            if (retry < max_retry)
-            {
-                int delay = base_delay_milliseconds * (1 << (retry));
-                std::this_thread::sleep_for(std::chrono::milliseconds(delay));
-            }
-            ++retry;
-        } while (retry <= max_retry && m_enabled.load() && !m_launched.load());
-
-        if (!m_enabled.load() || m_launched.load())
-        {
-            Logger::error(L"Retry cancelled. CmdPal is disabled or already launched.");
-        }
-        else
-        {
-            Logger::error(L"CmdPal launch failed after {} attempts.", retry);
-        }
+        m_enabled = false;
     }
 
     virtual bool on_hotkey(size_t) override
@@ -340,13 +273,10 @@ public:
 
     virtual bool is_enabled() override
     {
-        return CmdPal::m_enabled.load();
+        return m_enabled;
     }
 };
 
-std::atomic<bool> CmdPal::m_enabled{ false };
-std::atomic<bool> CmdPal::m_launched{ false };
-
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new CmdPal();

src/modules/cmdpal/CmdPalModuleInterface/resource.h

@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by AlwaysOnTopModuleInterface.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Command Palette Module"
+#define INTERNAL_NAME "PowerToys.CmdPalModuleInterface"
+#define ORIGINAL_FILENAME "PowerToys.CmdPalModuleInterface.dll"
+
+// Non-localizable
+//////////////////////////////

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

@@ -1,17 +1,17 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.2.0" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.1.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24508.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
     <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.6" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.3" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs

@@ -14,12 +14,11 @@ namespace TemplateCmdPalExtension;
 public class Program
 {
     [MTAThread]
-    public static void Main(string[] args)
+    public static async Task Main(string[] args)
     {
         if (args.Length > 0 && args[0] == "-RegisterProcessAsComServer")
         {
-            global::Shmuelie.WinRTServer.ComServer server = new();
-
+            await using global::Shmuelie.WinRTServer.ComServer server = new();
             ManualResetEvent extensionDisposedEvent = new(false);
             
             // We are instantiating an extension instance once above, and returning it every time the callback in RegisterExtension below is called.
@@ -32,8 +31,6 @@ public class Program
             // This will make the main thread wait until the event is signalled by the extension class.
             // Since we have single instance of the extension object, we exit as soon as it is disposed.
             extensionDisposedEvent.WaitOne();
-            server.Stop();
-            server.UnsafeDispose();
         }
         else
         {

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>TemplateCmdPalExtension</RootNamespace>
@@ -56,35 +56,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PublishSingleFile>true</PublishSingleFile>
     <IsAotCompatible>true</IsAotCompatible>
-
     <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
     <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
     <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081;$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <WarningsNotAsErrors>IL2081</WarningsNotAsErrors>
 
-    <!-- When publishing trimmed, make sure to treat trimming warnings as build errors -->
-    <ILLinkTreatWarningsAsErrors>true</ILLinkTreatWarningsAsErrors>
-
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <!-- In Debug builds, trimming is disabled by default, but all the trim & 
-         AOT warnings are enabled. This gives debug builds a tighter inner loop,
-         while at least warning about future trim violations -->
-    <PublishTrimmed>false</PublishTrimmed>
-    
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
-    <EnableAotAnalyzer>true</EnableAotAnalyzer>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'!='Debug'">
-    <!-- In Release builds, trimming is enabled by default. 
-         feel free to disable this if needed -->
     <PublishTrimmed>true</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
-
-
 </Project>

src/modules/cmdpal/Microsoft.CmdPal.Common/Contracts/IFileService.cs

@@ -0,0 +1,14 @@
+// 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 Microsoft.CmdPal.Common.Contracts;
+
+public interface IFileService
+{
+    T Read<T>(string folderPath, string fileName);
+
+    void Save<T>(string folderPath, string fileName, T content);
+
+    void Delete(string folderPath, string fileName);
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Contracts/ILocalSettingsService.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.Common.Contracts;
+
+public interface ILocalSettingsService
+{
+    Task<bool> HasSettingAsync(string key);
+
+    Task<T?> ReadSettingAsync<T>(string key);
+
+    Task SaveSettingAsync<T>(string key, T value);
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Extensions/ApplicationExtensions.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Common.Services;
+using Microsoft.UI.Xaml;
+
+namespace Microsoft.CmdPal.Common.Extensions;
+
+/// <summary>
+/// Extension class implementing extension methods for <see cref="Application"/>.
+/// </summary>
+public static class ApplicationExtensions
+{
+    /// <summary>
+    /// Get registered services at the application level from anywhere in the
+    /// application.
+    ///
+    /// Note:
+    /// https://learn.microsoft.com/uwp/api/windows.ui.xaml.application.current?view=winrt-22621#windows-ui-xaml-application-current
+    /// "Application is a singleton that implements the static Current property
+    /// to provide shared access to the Application instance for the current
+    /// application. The singleton pattern ensures that state managed by
+    /// Application, including shared resources and properties, is available
+    /// from a single, shared location."
+    ///
+    /// Example of usage:
+    /// <code>
+    /// Application.Current.GetService<T>()
+    /// </code>
+    /// </summary>
+    /// <typeparam name="T">Service type.</typeparam>
+    /// <param name="application">Current application.</param>
+    /// <returns>Service reference.</returns>
+    public static T GetService<T>(this Application application)
+        where T : class
+    {
+        return (application as IApp)!.GetService<T>();
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Extensions/IHostExtensions.cs

@@ -0,0 +1,40 @@
+// 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 Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace Microsoft.CmdPal.Common.Extensions;
+
+public static class IHostExtensions
+{
+    /// <summary>
+    /// <inheritdoc cref="ActivatorUtilities.CreateInstance(IServiceProvider, Type, object[])"/>
+    /// </summary>
+    public static T CreateInstance<T>(this IHost host, params object[] parameters)
+    {
+        return ActivatorUtilities.CreateInstance<T>(host.Services, parameters);
+    }
+
+    /// <summary>
+    /// Gets the service object for the specified type, or throws an exception
+    /// if type was not registered.
+    /// </summary>
+    /// <typeparam name="T">Service type</typeparam>
+    /// <param name="host">Host object</param>
+    /// <returns>Service object</returns>
+    /// <exception cref="ArgumentException">Throw an exception if the specified
+    /// type is not registered</exception>
+    public static T GetService<T>(this IHost host)
+        where T : class
+    {
+        if (host.Services.GetService(typeof(T)) is not T service)
+        {
+            throw new ArgumentException($"{typeof(T)} needs to be registered in ConfigureServices.");
+        }
+
+        return service;
+    }
+}

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

@@ -0,0 +1,36 @@
+// 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.IO;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.Common.Helpers;
+
+public static class Json
+{
+    public static async Task<T> ToObjectAsync<T>(string value)
+    {
+        if (typeof(T) == typeof(bool))
+        {
+            return (T)(object)bool.Parse(value);
+        }
+
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(value));
+        return (await JsonSerializer.DeserializeAsync<T>(stream))!;
+    }
+
+    public static async Task<string> StringifyAsync<T>(T value)
+    {
+        if (typeof(T) == typeof(bool))
+        {
+            return value!.ToString()!.ToLowerInvariant();
+        }
+
+        await using var stream = new MemoryStream();
+        await JsonSerializer.SerializeAsync(stream, value);
+        return Encoding.UTF8.GetString(stream.ToArray());
+    }
+}

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

@@ -9,7 +9,7 @@ using Microsoft.UI.Dispatching;
 
 namespace Microsoft.CmdPal.Common.Helpers;
 
-public static partial class NativeEventWaiter
+public static class NativeEventWaiter
 {
     public static void WaitForEventLoop(string eventName, Action callback)
     {

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

@@ -9,7 +9,7 @@ using Windows.Win32.Foundation;
 
 namespace Microsoft.CmdPal.Common.Helpers;
 
-public static partial class RuntimeHelper
+public static class RuntimeHelper
 {
     public static bool IsMSIX
     {

src/modules/cmdpal/Microsoft.CmdPal.Common/Messages/HideWindowMessage.cs

@@ -4,6 +4,6 @@
 
 namespace Microsoft.CmdPal.Common.Messages;
 
-public partial record HideWindowMessage()
+public record HideWindowMessage()
 {
 }

src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj

@@ -1,6 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Common</RootNamespace>
     <Nullable>enable</Nullable>

src/modules/cmdpal/Microsoft.CmdPal.Common/Models/LocalSettingsOptions.cs

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Common.Models;
+
+public class LocalSettingsOptions
+{
+    public string? ApplicationDataFolder
+    {
+        get; set;
+    }
+
+    public string? LocalSettingsFile
+    {
+        get; set;
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/NativeMethods.txt

@@ -1,7 +1,16 @@
+EnableWindow
+CoCreateInstance
+FileOpenDialog
+FileSaveDialog
+IFileOpenDialog
+IFileSaveDialog
+SHCreateItemFromParsingName
 GetCurrentPackageFullName
 SetWindowLong
 GetWindowLong
 WINDOW_EX_STYLE
+SHLoadIndirectString
+StrFormatByteSizeEx
 SFBS_FLAGS
 MAX_PATH
 GetDpiForWindow

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/FileService.cs

@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using Microsoft.CmdPal.Common.Contracts;
+
+namespace Microsoft.CmdPal.Common.Services;
+
+public class FileService : IFileService
+{
+    private static readonly Encoding _encoding = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
+
+#pragma warning disable CS8603 // Possible null reference return.
+    public T Read<T>(string folderPath, string fileName)
+    {
+        var path = Path.Combine(folderPath, fileName);
+        if (File.Exists(path))
+        {
+            using var fileStream = File.OpenText(path);
+            return JsonSerializer.Deserialize<T>(fileStream.BaseStream);
+        }
+
+        return default;
+    }
+#pragma warning restore CS8603 // Possible null reference return.
+
+    public void Save<T>(string folderPath, string fileName, T content)
+    {
+        if (!Directory.Exists(folderPath))
+        {
+            Directory.CreateDirectory(folderPath);
+        }
+
+        var fileContent = JsonSerializer.Serialize(content);
+        File.WriteAllText(Path.Combine(folderPath, fileName), fileContent, _encoding);
+    }
+
+    public void Delete(string folderPath, string fileName)
+    {
+        if (fileName != null && File.Exists(Path.Combine(folderPath, fileName)))
+        {
+            File.Delete(Path.Combine(folderPath, fileName));
+        }
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IApp.cs

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Common.Services;
+
+/// <summary>
+/// Interface for the current application singleton object exposing the API
+/// that can be accessed from anywhere in the application.
+/// </summary>
+public interface IApp
+{
+    /// <summary>
+    /// Gets services registered at the application level.
+    /// </summary>
+    public T GetService<T>()
+        where T : class;
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/LocalSettingsService.cs

@@ -0,0 +1,120 @@
+// 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.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Common.Contracts;
+using Microsoft.CmdPal.Common.Helpers;
+using Microsoft.CmdPal.Common.Models;
+using Microsoft.Extensions.Options;
+using Windows.Storage;
+
+namespace Microsoft.CmdPal.Common.Services;
+
+public class LocalSettingsService : ILocalSettingsService
+{
+    // TODO! for now, we're hardcoding the path as effectively:
+    // %localappdata%\CmdPal\LocalSettings.json
+    private const string DefaultApplicationDataFolder = "CmdPal";
+    private const string DefaultLocalSettingsFile = "LocalSettings.json";
+
+    private readonly IFileService _fileService;
+    private readonly LocalSettingsOptions _options;
+
+    private readonly string _localApplicationData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+    private readonly string _applicationDataFolder;
+    private readonly string _localSettingsFile;
+
+    private readonly bool _isMsix;
+
+    private Dictionary<string, object> _settings;
+    private bool _isInitialized;
+
+    public LocalSettingsService(IFileService fileService, IOptions<LocalSettingsOptions> options)
+    {
+        _isMsix = false; // RuntimeHelper.IsMSIX;
+
+        _fileService = fileService;
+        _options = options.Value;
+
+        _applicationDataFolder = Path.Combine(_localApplicationData, _options.ApplicationDataFolder ?? DefaultApplicationDataFolder);
+        _localSettingsFile = _options.LocalSettingsFile ?? DefaultLocalSettingsFile;
+
+        _settings = new Dictionary<string, object>();
+    }
+
+    private async Task InitializeAsync()
+    {
+        if (!_isInitialized)
+        {
+            _settings = await Task.Run(() => _fileService.Read<Dictionary<string, object>>(_applicationDataFolder, _localSettingsFile)) ?? new Dictionary<string, object>();
+
+            _isInitialized = true;
+        }
+    }
+
+    public async Task<bool> HasSettingAsync(string key)
+    {
+        if (_isMsix)
+        {
+            return ApplicationData.Current.LocalSettings.Values.ContainsKey(key);
+        }
+        else
+        {
+            await InitializeAsync();
+
+            if (_settings != null)
+            {
+                return _settings.ContainsKey(key);
+            }
+        }
+
+        return false;
+    }
+
+    public async Task<T?> ReadSettingAsync<T>(string key)
+    {
+        if (_isMsix)
+        {
+            if (ApplicationData.Current.LocalSettings.Values.TryGetValue(key, out var obj))
+            {
+                return await Json.ToObjectAsync<T>((string)obj);
+            }
+        }
+        else
+        {
+            await InitializeAsync();
+
+            if (_settings != null && _settings.TryGetValue(key, out var obj))
+            {
+                var s = obj.ToString();
+
+                if (s != null)
+                {
+                    return await Json.ToObjectAsync<T>(s);
+                }
+            }
+        }
+
+        return default;
+    }
+
+    public async Task SaveSettingAsync<T>(string key, T value)
+    {
+        if (_isMsix)
+        {
+            ApplicationData.Current.LocalSettings.Values[key] = await Json.StringifyAsync(value!);
+        }
+        else
+        {
+            await InitializeAsync();
+
+            _settings[key] = await Json.StringifyAsync(value!);
+
+            await Task.Run(() => _fileService.Save(_applicationDataFolder, _localSettingsFile, _settings));
+        }
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/AppStateModel.cs

@@ -49,7 +49,7 @@ public partial class AppStateModel : ObservableObject
             // Read the JSON content from the file
             var jsonContent = File.ReadAllText(FilePath);
 
-            var loaded = JsonSerializer.Deserialize<AppStateModel>(jsonContent, JsonSerializationContext.Default.AppStateModel);
+            var loaded = JsonSerializer.Deserialize<AppStateModel>(jsonContent, _deserializerOptions);
 
             Debug.WriteLine(loaded != null ? "Loaded settings file" : "Failed to parse");
 
@@ -73,7 +73,7 @@ public partial class AppStateModel : ObservableObject
         try
         {
             // Serialize the main dictionary to JSON and save it to the file
-            var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.AppStateModel);
+            var settingsJson = JsonSerializer.Serialize(model, _serializerOptions);
 
             // Is it valid JSON?
             if (JsonNode.Parse(settingsJson) is JsonObject newSettings)
@@ -89,7 +89,7 @@ public partial class AppStateModel : ObservableObject
                         savedSettings[item.Key] = item.Value != null ? item.Value.DeepClone() : null;
                     }
 
-                    var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
+                    var serialized = savedSettings.ToJsonString(_serializerOptions);
                     File.WriteAllText(FilePath, serialized);
 
                     // TODO: Instead of just raising the event here, we should
@@ -122,19 +122,18 @@ public partial class AppStateModel : ObservableObject
         return Path.Combine(directory, "state.json");
     }
 
-    // [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
-    // private static readonly JsonSerializerOptions _serializerOptions = new()
-    // {
-    //    WriteIndented = true,
-    //    Converters = { new JsonStringEnumConverter() },
-    // };
+    private static readonly JsonSerializerOptions _serializerOptions = new()
+    {
+        WriteIndented = true,
+        Converters = { new JsonStringEnumConverter() },
+    };
 
-    // private static readonly JsonSerializerOptions _deserializerOptions = new()
-    // {
-    //    PropertyNameCaseInsensitive = true,
-    //    IncludeFields = true,
-    //    AllowTrailingCommas = true,
-    //    PreferredObjectCreationHandling = JsonObjectCreationHandling.Populate,
-    //    ReadCommentHandling = JsonCommentHandling.Skip,
-    // };
+    private static readonly JsonSerializerOptions _deserializerOptions = new()
+    {
+        PropertyNameCaseInsensitive = true,
+        IncludeFields = true,
+        AllowTrailingCommas = true,
+        PreferredObjectCreationHandling = JsonObjectCreationHandling.Populate,
+        ReadCommentHandling = JsonCommentHandling.Skip,
+    };
 }

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

@@ -4,9 +4,9 @@
 
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
-using Windows.System;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
@@ -25,8 +25,6 @@ public partial class CommandBarViewModel : ObservableObject,
 
             field = value;
             SetSelectedItem(value);
-
-            OnPropertyChanged(nameof(SelectedItem));
         }
     }
 
@@ -49,9 +47,7 @@ public partial class CommandBarViewModel : ObservableObject,
     public partial PageViewModel? CurrentPage { get; set; }
 
     [ObservableProperty]
-    public partial ObservableCollection<ContextMenuStackViewModel> ContextMenuStack { get; set; } = [];
-
-    public ContextMenuStackViewModel? ContextMenu => ContextMenuStack.LastOrDefault();
+    public partial ObservableCollection<CommandContextItemViewModel> ContextCommands { get; set; } = [];
 
     public CommandBarViewModel()
     {
@@ -104,97 +100,35 @@ public partial class CommandBarViewModel : ObservableObject,
         if (SelectedItem.MoreCommands.Count() > 1)
         {
             ShouldShowContextMenu = true;
-
-            ContextMenuStack.Clear();
-            ContextMenuStack.Add(new ContextMenuStackViewModel(SelectedItem));
-            OnPropertyChanged(nameof(ContextMenu));
+            ContextCommands = [.. SelectedItem.AllCommands];
         }
         else
         {
             ShouldShowContextMenu = false;
         }
-
-        OnPropertyChanged(nameof(HasSecondaryCommand));
-        OnPropertyChanged(nameof(SecondaryCommand));
-        OnPropertyChanged(nameof(ShouldShowContextMenu));
     }
 
     // InvokeItemCommand is what this will be in Xaml due to source generator
     // this comes in when an item in the list is tapped
-    // [RelayCommand]
-    public ContextKeybindingResult InvokeItem(CommandContextItemViewModel item) =>
-        PerformCommand(item);
+    [RelayCommand]
+    private void InvokeItem(CommandContextItemViewModel item) =>
+       WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.Command.Model, item.Model));
 
     // this comes in when the primary button is tapped
     public void InvokePrimaryCommand()
     {
-        PerformCommand(PrimaryCommand);
+        if (PrimaryCommand != null)
+        {
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(PrimaryCommand.Command.Model, PrimaryCommand.Model));
+        }
     }
 
     // this comes in when the secondary button is tapped
     public void InvokeSecondaryCommand()
     {
-        PerformCommand(SecondaryCommand);
-    }
-
-    public ContextKeybindingResult CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
-    {
-        var matchedItem = ContextMenu?.CheckKeybinding(ctrl, alt, shift, win, key);
-        return matchedItem != null ? PerformCommand(matchedItem) : ContextKeybindingResult.Unhandled;
-    }
-
-    private ContextKeybindingResult PerformCommand(CommandItemViewModel? command)
-    {
-        if (command == null)
+        if (SecondaryCommand != null)
         {
-            return ContextKeybindingResult.Unhandled;
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(SecondaryCommand.Command.Model, SecondaryCommand.Model));
         }
-
-        if (command.HasMoreCommands)
-        {
-            ContextMenuStack.Add(new ContextMenuStackViewModel(command));
-            OnPropertyChanging(nameof(ContextMenu));
-            OnPropertyChanged(nameof(ContextMenu));
-            return ContextKeybindingResult.KeepOpen;
-        }
-        else
-        {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
-            return ContextKeybindingResult.Hide;
-        }
-    }
-
-    public bool CanPopContextStack()
-    {
-        return ContextMenuStack.Count > 1;
-    }
-
-    public void PopContextStack()
-    {
-        if (ContextMenuStack.Count > 1)
-        {
-            ContextMenuStack.RemoveAt(ContextMenuStack.Count - 1);
-        }
-
-        OnPropertyChanging(nameof(ContextMenu));
-        OnPropertyChanged(nameof(ContextMenu));
-    }
-
-    public void ClearContextStack()
-    {
-        while (ContextMenuStack.Count > 1)
-        {
-            ContextMenuStack.RemoveAt(ContextMenuStack.Count - 1);
-        }
-
-        OnPropertyChanging(nameof(ContextMenu));
-        OnPropertyChanged(nameof(ContextMenu));
     }
 }
-
-public enum ContextKeybindingResult
-{
-    Unhandled,
-    Hide,
-    KeepOpen,
-}

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

@@ -9,16 +9,12 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context)
 {
-    private readonly KeyChord nullKeyChord = new(0, 0, 0);
-
     public new ExtensionObject<ICommandContextItem> Model { get; } = new(contextItem);
 
     public bool IsCritical { get; private set; }
 
     public KeyChord? RequestedShortcut { get; private set; }
 
-    public bool HasRequestedShortcut => RequestedShortcut != null && (RequestedShortcut.Value != nullKeyChord);
-
     public override void InitializeProperties()
     {
         if (IsInitialized)
@@ -35,9 +31,6 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
         }
 
         IsCritical = contextItem.IsCritical;
-
-        // I actually don't think this will ever actually be null, because
-        // KeyChord is a struct, which isn't nullable in WinRT
         if (contextItem.RequestedShortcut != null)
         {
             RequestedShortcut = new(

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandItemViewModel.cs

@@ -48,7 +48,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
     public List<CommandContextItemViewModel> MoreCommands { get; private set; } = [];
 
-    IEnumerable<CommandContextItemViewModel> IContextMenuContext.MoreCommands => MoreCommands;
+    IEnumerable<CommandContextItemViewModel> ICommandBarContext.MoreCommands => MoreCommands;
 
     public bool HasMoreCommands => MoreCommands.Count > 0;
 
@@ -187,26 +187,23 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         // use Initialize straight up
         MoreCommands.ForEach(contextItem =>
         {
-            contextItem.SlowInitializeProperties();
+            contextItem.InitializeProperties();
         });
 
-        if (!string.IsNullOrEmpty(model.Command?.Name))
+        _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
         {
-            _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
-            {
-                _itemTitle = Name,
-                Subtitle = Subtitle,
-                Command = Command,
+            _itemTitle = Name,
+            Subtitle = Subtitle,
+            Command = Command,
 
-                // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
-            };
+            // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
+        };
 
-            // Only set the icon on the context item for us if our command didn't
-            // have its own icon
-            if (!Command.HasIcon)
-            {
-                _defaultCommandContextItem._listItemIcon = _listItemIcon;
-            }
+        // Only set the icon on the context item for us if our command didn't
+        // have its own icon
+        if (!Command.HasIcon)
+        {
+            _defaultCommandContextItem._listItemIcon = _listItemIcon;
         }
 
         Initialized |= InitializedState.SelectionInitialized;