for test

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
     "isRoot": true,
     "tools": {
         "dotnet-consolidate": {
-            "version": "4.2.0",
+            "version": "2.0.0",
             "commands": [
                 "dotnet-consolidate"
             ]
         },
         "xamlstyler.console": {
-            "version": "3.2501.8",
+            "version": "3.2404.2",
             "commands": [
               "xstyler"
             ]

.configurations/configuration.dsc.yaml

@@ -6,16 +6,12 @@ properties:
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
       settings:
         Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Community (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.Community
         source: winget
@@ -25,8 +21,6 @@ properties:
       directives:
         description: Install required VS workloads
         allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Community
         channelId: VisualStudio.17.Release

.configurations/configuration.vsEnterprise.dsc.yaml

@@ -6,16 +6,12 @@ properties:
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
       settings:
         Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Enterprise (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.Enterprise
         source: winget
@@ -25,8 +21,6 @@ properties:
       directives:
         description: Install required VS workloads
         allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Enterprise
         channelId: VisualStudio.17.Release

.configurations/configuration.vsProfessional.dsc.yaml

@@ -6,16 +6,12 @@ properties:
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
       settings:
         Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Professional (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.Professional
         source: winget
@@ -25,8 +21,6 @@ properties:
       directives:
         description: Install required VS workloads
         allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Professional
         channelId: VisualStudio.17.Release

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,6 @@
 name: "🕷️ Bug report"
 description: Report errors or unexpected behavior
+type: Bug
 labels:
 - Issue-Bug
 - Needs-Triage
@@ -7,17 +8,15 @@ body:
 - type: markdown
   attributes:
     value: Please make sure to [search for existing issues](https://github.com/microsoft/PowerToys/issues) before filing a new one!
-- id: version
-  type: input
+- type: input
   attributes:
     label: Microsoft PowerToys version
-    placeholder: X.XX.X
+    placeholder: 0.70.0
     description: Hover over system tray icon or look at Settings
   validations:
     required: true
 
-- id: installed
-  type: dropdown
+- type: dropdown
   attributes:
     label: Installation method
     description: How / Where was PowerToys installed from?
@@ -34,6 +33,14 @@ body:
   validations:
     required: true
 
+- type: dropdown
+  attributes:
+    label: Running as admin
+    description: Are you running PowerToys as Admin?
+    options:
+      - "Yes"
+      - "No"
+
 - type: dropdown
   attributes:
     label: Area(s) with issue?
@@ -46,7 +53,6 @@ body:
       - Awake
       - ColorPicker
       - Command not found
-      - Command Palette
       - Crop and Lock
       - Environment Variables
       - FancyZones
@@ -60,7 +66,7 @@ body:
       - Keyboard Manager
       - Mouse Utilities
       - Mouse Without Borders
-      - New+
+      - New+ 
       - Peek
       - PowerRename
       - PowerToys Run
@@ -99,19 +105,6 @@ body:
   validations:
     required: false
 
-- id: additionalInfo
-  type: textarea
-  attributes:
-    label: Additional Information
-    placeholder: |
-      OS version
-      .Net version
-      System Language
-      User or System Installation
-      Running as admin
-  validations:
-    required: false
-    
 - type: textarea
   attributes:
     label: Other Software
@@ -122,4 +115,3 @@ body:
       My Cool Application v0.3 (include a code snippet if it would help!)
   validations:
     required: false
-  

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

@@ -89,7 +89,6 @@ onefuzzingestionpreparationtool
 OTP
 Yubi
 Yubico
-svgl
 
 # KEYS
 
@@ -233,9 +232,6 @@ SWAPBUTTON
 SYSTEMDOCKED
 TABLETPC
 
-# Units
-nmi
-
 # MATH
 
 artanh
@@ -271,11 +267,6 @@ mengyuanchen
 
 # DllName
 testhost
-Testably
 
 #Tools
 OIP
-xef
-xes
-PACKAGEVERSIONNUMBER
-APPXMANIFESTVERSION

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

@@ -79,7 +79,6 @@ Gershaft
 Giordani
 Gokce
 gordon
-Griese
 grzhan
 Guo
 hanselman
@@ -110,7 +109,6 @@ Lambson
 Laute
 laviusmotileng
 Leilei
-Loewen
 Luecking
 Mahalingam
 Markovic
@@ -155,7 +153,6 @@ Santossio
 Schoen
 Sekan
 Seraphima
-Shmuelie
 skttl
 somil
 Soref
@@ -187,9 +184,6 @@ zhaopy
 zhaoqpcn
 Zoltan
 Zykova
-Sameerjs
-ruslanlap
-vednig
 
 # OTHERS
 
@@ -202,7 +196,6 @@ cortana
 dlnilsson
 fancymouse
 firefox
-fudan
 gpt
 Inkscape
 Markdig
@@ -218,7 +211,6 @@ regedit
 roslyn
 Spotify
 Vanara
-wangyi
 WEX
 windowwalker
 winui
@@ -226,9 +218,7 @@ winuiex
 wix
 wordpad
 WWL
-wyhash
 xamlstyler
 Xavalon
 Xbox
 Youdao
-zadjii

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

@@ -96,11 +96,10 @@
 ^\Qdoc/devdocs/localization.md\E$
 ^\Qsrc/common/ManagedCommon/ColorFormatHelper.cs\E$
 ^\Qsrc/common/notifications/BackgroundActivatorDLL/cpp.hint\E$
-^\Qsrc/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002.pdn\E$
 ^\Qsrc/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/colorPicker.cur\E$
 ^\Qsrc/modules/colorPicker/ColorPickerUI/Shaders/GridShader.cso\E$
-^\Qsrc/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs\E$
 ^\Qsrc/modules/MouseUtils/MouseJumpUI/MainForm.resx\E$
+^\Qsrc/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs\E$
 ^\Qsrc/modules/MouseWithoutBorders/App/Form/frmAbout.cs\E$
 ^\Qsrc/modules/MouseWithoutBorders/App/Form/frmInputCallback.resx\E$
 ^\Qsrc/modules/MouseWithoutBorders/App/Form/frmLogon.resx\E$

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

@@ -232,15 +232,6 @@ _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
 # ignore long runs of a single character:
 \b([A-Za-z])\g{-1}{3,}\b
 
-# Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
-
-# imgur
-\bimgur\.com/[^.]+
-
-# Process Process (typename varname)
-Process Process
-
 # ZoomIt menu items with accelerator keys
 E&xit
-St&yle
+St&yle

.github/workflows/dependency-review.yml

@@ -1,26 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request,
-# surfacing known-vulnerable versions of the packages declared or updated in the PR.
-# Once installed, if the workflow run is marked as required,
-# PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# As recommended by Microsoft's security guidelines (https://docs.opensource.microsoft.com/security/tsg/actions/#requirements-for-security-hardening-your-own-github-actions), 
-# 3rd-party actions should be pinned to a specific commit hash to prevent supply chain attacks. 
-# This update aligns with best practices; 1st/2nd-party actions is not required hash pinning.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-name: 'Dependency Review'
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v4
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4

.github/workflows/msstore-submissions.yml

@@ -39,11 +39,6 @@ jobs:
           echo powerToysInstallerX64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("x64"))][0].browser_download_url') >> $GITHUB_OUTPUT
           echo powerToysInstallerArm64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("arm64"))][0].browser_download_url') >> $GITHUB_OUTPUT
 
-      - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: '9.0.x'
-
       - uses: microsoft/setup-msstore-cli@v1
 
       - name: Fetch Store Credential

.github/workflows/spelling2.yml

@@ -93,7 +93,7 @@ jobs:
     steps:
       - name: check-spelling
         id: spelling
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@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@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@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@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@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@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
         with:
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
           checkout: true

.gitignore

@@ -224,7 +224,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk
+# Including strong name files can present a security risk 
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -322,7 +322,7 @@ ImageResizer/tools/**
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output
+# Azure Stream Analytics local run output 
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -331,7 +331,7 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder
+# MFractors (Xamarin productivity tool) working folder 
 .mfractor/
 
 # Temp build files

.pipelines/ESRPSigning_cmdpal_msix_content.json

@@ -1,51 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "*.dll",
-                "*.exe"                
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "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"
-                    }
-                ]
-            }
-        }
-    ]
-}

.pipelines/ESRPSigning_core.json

@@ -128,7 +128,6 @@
                 "PowerToys.KeyboardManager.dll",
                 "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
                 "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
-                "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",
 
                 "PowerToys.Launcher.dll",
                 "PowerToys.PowerLauncher.dll",
@@ -217,11 +216,7 @@
                 "PowerToys.ZoomItSettingsInterop.dll",
 
                 "WinUI3Apps\\PowerToys.Settings.dll",
-                "WinUI3Apps\\PowerToys.Settings.exe",
-
-                "PowerToys.CmdPalModuleInterface.dll",
-                "CmdPalKeyboardService.dll",
-                "*Microsoft.CmdPal.UI_*.msix"
+                "WinUI3Apps\\PowerToys.Settings.exe"
             ],
             "SigningInfo": {
                 "Operations": [
@@ -331,8 +326,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

@@ -1,108 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "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": [
-                    {
-                        "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"
-                    }
-                ]
-            }
-        }
-    ]
-}

.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,54 +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
-$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
+$propsFile = "Directory.Packages.props"
 if (Test-Path $propsFile) {
-    $file = Read-FileWithEncoding -Path $propsFile
-    $content = $file.Content
+    $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 $propsFile -Content $content -Encoding $file.encoding
+        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]*\\'
         $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

@@ -1,12 +1,5 @@
 trigger: none
 pr: none
-schedules:
-  - cron: "0 0 * * *" # every day at midnight
-    displayName: "Daily midnight Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
 
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 
@@ -15,7 +8,6 @@ parameters:
     type: object
     default:
       - x64
-      - arm64
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
@@ -28,15 +20,6 @@ parameters:
     type: boolean
     displayName: "Build Using Visual Studio Preview"
     default: false
-  - name: useLatestWinAppSDK
-    type: boolean
-    default: true
-  - name: winAppSDKVersionNumber
-    type: string
-    default: 1.7
-  - name: useExperimentalVersion
-    type: boolean
-    default: false
 
 extends:
   template: templates/pipeline-ci-build.yml
@@ -45,6 +28,3 @@ extends:
     enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
-    useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
-    winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
-    useExperimentalVersion: ${{ parameters.useExperimentalVersion }}

.pipelines/v2/release.yml

@@ -40,9 +40,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:
@@ -82,7 +79,6 @@ extends:
               buildConfigurations: ${{ parameters.buildConfigurations }}
               versionNumber: ${{ parameters.versionNumber }}
               publishArtifacts: false # 1ES PT handles publication for us.
-              official: true
               codeSign: true
               runTests: false
               signingIdentity:
@@ -105,36 +101,12 @@ extends:
                 # 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
-        displayName: Build SDK
-        dependsOn: []
-        jobs:
-          - template: .pipelines/v2/templates/job-build-sdk.yml@self
-            parameters:
-              pool:
-                name: SHINE-INT-L
-                image: SHINE-VS17-Latest
-                os: windows
-              official: true
-              codeSign: true
-              signingIdentity:
-                serviceName: $(SigningServiceName)
-                appId: $(SigningAppId)
-                tenantId: $(SigningTenantId)
-                akvName: $(SigningAKVName)
-                authCertName: $(SigningAuthCertName)
-                signCertName: $(SigningSignCertName)
-                useManagedIdentity: $(SigningUseManagedIdentity)
-                clientId: $(SigningOriginalClientId)
-
       - stage: Publish
         displayName: Publish
         dependsOn: [Build]
@@ -143,7 +115,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
@@ -99,7 +96,6 @@ jobs:
             ${{ else }}:
               OutputBuildPlatform: ${{ platform }}
   variables:
-    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
     # Azure DevOps abhors a vacuum
     # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
     # later on. We'll just... set them to a single space and if we need to, check IsNullOrWhiteSpace.
@@ -149,7 +145,7 @@ jobs:
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
-      version: '6.0' # .NET 6.0 is required in CI for ESRP code signing tasks. Please do not remove.
+      version: '6.0'
 
   - template: steps-ensure-dotnet-version.yml
     parameters:
@@ -215,11 +211,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
@@ -251,32 +242,6 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
-  - task: CopyFiles@2
-    displayName: Stage SDK/build
-    inputs:
-      contents: |-
-        "**/cmdpal/extensionsdk/nuget/Microsoft.CommandPalette.Extensions.SDK.props"
-        "**/cmdpal/extensionsdk/nuget/Microsoft.CommandPalette.Extensions.SDK.targets"
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/sdk/build
-
-  - task: CopyFiles@2
-    displayName: Stage SDK/lib
-    inputs:
-      contents: |-
-        "**/Microsoft.CommandPalette.Extensions.Toolkit/$(BuildPlatform)/release/WinUI3Apps/CmdPal/Microsoft.CommandPalette.Extensions.Toolkit.dll"
-        "**/Microsoft.CommandPalette.Extensions.Toolkit/$(BuildPlatform)/release/WinUI3Apps/CmdPal/Microsoft.CommandPalette.Extensions.Toolkit.deps.json"
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/sdk/lib/net8.0-windows10.0.19041.0
-
-  - task: CopyFiles@2
-    displayName: Stage SDK/winmd
-    inputs:
-      contents: |-
-        "**/Microsoft.CommandPalette.Extensions/$(BuildPlatform)/release/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.winmd"
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/sdk/winmd
-
   - task: VSBuild@1
     displayName: Build BugReportTool
     inputs:
@@ -344,16 +309,11 @@ jobs:
     displayName: HACK Copy core WebView2 ARM64 dll to output directory
     condition: eq(variables['BuildPlatform'],'arm64')
     inputs:
-      contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
+      contents: packages/Microsoft.Web.WebView2.1.0.2739.15/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
       targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
       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,36 +359,7 @@ 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: |-
-        & "$(MakeAppxPath)" unpack /p "$(CmdPalPackagePath)" /d "$(JobOutputDirectory)/CmdPalPackageContents"
-      displayName: Unpack the MSIX for signing
-
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: Sign CmdPal MSIX content
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: '$(JobOutputDirectory)/CmdPalPackageContents'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_cmdpal_msix_content.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-    - pwsh: |-
-        $outDir = New-Item -Type Directory "$(JobOutputDirectory)/_appx" -ErrorAction:Ignore
-        $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
       parameters:
         displayName: Sign Core PowerToys
@@ -449,10 +380,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 }}
@@ -508,7 +435,7 @@ jobs:
       $machinePlat = "hash_machine_$(BuildPlatform).txt";
       $combinedUserPath = $p + $userPlat;
       $combinedMachinePath = $p + $machinePlat;
-
+      
       echo $p
 
       echo $userPlat
@@ -518,7 +445,7 @@ jobs:
       echo $machinePlat
       echo $machineHash
       echo $combinedMachinePath
-
+      
       $userHash | out-file -filepath $combinedUserPath
       $machineHash | out-file -filepath $combinedMachinePath
     displayName: Calculate file hashes

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

@@ -1,100 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: official
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: signingIdentity
-    type: object
-    default: {}
-
-jobs:
-- job: "BuildSDK"
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  displayName: Build SDK
-  timeoutInMinutes: 240
-  cancelTimeoutInMinutes: 1
-  templateContext: # Required when this template is hosted in 1ES PT
-    outputs:
-    - output: pipelineArtifact
-      artifactName: SDK
-      targetPath: $(Build.ArtifactStagingDirectory)
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-    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
-    displayName: Build SDK
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: Sign SDK
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'src/modules'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_sdk.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  - pwsh: |-
-      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -BuildStep "pack" -IsAzurePipelineBuild
-    displayName: Pack SDK
-
-  - task: CopyFiles@2
-    displayName: Copy Nuget to Artifact Staging
-    inputs:
-      sourceFolder: "$(build.sourcesdirectory)/src/modules/cmdpal/extensionsdk/_build"
-      contents: '*.nupkg'
-      targetFolder: '$(Build.ArtifactStagingDirectory)'
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: Sign NuGet packages
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: $(Build.ArtifactStagingDirectory)
-          Pattern: '*.nupkg'
-          UseMinimatch: true
-          signConfigType: inlineSignParams
-          inlineOperation: >-
-            [
-                {
-                    "KeyCode": "CP-401405",
-                    "OperationCode": "NuGetSign",
-                    "Parameters": {},
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                },
-                {
-                    "KeyCode": "CP-401405",
-                    "OperationCode": "NuGetVerify",
-                    "Parameters": {},
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                }
-            ]

.pipelines/v2/templates/job-ci-precheck.yml

@@ -0,0 +1,30 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json
+jobs:
+- job: Precheck
+  pool:
+    vmImage: windows-2022
+  steps:
+  - checkout: none
+
+  - pwsh: |-
+      try {
+        # Try based on pull request first
+        $pullRequestNumber = "$(system.pullRequest.pullRequestNumber)";
+        $gitHubPullRequest = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/pulls/$pullRequestNumber/files"
+        # If there are no files updated in the commit that are .md, set skipBuild variable
+        if(([array]($gitHubPullRequest.filename) -notmatch ".md|.txt").Length -eq 0) {
+            Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
+            Write-Host 'Skipping Build'
+        }
+      }
+      catch {
+        # Fall back to the latest commit otherwise.
+        $commit = "$(build.sourceVersion)";
+        $gitHubCommit = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/commits/$commit"
+        if(([array]($githubCommit.files.filename) -notmatch ".md|.txt").Length -eq 0) {
+          Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
+          Write-Host 'Skipping Build'
+        }
+      }
+    displayName: Verify whether we need to build at all
+    name: verifyBuildRequest

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

@@ -105,4 +105,4 @@ jobs:
         **\UITests-FancyZones.dll
         **\UITests-FancyZonesEditor.dll
         !**\obj\**
-        !**\ref\**
+        !**\ref\**

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

@@ -36,40 +36,18 @@ parameters:
     default: false
 
 stages:
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - stage: Build_${{ platform }}
-      displayName: Build ${{ platform }}
-      dependsOn: []
+  # Allow manual builds to skip pre-check
+  - ${{ if ne(variables['Build.Reason'], 'Manual') }}:
+    - stage: Precheck
       jobs:
-        - template: job-build-project.yml
-          parameters:
-            pool:
-              ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-                name: SHINE-INT-L
-              ${{ else }}:
-                name: SHINE-OSS-L
-              ${{ if eq(parameters.useVSPreview, true) }}:
-                demands: ImageOverride -equals SHINE-VS17-Preview
-            buildPlatforms:
-              - ${{ platform }}
-            buildConfigurations: [Release]
-            enablePackageCaching: true
-            enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-            runTests: ${{ parameters.runTests }}
-            useVSPreview: ${{ parameters.useVSPreview }}
-            useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
-            ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
-              winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
-              useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
+        - template: job-ci-precheck.yml
 
-    - ${{ if and(eq(parameters.runTests, true), not(and(eq(platform, 'arm64'), eq(variables['System.PullRequest.IsFork'], true)))) }}:
-      - stage: Test_${{ platform }}
-        displayName: Test ${{ platform }}
-        dependsOn:
-          - Build_${{platform}}
-        jobs:
-          - template: job-test-project.yml
-            parameters:
-              platform: ${{ platform }}
-              configuration: Release
-              useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+  - ${{ each platform in parameters.buildPlatforms }}:
+    - stage: Test_${{ platform }}
+      displayName: Test ${{ platform }}
+      jobs:
+        - template: job-test-project.yml
+          parameters:
+            platform: ${{ platform }}
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}

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

@@ -87,30 +87,6 @@ steps:
       dir $(build.sourcesdirectory)\extractedMsi
     displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
 
-  # Extract CmdPal msix package to check if its content is signed
-  - pwsh: |-
-      Write-Host "Extracting CmdPal MSIX package"
-
-      # Define the directory to search
-      $searchDir = "extractedMsi\File"
-
-      # Define the regex pattern for MSIX files
-      $pattern = '^Microsoft.CmdPal.UI.*\.msix$'
-
-      # Get all files in the directory and subdirectories
-      $msixFile = Get-ChildItem -Path $searchDir -Recurse -File | Where-Object {
-          $_.Name -match $pattern
-      }
-
-      Write-Host "MSIX file found: " $msixFile
-
-      $destinationDir = "$(build.sourcesdirectory)\extractedMsi\File\extractedCmdPalMsix"
-
-      Expand-Archive -Path $msixFile -DestinationPath $destinationDir
-      Get-ChildItem -Path $destinationDir -Recurse -File
-
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract CmdPal MSIX package
-
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
       & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'

.pipelines/v2/templates/steps-download-artifacts-with-azure-cli.yml

@@ -24,10 +24,18 @@ steps:
 - pwsh: |
     $azureCliPath = "$(Build.ArtifactStagingDirectory)\AzureCLI\bin"
     $env:Path = "$azureCliPath;" + $env:Path
+    Write-Host "Add azure-devops..."
+    az extension add -n azure-devops
     Write-Host "Configuring Azure DevOps defaults..."
     az devops configure --defaults organization='$(System.TeamFoundationCollectionUri)' project='$(System.TeamProject)' --use-git-aliases true
+    Write-Host "check permission"
+    az pipelines list --org "$(System.TeamFoundationCollectionUri)" --project "$(System.TeamProject)" --output table
     Write-Host "Downloading artifacts..."
-    az pipelines runs artifact download --artifact-name ${{parameters.artifactName}} --path "$(Pipeline.Workspace)/${{parameters.artifactName}}" --run-id $(Build.BuildId) --debug
+    if ($env:AZURE_DEVOPS_EXT_PAT -eq $null -or $env:AZURE_DEVOPS_EXT_PAT -eq "") {
+      Write-Host "Error: AZURE_DEVOPS_EXT_PAT is not set."
+      exit 1
+    }
+    az pipelines runs artifact download --artifact-name ${{parameters.artifactName}} --path "$(Pipeline.Workspace)/${{parameters.artifactName}}" --run-id 116384714 --debug
   displayName: 'Download artifacts with Azure CLI'
   env:
     AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)

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

@@ -15,14 +15,9 @@ Param(
 $referencedFileVersionsPerDll = @{}
 $totalFailures = 0
 
-Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude *UITest*,MouseJump.Common.UnitTests*,*.FuzzTests* | ForEach-Object {
-    # Temporarily exclude All UI-Test, Fuzzer-Test projects because of Appium.WebDriver dependencies
+Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZones*,MouseJump.Common.UnitTests*,*.FuzzTests* | ForEach-Object {
+    # Temporarily exclude FancyZones UI tests because of Appium.WebDriver dependencies
     $depsJsonFullFileName = $_.FullName
-
-    if ($depsJsonFullFileName -like "*CmdPal*") {
-        return
-    }
-
     $depsJsonFileName = $_.Name
     $depsJson = Get-Content $depsJsonFullFileName | ConvertFrom-Json
 

.pipelines/versionAndSignCheck.ps1

@@ -22,11 +22,7 @@ $versionExceptions = @(
     "TraceReloggerLib.dll",
     "Microsoft.WindowsAppRuntime.Release.Net.dll",
     "Microsoft.Windows.Widgets.Projection.dll",
-    "WinRT.Host.Shim.dll",
-    "WyHash.dll",
-    "Microsoft.Recognizers.Text.DataTypes.TimexExpression.dll",
-    "ObjectModelCsProjection.dll",
-    "RendererCsProjection.dll") -join '|';
+    "WinRT.Host.Shim.dll") -join '|';
 $nullVersionExceptions = @(
     "codicon.ttf",
     "e_sqlite3.dll",
@@ -47,14 +43,12 @@ $nullVersionExceptions = @(
     "PushNotificationsLongRunningTask.ProxyStub.dll",
     "WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll",
     "System.Diagnostics.EventLog.Messages.dll",
-    "Microsoft.Windows.Widgets.dll",
-    "AdaptiveCards.ObjectModel.WinUI3.dll",
-    "AdaptiveCards.Rendering.WinUI3.dll") -join '|';
+    "Microsoft.Windows.Widgets.dll") -join '|';
 $totalFailure = 0;
 
 Write-Host $DirPath;
 
-if (-not (Test-Path $DirPath)) {
+if (-not (Test-Path $DirPath)) {  
     Write-Error "Folder does not exist!"
 }
 
@@ -76,7 +70,7 @@ $items | ForEach-Object {
         Write-Host "Version set to 1.0.0.0: " + $_.FullName
         $totalFailure++;
     }
-    elseif ($_.VersionInfo.FileVersion -eq $null -and $_.Name -notmatch $nullVersionExceptions) {
+    elseif ($_.VersionInfo.FileVersion -eq $null -and $_.Name -notmatch $nullVersionExceptions) { 
         # These items are exceptions that actually a version not set.
         Write-Host "Version not set: " + $_.FullName
         $totalFailure++;

.pipelines/versionSetting.ps1

@@ -38,19 +38,9 @@ $verPropReadFileLocation = $verPropWriteFileLocation;
 $verProps.Project.PropertyGroup.Version = $versionNumber;
 $verProps.Project.PropertyGroup.DevEnvironment = $DevEnvironment;
 
-Write-Host "xml" $verProps.Project.PropertyGroup.Version
+Write-Host "xml" $verProps.Project.PropertyGroup.Version 
 $verProps.Save($verPropWriteFileLocation);
 
-
-#### The same thing as above, but for the CmdPal version
-$verPropWriteFileLocation = $PSScriptRoot + '/../src/CmdPalVersion.props';
-$verPropReadFileLocation = $verPropWriteFileLocation;
-[XML]$verProps = Get-Content $verPropReadFileLocation
-$verProps.Project.PropertyGroup.DevEnvironment = $DevEnvironment;
-Write-Host "xml" $verProps.Project.PropertyGroup.Version
-$verProps.Save($verPropWriteFileLocation);
-#######
-
 # Set PowerRenameContextMenu package version in AppManifest.xml
 $powerRenameContextMenuAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml';
 $powerRenameContextMenuAppManifestReadFileLocation = $powerRenameContextMenuAppManifestWriteFileLocation;

.vsconfig

@@ -1,13 +1,12 @@
 {
   "version": "1.0",
-  "components": [
+  "components": [  
     "Microsoft.VisualStudio.Component.CoreEditor",
     "Microsoft.VisualStudio.Workload.CoreEditor",
     "Microsoft.VisualStudio.Workload.NativeDesktop",
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Workload.Universal",
     "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
     "Microsoft.VisualStudio.Component.Windows10SDK.22621",
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
     "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
@@ -19,4 +18,4 @@
     "Microsoft.VisualStudio.Component.VC.ATL.Spectre",
     "Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs"
   ]
-}
+} 

COMMUNITY.md

@@ -16,7 +16,7 @@ Christian contributed New+ utility
 CleanCodeDeveloper helped do massive amounts of code stability and image resizer work.
 
 ### [@plante-msft](https://github.com/plante-msft) - Connor Plante
-Connor was the creator of Workspaces and helped create Command Palette (PowerToys Run v2)
+Connor was the creator of Workspaces and helped create PowerToys Run v2
 
 ### [@damienleroy](https://github.com/damienleroy) - [Damien Leroy](https://www.linkedin.com/in/Damien-Leroy-b2734416a/)
 Damien has helped out by developing and contributing the Quick Accent utility.
@@ -46,7 +46,7 @@ Jeff added in multiple new features into Keyboard manager, such as key chord sup
 Joe has helped triaging, discussing, issues as well as fixing bugs and building features for Text Extractor.
 
 ### [@joadoumie](https://github.com/joadoumie) - Jordi Adoumie
-Jordi helped innovate amazing new features into Advanced Paste and helped create Command Palette (PowerToys Run v2)
+Jordi helped innovate amazing new features into Advanced Paste and helped create PowerToys Run v2
   
 ### [@jsoref](https://github.com/jsoref) - [Josh Soref](https://check-spelling.dev/)
 Helping keep our spelling correct :)
@@ -57,9 +57,6 @@ Color Picker is from Martin.
 ### [@mikeclayton](https://github.com/mikeclayton) - [Michael Clayton](https://michael-clayton.com)
 Michael contributed the [initial version](https://github.com/microsoft/PowerToys/issues/23216) of the Mouse Jump tool and [a number of updates](https://github.com/microsoft/PowerToys/pulls?q=is%3Apr+author%3Amikeclayton) based on his FancyMouse utility.
 
-### [@pedrolamas](https://github.com/pedrolamas/) - Pedro Lamas
-Pedro helped create the thumbnail and File Explorer previewers for 3D files like STL and GCode.  If you like 3D printing, these are very helpful.
-
 ### [@PesBandi](https://github.com/PesBandi/) - PesBandi
 PesBandi has helped do massive amounts of Quick Accent and bug fixes.
 
@@ -187,11 +184,15 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@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
-- [@zhiwei-ms](https://github.com/zhiwei-ms) - Zhiwei Yu - Product Manager
+- [@jaimecbernardo](https://github.com/jaimecbernardo) - Jaime Bernardo - Dev lead
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
 - [@yeelam-gordon](https://github.com/yeelam-gordon) - Gordon Lam - Dev lead
 - [@jamrobot](https://github.com/jamrobot) - Jerry Xu - Dev lead
+- [@drawbyperpetual](https://github.com/drawbyperpetual) - Anirudha Shankar - Dev
+- [@mantaionut](https://github.com/mantaionut) - Ionut Manta - Dev
+- [@donlaci](https://github.com/donlaci) - Laszlo Nemeth - Dev
+- [@SeraphimaZykova](https://github.com/SeraphimaZykova) - Seraphima Zykova - Dev
+- [@stefansjfw](https://github.com/stefansjfw) - Stefan Markovic - Dev
 - [@lei9444](https://github.com/lei9444) - Leilei Zhang - Dev
 - [@shuaiyuanxx](https://github.com/shuaiyuanxx) - Shawn Yuan - Dev
 - [@moooyo](https://github.com/moooyo) - Yu Leng - Dev
@@ -205,7 +206,7 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
 - [@vanzue](https://github.com/vanzue) - Kai Tao - Dev
 
-## Former PowerToys core team members
+# Former PowerToys core team members
 
 - [@indierawk2k2](https://github.com/indierawk2k2) - Mike Harsh - Product Manager
 - [@ethanfangg](https://github.com/ethanfangg) - Ethan Fang - Product Manager
@@ -218,9 +219,3 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@taras-janea](https://github.com/taras-janea) - Taras Sich - Dev
 - [@yuyoyuppe](https://github.com/yuyoyuppe) - Andrey Nekrasov - Dev
 - [@gokcekantarci](https://github.com/gokcekantarci) - Gokce Kantarci - Dev
-- [@drawbyperpetual](https://github.com/drawbyperpetual) - Anirudha Shankar - Dev
-- [@mantaionut](https://github.com/mantaionut) - Ionut Manta - Dev
-- [@donlaci](https://github.com/donlaci) - Laszlo Nemeth - Dev
-- [@SeraphimaZykova](https://github.com/SeraphimaZykova) - Seraphima Zykova - Dev
-- [@stefansjfw](https://github.com/stefansjfw) - Stefan Markovic - Dev
-- [@jaimecbernardo](https://github.com/jaimecbernardo) - Jaime Bernardo - Dev lead

Directory.Packages.props

@@ -3,21 +3,17 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
-    <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
-    <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.2" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
-    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
@@ -29,39 +25,38 @@
     <PackageVersion Include="Mages" Version="3.0.0" />
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
-    <PackageVersion Include="MessagePack" Version="3.1.3" />
+    <PackageVersion Include="MessagePack" Version="2.5.187" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.2" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.2" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.5" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.2" />
     <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" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
     <!-- 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.5" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.2" />
     <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. -->
     <!-- 
       TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="3.8.3" />
+    <PackageVersion Include="MSTest" Version="3.6.3" />
     <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
@@ -69,42 +64,38 @@
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
     <PackageVersion Include="SharpCompress" Version="0.37.2" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
     <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.5" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.2" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.5" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.5" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.2" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.2" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.2" />
     <!-- 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.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.5" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.2" />
     <!-- 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.5" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.5" />
-    <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.5" />
-    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.2" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.2" />
+    <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
+    <PackageVersion Include="System.Management" Version="9.0.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.5" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.5" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.5" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.5" />
-    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.2" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.2" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.2" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
     <PackageVersion Include="WinUIEx" Version="2.2.0" />
     <PackageVersion Include="WPF-UI" Version="3.0.5" />
-    <PackageVersion Include="WyHash" Version="1.0.5" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsExperimentationLive)'!=''">
     <!-- Additional dependencies used by experimentation -->
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -3,14 +3,12 @@
 This software incorporates material from third parties.
 
 - Color Picker
-- Command Palette
 - File Explorer Add-ins
 - ImageResizer
 - PowerToys Run
 - Installer/Runner
 - Measure tool
 - Peek
-- Registry Preview
 
 ## Utility: Color Picker
 
@@ -40,75 +38,6 @@ 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: Command Palette
-
-### wyhash
-
-We use the WyHash NuGet package for calculating stable hashes for strings.
-
-**Source**: [https://github.com/wangyi-fudan/wyhash](https://github.com/wangyi-fudan/wyhash)
-
-```
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-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 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.
-
-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
@@ -859,34 +788,6 @@ SOFTWARE.
 
 ## Utility: Peek
 
-### Monaco Editor
-
-**Source**: https://github.com/Microsoft/monaco-editor
-
-**Additional third party notifications:** https://github.com/microsoft/monaco-editor/blob/main/ThirdPartyNotices.txt
-
-The MIT License (MIT)
-
-Copyright (c) 2016 - present Microsoft Corporation
-
-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.
-
 ### The Quite OK Image Format reference decoder
 
 **Source**: https://github.com/phoboslab/qoi
@@ -1393,55 +1294,19 @@ EXHIBIT A -Mozilla Public License.
      Original Code Source Code for Your Modifications.]
 ```
 
-## Utility: Registry Preview
-
-### Monaco Editor
-
-**Source**: https://github.com/Microsoft/monaco-editor
-
-**Additional third party notifications:** https://github.com/microsoft/monaco-editor/blob/main/ThirdPartyNotices.txt
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2016 - present Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## NuGet Packages used by PowerToys
 
-- AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
-- AdaptiveCards.Rendering.WinUI3 2.1.0-beta
-- AdaptiveCards.Templating 2.0.2
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.17
-- CommunityToolkit.Common 8.4.0
-- CommunityToolkit.Mvvm 8.4.0
-- CommunityToolkit.WinUI.Animations 8.2.250402
-- CommunityToolkit.WinUI.Collections 8.2.250402
-- CommunityToolkit.WinUI.Controls.Primitives 8.2.250402
-- CommunityToolkit.WinUI.Controls.Segmented 8.2.250402
-- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250402
-- CommunityToolkit.WinUI.Controls.Sizers 8.2.250402
-- CommunityToolkit.WinUI.Converters 8.2.250402
-- CommunityToolkit.WinUI.Extensions 8.2.250402
+- CommunityToolkit.Mvvm 8.2.2
+- CommunityToolkit.WinUI.Animations 8.0.240109
+- CommunityToolkit.WinUI.Collections 8.0.240109
+- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109
+- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109
+- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109
+- CommunityToolkit.WinUI.Converters 8.0.240109
+- CommunityToolkit.WinUI.Extensions 8.0.240109
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
@@ -1452,65 +1317,59 @@ SOFTWARE.
 - LazyCache 2.4.0
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
-- MessagePack 3.1.3
-- Microsoft.Bcl.AsyncInterfaces 9.0.5
+- MessagePack 2.5.187
+- Microsoft.Bcl.AsyncInterfaces 9.0.2
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.5
+- Microsoft.Data.Sqlite 9.0.2
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.5
-- Microsoft.Extensions.Hosting 9.0.5
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.5
-- Microsoft.Extensions.Logging 9.0.5
-- Microsoft.Extensions.Logging.Abstractions 9.0.5
+- Microsoft.Extensions.DependencyInjection 9.0.2
+- Microsoft.Extensions.Hosting 9.0.2
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.2
+- Microsoft.Extensions.Logging 9.0.2
+- Microsoft.Extensions.Logging.Abstractions 9.0.2
 - 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.5
-- Microsoft.Windows.Compatibility 9.0.5
+- Microsoft.Web.WebView2 1.0.2739.15
+- Microsoft.Win32.SystemEvents 9.0.2
+- Microsoft.Windows.Compatibility 9.0.2
 - Microsoft.Windows.CsWin32 0.2.46-beta
-- Microsoft.Windows.CsWinRT 2.2.0
+- Microsoft.Windows.CsWinRT 2.1.5
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.7.250401001
-- Microsoft.WindowsPackageManager.ComInterop 1.10.340
+- Microsoft.WindowsAppSDK 1.6.241114003
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
 - Moq 4.18.4
-- MSTest 3.8.3
+- MSTest 3.6.3
 - NLog.Extensions.Logging 5.3.8
 - NLog.Schema 5.2.8
 - OpenAI 2.0.0
 - ReverseMarkdown 4.1.0
 - ScipBe.Common.Office.OneNote 3.0.1
 - SharpCompress 0.37.2
-- StreamJsonRpc 2.21.69
+- StreamJsonRpc 2.19.27
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.5
+- System.CodeDom 9.0.2
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.5
-- System.Configuration.ConfigurationManager 9.0.5
-- System.Data.OleDb 9.0.5
+- System.ComponentModel.Composition 9.0.2
+- System.Configuration.ConfigurationManager 9.0.2
+- System.Data.OleDb 9.0.2
 - System.Data.SqlClient 4.8.6
-- System.Diagnostics.EventLog 9.0.5
-- System.Diagnostics.PerformanceCounter 9.0.5
-- System.Drawing.Common 9.0.5
-- System.IO.Abstractions 22.0.13
-- System.IO.Abstractions.TestingHelpers 22.0.13
-- System.Management 9.0.5
-- System.Net.Http 4.3.4
-- System.Private.Uri 4.3.2
+- System.Diagnostics.EventLog 9.0.2
+- System.Diagnostics.PerformanceCounter 9.0.2
+- System.Drawing.Common 9.0.2
+- System.IO.Abstractions 21.0.29
+- System.IO.Abstractions.TestingHelpers 21.0.29
+- System.Management 9.0.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.5
-- System.ServiceProcess.ServiceController 9.0.5
-- System.Text.Encoding.CodePages 9.0.5
-- System.Text.Json 9.0.5
-- System.Text.RegularExpressions 4.3.1
+- System.Runtime.Caching 9.0.2
+- System.ServiceProcess.ServiceController 9.0.2
+- System.Text.Encoding.CodePages 9.0.2
+- System.Text.Json 9.0.2
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0
 - UTF.Unknown 2.5.1
 - WinUIEx 2.2.0
 - WPF-UI 3.0.5
-- WyHash 1.0.5
-

PowerToys.sln

@@ -620,64 +620,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "src\common\Tele
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBorders.UnitTests", "src\modules\MouseWithoutBorders\MouseWithoutBorders.UnitTests\MouseWithoutBorders.UnitTests.csproj", "{66614C26-314C-4B91-9071-76133422CFEF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommandPalette", "CommandPalette", "{3846508C-77EB-4034-A702-F8BB263C4F79}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Built-in Extensions", "Built-in Extensions", "{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{6CE438DF-C245-4997-A360-0A0939E4BA34}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Bookmarks", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj", "{E09AA983-C755-474F-83D6-A5CDF528C070}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Calc", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{6D56B64D-FF1F-488F-AFED-9B9854A5D399}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Registry", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj", "{92EC89E4-9972-453A-8A1A-3A9E230C146A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsServices", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj", "{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsSettings", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj", "{D1160404-D3D1-497A-883A-4059C07C2273}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsTerminal", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj", "{40F6D69D-E321-400F-A767-5628C7AE453D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.CommandPalette.Extensions", "src\modules\cmdpal\extensionsdk\Microsoft.CommandPalette.Extensions\Microsoft.CommandPalette.Extensions.vcxproj", "{305DD37E-C85D-4B08-AAFE-7381FA890463}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CommandPalette.Extensions.Toolkit", "src\modules\cmdpal\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj", "{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Common", "src\modules\cmdpal\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj", "{14E62033-58D0-4A7D-8990-52F50A08BBBD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\modules\cmdpal\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Extensions", "Sample Extensions", "{071E18A4-A530-46B8-AB7D-B862EE55E24E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessMonitorExtension", "src\modules\cmdpal\ext\ProcessMonitorExtension\ProcessMonitorExtension.csproj", "{C846F7A7-792A-47D9-B0CB-417C900EE03D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePagesExtension", "src\modules\cmdpal\ext\SamplePagesExtension\SamplePagesExtension.csproj", "{C831231F-891C-4572-9694-45062534B42A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{7520A2FE-00A2-49B8-83ED-DB216E874C04}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI", "src\modules\cmdpal\Microsoft.CmdPal.UI\Microsoft.CmdPal.UI.csproj", "{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj", "{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.ClipboardHistory", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj", "{79775343-7A3D-445D-9104-3DD5B2893DF9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalModuleInterface", "src\modules\cmdpal\CmdPalModuleInterface\CmdPalModuleInterface.vcxproj", "{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesCsharpLibrary", "src\modules\Workspaces\WorkspacesCsharpLibrary\WorkspacesCsharpLibrary.csproj", "{89D0E199-B17A-418C-B2F8-7375B6708357}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension.win10", "src\modules\NewPlus\NewShellExtensionContextMenu.win10\NewPlus.ShellExtension.win10.vcxproj", "{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexer", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj", "{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj", "{C0CE3B5E-16D3-495D-B335-CA791B660162}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
@@ -690,8 +636,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItModuleInterface", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItSettingsInterop", "src\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj", "{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj", "{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITestAutomation", "src\common\UITestAutomation\UITestAutomation.csproj", "{A558C25D-2007-498E-8B6F-43405AFAE9E2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardManagerEditorUI", "src\modules\keyboardmanager\KeyboardManagerEditorUI\KeyboardManagerEditorUI.csproj", "{08F9155D-B6DC-46E5-9C83-AF60B655898B}"
@@ -700,16 +644,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorLibrar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.FuzzTests", "src\modules\Hosts\Hosts.FuzzTests\Hosts.FuzzTests.csproj", "{EBED240C-8702-452D-B764-6DB9DA9179AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.UITests", "src\modules\Hosts\Hosts.UITests\Hosts.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests", "src\modules\registrypreview\RegistryPreview.FuzzTests\RegistryPreview.FuzzTests.csproj", "{5702B3CC-8575-48D5-83D8-15BB42269CD3}"
-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("{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}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2262,154 +2196,6 @@ Global
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|ARM64.Build.0 = Release|ARM64
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|x64.ActiveCfg = Release|x64
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|x64.Build.0 = Release|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|x64.ActiveCfg = Debug|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|x64.Build.0 = Debug|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|ARM64.Build.0 = Release|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|x64.ActiveCfg = Release|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|x64.Build.0 = Release|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|x64.ActiveCfg = Debug|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|x64.Build.0 = Debug|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|ARM64.Build.0 = Release|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|x64.ActiveCfg = Release|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|x64.Build.0 = Release|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|x64.ActiveCfg = Debug|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|x64.Build.0 = Debug|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|ARM64.Build.0 = Release|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|x64.ActiveCfg = Release|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|x64.Build.0 = Release|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|x64.ActiveCfg = Debug|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|x64.Build.0 = Debug|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|ARM64.Build.0 = Release|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|x64.ActiveCfg = Release|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|x64.Build.0 = Release|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|ARM64.Build.0 = Debug|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|x64.ActiveCfg = Debug|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|x64.Build.0 = Debug|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|ARM64.ActiveCfg = Release|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|ARM64.Build.0 = Release|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|x64.ActiveCfg = Release|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|x64.Build.0 = Release|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|x64.ActiveCfg = Debug|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|x64.Build.0 = Debug|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|ARM64.Build.0 = Release|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|x64.ActiveCfg = Release|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|x64.Build.0 = Release|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|x64.ActiveCfg = Debug|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|x64.Build.0 = Debug|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|ARM64.Build.0 = Release|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|x64.ActiveCfg = Release|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|x64.Build.0 = Release|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.Build.0 = Debug|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|x64.ActiveCfg = Debug|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|x64.Build.0 = Debug|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|ARM64.ActiveCfg = Release|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|ARM64.Build.0 = Release|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|x64.ActiveCfg = Release|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|x64.Build.0 = Release|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|x64.ActiveCfg = Debug|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|x64.Build.0 = Debug|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|ARM64.Build.0 = Release|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|x64.ActiveCfg = Release|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|x64.Build.0 = Release|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|x64.ActiveCfg = Debug|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|x64.Build.0 = Debug|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|ARM64.Build.0 = Release|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|x64.ActiveCfg = Release|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|x64.Build.0 = Release|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|x64.ActiveCfg = Debug|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|x64.Build.0 = Debug|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|ARM64.Build.0 = Release|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.ActiveCfg = Release|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.Build.0 = Release|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|x64.ActiveCfg = Debug|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|x64.Build.0 = Debug|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|x64.Deploy.0 = Debug|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|ARM64.Build.0 = Release|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|ARM64.Deploy.0 = Release|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|x64.ActiveCfg = Release|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|x64.Build.0 = Release|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|x64.Deploy.0 = Release|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|x64.ActiveCfg = Debug|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|x64.Build.0 = Debug|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|x64.Deploy.0 = Debug|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|ARM64.Build.0 = Release|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|ARM64.Deploy.0 = Release|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|x64.ActiveCfg = Release|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|x64.Build.0 = Release|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|x64.Deploy.0 = Release|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|x64.ActiveCfg = Debug|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|x64.Build.0 = Debug|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|x64.Deploy.0 = Debug|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|ARM64.Build.0 = Release|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|ARM64.Deploy.0 = Release|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|x64.ActiveCfg = Release|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|x64.Build.0 = Release|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|x64.Deploy.0 = Release|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|x64.ActiveCfg = Debug|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|x64.Build.0 = Debug|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|ARM64.Build.0 = Release|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|x64.ActiveCfg = Release|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|x64.Build.0 = Release|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|x64.ActiveCfg = Debug|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|x64.Build.0 = Debug|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|ARM64.Build.0 = Release|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|x64.ActiveCfg = Release|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|x64.Build.0 = Release|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|x64.ActiveCfg = Debug|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|x64.Build.0 = Debug|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|ARM64.Build.0 = Release|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|x64.ActiveCfg = Release|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|x64.Build.0 = Release|x64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Debug|ARM64.Build.0 = Debug|ARM64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Debug|x64.ActiveCfg = Debug|x64
@@ -2426,54 +2212,6 @@ Global
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|ARM64.Build.0 = Release|ARM64
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x64.ActiveCfg = Release|x64
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x64.Build.0 = Release|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|x64.ActiveCfg = Debug|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|x64.Build.0 = Debug|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|x64.Deploy.0 = Debug|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|ARM64.Build.0 = Release|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|ARM64.Deploy.0 = Release|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|x64.ActiveCfg = Release|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|x64.Build.0 = Release|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|x64.Deploy.0 = Release|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|x64.ActiveCfg = Debug|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|x64.Build.0 = Debug|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|ARM64.Build.0 = Release|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|x64.ActiveCfg = Release|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|x64.Build.0 = Release|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|x64.ActiveCfg = Debug|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|x64.Build.0 = Debug|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|ARM64.Build.0 = Release|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|x64.ActiveCfg = Release|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|x64.Build.0 = Release|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|x64.ActiveCfg = Debug|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|x64.Build.0 = Debug|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|ARM64.Build.0 = Release|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|x64.ActiveCfg = Release|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|x64.Build.0 = Release|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.ActiveCfg = Debug|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.Build.0 = Debug|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.Deploy.0 = Debug|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.Build.0 = Release|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.Deploy.0 = Release|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.ActiveCfg = Release|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Build.0 = Release|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Deploy.0 = Release|x64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.ActiveCfg = Debug|x64
@@ -2514,26 +2252,20 @@ Global
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|ARM64.Build.0 = Release|ARM64
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x64.ActiveCfg = Release|x64
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x64.Build.0 = Release|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.ActiveCfg = Debug|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.Build.0 = Debug|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.Deploy.0 = Debug|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.Build.0 = Release|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.Deploy.0 = Release|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.ActiveCfg = Release|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.Build.0 = Release|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.Deploy.0 = Release|x64
+		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x86.ActiveCfg = Release|x64
+		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x86.Build.0 = Release|x64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|x64.ActiveCfg = Debug|x64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|x64.Build.0 = Debug|x64
+		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|x86.ActiveCfg = Debug|x64
+		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|x86.Build.0 = Debug|x64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Release|ARM64.ActiveCfg = Release|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Release|ARM64.Build.0 = Release|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Release|x64.ActiveCfg = Release|x64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Release|x64.Build.0 = Release|x64
+		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Release|x86.ActiveCfg = Release|x64
+		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Release|x86.Build.0 = Release|x64
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B}.Debug|ARM64.Build.0 = Debug|ARM64
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B}.Debug|x64.ActiveCfg = Debug|x64
@@ -2558,44 +2290,6 @@ Global
 		{EBED240C-8702-452D-B764-6DB9DA9179AF}.Release|ARM64.Build.0 = Release|ARM64
 		{EBED240C-8702-452D-B764-6DB9DA9179AF}.Release|x64.ActiveCfg = Release|x64
 		{EBED240C-8702-452D-B764-6DB9DA9179AF}.Release|x64.Build.0 = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Debug|x64.ActiveCfg = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Debug|x64.Build.0 = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Release|ARM64.Build.0 = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Release|x64.ActiveCfg = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Release|x64.Build.0 = Release|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|x64.ActiveCfg = Debug|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|x64.Build.0 = Debug|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|ARM64.Build.0 = Release|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|x64.ActiveCfg = Release|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|x64.Build.0 = Release|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.ActiveCfg = Debug|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.Build.0 = Debug|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.Build.0 = Debug|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.Build.0 = Release|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.ActiveCfg = Release|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.Build.0 = Release|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.ActiveCfg = Debug|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.Build.0 = Debug|x64
-		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2823,51 +2517,18 @@ Global
 		{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD} = {8F62026A-294B-41C6-8839-87463613F216}
 		{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
-		{3846508C-77EB-4034-A702-F8BB263C4F79} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
-		{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{6CE438DF-C245-4997-A360-0A0939E4BA34} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{E09AA983-C755-474F-83D6-A5CDF528C070} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{D1160404-D3D1-497A-883A-4059C07C2273} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{40F6D69D-E321-400F-A767-5628C7AE453D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{305DD37E-C85D-4B08-AAFE-7381FA890463} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{071E18A4-A530-46B8-AB7D-B862EE55E24E} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D} = {071E18A4-A530-46B8-AB7D-B862EE55E24E}
-		{C831231F-891C-4572-9694-45062534B42A} = {071E18A4-A530-46B8-AB7D-B862EE55E24E}
-		{7520A2FE-00A2-49B8-83ED-DB216E874C04} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{79775343-7A3D-445D-9104-3DD5B2893DF9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{89D0E199-B17A-418C-B2F8-7375B6708357} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{C0CE3B5E-16D3-495D-B335-CA791B660162} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{E4585179-2AC1-4D5F-A3FF-CFC5392F694C} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{4382A954-179A-4078-92AF-715187DFFF50} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{EBED240C-8702-452D-B764-6DB9DA9179AF} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
-		{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}
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -11,15 +11,14 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 |              | Current utilities: |              |
 |--------------|--------------------|--------------|
 | [Advanced Paste](https://aka.ms/PowerToysOverview_AdvancedPaste) | [Always on Top](https://aka.ms/PowerToysOverview_AoT) | [PowerToys Awake](https://aka.ms/PowerToysOverview_Awake) |
-| [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
-| [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
-| [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
-| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
-| [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
-| [Peek](https://aka.ms/PowerToysOverview_Peek) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
-| [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
-| [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
-| [ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |
+| [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) |
+| [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) |
+| [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) | [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) |
+| [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) |
+| [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
+| [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) |
+| [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
+| [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) | [ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |
 
 ## Installing and running Microsoft PowerToys
 
@@ -35,19 +34,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.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.89%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.88%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.88.0/PowerToysUserSetup-0.88.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.88.0/PowerToysUserSetup-0.88.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.88.0/PowerToysSetup-0.88.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.88.0/PowerToysSetup-0.88.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.88.0-x64.exe][ptUserX64] | 5BBA2E06603CAAE0269DFBC991095C6664FD934130335197C1BA3120E19B7CA3 |
+| Per user - ARM64     | [PowerToysUserSetup-0.88.0-arm64.exe][ptUserArm64] | E79723F9F94068C699E01334C8CC0C85F37818EB4664FC772D2B545A1C37C3FA |
+| Machine wide - x64   | [PowerToysSetup-0.88.0-x64.exe][ptMachineX64] | C43742DB7AA3F8B01FE7AE1DA591F0342767AFE5BBACB72F2968CE5E8EE1E3AC |
+| Machine wide - ARM64 | [PowerToysSetup-0.88.0-arm64.exe][ptMachineArm64] | AEE4A67643C886336F31F86C4117BA5F01BCA5E0E99FF34524217DC91AFA7132 |
 
 This is our preferred method.
 
@@ -93,168 +92,141 @@ 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.88 - January 2025 Update
 
-In this release, we focused on new features, stability, and automation.
+In this release, we focused on new features, stability, and improvements.
 
-**✨Highlights**
+**Highlights**
 
- - We focused on greatly improving Command Palette's performance and fixing a large amount 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)!
+ - New utility: ZoomIt - a screen zoom, annotation, and recording tool for technical presentations and demos. This utility from Sysinternals has had its source code released and included in PowerToys. ZoomIt will still continue to be updated and shipped by Sysinternals for users who prefer to have it as a standalone utility outside of PowerToys. Thanks [@markrussinovich](https://github.com/markrussinovich), [@foxmsft](https://github.com/foxmsft) and [@johnstep](https://github.com/johnstep) for contributing the original code and reviewing the PowerToys integration!
+ - Video Conference Mute has been deprecated and was removed from PowerToys.
+ - .Net 9.0.1 fixed many issue in WPF, improving stability for PowerToys Run.
+
+### General
+ - Applied a workaround for the Windows App SDK applications title bar override that was causing accent color to not be shown on the top bar of applications on Windows 10. Thanks [@pingzing](https://github.com/pingzing)!
+ - Improved the "admin application running" notification checking logic to be less demanding on resources. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed an issue causing many utilities to crash when the GPO to disable data diagnostics was applied.
 
 ### 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)!
+ - Fixed a crash when the application was exiting. (This was a hotfix for 0.87)
+ - Added a Json format validation step to verify if a conversion to Json should be applied.
+ - Fixed accessibility issues when using a screen reader.
+ - Added support for all BitmapDecoder supported image file types to the Image to Text functionality. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed an issue causing Advanced Paste initialization errors to hang the PowerToys main process.
 
-### Color Picker
+### FancyZones
 
- - 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 actually exist.
-
-### 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 caret was at position 0, and add 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 Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added setting to enable/disable system tray icon in CmdPal and align 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 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 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.
-
-### Image Resizer
-
- - Fixed an issue where deleting an Image Resizer preset removed the wrong preset.
+ - Removed Workspaces Editor from the exclusions list so it can be snapped by FancyZones.
 
 ### Keyboard Manager
 
- - 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)!
+ - Added an option to make a shortcut remapping only trigger with exact modifiers.
 
-### PowerRename
+### Monaco Preview
 
- - 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 .resx and .resw files in Peek and File Explorer add-ons. Thanks [@asif4318](https://github.com/asif4318)!
+ - Added a setting to make the code minimap toggle-able in Peek and File Explorer add-ons. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Fixed an issue causing Json format preview setting to not be applied correctly.
+ - Fixed an issue causing the wrong Monaco assets to be used at runtime.
+
+### Mouse Without Borders
+
+ - Fixed an issue causing clipboard to stop working after going through a UAC screen when using the Service mode. Thanks [@YDKK](https://github.com/YDKK)!
+
+### New+
+
+ - Fixed an issue causing New+ to override the New file or folder creation from the File Explorer Ribbon buttons or keyboard shortcuts on Windows 10.
+ - When creating file or folders through a template, they should now have the current time as the last modified date. Thanks [@cgaarden](https://github.com/cgaarden)!
+
+### Peek
+
+ - Fixed an issue causing Peek to not appear if it was previously minimized. Thanks [@asif4318](https://github.com/asif4318)!
 
 ### PowerToys Run
 
- - Added support for custom formats in the "Time and Date" plugin and improves 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)!
+ - Fixed a transparent border issue on Windows 10. (This was a hotfix for 0.87)
+ - Fixed a crash in the OneNote plugin after the .Net 9 update. (This was a hotfix for 0.87)
+ - Fixed an issue causing the Calculator plugin to return division by zero errors when dividing by hexadecimal numbers. Thanks [@plante-msft](https://github.com/plante-msft)!
+ - Updated the Calculator plugin Mages library to 3.0.0 and added support for the random integer function. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Improved handling of non-base 10 numbers to add support for binary and octal numbers in the Calculator plugin. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added a setting to enable selection of which units to use for trigonometric functions. Thanks [@OldUser101](https://github.com/OldUser101)!
+ - Fixed a .NET 9 regression causing the PowerToys Run dialog to not be draggable. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added context menu buttons for the VS Code Workspaces plugin, for copying the path, opening in File Explorer or in Console. Thanks [@programming-with-ia](https://github.com/programming-with-ia)!
+ - Added some telemetry to gather data on which hotkey is used to trigger PowerToys Run.
+ - Removed the workarounds that were in place to fix some WPF issues that were fixed in .NET 9.0.1.
+ - Fixed a typo in the Value Generator plugin messages. Thanks [@OldUser101](https://github.com/OldUser101)!
 
 ### 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)!
+ - Added the ć character to the Slovenian character set. Thanks [@dsoklic](https://github.com/dsoklic)!
+ - Added the Proto-Indo-European character set. 
 
 ### 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 causing line breaks to not be parsed correctly for REG_MULTI_SZ values. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added a tooltip to values to show multiple lines of data. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added a context menu to enable copying type, value and key paths. Thanks [@htcfreek](https://github.com/htcfreek)!
 
 ### 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.
+ - Made the Advanced Paste paste OpenAI configuration modal scrollable.
+ - Fixed the text on the Quick Accent page to refer to "character sets" instead of "character set". Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added the plugin's dll file version and website to the PowerToys Run plugin settings. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added the Workspaces file to the list of files that gets backed up by the Back up / Restore functionality.
+ - Fixed an issue causing some of the selected character sets to be unselected when opening the character set expander in the Quick Accent page.
+ - Improved GPO logic, icons, info bar layout and enabled state of all modules settings pages. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed some accessibility issues and refactored and improved quality of the code related to image sizes in the Image Resizer page. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed mentions of "Backup" to "Back up" when it should be used as a verb. Thanks [@JackStuart](https://github.com/JackStuart)!
+ - Added a "New" label to Settings to better highlight new utilities that get released. Thanks [@niels9001](https://github.com/niels9001) for the UI tweaks!
+
+### Text Extractor
+
+ - Fixed many accessibility and UI issues on the overlay UI. 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 causing the Workspaces Editor to start outside of visible desktop area.
+ - Fixed an issue to maintain command line arguments for applications when trying using the "Launch and Edit" feature.
+
+### Video Conference Mute
+
+ - The module has been deprecated in 0.88.0, being removed from PowerToys.
+
+### ZoomIt
+
+ - New utility: Zoom It - a screen zoom, annotation, and recording tool for technical presentations and demos. This utility from Sysinternals has had its source code released and included in PowerToys. ZoomIt will still continue to be updated and shipped by Sysinternals for users who prefer to have it as a standalone utility outside of PowerToys. Thanks [@markrussinovich](https://github.com/markrussinovich), [@foxmsft](https://github.com/foxmsft) and [@johnstep](https://github.com/johnstep) for contributing the original code and reviewing the PowerToys integration!
 
 ### 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)!
+ - Updated the PowerToys Run documentation to reflect documentation pages for new plugins.
+ - Added YubicoOauthOTP plugin mention to thirdPartyRunPlugins.md. Thanks [@dlnilsson](https://github.com/dlnilsson)!
 
 ### 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
+ - Added fuzz testing for AdvancedPaste, with a new pipeline for OneFuzz.
+ - Added a new CI pipeline to build with the latest WindowsAppSDK.
+ - Added a new CI pipeline to build with the latest webview2 from Edge Canary.
+ - Made the HostsUILib project AOT compatible. Thanks [@snickler](https://github.com/snickler) for your help reviewing this!
+ - Made FilePreviewCommon and MarkdownPreviewHandler AOT compatible. Thanks [@snickler](https://github.com/snickler) for your help reviewing this!
+ - Made the PowerAccent.Core project AOT compatible. Thanks [@snickler](https://github.com/snickler) for your help reviewing this!
+ - Cleaned up some code for AOT compatibility in the Advanced Paste module. Thanks [@snickler](https://github.com/snickler) for your help reviewing this!
+ - Removed the prerelease flag from the PowerToys development DSC configurations. Thanks [@denelon](https://github.com/denelon)!
+ - Improved Dart CI reliability by improving error messages and retrying to the step that installs the correct dotnet version.
+ - Improved Dart CI reliability by fixing retries when downloading the localization files.
+ - Improved Dart CI build times by removing the steps to build the no longer needed abstracted utility nuget packages.
+ - Removed the solution.props file from the solution root.
+ - Fixed PowerToys Run Calculator plugin tests when running in systems with different number formats. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Updated many .NET packages from .NET 9.0.0 to 9.0.1 for security fixes. Thanks [@snickler](https://github.com/snickler)!
+ - Refactored the Mouse Without Borders Common.Log.cs and Common.Receiver.cs files. Thanks [@mikeclayton](https://github.com/mikeclayton)!
 
- - 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
+#### What is being planned for version 0.89
 
-For [v0.92][github-next-release-work], we'll work on the items below:
+For [v0.89][github-next-release-work], we'll work on the items below:
 
- - Continued Command Palette polish
- - New UI Automation tests
- - Working on installer upgrades
- - Upgrading Keyboard Manager's editor UI
  - Stability / bug fixes
+ - New module: File Actions Menu
+ - PowerToys Run v2 development work
 
 ## PowerToys Community
 

doc/Fuzzing/CppFuzzingGuide.md

@@ -1,117 +0,0 @@
-# 🧪 C++ Project Fuzzing Test Guide
-
-This guide walks you through setting up a **fuzzing test** project for a C++ module using [libFuzzer](https://llvm.org/docs/LibFuzzer.html).
-.
-
----
-
-## 🏗️ Step-by-Step Setup
-
-### 1. Create a New C++ Project
-
-- Use **Empty Project** template.
-- Name it `<ModuleName>.FuzzingTest`.
-
----
-
-### 2. Update Build Configuration
-
-- In **Configuration Manager**, Uncheck Build for both Release|ARM64, Debug|ARM64 and Debug|x64 configurations.
-- Note: ARM64 is not supported in this case, so leave ARM64 configurations build disabled.
----
-
-### 3. Enable ASan and libFuzzer in `.vcxproj`
-
-Edit the project file to enable fuzzing:
-
-```xml
-<PropertyGroup>
-  <EnableASAN>true</EnableASAN>
-  <EnableFuzzer>true</EnableFuzzer>
-</PropertyGroup>
-```
-
----
-
-### 4. Add Fuzzing Compiler Flags
-
-Add this to `AdditionalOptions` under the `Fuzzing` configuration:
-
-```xml
-/fsanitize=address
-/fsanitize-coverage=inline-8bit-counters
-/fsanitize-coverage=edge
-/fsanitize-coverage=trace-cmp
-/fsanitize-coverage=trace-div
-%(AdditionalOptions)
-```
-
----
-
-### 5. Link the Sanitizer Coverage Runtime
-
-In `Linker → Input → Additional Dependencies`, add:
-
-```text
-$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib
-```
-
----
-
-### 6. Copy Required Runtime DLL
-
-Add a `PostBuildEvent` to copy the ASAN DLL:
-
-```xml
-<Command>
-  xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"
-</Command>
-```
-
----
-
-### 7. Add Preprocessor Definitions
-
-To avoid annotation issues, add these to the `Preprocessor Definitions`:
-
-```text
-_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION
-```
-
----
-
-## 🧬 Required Code
-
-### `LLVMFuzzerTestOneInput` Entry Point
-
-Every fuzzing project must expose this function:
-
-```cpp
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    std::string input(reinterpret_cast<const char*>(data), size);
-
-    try
-    {
-        // Call your module with the input here.
-    }
-    catch (...) {}
-
-    return 0;
-}
-```
-
----
-
-## ⚙️ [Test run in the cloud](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/faq/notwindows/walkthrough)
-
-To submit a job to the cloud you can run with this command:
-
-```
-oip submit --config .\OneFuzzConfig.json --drop-path <your_submission_directory> --platform windows --do-not-file-bugs --duration 1
-```
-You want to run with --do-not-file-bugs because if there is an issue with running the parser in the cloud (which is very possible), you don't want bugs to be created if there is an issue. The --duration task is the number of hours you want the task to run. I recommend just running for 1 hour to make sure things work initially. If you don't specify this parameter, it will default to 48 hours. You can find more about submitting a test job here. 
-
-OneFuzz will send you an email when the job has started.
-
----

doc/devdocs/UITests.md

@@ -88,4 +88,4 @@ namespace UITests_KeyboardManager
 ## Extra tools and information
 
  **Accessibility Tools**:
-While working on tests, you may need a tool that helps you to view the element's accessibility data, e.g. for finding the button to click. For this purpose, you could use [AccessibilityInsights](https://accessibilityinsights.io/docs/windows/overview).
+While working on tests, you may need a tool that helps you to view the element's accessibility data, e.g. for finding the button to click. For this purpose, you could use [AccessibilityInsights](https://accessibilityinsights.io/docs/windows/overview) 

doc/devdocs/modules/launcher/plugins/timedate.md

@@ -16,70 +16,49 @@ The 'Time and Date' plugin shows the date and time in different formats. For the
 ### Available formats
 
 **Remarks**
-- The following formats requires a prefix in the query when using them as date input:
+- The following formats requires a prefix in the query:
    - Unix Timestamp: `u`
    - Unix Timestamp in milliseconds: `ums`
    - Windows file time: `ft`
-   - OLE Automation date: `oa`
-   - Excel 1900 date value: `exc`
-   - Excel 1904 date value: `exf`
 - On invalid number inputs we show a warning that tells the user which prefixes are allowed/required.
 
 **List of available formats**
 
 The following formats are currently available:
 
-| Format | Example (Based on default settings) | As result | As input | Result as custom format only
+| Format | Example (Based on default settings) | As result | As input |
 |--------------|-----------|------------|------------|
-| Time | 5:10 PM | x | x | |
-| Date | 3/5/2022 | x | x | |
-| Now | 3/5/2022 5:10 PM | x | x | |
-| Time UTC | 4:10 PM | x | x | |
-| Now UTC | 3/5/2022 4:10 PM | x | x | |
-| Unix Timestamp | 1646496622 | x | x | |
-| Unix Timestamp in milliseconds | 1646496622500 | x | x | |
-| Hour | 10 | x | | |
-| Minute | 30 | x | | |
-| Second | 45 | x | | |
-| Millisecond | 678 | x | | |
-| Day (Week day) | Saturday | x | | |
-| Day of the week | 6 | x | | |
-| Day of the month | 5 | x | | |
-| Day of the year | 64 | x | | |
-| Week of the month | 1 | x | | |
-| Week of the year (Calendar week, Week number) | 10 | x | | |
-| Month | March | x | | |
-| Month of the year | 3 | x | | |
-| Month and day | March 7 | x | x | |
-| Year | 2022 | x | | |
-| Era | AD | x | | |
-| Era abbreviation | A | x | | |
-| Month and year | March 2022 | x | x | |
-| Windows file time (Int64 number) | 637820976123938199 | x | x | |
-| Universal time format: YYYY-MM-DD hh:mm:ss| 2022-03-05 16:20:12Z | x | x | |
-| ISO 8601 | 2022-03-05T17:23:04 | x | x | |
-| ISO 8601 UTC | 2022-03-05T16:23:04 | x | x | |
-| ISO 8601 with time zone | 2022-03-05T17:23:04+01:00 | x | x | |
-| ISO 8601 UTC with time zone | 2022-03-05T16:23:04Z | x | x | |
-| RFC1123 | Sat, 05 Mar 2022 16:23:04 GMT | x | x | |
-| OLE Automation date | 45723.44143763889 | | x | x |
-| Excel's 1900 date value | 45723.44143763889 | | x | x |
-| Excel's 1904 date value | 44261.44143763889 | | x | x |
-
-**Custom format definition**
-The user can create its own formats. One per line in the settings text box. The format of each line is `<name>=<syntax pattern>`.
-If the syntax pattern starting with `UTC:` then we use the UTC time instead of the local time.
-As syntax pattern the pattern from `DateTime.ToString()` and the following custom pattern are available:
-- DOW: Number of the day in the week.
-- WOM: Number of week in the month.
-- WOY: Number of the week in the year.
-- EAB: Era abbreviation.
-- WFT: Windows file time.
-- UXT: Unix time stamp.
-- UMS: Unix time stamp in milliseconds.
-- OAD: OLE Automation date.
-- EXC: Excel's 1900 based date value.
-- EXF: Excel's 1904 based date value.
+| Time | 5:10 PM | x | x |
+| Date | 3/5/2022 | x | x |
+| Now | 3/5/2022 5:10 PM | x | x |
+| Time UTC | 4:10 PM | x | x |
+| Now UTC | 3/5/2022 4:10 PM | x | x |
+| Unix Timestamp | 1646496622 | x | x |
+| Unix Timestamp in milliseconds | 1646496622500 | x | x |
+| Hour | 10 | x | |
+| Minute | 30 | x | |
+| Second | 45 | x | |
+| Millisecond | 678 | x | |
+| Day (Week day) | Saturday | x | |
+| Day of the week | 6 | x | |
+| Day of the month | 5 | x | |
+| Day of the year | 64 | x | |
+| Week of the month | 1 | x | |
+| Week of the year (Calendar week, Week number) | 10 | x | |
+| Month | March | x | |
+| Month of the year | 3 | x | |
+| Month and day | March 7 | x | x |
+| Year | 2022 | x | |
+| Era | AD | x | |
+| Era abbreviation | A | x | |
+| Month and year | March 2022 | x | x |
+| Windows file time (Int64 number) | 637820976123938199 | x | x |
+| Universal time format: YYYY-MM-DD hh:mm:ss| 2022-03-05 16:20:12Z | x | x |
+| ISO 8601 | 2022-03-05T17:23:04 | x | x |
+| ISO 8601 UTC | 2022-03-05T16:23:04 | x | x |
+| ISO 8601 with time zone | 2022-03-05T17:23:04+01:00 | x | x |
+| ISO 8601 UTC with time zone | 2022-03-05T16:23:04Z | x | x |
+| RFC1123 | Sat, 05 Mar 2022 16:23:04 GMT | x | x |
 
 ### Add new formats
 - To add a new formats you have to add them to the method `GetList()` of the [`AvailableResultsList`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/AvailableResultsList.cs) class.
@@ -94,13 +73,13 @@ As syntax pattern the pattern from `DateTime.ToString()` and the following custo
 
 	| Key | Type | Default value | Name | Description |
 	|--------------|--------------|-----------|------------|------------|
+	| `CalendarFirstWeekRule` | Combo box | `-1` (Use system settings) | First week of the year | Configure the calendar rule for the first week of the year. |
+	| `FirstDayOfWeek` | Combo box | `-1` (Use system settings) | First day of the week | |
 	| `OnlyDateTimeNowGlobal` | Checkbox | `true` | Show only 'Time', 'Date', and 'Now' result for system time on global queries | Regardless of this setting, for global queries the first word of the query has to be a complete match. |
 	| `TimeWithSeconds` | Checkbox | `false` | Show time with seconds | This setting applies to the 'Time' and 'Now' result. |
 	| `DateWithWeekday` | Checkbox | `false` | Show date with weekday and name of month | This setting applies to the 'Date' and 'Now' result. |
 	| `HideNumberMessageOnGlobalQuery` | Checkbox | `false` | Hide 'Invalid number input' error message on global queries | |
-	| `CalendarFirstWeekRule` | Combo box | `-1` (Use system settings) | First week of the year | Configure the calendar rule for the first week of the year. |
-	| `FirstDayOfWeek` | Combo box | `-1` (Use system settings) | First day of the week | |
-	| `CustomFormats` | Multiline text box | `string.Empty` | Custom formats | Use date and time string format syntax and DOW (Day of Week), WOM (Week of Month), WOY (Week of the year), EAB (Era abbreviation), WFT (Windows File Time), UXT (Unix Time), UMS (Unix Time in milliseconds), OAD (OLE Automation date), EXC (Excel's 1900 based date value), EXF (Excel's 1904 based date value). If the format starts with UTC:, then Universal Time (UTC) is used. (Use a backslash to escape format sequences and the backslash character as text.) |
+	
 
 ## Classes
 

doc/devdocs/settingsv2/dsc-configure.md

@@ -94,5 +94,5 @@ Note that we've supplied `Debug` option, so a `%TEMP\PowerToys.DSC.TestConfigure
 Finally, you can test it with winget by invoking it as such:
 
 ```ps
-winget configure .\configuration.winget --accept-configuration-agreements --disable-interactivity
+winget configure .\configuration.dsc.yaml --accept-configuration-agreements --disable-interactivity
 ```

doc/thirdPartyRunPlugins.md

@@ -42,10 +42,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [CanIUse](https://github.com/skttl/ptrun-caniuse) | [skttl](https://github.com/skttl) | Look up browser feature support with caniuse.com |
 | [TailwindCSS](https://github.com/skttl/ptrun-tailwindcss) | [skttl](https://github.com/skttl) | Search the documentation of TailwindCSS |
 | [HttpStatusCodes](https://github.com/grzhan/HttpStatusCodePowerToys) | [grzhan](https://github.com/grzhan) | Search for http status codes |
-| [SVGL](https://github.com/Sameerjs6/powertoys-svgl) | [SameerJS6](https://github.com/SameerJS6) | Search, Browse and copy SVG logos from SVGL. |
-| [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. |
 
 ## Extending software plugins
 
@@ -67,5 +63,3 @@ Below are community created plugins that target a website or software.  They are
 | [SSH](https://github.com/8LWXpg/PowerToysRun-SSH) | [8LWXpg](https://github.com/8LWXpg) | Connect to ssh clients |
 | [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 |

installer/PowerToysSetup/CmdPal.wxs

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define CmdPalBuildDir="$(var.BinDir)\WinUI3Apps\CmdPal\"?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsInstallFolder">
-      <Directory Id="CmdPalInstallFolder" Name="CmdPal">
-        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
-        <?if $(sys.BUILDARCH) = x64 ?>
-          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
-        <?else ?>
-          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
-        <?endif ?>
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-
-    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
-      <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" />
-        <?else ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_arm64.msix" />
-        <?endif ?>
-
-      </Component>
-    </DirectoryRef>
-
-    <?if $(sys.BUILDARCH) = x64 ?>
-    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
-      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?else ?>
-    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
-      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?endif ?>
-
-    <ComponentGroup Id="CmdPalComponentGroup">
-      <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall"/>
-    <?if $(sys.BUILDARCH) = x64 ?>
-        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall"/>
-    <?else ?>
-        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall"/>
-    <?endif ?>
-      </Component>
-      <ComponentRef Id="Module_CmdPal" />
-      <ComponentRef Id="Module_CmdPal_Deps" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/PowerToysBootstrapper.wixproj

@@ -17,12 +17,6 @@
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
     <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=false</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform Condition="'$(Platform)'=='x64'">x64</Platform>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
-  <Import Project="..\..\src\CmdPalVersion.props" Condition="Exists('..\..\src\CmdPalVersion.props')" />
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
     <!-- THIS IS AN INNER LOOP OPTIMIZATION
     The build pipeline builds the Settings and Launcher projects for Publication
     using a specific profile. If you're doing local installer builds, this will
@@ -19,7 +17,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
     <PreBuildEvent>IF NOT DEFINED IsPipeline (
 call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
 SET PTRoot=$(SolutionDir)\..
@@ -34,7 +32,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
       call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
       call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
-      call move /Y ..\..\..\CmdPal.wxs.bk ..\..\..\CmdPal.wxs
       call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
       call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
       call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
@@ -57,7 +54,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
       call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
       call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
-    </PostBuildEvent>
+      </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <Name>PowerToysInstaller</Name>
@@ -68,12 +65,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
     <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=false</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup>
     <!-- We do not support debug installer builds -->
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -113,7 +104,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="AdvancedPaste.wxs" />
     <Compile Include="Awake.wxs" />
     <Compile Include="BaseApplications.wxs" />
-    <Compile Include="CmdPal.wxs" />
     <Compile Include="ColorPicker.wxs" />
     <Compile Include="EnvironmentVariables.wxs" />
     <Compile Include="FileExplorerPreview.wxs" />
@@ -198,4 +188,4 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </ItemGroup>
   </Target>
   <Target Name="Restore" />
-</Project>
+</Project>

installer/PowerToysSetup/Product.wxs

@@ -79,7 +79,6 @@
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
       <ComponentGroupRef Id="WorkspacesComponentGroup" />
-      <ComponentGroupRef Id="CmdPalComponentGroup" />
     </Feature>
 
     <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
@@ -136,7 +135,6 @@
     <InstallExecuteSequence>
       <Custom Action="DetectPrevInstallPath" After="AppSearch" />
       <Custom Action="SetLaunchPowerToysParam" Before="LaunchPowerToys" />
-      <Custom Action="SetInstallCmdPalPackageParam" Before="InstallCmdPalPackage" />
       <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
       <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
       <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
@@ -152,9 +150,6 @@
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles">
         NOT Installed
       </Custom>
-      <Custom Action="InstallCmdPalPackage" After="InstallFiles">
-        NOT Installed
-      </Custom>
       <Custom Action="WixCloseApplications" Before="RemoveFiles" />
       <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <!-- TODO: Use to activate embedded MSIX -->
@@ -176,9 +171,6 @@
       <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")
       </Custom>
-      <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles">
-        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
       <Custom Action="UnsetAdvancedPasteAPIKey" Before="RemoveFiles">
         Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
       </Custom>
@@ -212,10 +204,6 @@
                     Property="LaunchPowerToys"
                     Value="[INSTALLFOLDER]" />
 
-    <CustomAction Id="SetInstallCmdPalPackageParam"
-                    Property="InstallCmdPalPackage"
-                    Value="[INSTALLFOLDER]" />
-
     <CustomAction
       Id="LaunchPowerToys"
       Return="ignore"
@@ -439,14 +427,6 @@
                 DllEntry="UnRegisterContextMenuPackagesCA"
                   />
 
-    <CustomAction Id="UnRegisterCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="UnRegisterCmdPalPackageCA"
-                  />
-
     <CustomAction Id="CheckGPO"
                   Return="check"
                   Impersonate="yes"
@@ -454,14 +434,6 @@
                   DllEntry="CheckGPOCA"
                   />
 
-    <CustomAction Id="InstallCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="InstallCmdPalPackageCA"
-                  />
-
     <!-- Close 'PowerToys.exe' before uninstall-->
     <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
     <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />

installer/PowerToysSetupCustomActions/CustomAction.cpp

@@ -11,7 +11,6 @@
 #include "../../src/common/updating/installer.h"
 #include "../../src/common/version/version.h"
 #include "../../src/common/Telemetry/EtwTrace/EtwTrace.h"
-#include "../../src/common/utils/package.h"
 #include "../../src/common/utils/clean_video_conference.h"
 
 #include <winrt/Windows.ApplicationModel.h>
@@ -36,13 +35,13 @@ TRACELOGGING_DEFINE_PROVIDER(
     TraceLoggingOptionProjectTelemetry());
 
 const DWORD USERNAME_DOMAIN_LEN = DNLEN + UNLEN + 2; // Domain Name + '\' + User Name + '\0'
-const DWORD USERNAME_LEN = UNLEN + 1;                // User Name + '\0'
+const DWORD USERNAME_LEN = UNLEN + 1; // User Name + '\0'
 
-static const wchar_t *POWERTOYS_EXE_COMPONENT = L"{A2C66D91-3485-4D00-B04D-91844E6B345B}";
-static const wchar_t *POWERTOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC16F7708}";
+static const wchar_t* POWERTOYS_EXE_COMPONENT = L"{A2C66D91-3485-4D00-B04D-91844E6B345B}";
+static const wchar_t* POWERTOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC16F7708}";
 
-constexpr inline const wchar_t *DataDiagnosticsRegKey = L"Software\\Classes\\PowerToys";
-constexpr inline const wchar_t *DataDiagnosticsRegValueName = L"AllowDataDiagnostics";
+constexpr inline const wchar_t* DataDiagnosticsRegKey = L"Software\\Classes\\PowerToys";
+constexpr inline const wchar_t* DataDiagnosticsRegValueName = L"AllowDataDiagnostics";
 
 #define TraceLoggingWriteWrapper(provider, eventName, ...)   \
     if (isDataDiagnosticEnabled())                           \
@@ -53,16 +52,16 @@ constexpr inline const wchar_t *DataDiagnosticsRegValueName = L"AllowDataDiagnos
         trace.UpdateState(false);                            \
     }
 
-static Shared::Trace::ETWTrace trace{L"PowerToys_Installer"};
+static Shared::Trace::ETWTrace trace{ L"PowerToys_Installer" };
 
 inline bool isDataDiagnosticEnabled()
 {
     HKEY key{};
     if (RegOpenKeyExW(HKEY_CURRENT_USER,
-                      DataDiagnosticsRegKey,
-                      0,
-                      KEY_READ,
-                      &key) != ERROR_SUCCESS)
+                        DataDiagnosticsRegKey,
+                        0,
+                        KEY_READ,
+                        &key) != ERROR_SUCCESS)
     {
         return false;
     }
@@ -87,7 +86,8 @@ inline bool isDataDiagnosticEnabled()
     return isDataDiagnosticsEnabled == 1;
 }
 
-HRESULT getInstallFolder(MSIHANDLE hInstall, std::wstring &installationDir)
+
+HRESULT getInstallFolder(MSIHANDLE hInstall, std::wstring& installationDir)
 {
     DWORD len = 0;
     wchar_t _[1];
@@ -116,13 +116,13 @@ BOOL IsLocalSystem()
 
     // open process token
     if (!OpenProcessToken(GetCurrentProcess(),
-                          TOKEN_QUERY,
-                          &hToken))
+        TOKEN_QUERY,
+        &hToken))
         return FALSE;
 
     // retrieve user SID
     if (!GetTokenInformation(hToken, TokenUser, pTokenUser,
-                             sizeof(bTokenUser), &cbTokenUser))
+        sizeof(bTokenUser), &cbTokenUser))
     {
         CloseHandle(hToken);
         return FALSE;
@@ -132,7 +132,7 @@ BOOL IsLocalSystem()
 
     // allocate LocalSystem well-known SID
     if (!AllocateAndInitializeSid(&siaNT, 1, SECURITY_LOCAL_SYSTEM_RID,
-                                  0, 0, 0, 0, 0, 0, 0, &pSystemSid))
+        0, 0, 0, 0, 0, 0, 0, &pSystemSid))
         return FALSE;
 
     // compare the user SID from the token with the LocalSystem SID
@@ -194,7 +194,7 @@ static std::filesystem::path GetUserPowerShellModulesPath()
 
     if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &myDocumentsBlockPtr)))
     {
-        const std::wstring myDocuments{myDocumentsBlockPtr};
+        const std::wstring myDocuments{ myDocumentsBlockPtr };
         CoTaskMemFree(myDocumentsBlockPtr);
         return std::filesystem::path(myDocuments) / "PowerShell" / "Modules";
     }
@@ -227,12 +227,10 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
 
     BOOL isSystemUser = IsLocalSystem();
 
-    if (isSystemUser)
-    {
+    if (isSystemUser) {
 
-        auto action = [&commandLine](HANDLE userToken)
-        {
-            STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+        auto action = [&commandLine](HANDLE userToken) {
+            STARTUPINFO startupInfo{ .cb = sizeof(STARTUPINFO),  .wShowWindow = SW_SHOWNORMAL };
             PROCESS_INFORMATION processInformation;
 
             PVOID lpEnvironment = NULL;
@@ -271,7 +269,7 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
     }
     else
     {
-        STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+        STARTUPINFO startupInfo{ .cb = sizeof(STARTUPINFO),  .wShowWindow = SW_SHOWNORMAL };
 
         PROCESS_INFORMATION processInformation;
 
@@ -315,7 +313,7 @@ UINT __stdcall CheckGPOCA(MSIHANDLE hInstall)
     LPWSTR currentScope = nullptr;
     hr = WcaGetProperty(L"InstallScope", &currentScope);
 
-    if (std::wstring{currentScope} == L"perUser")
+    if (std::wstring{ currentScope } == L"perUser")
     {
         if (powertoys_gpo::getDisablePerUserInstallationValue() == powertoys_gpo::gpo_rule_configured_enabled)
         {
@@ -356,7 +354,7 @@ UINT __stdcall ApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
     hr = getInstallFolder(hInstall, installationFolder);
     ExitOnFailure(hr, "Failed to get installFolder.");
 
-    for (const auto &changeSet : getAllOnByDefaultModulesChangeSets(installationFolder))
+    for (const auto& changeSet : getAllOnByDefaultModulesChangeSets(installationFolder))
     {
         if (!changeSet.apply())
         {
@@ -384,7 +382,7 @@ UINT __stdcall UnApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
     ExitOnFailure(hr, "Failed to initialize");
     hr = getInstallFolder(hInstall, installationFolder);
     ExitOnFailure(hr, "Failed to get installFolder.");
-    for (const auto &changeSet : getAllModulesChangeSets(installationFolder))
+    for (const auto& changeSet : getAllModulesChangeSets(installationFolder))
     {
         changeSet.unApply();
     }
@@ -398,8 +396,8 @@ LExit:
     return WcaFinalize(er);
 }
 
-const wchar_t *DSC_CONFIGURE_PSD1_NAME = L"Microsoft.PowerToys.Configure.psd1";
-const wchar_t *DSC_CONFIGURE_PSM1_NAME = L"Microsoft.PowerToys.Configure.psm1";
+const wchar_t* DSC_CONFIGURE_PSD1_NAME = L"Microsoft.PowerToys.Configure.psd1";
+const wchar_t* DSC_CONFIGURE_PSM1_NAME = L"Microsoft.PowerToys.Configure.psm1";
 
 UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
 {
@@ -431,7 +429,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
             ExitOnFailure(hr, "Unable to create Powershell modules folder");
         }
 
-        for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
+        for (const auto* filename : { DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME })
         {
             fs::copy_file(fs::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, fs::copy_options::overwrite_existing, errorCode);
 
@@ -479,7 +477,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         std::error_code errorCode;
 
-        for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
+        for (const auto* filename : { DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME })
         {
             fs::remove(versionedModulePath / filename, errorCode);
 
@@ -490,7 +488,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
             }
         }
 
-        for (const auto *modulePath : {&versionedModulePath, &powerToysModulePath})
+        for (const auto* modulePath : { &versionedModulePath, &powerToysModulePath })
         {
             fs::remove(*modulePath, errorCode);
 
@@ -537,7 +535,7 @@ UINT __stdcall InstallEmbeddedMSIXCA(MSIHANDLE hInstall)
         using namespace winrt::Windows::Management::Deployment;
         using namespace winrt::Windows::Foundation;
 
-        Uri msix_uri{msix_path.wstring()};
+        Uri msix_uri{ msix_path.wstring() };
         PackageManager pm;
         auto result = pm.AddPackageAsync(msix_uri, nullptr, DeploymentOptions::None).get();
         if (!result)
@@ -571,7 +569,7 @@ UINT __stdcall UninstallEmbeddedMSIXCA(MSIHANDLE hInstall)
     hr = WcaInitialize(hInstall, "UninstallEmbeddedMSIXCA");
     ExitOnFailure(hr, "Failed to initialize");
 
-    for (const auto &p : pm.FindPackagesForUser({}, package_name, publisher))
+    for (const auto& p : pm.FindPackagesForUser({}, package_name, publisher))
     {
         auto result = pm.RemovePackageAsync(p.Id().FullName()).get();
         if (result)
@@ -685,6 +683,7 @@ UINT __stdcall UninstallCommandNotFoundModuleCA(MSIHANDLE hInstall)
     command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + winrt::to_string(installationFolder) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"";
 #endif
 
+
     system(command.c_str());
 
 LExit:
@@ -739,10 +738,10 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
     HRESULT hr = S_OK;
     UINT er = ERROR_SUCCESS;
 
-    ITaskService *pService = nullptr;
-    ITaskFolder *pTaskFolder = nullptr;
-    IRegisteredTaskCollection *pTaskCollection = nullptr;
-    ITaskFolder *pRootFolder = nullptr;
+    ITaskService* pService = nullptr;
+    ITaskFolder* pTaskFolder = nullptr;
+    IRegisteredTaskCollection* pTaskCollection = nullptr;
+    ITaskFolder* pRootFolder = nullptr;
     LONG numTasks = 0;
 
     hr = WcaInitialize(hInstall, "RemoveScheduledTasksCA");
@@ -755,10 +754,10 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
     // ------------------------------------------------------
     // Create an instance of the Task Service.
     hr = CoCreateInstance(CLSID_TaskScheduler,
-                          nullptr,
-                          CLSCTX_INPROC_SERVER,
-                          IID_ITaskService,
-                          reinterpret_cast<void **>(&pService));
+        nullptr,
+        CLSCTX_INPROC_SERVER,
+        IID_ITaskService,
+        reinterpret_cast<void**>(&pService));
     ExitOnFailure(hr, "Failed to create an instance of ITaskService: %x", hr);
 
     // Connect to the task service.
@@ -786,7 +785,7 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
     {
         // Delete all the tasks found.
         // If some tasks can't be deleted, the folder won't be deleted later and the user will still be notified.
-        IRegisteredTask *pRegisteredTask = nullptr;
+        IRegisteredTask* pRegisteredTask = nullptr;
         hr = pTaskCollection->get_Item(_variant_t(i + 1), &pRegisteredTask);
         if (SUCCEEDED(hr))
         {
@@ -862,7 +861,8 @@ UINT __stdcall TelemetryLogInstallSuccessCA(MSIHANDLE hInstall)
         TraceLoggingWideString(get_product_version().c_str(), "Version"),
         ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
         TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE)
+        );
 
 LExit:
     er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
@@ -1028,7 +1028,7 @@ UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)
 
     try
     {
-        if (auto install_path = GetMsiPackageInstalledPath(std::wstring{currentScope} == L"perUser"))
+        if (auto install_path = GetMsiPackageInstalledPath(std::wstring{ currentScope } == L"perUser"))
         {
             MsiSetPropertyW(hInstall, L"PREVIOUSINSTALLFOLDER", install_path->data());
         }
@@ -1040,82 +1040,6 @@ UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
-UINT __stdcall InstallCmdPalPackageCA(MSIHANDLE hInstall)
-{
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::Management::Deployment;
-
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "InstallCmdPalPackage");
-    hr = getInstallFolder(hInstall, installationFolder);
-
-    try
-    {
-        auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\", false);
-        auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\Dependencies\\", true);
-
-        if (!msix.empty())
-        {
-            auto msixPath = msix[0];
-
-            if (!package::RegisterPackage(msixPath, dependencies))
-            {
-                Logger::error(L"Failed to install CmdPal package");
-                er = ERROR_INSTALL_FAILURE;
-            }
-        }
-    }
-    catch (std::exception &e)
-    {
-        std::string errorMessage{"Exception thrown while trying to install CmdPal package: "};
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UnRegisterCmdPalPackageCA(MSIHANDLE hInstall)
-{
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::Management::Deployment;
-
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "UnRegisterCmdPalPackageCA");
-
-    try
-    {
-        // Packages to unregister
-        std::wstring packageToRemoveDisplayName {L"Microsoft.CommandPalette"};
-
-        if (!package::UnRegisterPackage(packageToRemoveDisplayName))
-        {
-            Logger::error(L"Failed to unregister package: " + packageToRemoveDisplayName);
-            er = ERROR_INSTALL_FAILURE;
-        }
-    }
-    catch (std::exception &e)
-    {
-        std::string errorMessage{"Exception thrown while trying to unregister the CmdPal package: "};
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-
 UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
 {
     using namespace winrt::Windows::Foundation;
@@ -1129,20 +1053,54 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
     try
     {
         // Packages to unregister
-        const std::vector<std::wstring> packagesToRemoveDisplayName{{L"PowerRenameContextMenu"}, {L"ImageResizerContextMenu"}, {L"FileLocksmithContextMenu"}, {L"NewPlusContextMenu"}};
+        const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" }, { L"NewPlusContextMenu" } };
 
-        for (auto const &package : packagesToRemoveDisplayName)
+        PackageManager packageManager;
+
+        for (auto const& package : packageManager.FindPackages())
         {
-            if (!package::UnRegisterPackage(package))
+            const auto& packageFullName = std::wstring{ package.Id().FullName() };
+
+            for (const auto& packageToRemove : packagesToRemoveDisplayName)
             {
-                Logger::error(L"Failed to unregister package: " + package);
-                er = ERROR_INSTALL_FAILURE;
+                if (packageFullName.contains(packageToRemove))
+                {
+                    auto deploymentOperation{ packageManager.RemovePackageAsync(packageFullName) };
+                    deploymentOperation.get();
+
+                    // Check the status of the operation
+                    if (deploymentOperation.Status() == AsyncStatus::Error)
+                    {
+                        auto deploymentResult{ deploymentOperation.GetResults() };
+                        auto errorCode = deploymentOperation.ErrorCode();
+                        auto errorText = deploymentResult.ErrorText();
+
+                        Logger::error(L"Unregister {} package failed. ErrorCode: {}, ErrorText: {}", packageFullName, std::to_wstring(errorCode), errorText);
+
+                        er = ERROR_INSTALL_FAILURE;
+                    }
+                    else if (deploymentOperation.Status() == AsyncStatus::Canceled)
+                    {
+                        Logger::error(L"Unregister {} package canceled.", packageFullName);
+
+                        er = ERROR_INSTALL_FAILURE;
+                    }
+                    else if (deploymentOperation.Status() == AsyncStatus::Completed)
+                    {
+                        Logger::info(L"Unregister {} package completed.", packageFullName);
+                    }
+                    else
+                    {
+                        Logger::debug(L"Unregister {} package started.", packageFullName);
+                    }
+                }
+
             }
         }
     }
-    catch (std::exception &e)
+    catch (std::exception& e)
     {
-        std::string errorMessage{"Exception thrown while trying to unregister sparse packages: "};
+        std::string errorMessage{ "Exception thrown while trying to unregister sparse packages: " };
         errorMessage += e.what();
         Logger::error(errorMessage);
 
@@ -1170,7 +1128,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 39> processesToTerminate = {
+    std::array<std::wstring_view, 38> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
@@ -1207,7 +1165,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.WorkspacesLauncherUI.exe",
         L"PowerToys.WorkspacesEditor.exe",
         L"PowerToys.WorkspacesWindowArranger.exe",
-        L"Microsoft.CmdPal.UI.exe",
         L"PowerToys.ZoomIt.exe",
         L"PowerToys.exe",
     };
@@ -1220,7 +1177,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         }
         wchar_t processName[MAX_PATH] = L"<unknown>";
 
-        HANDLE hProcess{OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE, FALSE, procID)};
+        HANDLE hProcess{ OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE, FALSE, procID) };
         if (!hProcess)
         {
             continue;
@@ -1240,9 +1197,8 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
             if (processName == processToTerminate)
             {
                 const DWORD timeout = 500;
-                auto windowEnumerator = [](HWND hwnd, LPARAM procIDPtr) -> BOOL
-                {
-                    auto targetProcID = *reinterpret_cast<const DWORD *>(procIDPtr);
+                auto windowEnumerator = [](HWND hwnd, LPARAM procIDPtr) -> BOOL {
+                    auto targetProcID = *reinterpret_cast<const DWORD*>(procIDPtr);
                     DWORD windowProcID = 0;
                     GetWindowThreadProcessId(hwnd, &windowProcID);
                     if (windowProcID == targetProcID)
@@ -1268,15 +1224,15 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
 void initSystemLogger()
 {
     static std::once_flag initLoggerFlag;
-    std::call_once(initLoggerFlag, []()
-                   {
-            WCHAR temp_path[MAX_PATH];
-            auto ret = GetTempPath(MAX_PATH, temp_path);
+    std::call_once(initLoggerFlag, []() {
+        WCHAR temp_path[MAX_PATH];
+        auto ret = GetTempPath(MAX_PATH, temp_path);
 
-            if (ret)
-            {
-                Logger::init("PowerToysMSI", std::wstring{ temp_path } + L"\\PowerToysMSIInstaller", L"");
-            } });
+        if (ret)
+        {
+            Logger::init("PowerToysMSI", std::wstring{ temp_path } + L"\\PowerToysMSIInstaller", L"");
+        }
+        });
 }
 
 // DllMain - Initialize and cleanup WiX custom action utils.

installer/PowerToysSetupCustomActions/CustomAction.def

@@ -18,9 +18,7 @@ EXPORTS
 	TerminateProcessesCA
 	InstallEmbeddedMSIXCA
 	InstallDSCModuleCA
-	InstallCmdPalPackageCA
 	UnApplyModulesRegistryChangeSetsCA
-	UnRegisterCmdPalPackageCA
 	UnRegisterContextMenuPackagesCA
 	UninstallEmbeddedMSIXCA
 	UninstallDSCModuleCA

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" 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="..\wix.props" Condition="Exists('..\wix.props')" />
   <PropertyGroup Label="Globals">
@@ -55,7 +54,6 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\AdvancedPaste.wxs"" ""$(ProjectDir)..\PowerToysSetup\AdvancedPaste.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetup\Awake.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Core.wxs"" ""$(ProjectDir)..\PowerToysSetup\Core.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs.bk""""

src/CmdPalVersion.props

@@ -1,11 +0,0 @@
-<?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>
-    <DevEnvironment>Local</DevEnvironment>
-
-    <!-- Forcing for every DLL on by default -->
-    <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
-  </PropertyGroup>
-</Project>

src/Common.Dotnet.AotCompatibility.props

@@ -5,8 +5,5 @@
     <IsAotCompatible>true</IsAotCompatible>
     <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
     <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
-
-    <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081;$(WarningsNotAsErrors)</WarningsNotAsErrors>
   </PropertyGroup>
 </Project>

src/Common.Dotnet.CsWinRT.props

@@ -1,10 +1,8 @@
 <?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>
+    <WindowsSdkPackageVersion>10.0.22621.48</WindowsSdkPackageVersion>
     <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
@@ -16,7 +14,7 @@
     <WarningLevel>4</WarningLevel>
     <NoWarn></NoWarn>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>CA1824;CA1416;CA1720;CA1859;CA2263;CA2022;MVVMTK0045;MVVMTK0049</WarningsNotAsErrors>
+    <WarningsNotAsErrors>CA1720;CA1859;CA2263;CA2022</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">

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

@@ -1,18 +0,0 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="ExtensionTargetsAppSdkCppProp">
-    <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImportsWinAppSdkCppProp" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
-  </Target>
-</Project>

src/WinAppSdkCppPre.props

@@ -1,5 +0,0 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
-  <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-</Project>

src/codeAnalysis/GlobalSuppressions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// 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.
 
@@ -12,10 +12,10 @@ using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:PrefixLocalCallsWithThis", Justification = "We follow the C# Core Coding Style which avoids using `this` unless absolutely necessary.")]
 
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:ElementsMustAppearInTheCorrectOrder", Justification = "It is not a priority and has high impact in code changes.")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:ElementsMustBeOrderedByAccess", Justification = "It is not a priority and has high impact in code changes.")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1203:ConstantsMustAppearBeforeFields", Justification = "It is not a priority and has high impact in code changes.")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1204:StaticElementsMustAppearBeforeInstanceElements", Justification = "It is not a priority and has high impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:ElementsMustAppearInTheCorrectOrder", Justification = "It is not a priority and have hight impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:ElementsMustBeOrderedByAccess", Justification = "It is not a priority and have hight impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1203:ConstantsMustAppearBeforeFields", Justification = "It is not a priority and have hight impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1204:StaticElementsMustAppearBeforeInstanceElements", Justification = "It is not a priority and have hight impact in code changes.")]
 
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:FieldNamesMustNotBeginWithUnderscore", Justification = "We follow the C# Core Coding Style which uses underscores as prefixes rather than using `this.`.")]
 
@@ -62,17 +62,3 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
-
-// AOT MVVMTK0045
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "AdvancedPaste.ViewModels")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "HostsUILib")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "EnvironmentVariablesUILib")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI.Views")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]
-
-// AOT MVVMTK0049
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.INotifyPropertyChangedGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "type", Target = "~T:Peek.UI.Views.TitleBar")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]

src/common/AllExperiments/Logger.cs

@@ -25,7 +25,7 @@ namespace AllExperiments
             }
 
             // Using InvariantCulture since this is used for a log file name
-            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 

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

@@ -1,7 +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.AotCompatibility.props" />
 
   <PropertyGroup>
     <UseWPF>true</UseWPF>

src/common/Common.UI/SettingsDeepLink.cs

@@ -31,7 +31,6 @@ namespace Common.UI
             Dashboard,
             AdvancedPaste,
             Workspaces,
-            CmdPal,
             ZoomIt,
         }
 
@@ -79,8 +78,6 @@ namespace Common.UI
                     return "AdvancedPaste";
                 case SettingsWindow.Workspaces:
                     return "Workspaces";
-                case SettingsWindow.CmdPal:
-                    return "CmdPal";
                 case SettingsWindow.ZoomIt:
                     return "ZoomIt";
                 default:
@@ -94,20 +91,20 @@ namespace Common.UI
         {
             try
             {
-                var directoryPath = System.AppContext.BaseDirectory;
+                var assemblyPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+                var fullPath = new DirectoryInfo(assemblyPath).FullName;
                 if (mainExecutableIsOnTheParentFolder)
                 {
                     // Need to go into parent folder for PowerToys.exe. Likely a WinUI3 App SDK application.
-                    directoryPath = Path.Combine(directoryPath, "..");
-                    directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
+                    fullPath = fullPath + "\\..\\PowerToys.exe";
                 }
                 else
                 {
                     // PowerToys.exe is in the same path as the application.
-                    directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
+                    fullPath = fullPath + "\\PowerToys.exe";
                 }
 
-                Process.Start(new ProcessStartInfo(directoryPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) });
+                Process.Start(new ProcessStartInfo(fullPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) });
             }
             catch
             {

src/common/Common.UI/ThemeManager.cs

@@ -11,7 +11,7 @@ using Microsoft.Win32;
 
 namespace Common.UI
 {
-    public partial class ThemeManager : IDisposable
+    public class ThemeManager : IDisposable
     {
         private readonly Application _app;
         private const string LightTheme = "Light.Accent1";

src/common/GPOWrapper/GPOWrapper.cpp

@@ -16,10 +16,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCmdNotFoundEnabledValue());
     }
-    GpoRuleConfigured GPOWrapper::GetConfiguredCmdPalEnabledValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCmdPalEnabledValue());
-    }
     GpoRuleConfigured GPOWrapper::GetConfiguredColorPickerEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredColorPickerEnabledValue());
@@ -236,10 +232,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowDataDiagnosticsValue());
     }
-    GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusReplaceVariablesValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusReplaceVariablesValue());
-    }
     GpoRuleConfigured GPOWrapper::GetConfiguredRunAtStartupValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredRunAtStartupValue());

src/common/GPOWrapper/GPOWrapper.h

@@ -10,7 +10,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredAlwaysOnTopEnabledValue();
         static GpoRuleConfigured GetConfiguredAwakeEnabledValue();
         static GpoRuleConfigured GetConfiguredCmdNotFoundEnabledValue();
-        static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
         static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
         static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
         static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
@@ -65,7 +64,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
         static GpoRuleConfigured GetAllowDataDiagnosticsValue();
         static GpoRuleConfigured GetConfiguredRunAtStartupValue();
-        static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue();
     };
 }
 

src/common/GPOWrapper/GPOWrapper.idl

@@ -14,7 +14,6 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredAlwaysOnTopEnabledValue();
             static GpoRuleConfigured GetConfiguredAwakeEnabledValue();
             static GpoRuleConfigured GetConfiguredCmdNotFoundEnabledValue();
-            static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
             static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
             static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
             static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
@@ -69,7 +68,6 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
             static GpoRuleConfigured GetAllowDataDiagnosticsValue();
             static GpoRuleConfigured GetConfiguredRunAtStartupValue();
-            static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue();
         }
     }
 }

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

@@ -6,7 +6,6 @@ using System;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using ManagedCommon.Serialization;
 
 namespace ManagedCommon
 {
@@ -36,7 +35,7 @@ namespace ManagedCommon
                     inputStream.Close();
                     reader.Dispose();
 
-                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data, SourceGenerationContext.Default.OutGoingLanguageSettings).LanguageTag;
+                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data).LanguageTag;
                 }
                 catch (Exception)
                 {

src/common/ManagedCommon/Logger.cs

@@ -15,23 +15,15 @@ namespace ManagedCommon
 {
     public static class Logger
     {
+        private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
+        private static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location).ProductVersion;
+
         private static readonly string Error = "Error";
         private static readonly string Warning = "Warning";
         private static readonly string Info = "Info";
         private static readonly string Debug = "Debug";
         private static readonly string TraceFlag = "Trace";
 
-        private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
-
-        /*
-         * Please pay more attention!
-         * If you want to publish it with Native AOT enabled (or publish as a single file).
-         * You need to find another way to remove Assembly.Location usage.
-         */
-#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
-        private static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location).ProductVersion;
-#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
-
         /// <summary>
         /// Initializes the logger and sets the path for logging.
         /// </summary>
@@ -54,23 +46,25 @@ namespace ManagedCommon
                 Directory.CreateDirectory(applicationLogPath);
             }
 
-            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 
             Trace.AutoFlush = true;
         }
 
-        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)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void LogError(string message)
         {
-            Log(message, Error, memberName, sourceFilePath, sourceLineNumber);
+            Log(message, Error);
         }
 
-        public static void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void LogError(string message, Exception ex)
         {
             if (ex == null)
             {
-                Log(message, Error, memberName, sourceFilePath, sourceLineNumber);
+                Log(message, Error);
             }
             else
             {
@@ -89,33 +83,38 @@ namespace ManagedCommon
                     "Stack trace: " + Environment.NewLine +
                     ex.StackTrace;
 
-                Log(exMessage, Error, memberName, sourceFilePath, sourceLineNumber);
+                Log(exMessage, Error);
             }
         }
 
-        public static void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void LogWarning(string message)
         {
-            Log(message, Warning, memberName, sourceFilePath, sourceLineNumber);
+            Log(message, Warning);
         }
 
-        public static void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void LogInfo(string message)
         {
-            Log(message, Info, memberName, sourceFilePath, sourceLineNumber);
+            Log(message, Info);
         }
 
-        public static void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void LogDebug(string message)
         {
-            Log(message, Debug, memberName, sourceFilePath, sourceLineNumber);
+            Log(message, Debug);
         }
 
-        public static void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void LogTrace()
         {
-            Log(string.Empty, TraceFlag, memberName, sourceFilePath, sourceLineNumber);
+            Log(string.Empty, TraceFlag);
         }
 
-        private static void Log(string message, string type, string memberName, string sourceFilePath, int sourceLineNumber)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void Log(string message, string type)
         {
-            Trace.WriteLine("[" + DateTime.Now.TimeOfDay + "] [" + type + "] " + GetCallerInfo(memberName, sourceFilePath, sourceLineNumber));
+            Trace.WriteLine("[" + DateTime.Now.TimeOfDay + "] [" + type + "] " + GetCallerInfo());
             Trace.Indent();
             if (message != string.Empty)
             {
@@ -125,27 +124,49 @@ namespace ManagedCommon
             Trace.Unindent();
         }
 
-        private static string GetCallerInfo(string memberName, string sourceFilePath, int sourceLineNumber)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static string GetCallerInfo()
         {
-            string callerFileName = "Unknown";
+            StackTrace stackTrace = new();
+
+            var callerMethod = GetCallerMethod(stackTrace);
+
+            return $"{callerMethod?.DeclaringType?.Name}::{callerMethod.Name}";
+        }
+
+        private static MethodBase GetCallerMethod(StackTrace stackTrace)
+        {
+            const int topFrame = 3;
+
+            var topMethod = stackTrace.GetFrame(topFrame)?.GetMethod();
 
             try
             {
-                string fileName = Path.GetFileName(sourceFilePath);
-                if (!string.IsNullOrEmpty(fileName))
+                if (topMethod?.Name == nameof(IAsyncStateMachine.MoveNext) && typeof(IAsyncStateMachine).IsAssignableFrom(topMethod?.DeclaringType))
                 {
-                    callerFileName = fileName;
+                    // Async method; return actual method as determined by heuristic:
+                    // "Nearest method on stack to async state-machine's MoveNext() in same namespace but in a different type".
+                    // There are tighter ways of determining the actual method, but this is good enough and probably faster.
+                    for (int deepFrame = topFrame + 1; deepFrame < stackTrace.FrameCount; deepFrame++)
+                    {
+                        var deepMethod = stackTrace.GetFrame(deepFrame)?.GetMethod();
+
+                        if (deepMethod?.DeclaringType != topMethod?.DeclaringType && deepMethod?.DeclaringType?.Namespace == topMethod?.DeclaringType?.Namespace)
+                        {
+                            return deepMethod;
+                        }
+                    }
                 }
             }
             catch (Exception)
             {
-                callerFileName = "Unknown";
+                // Ignore exceptions in Release. The code above won't throw, but if it does, we don't want to crash the app.
 #if DEBUG
                 throw;
 #endif
             }
 
-            return $"{callerFileName}::{memberName}::{sourceLineNumber}";
+            return topMethod;
         }
     }
 }

src/common/ManagedCommon/ManagedCommon.csproj

@@ -1,7 +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.AotCompatibility.props" />
 
   <PropertyGroup>
     <Description>PowerToys ManagedCommon</Description>

src/common/ManagedCommon/ModuleType.cs

@@ -10,7 +10,6 @@ namespace ManagedCommon
         AlwaysOnTop,
         Awake,
         ColorPicker,
-        CmdPal,
         CropAndLock,
         EnvironmentVariables,
         FancyZones,

src/common/ManagedCommon/NativeMethods.cs

@@ -53,7 +53,7 @@ namespace ManagedCommon
 
             internal static int Size
             {
-                get { return Marshal.SizeOf<INPUT>(); }
+                get { return Marshal.SizeOf(typeof(INPUT)); }
             }
         }
 

src/common/ManagedCommon/RunnerHelper.cs

@@ -14,11 +14,12 @@ namespace ManagedCommon
 {
     public static class RunnerHelper
     {
-        public static void WaitForPowerToysRunner(int powerToysPID, Action act, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "")
+        public static void WaitForPowerToysRunner(int powerToysPID, Action act)
         {
             var stackTrace = new StackTrace();
             var assembly = Assembly.GetCallingAssembly().GetName();
-            PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{memberName}]WaitForPowerToysRunner waiting for Event powerToysPID={powerToysPID}" });
+            var callingMethod = stackTrace.GetFrame(1).GetMethod().Name;
+            PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{callingMethod}]WaitForPowerToysRunner waiting for Event powerToysPID={powerToysPID}" });
             Task.Run(() =>
             {
                 const uint INFINITE = 0xFFFFFFFF;
@@ -28,7 +29,7 @@ namespace ManagedCommon
                 IntPtr powerToysProcHandle = NativeMethods.OpenProcess(SYNCHRONIZE, false, powerToysPID);
                 if (NativeMethods.WaitForSingleObject(powerToysProcHandle, INFINITE) == WAIT_OBJECT_0)
                 {
-                    PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{memberName}]WaitForPowerToysRunner Event Notified powerToysPID={powerToysPID}" });
+                    PowerToysTelemetry.Log.WriteEvent(new DebugEvent() { Message = $"[{assembly}][{callingMethod}]WaitForPowerToysRunner Event Notified powerToysPID={powerToysPID}" });
                     act.Invoke();
                 }
             });

src/common/ManagedCommon/SerializationContext/SourceGenerationContext.cs

@@ -1,13 +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.Text.Json.Serialization;
-using static ManagedCommon.LanguageHelper;
-
-namespace ManagedCommon.Serialization;
-
-[JsonSerializable(typeof(OutGoingLanguageSettings))]
-internal sealed partial class SourceGenerationContext : JsonSerializerContext
-{
-}

src/common/ManagedCommon/ThemeListener.cs

@@ -14,7 +14,7 @@ namespace ManagedCommon
     /// <param name="sender">Sender ThemeListener</param>
     public delegate void ThemeChangedEvent(ThemeListener sender);
 
-    public partial class ThemeListener : IDisposable
+    public class ThemeListener : IDisposable
     {
         /// <summary>
         /// Gets the App Theme.

src/common/UITestAutomation/Element/Button.cs

@@ -2,6 +2,13 @@
 // 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.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium.Windows;
+using OpenQA.Selenium.Interactions;
+using OpenQA.Selenium.Remote;
+using OpenQA.Selenium.Support.Events;
+
 namespace Microsoft.PowerToys.UITest
 {
     /// <summary>
@@ -9,14 +16,5 @@ namespace Microsoft.PowerToys.UITest
     /// </summary>
     public class Button : Element
     {
-        private static readonly string ExpectedControlType = "ControlType.Button";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Button"/> class.
-        /// </summary>
-        public Button()
-        {
-            this.TargetControlType = Button.ExpectedControlType;
-        }
     }
 }

src/common/UITestAutomation/Element/By.cs

@@ -11,42 +11,13 @@ namespace Microsoft.PowerToys.UITest
     /// </summary>
     public class By
     {
-        private readonly OpenQA.Selenium.By? by;
-        private readonly bool isAccessibilityId;
-        private readonly string? accessibilityId;
+        private readonly OpenQA.Selenium.By by;
 
         private By(OpenQA.Selenium.By by)
         {
-            isAccessibilityId = false;
             this.by = by;
         }
 
-        private By(string accessibilityId)
-        {
-            isAccessibilityId = true;
-            this.accessibilityId = accessibilityId;
-        }
-
-        public override string ToString()
-        {
-            // override ToString to return detailed debugging content provided by OpenQA.Selenium.By
-            return this.GetAccessibilityId();
-        }
-
-        public bool GetIsAccessibilityId() => this.isAccessibilityId;
-
-        public string GetAccessibilityId()
-        {
-            if (this.isAccessibilityId)
-            {
-                return this.accessibilityId!;
-            }
-            else
-            {
-                return this.by!.ToString();
-            }
-        }
-
         /// <summary>
         /// Creates a By object using the name attribute.
         /// </summary>
@@ -54,13 +25,6 @@ namespace Microsoft.PowerToys.UITest
         /// <returns>A By object.</returns>
         public static By Name(string name) => new By(OpenQA.Selenium.By.Name(name));
 
-        /// <summary>
-        /// Creates a By object using the className attribute.
-        /// </summary>
-        /// <param name="className">The className attribute to search for.</param>
-        /// <returns>A By object.</returns>
-        public static By ClassName(string className) => new By(OpenQA.Selenium.By.ClassName(className));
-
         /// <summary>
         /// Creates a By object using the ID attribute.
         /// </summary>
@@ -68,13 +32,6 @@ namespace Microsoft.PowerToys.UITest
         /// <returns>A By object.</returns>
         public static By Id(string id) => new By(OpenQA.Selenium.By.Id(id));
 
-        /// <summary>
-        /// Creates a By object using the ID attribute.
-        /// </summary>
-        /// <param name="accessibilityId">The ID attribute to search for.</param>
-        /// <returns>A By object.</returns>
-        public static By AccessibilityId(string accessibilityId) => new By(accessibilityId);
-
         /// <summary>
         /// Creates a By object using the XPath expression.
         /// </summary>
@@ -107,6 +64,6 @@ namespace Microsoft.PowerToys.UITest
         /// Converts the By object to an OpenQA.Selenium.By object.
         /// </summary>
         /// <returns>An OpenQA.Selenium.By object.</returns>
-        internal OpenQA.Selenium.By ToSeleniumBy() => by!;
+        internal OpenQA.Selenium.By ToSeleniumBy() => by;
     }
 }

src/common/UITestAutomation/Element/Element.cs

@@ -3,16 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.ObjectModel;
-using System.Drawing;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Xml.Linq;
-using ABI.Windows.Foundation;
-using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
 using OpenQA.Selenium.Interactions;
+using OpenQA.Selenium.Remote;
+using OpenQA.Selenium.Support.Events;
+using static Microsoft.PowerToys.UITest.UITestBase;
 
 [assembly: InternalsVisibleTo("Session")]
 
@@ -24,17 +24,8 @@ namespace Microsoft.PowerToys.UITest
     public class Element
     {
         private WindowsElement? windowsElement;
-
         private WindowsDriver<WindowsElement>? driver;
 
-        protected string? TargetControlType { get; set; }
-
-        internal bool IsMatchingTarget()
-        {
-            var ct = this.ControlType;
-            return string.IsNullOrEmpty(this.TargetControlType) || this.TargetControlType == this.ControlType;
-        }
-
         internal void SetWindowsElement(WindowsElement windowsElement) => this.windowsElement = windowsElement;
 
         internal void SetSession(WindowsDriver<WindowsElement> driver) => this.driver = driver;
@@ -52,28 +43,7 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         public string Text
         {
-            get { return this.windowsElement?.Text ?? string.Empty; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the UI element is Enabled or not.
-        /// </summary>
-        public bool Enabled
-        {
-            get { return this.windowsElement?.Enabled ?? false; }
-        }
-
-        public bool Selected
-        {
-            get { return this.windowsElement?.Selected ?? false; }
-        }
-
-        /// <summary>
-        /// Gets the Rect of the UI element.
-        /// </summary>
-        public Rectangle? Rect
-        {
-            get { return this.windowsElement?.Rect; }
+            get { return GetAttribute("Value"); }
         }
 
         /// <summary>
@@ -108,19 +78,26 @@ namespace Microsoft.PowerToys.UITest
             get { return GetAttribute("ControlType"); }
         }
 
+        /// <summary>
+        /// Checks if the UI element is enabled.
+        /// </summary>
+        /// <returns>True if the element is enabled; otherwise, false.</returns>
+        public bool IsEnabled() => GetAttribute("IsEnabled") == "True";
+
+        /// <summary>
+        /// Checks if the UI element is selected.
+        /// </summary>
+        /// <returns>True if the element is selected; otherwise, false.</returns>
+        public bool IsSelected() => GetAttribute("IsSelected") == "True";
+
         /// <summary>
         /// Click the UI element.
         /// </summary>
-        /// <param name="rightClick">If true, performs a right-click; otherwise, performs a left-click. Default value is false</param>
-        public virtual void Click(bool rightClick = false)
+        /// <param name="rightClick">If true, performs a right-click; otherwise, performs a left-click.</param>
+        public void Click(bool rightClick = false)
         {
-            PerformAction((actions, windowElement) =>
+            PerformAction(actions =>
             {
-                actions.MoveToElement(windowElement);
-
-                // Move 2by2 offset to make click more stable instead of click on the border of the element
-                actions.MoveByOffset(2, 2);
-
                 if (rightClick)
                 {
                     actions.ContextClick();
@@ -129,73 +106,6 @@ namespace Microsoft.PowerToys.UITest
                 {
                     actions.Click();
                 }
-
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Double Click the UI element.
-        /// </summary>
-        public virtual void DoubleClick()
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement);
-
-                // Move 2by2 offset to make click more stable instead of click on the border of the element
-                actions.MoveByOffset(2, 2);
-
-                actions.DoubleClick();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Drag element move offset.
-        /// </summary>
-        /// <param name="offsetX">The offsetX to move.</param>
-        /// <param name="offsetY">The offsetY to move.</param>
-        public void Drag(int offsetX, int offsetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Drag element move to other element.
-        /// </summary>
-        /// <param name="element">Move to this element.</param>
-        public void Drag(Element element)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).ClickAndHold();
-                Assert.IsNotNull(element.windowsElement, "element is null");
-                int dx = (element.windowsElement.Rect.X - windowElement.Rect.X) / 10;
-                int dy = (element.windowsElement.Rect.Y - windowElement.Rect.Y) / 10;
-                for (int i = 0; i < 10; i++)
-                {
-                    actions.MoveByOffset(dx, dy);
-                }
-
-                actions.Release();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Send Key of the element.
-        /// </summary>
-        /// <param name="key">The Key to Send.</param>
-        public void SendKeys(string key)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                windowElement.SendKeys(key);
             });
         }
 
@@ -208,6 +118,7 @@ namespace Microsoft.PowerToys.UITest
         {
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method GetAttribute with parameter: attributeName = {attributeName}");
             var attributeValue = this.windowsElement.GetAttribute(attributeName);
+            Assert.IsNotNull(attributeValue, $"Attribute '{attributeName}' is null.");
             return attributeValue;
         }
 
@@ -222,143 +133,53 @@ namespace Microsoft.PowerToys.UITest
             where T : Element, new()
         {
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
-
-            // leverage findAll to filter out mismatched elements
-            var collection = this.FindAll<T>(by, timeoutMS);
-
-            Assert.IsTrue(collection.Count > 0, $"Element not found using selector: {by}");
-
-            return collection[0];
-        }
-
-        /// <summary>
-        /// Finds an element by the selector.
-        /// Shortcut for this.Find<T>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class type of the element to find.</typeparam>
-        /// <param name="name">The name for finding the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds.</param>
-        /// <returns>The found element.</returns>
-        public T Find<T>(string name, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.Find<T>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds an element by the selector.
-        /// Shortcut for this.Find<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The selector to use for finding the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds.</param>
-        /// <returns>The found element.</returns>
-        public Element Find(By by, int timeoutMS = 3000)
-        {
-            return this.Find<Element>(by, timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds an element by the selector.
-        /// Shortcut for this.Find<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <param name="name">The name for finding the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds.</param>
-        /// <returns>The found element.</returns>
-        public Element Find(string name, int timeoutMS = 3000)
-        {
-            return this.Find<Element>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by the selector.
-        /// </summary>
-        /// <typeparam name="T">The class type of the elements to find.</typeparam>
-        /// <param name="by">The selector to use for finding the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds.</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
-            var foundElements = FindHelper.FindAll<T, AppiumWebElement>(
+            var foundElement = FindElementHelper.Find<T, AppiumWebElement>(
                 () =>
                 {
-                    if (by.GetIsAccessibilityId())
-                    {
-                        var elements = this.windowsElement.FindElementsByAccessibilityId(by.GetAccessibilityId());
-                        return elements;
-                    }
-                    else
-                    {
-                        var elements = this.windowsElement.FindElements(by.ToSeleniumBy());
-                        return elements;
-                    }
+                    var element = this.windowsElement.FindElement(by.ToSeleniumBy());
+                    Assert.IsNotNull(element, $"Element not found using selector: {by}");
+                    return element;
                 },
                 this.driver,
                 timeoutMS);
 
-            return foundElements ?? new ReadOnlyCollection<T>([]);
+            return foundElement;
         }
 
         /// <summary>
         /// Finds all elements by the selector.
-        /// Shortcut for this.FindAll<T>(By.Name(name), timeoutMS)
         /// </summary>
         /// <typeparam name="T">The class type of the elements to find.</typeparam>
-        /// <param name="name">The name for finding the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds.</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.FindAll<T>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by the selector.
-        /// Shortcut for this.FindAll<Element>(by, timeoutMS)
-        /// </summary>
         /// <param name="by">The selector to use for finding the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds.</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
+        public ReadOnlyCollection<T>? FindAll<T>(By by, int timeoutMS = 3000)
+            where T : Element, new()
         {
-            return this.FindAll<Element>(by, timeoutMS);
-        }
+            Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
+            var foundElements = FindElementHelper.FindAll<T, AppiumWebElement>(
+                () =>
+                {
+                    var elements = this.windowsElement.FindElements(by.ToSeleniumBy());
+                    Assert.IsTrue(elements.Count > 0, $"Elements not found using selector: {by}");
+                    return elements;
+                },
+                this.driver,
+                timeoutMS);
 
-        /// <summary>
-        /// Finds all elements by the selector.
-        /// Shortcut for this.FindAll<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <param name="name">The name for finding the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds.</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
-        {
-            return this.FindAll<Element>(By.Name(name), timeoutMS);
+            return foundElements;
         }
 
         /// <summary>
         /// Simulates a manual operation on the element.
         /// </summary>
-        /// <param name="action">The action to perform on the element.</param>
-        /// <param name="msPreAction">The number of milliseconds to wait before the action. Default value is 500 ms</param>
-        /// <param name="msPostAction">The number of milliseconds to wait after the action. Default value is 500 ms</param>
-        protected void PerformAction(Action<Actions, WindowsElement> action, int msPreAction = 500, int msPostAction = 500)
+        private void PerformAction(Action<Actions> action)
         {
-            if (msPreAction > 0)
-            {
-                Task.Delay(msPreAction).Wait();
-            }
-
-            var windowElement = this.windowsElement!;
+            var element = this.windowsElement;
             Actions actions = new Actions(this.driver);
-            action(actions, windowElement);
-
-            if (msPostAction > 0)
-            {
-                Task.Delay(msPostAction).Wait();
-            }
+            actions.MoveToElement(element);
+            action(actions);
+            actions.Build().Perform();
         }
     }
 }

src/common/UITestAutomation/Element/FindElementHelper.cs

@@ -2,9 +2,16 @@
 // 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.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
 
 [assembly: InternalsVisibleTo("Element")]
@@ -15,19 +22,13 @@ namespace Microsoft.PowerToys.UITest
     /// <summary>
     /// Helper class for finding elements.
     /// </summary>
-    internal static class FindHelper
+    internal static class FindElementHelper
     {
-        public static ReadOnlyCollection<T>? FindAll<T, TW>(Func<IReadOnlyCollection<TW>> findElementsFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
+        public static T Find<T, TW>(Func<TW> findElementFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
             where T : Element, new()
         {
-            var items = findElementsFunc();
-            var res = items.Select(item =>
-            {
-                var element = item as WindowsElement;
-                return NewElement<T>(element, driver, timeoutMS);
-            }).Where(item => item.IsMatchingTarget()).ToList();
-
-            return new ReadOnlyCollection<T>(res);
+            var item = findElementFunc() as WindowsElement;
+            return NewElement<T>(item, driver, timeoutMS);
         }
 
         public static ReadOnlyCollection<T>? FindAll<T, TW>(Func<ReadOnlyCollection<TW>> findElementsFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
@@ -38,7 +39,7 @@ namespace Microsoft.PowerToys.UITest
             {
                 var element = item as WindowsElement;
                 return NewElement<T>(element, driver, timeoutMS);
-            }).Where(item => item.IsMatchingTarget()).ToList();
+            }).ToList();
 
             return new ReadOnlyCollection<T>(res);
         }
@@ -50,12 +51,7 @@ namespace Microsoft.PowerToys.UITest
             Assert.IsNotNull(element, $"New Element {typeof(T).Name} error: element is null.");
 
             T newElement = new T();
-            if (timeoutMS > 0)
-            {
-                // Only set timeout if it is positive value
-                driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(timeoutMS);
-            }
-
+            driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(timeoutMS);
             newElement.SetSession(driver);
             newElement.SetWindowsElement(element);
             return newElement;

src/common/UITestAutomation/Element/HyperlinkButton.cs

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Represents a HyperLinkButton in the UI test environment.
-    /// HyperLinkButton represents a button control that functions as a hyperlink.
-    /// </summary>
-    public class HyperlinkButton : Button
-    {
-        private static readonly string ExpectedControlType = "ControlType.HyperLink";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HyperlinkButton"/> class.
-        /// </summary>
-        public HyperlinkButton()
-        {
-            this.TargetControlType = HyperlinkButton.ExpectedControlType;
-        }
-    }
-}

src/common/UITestAutomation/Element/NavigationViewItem.cs

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Represents a NavigationViewItem in the UI test environment.
-    /// NavigationViewItem represents the container for an item in a NavigationView control.
-    /// </summary>
-    public class NavigationViewItem : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.ListItem";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NavigationViewItem"/> class.
-        /// </summary>
-        public NavigationViewItem()
-        {
-            this.TargetControlType = NavigationViewItem.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Click the ListItem element.
-        /// </summary>
-        /// <param name="rightClick">If true, performs a right-click; otherwise, performs a left-click. Default value is false</param>
-        public override void Click(bool rightClick = false)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement, 10, 10);
-
-                if (rightClick)
-                {
-                    actions.ContextClick();
-                }
-                else
-                {
-                    actions.Click();
-                }
-
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Double Click the ListItem element.
-        /// </summary>
-        public override void DoubleClick()
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement, 10, 10);
-                actions.DoubleClick();
-                actions.Build().Perform();
-            });
-        }
-    }
-}

src/common/UITestAutomation/Element/TextBlock.cs

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Represents a TextBlock in the UI test environment.
-    /// TextBlock provides a lightweight control for displaying small amounts of flow content.
-    /// </summary>
-    public class TextBlock : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Text";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextBlock"/> class.
-        /// </summary>
-        public TextBlock()
-        {
-            this.TargetControlType = TextBlock.ExpectedControlType;
-        }
-    }
-}

src/common/UITestAutomation/Element/TextBox.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 OpenQA.Selenium;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Represents a TextBox in the UI test environment.
-    /// TextBox represents a control that can be used to display and edit plain text (single or multi-line).
-    /// </summary>
-    public class TextBox : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.Edit";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextBox"/> class.
-        /// </summary>
-        public TextBox()
-        {
-            this.TargetControlType = TextBox.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Sets the text of the textbox.
-        /// </summary>
-        /// <param name="value">The text to set.</param>
-        /// <param name="clearText">A value indicating whether to clear the text before setting it. Default value is true</param>
-        /// <returns>The current TextBox instance.</returns>
-        public TextBox SetText(string value, bool clearText = true)
-        {
-            if (clearText)
-            {
-                PerformAction((actions, windowElement) =>
-                {
-                    // select all text and delete it
-                    windowElement.SendKeys(Keys.Control + "a");
-                    windowElement.SendKeys(Keys.Delete);
-                });
-            }
-
-            PerformAction((actions, windowElement) =>
-            {
-                windowElement.SendKeys(value);
-            });
-
-            return this;
-        }
-    }
-}

src/common/UITestAutomation/Element/ToggleSwitch.cs

@@ -1,41 +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 Newtonsoft.Json.Linq;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Represents a ToggleSwitch in the UI test environment.
-    /// </summary>
-    public class ToggleSwitch : Button
-    {
-        /// <summary>
-        /// Gets a value indicating whether the ToggleSwitch is on.
-        /// </summary>
-        public bool IsOn
-        {
-            get
-            {
-                return this.Selected;
-            }
-        }
-
-        /// <summary>
-        /// Sets the ToggleSwitch to the specified value.
-        /// </summary>
-        /// <param name="value">A value indicating whether the ToggleSwitch should be active. Default is true</param>
-        /// <returns>The current ToggleSwitch instance.</returns>
-        public ToggleSwitch Toggle(bool value = true)
-        {
-            if (this.IsOn != value)
-            {
-                // Toggle the switch
-                this.Click();
-            }
-
-            return this;
-        }
-    }
-}

src/common/UITestAutomation/Element/Window.cs

@@ -2,6 +2,13 @@
 // 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.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium.Windows;
+using OpenQA.Selenium.Interactions;
+using OpenQA.Selenium.Remote;
+using OpenQA.Selenium.Support.Events;
+
 namespace Microsoft.PowerToys.UITest
 {
     /// <summary>
@@ -18,7 +25,7 @@ namespace Microsoft.PowerToys.UITest
         {
             if (byClickButton)
             {
-                Find<Button>("Maximize").Click();
+                Find<Button>(By.Name("Maximize")).Click();
             }
             else
             {
@@ -37,7 +44,7 @@ namespace Microsoft.PowerToys.UITest
         {
             if (byClickButton)
             {
-                Find<Button>("Restore").Click();
+                Find<Button>(By.Name("Restore")).Click();
             }
             else
             {
@@ -56,7 +63,7 @@ namespace Microsoft.PowerToys.UITest
         {
             if (byClickButton)
             {
-                Find<Button>("Minimize").Click();
+                Find<Button>(By.Name("Minimize")).Click();
             }
             else
             {
@@ -74,7 +81,7 @@ namespace Microsoft.PowerToys.UITest
         {
             if (byClickButton)
             {
-                Find<Button>("Close").Click();
+                Find<Button>(By.Name("Close")).Click();
             }
             else
             {

src/common/UITestAutomation/Session.cs

@@ -2,10 +2,14 @@
 // 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.ObjectModel;
+using System.IO;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
 using OpenQA.Selenium.Interactions;
@@ -41,150 +45,41 @@ namespace Microsoft.PowerToys.UITest
             where T : Element, new()
         {
             Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
-
-            // leverage findAll to filter out mismatched elements
-            var collection = this.FindAll<T>(by, timeoutMS);
-
-            Assert.IsTrue(collection.Count > 0, $"Element not found using selector: {by}");
-
-            return collection[0];
-        }
-
-        /// <summary>
-        /// Shortcut for this.Find<T>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        public T Find<T>(string name, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.Find<T>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Find<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        public Element Find(By by, int timeoutMS = 3000)
-        {
-            return this.Find<Element>(by, timeoutMS);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Find<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        public Element Find(string name, int timeoutMS = 3000)
-        {
-            return this.Find<Element>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by selector.
-        /// </summary>
-        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
-        /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
-            var foundElements = FindHelper.FindAll<T, WindowsElement>(
+            var foundElement = FindElementHelper.Find<T, WindowsElement>(
                 () =>
                 {
-                    if (by.GetIsAccessibilityId())
-                    {
-                        var elements = this.WindowsDriver.FindElementsByAccessibilityId(by.GetAccessibilityId());
-                        return elements;
-                    }
-                    else
-                    {
-                        var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
-                        return elements;
-                    }
+                    var element = this.WindowsDriver.FindElement(by.ToSeleniumBy());
+                    Assert.IsNotNull(element, $"Element not found using selector: {by}");
+                    return element;
                 },
                 this.WindowsDriver,
                 timeoutMS);
 
-            return foundElements ?? new ReadOnlyCollection<T>([]);
+            return foundElement;
         }
 
         /// <summary>
         /// Finds all elements by selector.
-        /// Shortcut for this.FindAll<T>(By.Name(name), timeoutMS)
         /// </summary>
         /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.FindAll<T>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by selector.
-        /// Shortcut for this.FindAll<Element>(by, timeoutMS)
-        /// </summary>
         /// <param name="by">The selector to find the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
+        public ReadOnlyCollection<T>? FindAll<T>(By by, int timeoutMS = 3000)
+            where T : Element, new()
         {
-            return this.FindAll<Element>(by, timeoutMS);
-        }
+            Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
+            var foundElements = FindElementHelper.FindAll<T, WindowsElement>(
+                () =>
+                {
+                    var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
+                    Assert.IsTrue(elements.Count > 0, $"Elements not found using selector: {by}");
+                    return elements;
+                },
+                this.WindowsDriver,
+                timeoutMS);
 
-        /// <summary>
-        /// Finds all elements by selector.
-        /// Shortcut for this.FindAll<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <param name="name">The name to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
-        {
-            return this.FindAll<Element>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Keyboard Action key.
-        /// </summary>
-        /// <param name="key1">The Keys1 to click.</param>
-        /// <param name="key2">The Keys2 to click.</param>
-        /// <param name="key3">The Keys3 to click.</param>
-        /// <param name="key4">The Keys4 to click.</param>
-        public void KeyboardAction(string key1, string key2 = "", string key3 = "", string key4 = "")
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                if (string.IsNullOrEmpty(key2))
-                {
-                    actions.SendKeys(key1);
-                }
-                else if (string.IsNullOrEmpty(key3))
-                {
-                    actions.SendKeys(key1).SendKeys(key2);
-                }
-                else if (string.IsNullOrEmpty(key4))
-                {
-                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3);
-                }
-                else
-                {
-                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3).SendKeys(key4);
-                }
-
-                actions.Release();
-                actions.Build().Perform();
-            });
+            return foundElements;
         }
 
         /// <summary>
@@ -215,7 +110,6 @@ namespace Microsoft.PowerToys.UITest
                 SetForegroundWindow(windowHandle);
                 var hexWindowHandle = windowHandle.ToString("x");
                 var appCapabilities = new AppiumOptions();
-
                 appCapabilities.AddAdditionalCapability("appTopLevelWindow", hexWindowHandle);
                 appCapabilities.AddAdditionalCapability("deviceName", "WindowsPC");
                 this.WindowsDriver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), appCapabilities);
@@ -231,28 +125,5 @@ namespace Microsoft.PowerToys.UITest
 
             return this;
         }
-
-        /// <summary>
-        /// Simulates a manual operation on the element.
-        /// </summary>
-        /// <param name="action">The action to perform on the element.</param>
-        /// <param name="msPreAction">The number of milliseconds to wait before the action. Default value is 500 ms</param>
-        /// <param name="msPostAction">The number of milliseconds to wait after the action. Default value is 500 ms</param>
-        protected void PerformAction(Action<Actions, WindowsDriver<WindowsElement>> action, int msPreAction = 500, int msPostAction = 500)
-        {
-            if (msPreAction > 0)
-            {
-                Task.Delay(msPreAction).Wait();
-            }
-
-            var windowsDriver = this.WindowsDriver;
-            Actions actions = new Actions(this.WindowsDriver);
-            action(actions, windowsDriver);
-
-            if (msPostAction > 0)
-            {
-                Task.Delay(msPostAction).Wait();
-            }
-        }
     }
 }

src/common/UITestAutomation/SessionHelper.cs

@@ -1,149 +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.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium.Appium;
-using OpenQA.Selenium.Appium.Windows;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Nested class for test initialization.
-    /// </summary>
-    internal class SessionHelper
-    {
-        // Default session path is PowerToys settings dashboard
-        private readonly string sessionPath = ModuleConfigData.Instance.GetModulePath(PowerToysModule.PowerToysSettings);
-
-        private string? locationPath;
-
-        private WindowsDriver<WindowsElement> Root { get; set; }
-
-        private WindowsDriver<WindowsElement>? Driver { get; set; }
-
-        private Process? appDriver;
-
-        [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
-        public SessionHelper(PowerToysModule scope)
-        {
-            this.sessionPath = ModuleConfigData.Instance.GetModulePath(scope);
-            this.locationPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-
-            var winAppDriverProcessInfo = new ProcessStartInfo
-            {
-                FileName = "C:\\Program Files (x86)\\Windows Application Driver\\WinAppDriver.exe",
-                Verb = "runas",
-            };
-
-            this.appDriver = Process.Start(winAppDriverProcessInfo);
-
-            var desktopCapabilities = new AppiumOptions();
-            desktopCapabilities.AddAdditionalCapability("app", "Root");
-            this.Root = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), desktopCapabilities);
-
-            // Set default timeout to 5 seconds
-            this.Root.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
-        }
-
-        /// <summary>
-        /// Initializes the test environment.
-        /// </summary>
-        /// <param name="scope">The PowerToys module to start.</param>
-        public SessionHelper Init()
-        {
-            this.StartExe(locationPath + this.sessionPath);
-
-            Assert.IsNotNull(this.Driver, $"Failed to initialize the test environment. Driver is null.");
-
-            return this;
-        }
-
-        /// <summary>
-        /// Cleans up the test environment.
-        /// </summary>
-        public void Cleanup()
-        {
-            ExitScopeExe();
-            try
-            {
-                appDriver?.Kill();
-                appDriver?.WaitForExit(); // Optional: Wait for the process to exit
-            }
-            catch (Exception ex)
-            {
-                // Handle exceptions if needed
-                Debug.WriteLine($"Exception during Cleanup: {ex.Message}");
-            }
-        }
-
-        /// <summary>
-        /// Starts a new exe and takes control of it.
-        /// </summary>
-        /// <param name="appPath">The path to the application executable.</param>
-        public void StartExe(string appPath)
-        {
-            var opts = new AppiumOptions();
-            opts.AddAdditionalCapability("app", appPath);
-            Console.WriteLine($"appPath: {appPath}");
-            this.Driver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), opts);
-
-            // Set default timeout to 5 seconds
-            this.Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
-        }
-
-        /// <summary>
-        /// Exit a exe.
-        /// </summary>
-        /// <param name="path">The path to the application executable.</param>
-        public void ExitExe(string path)
-        {
-            // Exit Exe
-            string exeName = Path.GetFileNameWithoutExtension(path);
-
-            // PowerToys.FancyZonesEditor
-            Process[] processes = Process.GetProcessesByName(exeName);
-            foreach (Process process in processes)
-            {
-                try
-                {
-                    process.Kill();
-                    process.WaitForExit(); // Optional: Wait for the process to exit
-                }
-                catch (Exception ex)
-                {
-                    Assert.Fail($"Failed to terminate process {process.ProcessName} (ID: {process.Id}): {ex.Message}");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Exit now exe.
-        /// </summary>
-        public void ExitScopeExe()
-        {
-            ExitExe(sessionPath);
-        }
-
-        /// <summary>
-        /// Restarts now exe and takes control of it.
-        /// </summary>
-        public void RestartScopeExe()
-        {
-            ExitExe(sessionPath);
-            StartExe(locationPath + sessionPath);
-        }
-
-        public WindowsDriver<WindowsElement> GetRoot() => this.Root;
-
-        public WindowsDriver<WindowsElement> GetDriver()
-        {
-            Assert.IsNotNull(this.Driver, $"Failed to get driver. Driver is null.");
-            return this.Driver;
-        }
-    }
-}

src/common/UITestAutomation/UITestAutomation.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
@@ -14,9 +13,9 @@
     <PackageReference Include="Appium.WebDriver" />
     <PackageReference Include="MSTest" />
     <PackageReference Include="System.IO.Abstractions" />
-    <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Private.Uri" />
-    <PackageReference Include="System.Text.RegularExpressions" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
 </Project>

src/common/UITestAutomation/UITestBase.cs

@@ -2,180 +2,129 @@
 // 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.ObjectModel;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using System.Reflection;
-using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
+using OpenQA.Selenium.Interactions;
 
 namespace Microsoft.PowerToys.UITest
 {
     /// <summary>
     /// Base class that should be inherited by all Test Classes.
     /// </summary>
-    [TestClass]
     public class UITestBase
     {
         public Session Session { get; set; }
 
-        private readonly SessionHelper sessionHelper;
-
-        private readonly PowerToysModule scope;
+        private readonly TestInit testInit = new TestInit();
 
         public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings)
         {
-            this.scope = scope;
-            this.sessionHelper = new SessionHelper(scope).Init();
-            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
+            this.testInit.SetScope(scope);
+            this.testInit.Init();
+            this.Session = new Session(this.testInit.GetRoot(), this.testInit.GetDriver());
+        }
+
+        ~UITestBase()
+        {
+            this.testInit.Cleanup();
         }
 
         /// <summary>
-        /// Initializes the test.
+        /// Nested class for test initialization.
         /// </summary>
-        [TestInitialize]
-        public void TestInit()
+        private sealed class TestInit
         {
-            if (this.scope == PowerToysModule.PowerToysSettings)
+            private WindowsDriver<WindowsElement> Root { get; set; }
+
+            private WindowsDriver<WindowsElement>? Driver { get; set; }
+
+            private static Process? appDriver;
+
+            // Default session path is PowerToys settings dashboard
+            private static string sessionPath = ModuleConfigData.Instance.GetModulePath(PowerToysModule.PowerToysSettings);
+
+            public TestInit()
             {
-                // close Debug warning dialog if any
-                // Such debug warning dialog seems only appear in PowerToys Settings
-                if (this.FindAll("DEBUG").Count > 0)
+                appDriver = Process.Start(new ProcessStartInfo
                 {
-                    this.Find("DEBUG").Find<Button>("Close").Click();
+                    FileName = "C:\\Program Files (x86)\\Windows Application Driver\\WinAppDriver.exe",
+                    Verb = "runas",
+                });
+
+                var desktopCapabilities = new AppiumOptions();
+                desktopCapabilities.AddAdditionalCapability("app", "Root");
+                this.Root = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), desktopCapabilities);
+
+                // Set default timeout to 5 seconds
+                this.Root.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
+            }
+
+            /// <summary>
+            /// Initializes the test environment.
+            /// </summary>
+            [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
+            public void Init()
+            {
+                string? path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                this.StartExe(path + sessionPath);
+
+                Assert.IsNotNull(this.Driver, $"Failed to initialize the test environment. Driver is null.");
+
+                // Set default timeout to 5 seconds
+                this.Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
+            }
+
+            /// <summary>
+            /// Cleans up the test environment.
+            /// </summary>
+            public void Cleanup()
+            {
+                try
+                {
+                    appDriver?.Kill();
+                }
+                catch (Exception ex)
+                {
+                    // Handle exceptions if needed
+                    Debug.WriteLine($"Exception during Cleanup: {ex.Message}");
                 }
             }
-        }
 
-        /// <summary>
-        /// UnInitializes the test.
-        /// </summary>
-        [TestCleanup]
-        public void TestClean()
-        {
-            this.sessionHelper.Cleanup();
-        }
+            /// <summary>
+            /// Starts a new exe and takes control of it.
+            /// </summary>
+            /// <param name="appPath">The path to the application executable.</param>
+            public void StartExe(string appPath)
+            {
+                var opts = new AppiumOptions();
+                opts.AddAdditionalCapability("app", appPath);
+                this.Driver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), opts);
+            }
 
-        /// <summary>
-        /// Finds an element by selector.
-        /// Shortcut for this.Session.Find<T>(by, timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        protected T Find<T>(By by, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.Session.Find<T>(by, timeoutMS);
-        }
+            /// <summary>
+            /// Sets scope to the Test Class.
+            /// </summary>
+            /// <param name="scope">The PowerToys module to start.</param>
+            public void SetScope(PowerToysModule scope)
+            {
+                sessionPath = ModuleConfigData.Instance.GetModulePath(scope);
+            }
 
-        /// <summary>
-        /// Shortcut for this.Session.Find<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        protected T Find<T>(string name, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.Session.Find<T>(By.Name(name), timeoutMS);
-        }
+            public WindowsDriver<WindowsElement> GetRoot() => this.Root;
 
-        /// <summary>
-        /// Shortcut for this.Session.Find<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The selector to find the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        protected Element Find(By by, int timeoutMS = 3000)
-        {
-            return this.Session.Find(by, timeoutMS);
-        }
-
-        /// <summary>
-        /// Shortcut for this.Session.Find<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <param name="name">The name of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        protected Element Find(string name, int timeoutMS = 3000)
-        {
-            return this.Session.Find(name, timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by selector.
-        /// Shortcut for this.Session.FindAll<T>(by, timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
-        /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.Session.FindAll<T>(by, timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by selector.
-        /// Shortcut for this.Session.FindAll<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
-        /// <param name="name">The name of the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            return this.Session.FindAll<T>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by selector.
-        /// Shortcut for this.Session.FindAll<Element>(by, timeoutMS)
-        /// </summary>
-        /// <param name="by">The selector to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 3000)
-        {
-            return this.Session.FindAll<Element>(by, timeoutMS);
-        }
-
-        /// <summary>
-        /// Finds all elements by selector.
-        /// Shortcut for this.Session.FindAll<Element>(By.Name(name), timeoutMS)
-        /// </summary>
-        /// <param name="name">The name of the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
-        {
-            return this.Session.FindAll<Element>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Restart scope exe.
-        /// </summary>
-        public void RestartScopeExe()
-        {
-            this.sessionHelper.RestartScopeExe();
-            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
-            return;
-        }
-
-        /// <summary>
-        /// Restart scope exe.
-        /// </summary>
-        public void ExitScopeExe()
-        {
-            this.sessionHelper.ExitScopeExe();
-            return;
+            public WindowsDriver<WindowsElement> GetDriver()
+            {
+                Assert.IsNotNull(this.Driver, $"Failed to get driver. Driver is null.");
+                return this.Driver;
+            }
         }
     }
 }

src/common/interop/Constants.cpp

@@ -187,8 +187,4 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::TERMINATE_SETTINGS_SHARED_EVENT;
     }
-    hstring Constants::ShowCmdPalEvent()
-    {
-        return CommonSharedConstants::CMDPAL_SHOW_EVENT;
-    }
 }

src/common/interop/Constants.h

@@ -50,7 +50,6 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring WorkspacesLaunchEditorEvent();
         static hstring WorkspacesHotkeyEvent();
         static hstring PowerToysRunnerTerminateSettingsEvent();
-        static hstring ShowCmdPalEvent();
     };
 }
 

src/common/interop/Constants.idl

@@ -47,7 +47,6 @@ namespace PowerToys
             static String WorkspacesLaunchEditorEvent();
             static String WorkspacesHotkeyEvent();
             static String PowerToysRunnerTerminateSettingsEvent();
-            static String ShowCmdPalEvent();
         }
     }
 }