fix unrecognized word

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

@@ -288,6 +288,3 @@ CACHEWRITE
 MRUCMPPROC
 MRUINFO
 REGSTR
-
-# Misc Win32 APIs and PInvokes
-INVOKEIDLIST

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

@@ -115,7 +115,6 @@ bigbar
 bigobj
 binlog
 binres
-binskim
 BITMAPFILEHEADER
 bitmapimage
 BITMAPINFO
@@ -256,7 +255,6 @@ Corpor
 cotaskmem
 COULDNOT
 countof
-covrun
 cpcontrols
 cph
 cplusplus
@@ -637,7 +635,6 @@ hmodule
 hmonitor
 homies
 homljgmgpmcbpjbnjpfijnhipfkiclkd
-HOOKPROC
 HORZRES
 HORZSIZE
 Hostbackdropbrush
@@ -972,7 +969,6 @@ msc
 mscorlib
 msctls
 msdata
-msdia
 MSDL
 MSGFLT
 MSHCTX

.github/workflows/msstore-submissions.yml

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

.pipelines/v2/release.yml

@@ -64,10 +64,6 @@ extends:
       tsa:
         enabled: true
         configFile: '$(Build.SourcesDirectory)\.pipelines\tsa.json'
-      binskim:
-        enabled: true
-        # Exclude every dll/exe in tests/*, as well as all msdia*, covrun* and vcruntime*
-        analyzeTargetGlob: +:file|$(Build.ArtifactStagingDirectory)/**/*.dll;+:file|$(Build.ArtifactStagingDirectory)/**/*.exe;-:file:regex|tests.*\.(dll|exe)$;-:file:regex|(covrun.*)\.dll$;-:file:regex|(msdia.*)\.dll$;-:file:regex|(vcruntime.*)\.dll$
 
     stages:
       - stage: Build

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

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

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

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

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

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

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

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

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

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

Directory.Packages.props

@@ -34,22 +34,22 @@
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.7" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.7" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.7" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.7" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.7" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -78,28 +78,28 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.8" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.7" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.8" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.8" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.8" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.7" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.7" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.7" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.7" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.7" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.7" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.8" />
+    <PackageVersion Include="System.Management" Version="9.0.7" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.8" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.7" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />

NOTICE.md

@@ -1519,23 +1519,23 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
-- Microsoft.Bcl.AsyncInterfaces 9.0.8
+- Microsoft.Bcl.AsyncInterfaces 9.0.7
 - Microsoft.Bot.AdaptiveExpressions.Core 4.23.0
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.8
+- Microsoft.Data.Sqlite 9.0.7
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.8
-- Microsoft.Extensions.Hosting 9.0.8
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.8
-- Microsoft.Extensions.Logging 9.0.8
-- Microsoft.Extensions.Logging.Abstractions 9.0.8
+- Microsoft.Extensions.DependencyInjection 9.0.7
+- Microsoft.Extensions.Hosting 9.0.7
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.7
+- Microsoft.Extensions.Logging 9.0.7
+- Microsoft.Extensions.Logging.Abstractions 9.0.7
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
-- Microsoft.Win32.SystemEvents 9.0.8
-- Microsoft.Windows.Compatibility 9.0.8
+- Microsoft.Win32.SystemEvents 9.0.7
+- Microsoft.Windows.Compatibility 9.0.7
 - Microsoft.Windows.CsWin32 0.3.183
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
@@ -1555,25 +1555,25 @@ SOFTWARE.
 - SkiaSharp.Views.WinUI 2.88.9
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.8
+- System.CodeDom 9.0.7
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.8
-- System.Configuration.ConfigurationManager 9.0.8
-- System.Data.OleDb 9.0.8
+- System.ComponentModel.Composition 9.0.7
+- System.Configuration.ConfigurationManager 9.0.7
+- System.Data.OleDb 9.0.7
 - System.Data.SqlClient 4.9.0
-- System.Diagnostics.EventLog 9.0.8
-- System.Diagnostics.PerformanceCounter 9.0.8
-- System.Drawing.Common 9.0.8
+- System.Diagnostics.EventLog 9.0.7
+- System.Diagnostics.PerformanceCounter 9.0.7
+- System.Drawing.Common 9.0.7
 - System.IO.Abstractions 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
-- System.Management 9.0.8
+- System.Management 9.0.7
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.8
-- System.ServiceProcess.ServiceController 9.0.8
-- System.Text.Encoding.CodePages 9.0.8
-- System.Text.Json 9.0.8
+- System.Runtime.Caching 9.0.7
+- System.ServiceProcess.ServiceController 9.0.7
+- System.Text.Encoding.CodePages 9.0.7
+- System.Text.Json 9.0.7
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

PowerToys.sln

@@ -461,8 +461,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.Common", "src\modules\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.FilePreviewer", "src\modules\peek\Peek.FilePreviewer\Peek.FilePreviewer.csproj", "{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Peek.UITests", "src\modules\peek\Peek.UITests\Peek.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MarkdownPreviewHandlerCpp", "src\modules\previewpane\MarkdownPreviewHandlerCpp\MarkdownPreviewHandlerCpp.vcxproj", "{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GcodePreviewHandlerCpp", "src\modules\previewpane\GcodePreviewHandlerCpp\GcodePreviewHandlerCpp.vcxproj", "{5A5DD09D-723A-44D3-8F2B-293584C3D731}"
@@ -762,7 +760,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UITests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.UITests\Microsoft.CmdPal.UITests.csproj", "{6748A29D-DA6A-033A-825B-752295FF6AA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UITests", "src\modules\cmdpal\Microsoft.CmdPal.UITests\Microsoft.CmdPal.UITests.csproj", "{6748A29D-DA6A-033A-825B-752295FF6AA0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{6EABCF9A-6526-441F-932F-658B1DC3E403}"
 EndProject
@@ -778,16 +776,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{8131151D-B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Calc.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Calc.UnitTests\Microsoft.CmdPal.Ext.Calc.UnitTests.csproj", "{E816D7AC-4688-4ECB-97CC-3D8E798F3825}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Registry.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Registry.UnitTests\Microsoft.CmdPal.Ext.Registry.UnitTests.csproj", "{E816D7AD-4688-4ECB-97CC-3D8E798F3826}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.System.UnitTests\Microsoft.CmdPal.Ext.System.UnitTests.csproj", "{E816D7AE-4688-4ECB-97CC-3D8E798F3827}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.TimeDate.UnitTests\Microsoft.CmdPal.Ext.TimeDate.UnitTests.csproj", "{E816D7AF-4688-4ECB-97CC-3D8E798F3828}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WindowWalker.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.WindowWalker.UnitTests\Microsoft.CmdPal.Ext.WindowWalker.UnitTests.csproj", "{E816D7B0-4688-4ECB-97CC-3D8E798F3829}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.UnitTestBase", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj", "{00D8659C-2068-40B6-8B86-759CD6284BBB}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -1856,14 +1844,6 @@ Global
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|ARM64.Build.0 = Release|ARM64
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.ActiveCfg = Release|x64
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.Build.0 = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|x64.ActiveCfg = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|x64.Build.0 = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|ARM64.Build.0 = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|x64.ActiveCfg = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|x64.Build.0 = Release|x64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.Build.0 = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|x64.ActiveCfg = Debug|x64
@@ -2810,46 +2790,6 @@ Global
 		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|ARM64.Build.0 = Release|ARM64
 		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|x64.ActiveCfg = Release|x64
 		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|x64.Build.0 = Release|x64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Debug|x64.Build.0 = Debug|x64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Release|x64.ActiveCfg = Release|x64
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826}.Release|x64.Build.0 = Release|x64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Debug|x64.Build.0 = Debug|x64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Release|x64.ActiveCfg = Release|x64
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827}.Release|x64.Build.0 = Release|x64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Debug|x64.Build.0 = Debug|x64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Release|x64.ActiveCfg = Release|x64
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828}.Release|x64.Build.0 = Release|x64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Debug|x64.Build.0 = Debug|x64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|x64.ActiveCfg = Release|x64
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|x64.Build.0 = Release|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|x64.ActiveCfg = Debug|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|x64.Build.0 = Debug|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.Build.0 = Release|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.ActiveCfg = Release|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3008,7 +2948,6 @@ Global
 		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{5A5DD09D-723A-44D3-8F2B-293584C3D731} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{B3E869C4-8210-4EBD-A621-FF4C4AFCBFA9} = {2F305555-C296-497E-AC20-5FA1B237996A}
@@ -3155,12 +3094,6 @@ Global
 		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
 		{F93C2817-C846-4259-84D8-B39A6B57C8DE} = {3527BF37-DFC5-4309-A032-29278CA21328}
 		{8131151D-B0E9-4E18-84A5-E5F946C4480A} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{00D8659C-2068-40B6-8B86-759CD6284BBB} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -14,7 +14,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
 | [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
 | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
-| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse Utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
+| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
 | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
 | [Peek](https://aka.ms/PowerToysOverview_Peek) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
 | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
@@ -35,19 +35,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.92%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.93.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.93.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.93.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.93.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.92.1-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.92.1-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.92.1-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.92.1-arm64.exe][ptMachineArm64] |
 
 This is our preferred method.
 
@@ -93,119 +93,139 @@ For guidance on developing for PowerToys, please read the [developer docs](./doc
 
 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
 
-### 0.93 - Aug 2025 Update
+### 0.92 - June 2025 Update
 
 In this release, we focused on new features, stability, optimization improvements, and automation.
 
 **✨Highlights**
 
- - PowerToys settings debuts a modern, card-based dashboard with clearer descriptions and faster navigation for a streamlined user experience.
- - Command Palette had over 99 issues resolved, including bringing back Clipboard History, adding context menu shortcuts, pinning favorite apps, and supporting history in Run.
- - Command Palette reduced its startup memory usage by ~15%, load time by ~40%, built-in extensions loading time by ~70%, and installation size by ~55%—all due to using the full Ahead-of-Time (AOT) compilation mode in Windows App SDK.
- - Peek now supports instant previews and embedded thumbnails for Binary G-code (.bgcode) 3D printing files, making it easy to inspect models at a glance. Thanks [@pedrolamas](https://github.com/pedrolamas)!
- - Mouse Utilities introduces a new spotlight highlighting mode that dims the screen and draws attention to your cursor, perfect for presentations.
- - Test coverage improvements for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename — ensuring better reliability and quality, with over 600 new unit tests (mostly for Command Palette) and doubled UI automation coverage.
+ - PowerToys settings now has a toggle for the system tray icon, giving users control over its visibility based on personal preference. Thanks [@BLM16](https://github.com/BLM16)!  
+ - Command Palette now has Ahead-of-Time ([AOT](https://learn.microsoft.com/en-us/dotnet/core/deploying/native-aot)) compatibility for all first-party extensions, improved extensibility, and core UX fixes, resulting in better performance and stability across commands.
+ - Color Picker now has customizable mouse button actions, enabling more personalized workflows by assigning functions to left, right, and middle clicks. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Bug Report Tool now has a faster and clearer reporting process, with progress indicators, improved compression, auto-cleanup of old trace logs, and inclusion of MSIX installer logs for more efficient diagnostics.
+ - File Explorer add-ons now have improved rendering stability, resolving issues with PDF previews, blank thumbnails, and text file crashes during file browsing.
+
+### Color Picker
+
+ - Added mouse button actions so you can choose what left, right, or middle click does. Thanks [@PesBandi](https://github.com/PesBandi)!  
+
+### Crop & Lock
+
+ - Aligned window styling with current Windows theme for a cleaner look. Thanks [@sadirano](https://github.com/sadirano)!  
 
 ### Command Palette
 
- - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
- - Fixed command title changes not being properly notified to screen readers. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made icon controls excluded from keyboard navigation by default for better accessibility. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved UI design with better text sizing and alignment.
- - Fixed keyboard shortcuts to work better in text boxes and context menus.
- - Added right-click context menus with critical command styling and separators.
- - Improved various context menu issues, improving item selection, handling of long titles, search bar text scaling, initial item behavior, and primary button functionality.
- - Fixed context menu crashes with better type handling.
- - Fixed "Reload" command to work with both uppercase and lowercase letters.
- - Added mouse back button support for easier navigation. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Updated back button tooltip to show keyboard shortcut information. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Command Palette window not appearing properly when activated. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Command Palette window staying hidden from taskbar after File Explorer restarts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed window focus not returning to previous app properly.
- - Fixed Command Palette window to always appear on top when shown and move to bottom when hidden. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed window hiding to properly work on UI thread. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed crashes and improved stability with better synchronization of Command list updates. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved extension disposal with better error handling to prevent crashes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved stability by fixing a UI threading issue when loading more results, preventing possible crashes and ensuring the loading state resets if loading fails. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Enhanced icon loading stability with better exception handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added thread safety to recent commands to prevent crashes. Thanks [@MaoShengelia](https://github.com/MaoShengelia)!
- - Fixed acrylic (frosted glass) system backdrop display issues by ensuring proper UI thread handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enhanced performance by resolving a regression in page loading.
+ - Applied consistent hotkey handling across all Command Palette commands for a smoother user experience.
+ - Improved graceful closing of Command Palette. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed consistency issue for extensions' alias with "Direct" setting and enabled localization for "Direct" and "Indirect" for better user understanding. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Improved visual clarity by styling critical context items correctly.
+ - Automatically focused the field when only one is present on the content page.
+ - Improved stability and efficiency when loading file icons in SDK ThumbnailHelper.cs by removing unnecessary operations. Thanks [@OldUser101](https://github.com/OldUser101)!
+ - Enhanced details view with commands implementation. (See [Extension sample](./src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs))
 
 ### Command Palette extensions
 
- - Added settings to each provider to control which fallback commands are enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)! for fixing a regression in this feature.
- - Added sample code showing how Command Palette extensions can track when their pages are loaded or unloaded. [Check it out here](./src/modules/cmdpal/ext/SamplePagesExtension/OnLoadPage.cs).
- - Fixed *Calculator* to accept regular spaces in numbers that use space separators. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Added a new setting to *Calculator* to make "Copy" the primary button (replacing “Save”) and enable "Close on Enter", streamlining the workflow. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Improved *Apps* indexing error handling and removed obsolete code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Prevented apps from showing in search when the *Apps* extension is disabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added ability to pin/unpin *Apps* using Ctrl+P shortcut.
- - Added keyboard shortcuts to the *Apps* context menu items for faster access. 
- - Added all file context menu options to the *Apps* items context menu, making all file actions available there for better functionality.
- - Streamlined All *Apps* extension settings by removing redundant descriptions, making the UI clearer.
- - Added command history to the *Run* page for easier access to previous commands.
- - Fixed directory path handling in *Run* fallback for better file navigation.
- - Fixed URL fallback item hiding properly in *Web Search* extension when search query becomes invalid. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added proper empty state message for *Web Search* extension when no results found. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added fallback command to *Windows Settings* extension for better search results.
- - Re-enabled *Clipboard History* feature with proper window handling.
- - Improved *Add Bookmark* extension to automatically detect file, folder, or URL types without manual input.
- - Updated terminology from "Kill process" to "End task" in *Window Walker* for consistency with Windows.
- - Fixed minor grammar error in SamplePagesExtension code comments. Thanks [@purofle](https://github.com/purofle)!
+ - Added "Copy Path" command to *App* search results for convenience. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Improved *Calculator* input experience by ignoring leading equal signs. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Corrected input handling in the *Calculator* extension to avoid showing errors for input with only leading whitespace.
+ - Improved *New Extension* wizard by validating names to prevent namespace errors.
+ - Ensured consistent context items display for the *Run* extension between fallback and top-level results.
+ - Fixed missing *Time & Date* commands in fallback results. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed outdated results in the *Time & Date* extension. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed an issue where *Web Search* always opened Microsoft Edge instead of the user's default browser on Windows 11 24H2 and later. Thanks [@RuggMatt](https://github.com/RuggMatt)!
+ - Improved ordering of *Windows Settings* extension search results from alphabetical to relevance-based for quicker access.
+ - Added "Restart Windows Explorer" command to the *Windows System Commands* provider for gracefully terminate and relaunch explorer.exe. Thanks [@jiripolasek](https://github.com/jiripolasek)!
 
-### Mouse Utilities
+### Command Palette Ahead-of-Time (AOT) readiness
 
- - Added a new spotlight highlighting mode that creates a large transparent circle around your cursor with a backdrop effect, providing an alternative to the traditional circle highlight. Perfect for presentations where you want to focus attention on a specific area while dimming the rest of the screen.
+ - We’ve made foundational changes to prepare the Command Palette for future Ahead-of-Time (AOT) publishing. This includes replacing the calculator library with ExprTk, improving COM object handling, refining Win32 interop, and correcting trimming behavior—all to ensure compatibility, performance, and reliability under AOT constraints. All first-party extensions are now AOT-compatible. These improvements lay the groundwork for publishing Command Palette as an AOT application in the next release.
+ - Special thanks to [@Sergio0694](https://github.com/Sergio0694) for guidance on making COM APIs AOT-compatible, [@jtschuster](https://github.com/jtschuster) for fixing COM object handling, [@ArashPartow](https://github.com/ArashPartow) from ExprTk for integration suggestions, and [@tian-lt](https://github.com/tian-lt) from the Windows Calculator team for valuable suggestion throughout the migration journey and review.
+ - As part of the upcoming release, we’re also enabling AOT compatibility for key dependencies, including markdown rendering, Adaptive Cards, internal logging and telemetry library, and the core Command Palette UX.
+
+### FancyZones
+
+ - Fixed DPI-scaling issues to ensure FancyZones Editor displays crisply on high-resolution monitors. Thanks [@HO-COOH](https://github.com/HO-COOH)! This inspired us a broader review across other PowerToys modules, leading to DPI display optimizations in Awake, Color Picker, PowerAccent, and more.
+
+### File Explorer add-ons
+
+ - Fixed potential failures in PDF previewer and thumbnail generation, improving reliability when browsing PDF files. Thanks [@mohiuddin-khan-shiam](https://github.com/mohiuddin-khan-shiam)!  
+ - Prevented Monaco Preview Handler crash when opening UTF-8-BOM text files.  
+
+### Hosts File Editor
+
+ - Added an in-app *“Learn more”* link to warning dialogs for quick guidance. Thanks [@PesBandi](https://github.com/PesBandi)!  
+
+### Mouse Without Borders
+
+ - Fixed firewall rule so MWB now accepts connections from IPs outside your local subnet.
+ - Cleaned legacy logs to reduce disk usage and noise.  
 
 ### Peek
 
- - Added preview and thumbnail support for Binary G-code (.bgcode) files used in 3D printing. You can now see embedded thumbnails and preview these compressed 3D printing files directly in Peek and File Explorer. Thanks [@pedrolamas](https://github.com/pedrolamas)!
+ - Updated QOI reader so 3-channel QOI images preview correctly in Peek and File Explorer. Thanks [@mbartlett21](https://github.com/mbartlett21)!  
+ - Added codec detection with a clear warning when a video can’t be previewed, along with a link to the Microsoft Store to download the required codec.
 
-### Quick Accent
+### PowerRename
 
- - Added Vietnamese language support to Quick Accent, mappings for Vietnamese vowels (a, e, i, o, u, y) and the letter d. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
+ - Added support for $YY-$MM-$DD in ModificationTime and AccessTime to enable flexible date-based renaming.
+
+### PowerToys Run
+
+ - Suppressed error UI for known WPF-related crashes to reduce user confusion, while retaining diagnostic logging for analysis. This targets COMException 0xD0000701 and 0x80263001 caused by temporary DWM unavailability.
+
+### Registry Preview
+
+ - Added "Extended data preview" via magnifier icon and context menu in the Data Grid, enabled easier inspection of complex registry types like REG_BINARY, REG_EXPAND_SZ, and REG_MULTI_SZ, etc. Thanks [@htcfreek](https://github.com/htcfreek)! 
+ - Improved file-saving experience in Registry Preview by aligning with Notepad-like behavior, enhancing user prompts, error handling, and preventing crashes during unsaved or interrupted actions. Thanks [@htcfreek](https://github.com/htcfreek)!  
 
 ### Settings
 
- - Completely redesigned the Settings dashboard with a modern card-based layout featuring organized sections for quick actions and shortcuts overview, replacing the old module list.
- - Rewrote setting descriptions to be more concise and follow Windows writing style guidelines, making them easier to understand.
- - Improved formatting and readability of release notes in the "What's New" section with better typography and spacing.
- - Added missing deep link support for various settings pages (Peek, Quick Accent, PowerToys Run, etc.) so you can jump directly to specific settings.
- - Resolved an issue where the settings page header would drift away from its position when resizing the settings window.
- - Resolved a settings crash related to incompatible property names in ZoomIt configuration.
+ - Added an option to hide or show the PowerToys system tray icon. Thanks [@BLM16](https://github.com/BLM16)!
+ - Improved settings to show progress while a bug report package is being generated.
+
+### Workspaces
+
+ - Stored Workspaces icons in user AppData to ensure profile portability and prevent loss during temporary folder cleanup.
+ - Enabled capture and launch of PWAs on non-default Edge or Chrome profiles, ensuring consistent behavior during creation and execution.
 
 ### Documentation
 
- - Added detailed step-by-step instructions for first-time developers building the Command Palette module, including prerequisites and Visual Studio setup guidance. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - **Fixed Broken SDK Link**: Corrected a broken markdown link in the Command Palette SDK README that was pointing to an incorrect directory path. Thanks [@ChrisGuzak](https://github.com/ChrisGuzak)!
- - Added documentation for the "Open With Cursor" plugin that enables opening Visual Studio and VS Code recent files using Cursor AI. Thanks [@VictorNoxx](https://github.com/VictorNoxx)!
- - Added documentation for two new community plugins - Hotkeys plugin for creating custom keyboard shortcuts, and RandomGen plugin for generating random data like passwords, colors, and placeholder text. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - Added SpeedTest and Dictionary Definition to the third-party plugins documentation for PowerToys Run. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - Corrected sample links and typo in Command Palette documentation. Thanks [@daverayment](https://github.com/daverayment) and [@roycewilliams](https://github.com/roycewilliams)!
 
 ### Development
 
- - Updated .NET libraries to 9.0.8 for performance and security. Thanks [@snickler](https://github.com/snickler)!
- - Updated the spell check system to version 0.0.25 with better GitHub integration and SARIF reporting, plus fixed numerous spelling errors throughout the codebase including property names and documentation. Thanks [@jsoref](https://github.com/jsoref)!
- - Cleaned up spelling check configuration to eliminate false positives and excessive noise that was appearing in every pull request, making the development process smoother.
- - Replaced NuGet feed with Azure Artifacts for better package management.
- - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours.
- - Replaced brittle pixel-by-pixel image comparison with perceptual hash (pHash) technology that's more robust to minor rendering differences - no more test failures due to anti-aliasing or compression artifacts.
- - Reduced CI/fuzzing/UI test timeouts from 4 hours to 90 minutes, dramatically improving developer feedback loops and preventing long waits when builds get stuck.
- - Standardized test project naming across the entire codebase and improved pipeline result identification by adding platform/install mode context to test run titles. Thanks [@khmyznikov](https://github.com/khmyznikov)!
- - Added comprehensive UI test suites for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename - ensuring better reliability and quality.
- - Enhanced UI test automation with command-line argument support, better session management, and improved element location methods using pattern matching to avoid failures from minor differences in exact matches.
+ - Updated .NET libraries to 9.0.6 for performance and security. Thanks [@snickler](https://github.com/snickler)!  
+ - Updated WinAppSDK to 1.7.2 for better stability and Windows support.  
+ - Introduced a one-step local build script that generates a signed installer, enhancing developer productivity.
+ - Generated portable PDBs so cross-platform debuggers can read symbol files, improving debugging experience in VSCode and other tools.
+ - Simplified WinGet configuration files by using the [Microsoft.Windows.Settings](https://www.powershellgallery.com/packages/Microsoft.Windows.Settings) module to enable Developer Mode. Thanks [@mdanish-kh](https://github.com/mdanish-kh)! 
+ - Adjusted build scripts for the latest Az.Accounts module to keep CI green.
+ - Streamlined release pipeline by removing hard-coded telemetry version numbers, and unified Command Palette versioning with Windows Terminal's versioning method for consistent updates.
+ - Enhanced the build validation step to show detailed differences between NOTICE.md and actual package dependencies and versions.
+ - Improved spell-checking accuracy across the repo. Thanks [@rovercoder](https://github.com/rovercoder)!  
+ - Upgraded CI to TouchdownBuild v5 for faster pipelines.  
+ - Added context comments to *Resources.resw* to help translators.
+ - Expanded fuzz testing coverage to include FancyZones.
+ - Integrated all unit tests into the CI pipeline, increasing from ~3,000 to ~5,000 tests.
+ - Enabled daily UI test automation on the main branch, now covering over 370 UI tests for end-to-end validation.
+ - Newly added unit tests for WorkspacesLib to improve reliability and maintainability.
 
-### What is being planned over the next few releases
+### General
 
-For [v0.94][github-next-release-work], we'll work on the items below:
+- Updated bug report compression library (cziplib 0.3.3) for faster and more reliable package creation. Thanks [@Chubercik](https://github.com/Chubercik)!
+- Included App Installer (“AppX Deployment Server”) event logs in bug reports for more thorough diagnostics.  
+
+### What is being planned for version 0.93
+
+For [v0.93][github-next-release-work], we'll work on the items below:
 
  - Continued Command Palette polish
- - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
- - Working on upgrading the installer to WiX 5
- - Working on shortcut conflict detection
- - Working on setting search
- - Upgrading Keyboard Manager's editor UI
  - New UI automation tests
+ - Working on installer upgrades
+ - Working on shortcut conflict detection
+ - Upgrading Keyboard Manager's editor UI
  - Stability, bug fixes
 
 ## PowerToys Community

doc/devdocs/UITests.md

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

doc/devdocs/readme.md

@@ -52,7 +52,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 ## Rules
 
 - **Follow the pattern of what you already see in the code.**
-- [Coding style](style.md).
+- [Coding style](development/style.md).
 - Try to package new functionality/components into libraries that have nicely defined interfaces.
 - Package new functionality into classes or refactor existing functionality into a class as you extend the code.
 - When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.

doc/thirdPartyRunPlugins.md

@@ -49,7 +49,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [Definition](https://github.com/ruslanlap/PowerToysRun-Definition) | [ruslanlap](https://github.com/ruslanlap) | Lookup word definitions, phonetics, and synonyms directly in PowerToys Run. |
 | [Hotkeys](https://github.com/ruslanlap/PowerToysRun-Hotkeys) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and trigger custom keyboard shortcuts directly from PowerToys Run. |
 | [RandomGen](https://github.com/ruslanlap/PowerToysRun-RandomGen) | [ruslanlap](https://github.com/ruslanlap) | 🎲 Generate random data instantly with a single keystroke. Perfect for developers, testers, designers, and anyone who needs quick access to random data. Features include secure passwords, PINs, names, business data, dates, numbers, GUIDs, color codes, and more. Especially useful for designers who need random color codes and placeholder content. |
-| [Open With Cursor](https://github.com/VictorNoxx/PowerToys-Run-Cursor/) | [VictorNoxx](https://github.com/VictorNoxx) | Open Visual Studio, VS Code recents with Cursor AI |
 
 ## Extending software plugins
 

installer/PowerToysSetup/Resources.wxs

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

src/common/UITestAutomation/Element/TextBox.cs

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

src/common/UITestAutomation/EnvironmentConfig.cs

@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Centralized configuration for all environment variables used in UI tests.
-    /// </summary>
-    public static class EnvironmentConfig
-    {
-        private static readonly Lazy<bool> _isInPipeline = new(() =>
-            !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("platform")));
-
-        private static readonly Lazy<bool> _useInstallerForTest = new(() =>
-        {
-            string? envValue = Environment.GetEnvironmentVariable("useInstallerForTest") ??
-                              Environment.GetEnvironmentVariable("USEINSTALLERFORTEST");
-            return !string.IsNullOrEmpty(envValue) && bool.TryParse(envValue, out bool result) && result;
-        });
-
-        private static readonly Lazy<string?> _platform = new(() =>
-            Environment.GetEnvironmentVariable("platform"));
-
-        /// <summary>
-        /// Gets a value indicating whether the tests are running in a CI/CD pipeline.
-        /// Determined by the presence of the "platform" environment variable.
-        /// </summary>
-        public static bool IsInPipeline => _isInPipeline.Value;
-
-        /// <summary>
-        /// Gets a value indicating whether to use installer paths for testing.
-        /// Checks both "useInstallerForTest" and "USEINSTALLERFORTEST" environment variables.
-        /// </summary>
-        public static bool UseInstallerForTest => _useInstallerForTest.Value;
-
-        /// <summary>
-        /// Gets the platform name from the environment variable.
-        /// Typically used in CI/CD pipelines to identify the build platform.
-        /// </summary>
-        public static string? Platform => _platform.Value;
-    }
-}

src/common/UITestAutomation/ModuleConfigData.cs

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

src/common/UITestAutomation/SessionHelper.cs

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

src/common/UITestAutomation/UITestBase.cs

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

src/common/UITestAutomation/VisualAssert.cs

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

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

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

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

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

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

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

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

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

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp

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

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

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

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

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

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

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

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

@@ -1,46 +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.Threading;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-/// <summary>
-/// Thread-safe boolean implementation using atomic operations
-/// </summary>
-public struct InterlockedBoolean(bool initialValue = false)
-{
-    private int _value = initialValue ? 1 : 0;
-
-    /// <summary>
-    /// Gets or sets the boolean value atomically
-    /// </summary>
-    public bool Value
-    {
-        get => Volatile.Read(ref _value) == 1;
-        set => Interlocked.Exchange(ref _value, value ? 1 : 0);
-    }
-
-    /// <summary>
-    /// Atomically sets the value to true
-    /// </summary>
-    /// <returns>True if the value was previously false, false if it was already true</returns>
-    public bool Set()
-    {
-        return Interlocked.Exchange(ref _value, 1) == 0;
-    }
-
-    /// <summary>
-    /// Atomically sets the value to false
-    /// </summary>
-    /// <returns>True if the value was previously true, false if it was already false</returns>
-    public bool Clear()
-    {
-        return Interlocked.Exchange(ref _value, 0) == 1;
-    }
-
-    public override int GetHashCode() => Value.GetHashCode();
-
-    public override string ToString() => Value.ToString();
-}

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

@@ -1,139 +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.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-/// <summary>
-/// An async gate that ensures only one operation runs at a time.
-/// If ExecuteAsync is called while already executing, it cancels the current execution
-/// and starts the operation again (superseding behavior).
-/// </summary>
-public class SupersedingAsyncGate : IDisposable
-{
-    private readonly Func<CancellationToken, Task> _action;
-    private readonly Lock _lock = new();
-    private int _callId;
-    private TaskCompletionSource<bool>? _currentTcs;
-    private CancellationTokenSource? _currentCancellationSource;
-    private Task? _executingTask;
-
-    public SupersedingAsyncGate(Func<CancellationToken, Task> action)
-    {
-        ArgumentNullException.ThrowIfNull(action);
-        _action = action;
-    }
-
-    /// <summary>
-    /// Executes the configured action. If another execution is running, this call will
-    /// cancel the current execution and restart the operation.
-    /// </summary>
-    /// <param name="cancellationToken">Optional external cancellation token</param>
-    public async Task ExecuteAsync(CancellationToken cancellationToken = default)
-    {
-        TaskCompletionSource<bool> tcs;
-
-        lock (_lock)
-        {
-            _currentCancellationSource?.Cancel();
-            _currentTcs?.TrySetException(new OperationCanceledException("Superseded by newer call"));
-
-            tcs = new();
-            _currentTcs = tcs;
-            _callId++;
-
-            var shouldStartExecution = _executingTask is null;
-            if (shouldStartExecution)
-            {
-                _executingTask = Task.Run(ExecuteLoop, CancellationToken.None);
-            }
-        }
-
-        await using var ctr = cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken));
-        await tcs.Task;
-    }
-
-    private async Task ExecuteLoop()
-    {
-        try
-        {
-            while (true)
-            {
-                TaskCompletionSource<bool>? currentTcs;
-                CancellationTokenSource? currentCts;
-                int currentCallId;
-
-                lock (_lock)
-                {
-                    currentTcs = _currentTcs;
-                    currentCallId = _callId;
-
-                    if (currentTcs is null)
-                    {
-                        break;
-                    }
-
-                    _currentCancellationSource?.Dispose();
-                    _currentCancellationSource = new();
-                    currentCts = _currentCancellationSource;
-                }
-
-                try
-                {
-                    await _action(currentCts.Token);
-                    CompleteIfCurrent(currentTcs, currentCallId, static t => t.TrySetResult(true));
-                }
-                catch (OperationCanceledException)
-                {
-                    CompleteIfCurrent(currentTcs, currentCallId, tcs => tcs.TrySetCanceled(currentCts.Token));
-                }
-                catch (Exception ex)
-                {
-                    CompleteIfCurrent(currentTcs, currentCallId, tcs => tcs.TrySetException(ex));
-                }
-            }
-        }
-        finally
-        {
-            lock (_lock)
-            {
-                _currentTcs = null;
-                _currentCancellationSource?.Dispose();
-                _currentCancellationSource = null;
-                _executingTask = null;
-            }
-        }
-    }
-
-    private void CompleteIfCurrent(
-        TaskCompletionSource<bool> candidate,
-        int id,
-        Action<TaskCompletionSource<bool>> complete)
-    {
-        lock (_lock)
-        {
-            if (_currentTcs == candidate && _callId == id)
-            {
-                complete(candidate);
-                _currentTcs = null;
-            }
-        }
-    }
-
-    public void Dispose()
-    {
-        lock (_lock)
-        {
-            _currentCancellationSource?.Cancel();
-            _currentCancellationSource?.Dispose();
-            _currentTcs?.TrySetException(new ObjectDisposedException(nameof(SupersedingAsyncGate)));
-            _currentTcs = null;
-        }
-
-        GC.SuppressFinalize(this);
-    }
-}

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

@@ -28,24 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
     <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>

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

@@ -9,7 +9,3 @@ GetWindowRect
 GetMonitorInfo
 SetWindowPos
 MonitorFromWindow
-
-SHOW_WINDOW_CMD
-ShellExecuteEx
-SEE_MASK_INVOKEIDLIST 

src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.Designer.cs

@@ -1,99 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CmdPal.Common.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CmdPal.Common.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open path in console.
-        /// </summary>
-        internal static string Indexer_Command_OpenPathInConsole {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenPathInConsole", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Properties.
-        /// </summary>
-        internal static string Indexer_Command_OpenProperties {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenProperties", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open with.
-        /// </summary>
-        internal static string Indexer_Command_OpenWith {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenWith", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Show in folder.
-        /// </summary>
-        internal static string Indexer_Command_ShowInFolder {
-            get {
-                return ResourceManager.GetString("Indexer_Command_ShowInFolder", resourceCulture);
-            }
-        }
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.resx

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Indexer_Command_OpenPathInConsole" xml:space="preserve">
-    <value>Open path in console</value>
-  </data>
-  <data name="Indexer_Command_OpenProperties" xml:space="preserve">
-    <value>Properties</value>
-  </data>
-  <data name="Indexer_Command_OpenWith" xml:space="preserve">
-    <value>Open with</value>
-  </data>
-  <data name="Indexer_Command_ShowInFolder" xml:space="preserve">
-    <value>Show in folder</value>
-  </data>
-</root>

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

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

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

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

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

@@ -2,14 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context), IContextItemViewModel
 {
     private readonly KeyChord nullKeyChord = new(0, 0, 0);
@@ -20,7 +17,7 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
 
     public KeyChord? RequestedShortcut { get; private set; }
 
-    public bool HasRequestedShortcut => RequestedShortcut is not null && (RequestedShortcut.Value != nullKeyChord);
+    public bool HasRequestedShortcut => RequestedShortcut != null && (RequestedShortcut.Value != nullKeyChord);
 
     public override void InitializeProperties()
     {
@@ -32,7 +29,7 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
         base.InitializeProperties();
 
         var contextItem = Model.Unsafe;
-        if (contextItem is null)
+        if (contextItem == null)
         {
             return; // throw?
         }

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

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -10,7 +9,6 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBarContext
 {
     public ExtensionObject<ICommandItem> Model => _commandItemModel;
@@ -68,7 +66,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     {
         get
         {
-            List<IContextItemViewModel> l = _defaultCommandContextItem is null ?
+            List<IContextItemViewModel> l = _defaultCommandContextItem == null ?
                 new() :
                 [_defaultCommandContextItem];
 
@@ -100,7 +98,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
@@ -128,7 +126,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
@@ -136,7 +134,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         Command.InitializeProperties();
 
         var listIcon = model.Icon;
-        if (listIcon is not null)
+        if (listIcon != null)
         {
             _listItemIcon = new(listIcon);
             _listItemIcon.InitializeProperties();
@@ -172,13 +170,13 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
         var more = model.MoreCommands;
-        if (more is not null)
+        if (more != null)
         {
             MoreCommands = more
                 .Select(item =>
@@ -300,7 +298,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     protected virtual void FetchProperty(string propertyName)
     {
         var model = this._commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -308,17 +306,13 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         switch (propertyName)
         {
             case nameof(Command):
-                if (Command is not null)
+                if (Command != null)
                 {
                     Command.PropertyChanged -= Command_PropertyChanged;
                 }
 
                 Command = new(model.Command, PageContext);
                 Command.InitializeProperties();
-
-                // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
-                // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
-                _itemTitle = model.Title;
                 UpdateProperty(nameof(Name));
                 UpdateProperty(nameof(Title));
                 UpdateProperty(nameof(Icon));
@@ -339,12 +333,12 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
             case nameof(model.MoreCommands):
                 var more = model.MoreCommands;
-                if (more is not null)
+                if (more != null)
                 {
                     var newContextMenu = more
                         .Select(item =>
                         {
-                            if (item is ICommandContextItem contextItem)
+                            if (item is CommandContextItem contextItem)
                             {
                                 return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                             }
@@ -391,14 +385,6 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         switch (propertyName)
         {
             case nameof(Command.Name):
-                // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
-                // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
-                var model = _commandItemModel.Unsafe;
-                if (model is not null)
-                {
-                    _itemTitle = model.Title;
-                }
-
                 UpdateProperty(nameof(Title));
                 UpdateProperty(nameof(Name));
                 break;
@@ -430,7 +416,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         Command.SafeCleanup();
 
         var model = _commandItemModel.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.PropChanged -= Model_PropChanged;
         }

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

@@ -44,7 +44,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
         }
 
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
@@ -67,13 +67,13 @@ public partial class CommandViewModel : ExtensionObjectViewModel
         }
 
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
         var ico = model.Icon;
-        if (ico is not null)
+        if (ico != null)
         {
             Icon = new(ico);
             Icon.InitializeProperties();
@@ -98,7 +98,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
     protected void FetchProperty(string propertyName)
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -125,7 +125,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
         Icon = new(null); // necessary?
 
         var model = Model.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.PropChanged -= Model_PropChanged;
         }

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

@@ -25,7 +25,7 @@ public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReferen
     public override void InitializeProperties()
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }

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

@@ -14,7 +14,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarContext
+public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 {
     private readonly ExtensionObject<IContentPage> _model;
 
@@ -28,7 +28,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
     public DetailsViewModel? Details { get; private set; }
 
     [MemberNotNullWhen(true, nameof(Details))]
-    public bool HasDetails => Details is not null;
+    public bool HasDetails => Details != null;
 
     /////// ICommandBarContext ///////
     public IEnumerable<IContextItemViewModel> MoreCommands => Commands.Skip(1);
@@ -67,7 +67,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
             foreach (var item in newItems)
             {
                 var viewModel = ViewModelFromContent(item, PageContext);
-                if (viewModel is not null)
+                if (viewModel != null)
                 {
                     viewModel.InitializeProperties();
                     newContent.Add(viewModel);
@@ -104,7 +104,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
         base.InitializeProperties();
 
         var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -113,7 +113,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
                 .ToList()
                 .Select<IContextItem, IContextItemViewModel>(item =>
                 {
-                    if (item is ICommandContextItem contextItem)
+                    if (item is CommandContextItem contextItem)
                     {
                         return new CommandContextItemViewModel(contextItem, PageContext);
                     }
@@ -133,7 +133,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
             });
 
         var extensionDetails = model.Details;
-        if (extensionDetails is not null)
+        if (extensionDetails != null)
         {
             Details = new(extensionDetails, PageContext);
             Details.InitializeProperties();
@@ -156,7 +156,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
         base.FetchProperty(propertyName);
 
         var model = this._model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -166,13 +166,13 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
             case nameof(Commands):
 
                 var more = model.Commands;
-                if (more is not null)
+                if (more != null)
                 {
                     var newContextMenu = more
                             .ToList()
                             .Select(item =>
                             {
-                                if (item is ICommandContextItem contextItem)
+                                if (item is CommandContextItem contextItem)
                                 {
                                     return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                                 }
@@ -216,7 +216,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
                 break;
             case nameof(Details):
                 var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
+                Details = extensionDetails != null ? new(extensionDetails, PageContext) : null;
                 UpdateDetails();
                 break;
         }
@@ -248,7 +248,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
     [RelayCommand]
     private void InvokePrimaryCommand(ContentPageViewModel page)
     {
-        if (PrimaryCommand is not null)
+        if (PrimaryCommand != null)
         {
             WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(PrimaryCommand.Command.Model, PrimaryCommand.Model));
         }
@@ -258,7 +258,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
     [RelayCommand]
     private void InvokeSecondaryCommand(ContentPageViewModel page)
     {
-        if (SecondaryCommand is not null)
+        if (SecondaryCommand != null)
         {
             WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(SecondaryCommand.Command.Model, SecondaryCommand.Model));
         }
@@ -285,7 +285,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
         Content.Clear();
 
         var model = _model.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.ItemsChanged -= Model_ItemsChanged;
         }

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

@@ -8,12 +8,14 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Diagnostics.Utilities;
 using Windows.System;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class ContextMenuViewModel : ObservableObject,
-    IRecipient<UpdateCommandBarMessage>
+    IRecipient<UpdateCommandBarMessage>,
+    IRecipient<OpenContextMenuMessage>
 {
     public ICommandBarContext? SelectedItem
     {
@@ -41,6 +43,7 @@ public partial class ContextMenuViewModel : ObservableObject,
     public ContextMenuViewModel()
     {
         WeakReferenceMessenger.Default.Register<UpdateCommandBarMessage>(this);
+        WeakReferenceMessenger.Default.Register<OpenContextMenuMessage>(this);
     }
 
     public void Receive(UpdateCommandBarMessage message)
@@ -48,9 +51,19 @@ public partial class ContextMenuViewModel : ObservableObject,
         SelectedItem = message.ViewModel;
     }
 
+    public void Receive(OpenContextMenuMessage message)
+    {
+        FilterOnTop = message.ContextMenuFilterLocation == ContextMenuFilterLocation.Top;
+
+        ResetContextMenu();
+
+        OnPropertyChanging(nameof(FilterOnTop));
+        OnPropertyChanged(nameof(FilterOnTop));
+    }
+
     public void UpdateContextItems()
     {
-        if (SelectedItem is not null)
+        if (SelectedItem != null)
         {
             if (SelectedItem.MoreCommands.Count() > 1)
             {
@@ -67,14 +80,14 @@ public partial class ContextMenuViewModel : ObservableObject,
             return;
         }
 
-        if (SelectedItem is null)
+        if (SelectedItem == null)
         {
             return;
         }
 
         _lastSearchText = searchText;
 
-        if (CurrentContextMenu is null)
+        if (CurrentContextMenu == null)
         {
             ListHelpers.InPlaceUpdateList(FilteredItems, []);
             return;
@@ -123,7 +136,7 @@ public partial class ContextMenuViewModel : ObservableObject,
     /// that have a shortcut key set.</returns>
     public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
     {
-        if (CurrentContextMenu is null)
+        if (CurrentContextMenu == null)
         {
             return [];
         }
@@ -139,7 +152,7 @@ public partial class ContextMenuViewModel : ObservableObject,
     public ContextKeybindingResult? CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
     {
         var keybindings = Keybindings();
-        if (keybindings is not null)
+        if (keybindings != null)
         {
             // Does the pressed key match any of the keybindings?
             var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
@@ -179,7 +192,7 @@ public partial class ContextMenuViewModel : ObservableObject,
         ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
     }
 
-    public void ResetContextMenu()
+    private void ResetContextMenu()
     {
         while (ContextMenuStack.Count > 1)
         {
@@ -189,7 +202,7 @@ public partial class ContextMenuViewModel : ObservableObject,
         OnPropertyChanging(nameof(CurrentContextMenu));
         OnPropertyChanged(nameof(CurrentContextMenu));
 
-        if (CurrentContextMenu is not null)
+        if (CurrentContextMenu != null)
         {
             ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
         }
@@ -197,7 +210,7 @@ public partial class ContextMenuViewModel : ObservableObject,
 
     public ContextKeybindingResult InvokeCommand(CommandItemViewModel? command)
     {
-        if (command is null)
+        if (command == null)
         {
             return ContextKeybindingResult.Unhandled;
         }

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

@@ -22,7 +22,7 @@ public partial class DetailsCommandsViewModel(
     {
         base.InitializeProperties();
         var model = _dataModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }

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

@@ -16,7 +16,7 @@ public abstract partial class DetailsElementViewModel(IDetailsElement _detailsEl
     public override void InitializeProperties()
     {
         var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }

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

@@ -18,7 +18,7 @@ public partial class DetailsLinkViewModel(
 
     public Uri? Link { get; private set; }
 
-    public bool IsLink => Link is not null;
+    public bool IsLink => Link != null;
 
     public bool IsText => !IsLink;
 
@@ -26,14 +26,14 @@ public partial class DetailsLinkViewModel(
     {
         base.InitializeProperties();
         var model = _dataModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
         Text = model.Text ?? string.Empty;
         Link = model.Link;
-        if (string.IsNullOrEmpty(Text) && Link is not null)
+        if (string.IsNullOrEmpty(Text) && Link != null)
         {
             Text = Link.ToString();
         }

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

@@ -22,7 +22,7 @@ public partial class DetailsTagsViewModel(
     {
         base.InitializeProperties();
         var model = _dataModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }

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

@@ -26,7 +26,7 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
     public override void InitializeProperties()
     {
         var model = _detailsModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
@@ -41,7 +41,7 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
         UpdateProperty(nameof(HeroImage));
 
         var meta = model.Metadata;
-        if (meta is not null)
+        if (meta != null)
         {
             foreach (var element in meta)
             {
@@ -53,7 +53,7 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
                     IDetailsTags => new DetailsTagsViewModel(element, this.PageContext),
                     _ => null,
                 };
-                if (vm is not null)
+                if (vm != null)
                 {
                     vm.InitializeProperties();
                     Metadata.Add(vm);

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

@@ -4,14 +4,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public interface IContextItemViewModel
 {
 }

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

@@ -16,7 +16,7 @@ public partial class IconDataViewModel : ObservableObject, IIconData
     // If the extension previously gave us a Data, then died, the data will
     // throw if we actually try to read it, but the pointer itself won't be
     // null, so this is relatively safe.
-    public bool HasIcon => !string.IsNullOrEmpty(Icon) || Data.Unsafe is not null;
+    public bool HasIcon => !string.IsNullOrEmpty(Icon) || Data.Unsafe != null;
 
     // Locally cached properties from IIconData.
     public string Icon { get; private set; } = string.Empty;
@@ -36,7 +36,7 @@ public partial class IconDataViewModel : ObservableObject, IIconData
     public void InitializeProperties()
     {
         var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }

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

@@ -26,7 +26,7 @@ public partial class IconInfoViewModel : ObservableObject, IIconInfo
 
     public bool HasIcon(bool light) => IconForTheme(light).HasIcon;
 
-    public bool IsSet => _model.Unsafe is not null;
+    public bool IsSet => _model.Unsafe != null;
 
     IIconData? IIconInfo.Dark => Dark;
 
@@ -43,7 +43,7 @@ public partial class IconInfoViewModel : ObservableObject, IIconInfo
     public void InitializeProperties()
     {
         var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }

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

@@ -27,7 +27,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
     public DetailsViewModel? Details { get; private set; }
 
     [MemberNotNullWhen(true, nameof(Details))]
-    public bool HasDetails => Details is not null;
+    public bool HasDetails => Details != null;
 
     public override void InitializeProperties()
     {
@@ -40,7 +40,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
         base.InitializeProperties();
 
         var li = Model.Unsafe;
-        if (li is null)
+        if (li == null)
         {
             return; // throw?
         }
@@ -50,7 +50,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
         TextToSuggest = li.TextToSuggest;
         Section = li.Section ?? string.Empty;
         var extensionDetails = li.Details;
-        if (extensionDetails is not null)
+        if (extensionDetails != null)
         {
             Details = new(extensionDetails, PageContext);
             Details.InitializeProperties();
@@ -67,7 +67,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
         base.FetchProperty(propertyName);
 
         var model = this.Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -85,7 +85,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
                 break;
             case nameof(Details):
                 var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
+                Details = extensionDetails != null ? new(extensionDetails, PageContext) : null;
                 Details?.InitializeProperties();
                 UpdateProperty(nameof(Details));
                 UpdateProperty(nameof(HasDetails));
@@ -136,7 +136,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
         Details?.SafeCleanup();
 
         var model = Model.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             // We don't need to revoke the PropChanged event handler here,
             // because we are just overriding CommandItem's FetchProperty and

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

@@ -6,7 +6,6 @@ using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -32,7 +31,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     private readonly Lock _listLock = new();
 
-    private InterlockedBoolean _isLoading;
+    private bool _isLoading;
     private bool _isFetching;
 
     public event TypedEventHandler<ListViewModel, object>? ItemsUpdated;
@@ -63,7 +62,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     private Task? _initializeItemsTask;
     private CancellationTokenSource? _cancellationTokenSource;
-    private CancellationTokenSource? _fetchItemsCancellationTokenSource;
 
     private ListItemViewModel? _lastSelectedItem;
 
@@ -123,34 +121,21 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
             ItemsUpdated?.Invoke(this, EventArgs.Empty);
             UpdateEmptyContent();
-            _isLoading.Clear();
+            _isLoading = false;
         }
     }
 
     //// Run on background thread, from InitializeAsync or Model_ItemsChanged
     private void FetchItems()
     {
-        // Cancel any previous FetchItems operation
-        _fetchItemsCancellationTokenSource?.Cancel();
-        _fetchItemsCancellationTokenSource?.Dispose();
-        _fetchItemsCancellationTokenSource = new CancellationTokenSource();
-
-        var cancellationToken = _fetchItemsCancellationTokenSource.Token;
-
         // TEMPORARY: just plop all the items into a single group
         // see 9806fe5d8 for the last commit that had this with sections
         _isFetching = true;
 
         try
         {
-            // Check for cancellation before starting expensive operations
-            cancellationToken.ThrowIfCancellationRequested();
-
             var newItems = _model.Unsafe!.GetItems();
 
-            // Check for cancellation after getting items from extension
-            cancellationToken.ThrowIfCancellationRequested();
-
             // Collect all the items into new viewmodels
             Collection<ListItemViewModel> newViewModels = [];
 
@@ -159,9 +144,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // building new viewmodels for the ones we haven't already built.
             foreach (var item in newItems)
             {
-                // Check for cancellation during item processing
-                cancellationToken.ThrowIfCancellationRequested();
-
                 ListItemViewModel viewModel = new(item, new(this));
 
                 // If an item fails to load, silently ignore it.
@@ -171,22 +153,15 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 }
             }
 
-            // Check for cancellation before initializing first twenty items
-            cancellationToken.ThrowIfCancellationRequested();
-
             var firstTwenty = newViewModels.Take(20);
             foreach (var item in firstTwenty)
             {
-                cancellationToken.ThrowIfCancellationRequested();
                 item?.SafeInitializeProperties();
             }
 
             // Cancel any ongoing search
             _cancellationTokenSource?.Cancel();
 
-            // Check for cancellation before updating the list
-            cancellationToken.ThrowIfCancellationRequested();
-
             lock (_listLock)
             {
                 // Now that we have new ViewModels for everything from the
@@ -197,11 +172,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // TODO: Iterate over everything in Items, and prune items from the
             // cache if we don't need them anymore
         }
-        catch (OperationCanceledException)
-        {
-            // Cancellation is expected, don't treat as error
-            return;
-        }
         catch (Exception ex)
         {
             // TODO: Move this within the for loop, so we can catch issues with individual items
@@ -251,7 +221,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 }
 
                 ItemsUpdated?.Invoke(this, EventArgs.Empty);
-                _isLoading.Clear();
+                _isLoading = false;
             });
     }
 
@@ -327,11 +297,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
     [RelayCommand]
     private void InvokeItem(ListItemViewModel? item)
     {
-        if (item is not null)
+        if (item != null)
         {
             WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.Command.Model, item.Model));
         }
-        else if (ShowEmptyContent && EmptyContent.PrimaryCommand?.Model.Unsafe is not null)
+        else if (ShowEmptyContent && EmptyContent.PrimaryCommand?.Model.Unsafe != null)
         {
             WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(
                 EmptyContent.PrimaryCommand.Command.Model,
@@ -343,14 +313,14 @@ public partial class ListViewModel : PageViewModel, IDisposable
     [RelayCommand]
     private void InvokeSecondaryCommand(ListItemViewModel? item)
     {
-        if (item is not null)
+        if (item != null)
         {
-            if (item.SecondaryCommand is not null)
+            if (item.SecondaryCommand != null)
             {
                 WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.SecondaryCommand.Command.Model, item.Model));
             }
         }
-        else if (ShowEmptyContent && EmptyContent.SecondaryCommand?.Model.Unsafe is not null)
+        else if (ShowEmptyContent && EmptyContent.SecondaryCommand?.Model.Unsafe != null)
         {
             WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(
                 EmptyContent.SecondaryCommand.Command.Model,
@@ -361,12 +331,12 @@ public partial class ListViewModel : PageViewModel, IDisposable
     [RelayCommand]
     private void UpdateSelectedItem(ListItemViewModel? item)
     {
-        if (_lastSelectedItem is not null)
+        if (_lastSelectedItem != null)
         {
             _lastSelectedItem.PropertyChanged -= SelectedItemPropertyChanged;
         }
 
-        if (item is not null)
+        if (item != null)
         {
             SetSelectedItem(item);
         }
@@ -412,7 +382,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
     private void SelectedItemPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
         var item = _lastSelectedItem;
-        if (item is null)
+        if (item == null)
         {
             return;
         }
@@ -467,7 +437,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
         base.InitializeProperties();
 
         var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -494,43 +464,26 @@ public partial class ListViewModel : PageViewModel, IDisposable
     public void LoadMoreIfNeeded()
     {
         var model = this._model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
-        if (!_isLoading.Set())
+        if (model.HasMoreItems && !_isLoading)
         {
-            return;
-
-            // NOTE: May miss newly available items until next scroll if model
-            // state changes between our check and this reset
-        }
-
-        _ = Task.Run(() =>
-        {
-            // Execute all COM calls on background thread to avoid reentrancy issues with UI
-            // with the UI thread when COM starts inner message pump
-            try
+            _isLoading = true;
+            _ = Task.Run(() =>
             {
-                if (model.HasMoreItems)
+                try
                 {
                     model.LoadMore();
-
-                    // _isLoading flag will be set as a result of LoadMore,
-                    // which must raise ItemsChanged to end the loading.
                 }
-                else
+                catch (Exception ex)
                 {
-                    _isLoading.Clear();
+                    ShowException(ex, model.Name);
                 }
-            }
-            catch (Exception ex)
-            {
-                _isLoading.Clear();
-                ShowException(ex, model.Name);
-            }
-        });
+            });
+        }
     }
 
     protected override void FetchProperty(string propertyName)
@@ -538,7 +491,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
         base.FetchProperty(propertyName);
 
         var model = this._model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -569,7 +522,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
     private void UpdateEmptyContent()
     {
         UpdateProperty(nameof(ShowEmptyContent));
-        if (!ShowEmptyContent || EmptyContent.Model.Unsafe is null)
+        if (!ShowEmptyContent || EmptyContent.Model.Unsafe == null)
         {
             return;
         }
@@ -589,10 +542,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
         _cancellationTokenSource?.Cancel();
         _cancellationTokenSource?.Dispose();
         _cancellationTokenSource = null;
-
-        _fetchItemsCancellationTokenSource?.Cancel();
-        _fetchItemsCancellationTokenSource?.Dispose();
-        _fetchItemsCancellationTokenSource = null;
     }
 
     protected override void UnsafeCleanup()
@@ -603,7 +552,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
         EmptyContent = new(new(null), PageContext); // necessary?
 
         _cancellationTokenSource?.Cancel();
-        _fetchItemsCancellationTokenSource?.Cancel();
 
         lock (_listLock)
         {
@@ -622,7 +570,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
         }
 
         var model = _model.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.ItemsChanged -= Model_ItemsChanged;
         }

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

@@ -22,7 +22,7 @@ public partial class LogMessageViewModel : ExtensionObjectViewModel
     public override void InitializeProperties()
     {
         var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HotkeySummonMessage.cs

@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.UI.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record HotkeySummonMessage(string CommandId, IntPtr Hwnd)
 {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/OpenContextMenuMessage.cs

@@ -2,12 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Windows.Foundation;
 
-namespace Microsoft.CmdPal.UI.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 /// <summary>
 /// Used to announce the context menu should open

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/OpenSettingsMessage.cs

@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.UI.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record OpenSettingsMessage()
 {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/QuitMessage.cs

@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 /// <summary>
 /// Message which closes the application. Used by <see cref="QuitCommand"/> via <see cref="BuiltInsCommandProvider"/>.

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ReloadCommandsMessage.cs

@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record ReloadCommandsMessage()
 {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/SettingsWindowClosedMessage.cs

@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.UI.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record SettingsWindowClosedMessage
 {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateFallbackItemsMessage.cs

@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record UpdateFallbackItemsMessage()
 {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj

@@ -45,4 +45,16 @@
     </Compile>
   </ItemGroup>
 
+
+  <!-- Just mark it as AOT compatible. Do not publish with AOT now. We need fully test before we really publish it as AOT enabled-->
+  <!--<PropertyGroup>
+    <SelfContained>true</SelfContained>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
+    --><!-- <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling> --><!--
+    <PublishAot>true</PublishAot>
+	<EnableMsixTooling>true</EnableMsixTooling>
+  </PropertyGroup>-->
+
 </Project>

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

@@ -5,7 +5,6 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 
@@ -46,7 +45,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
     [ObservableProperty]
     public partial AppExtensionHost ExtensionHost { get; private set; }
 
-    public bool HasStatusMessage => MostRecentStatusMessage is not null;
+    public bool HasStatusMessage => MostRecentStatusMessage != null;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(HasStatusMessage))]
@@ -133,7 +132,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
     public override void InitializeProperties()
     {
         var page = _pageModel.Unsafe;
-        if (page is null)
+        if (page == null)
         {
             return; // throw?
         }
@@ -178,7 +177,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
     protected virtual void FetchProperty(string propertyName)
     {
         var model = this._pageModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -224,10 +223,9 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
         extensionHint ??= ExtensionHost.GetExtensionDisplayName() ?? Title;
         Task.Factory.StartNew(
             () =>
-            {
-                var message = DiagnosticsHelper.BuildExceptionMessage(ex, extensionHint);
-                ErrorMessage += message;
-            },
+        {
+            ErrorMessage += $"A bug occurred in {$"the \"{extensionHint}\"" ?? "an unknown's"} extension's code:\n{ex.Message}\n{ex.Source}\n{ex.StackTrace}\n\n";
+        },
             CancellationToken.None,
             TaskCreationOptions.None,
             Scheduler);
@@ -242,7 +240,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
         ExtensionHost.StatusMessages.CollectionChanged -= StatusMessages_CollectionChanged;
 
         var model = _pageModel.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.PropChanged -= Model_PropChanged;
         }

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

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+public class PageViewModelFactory : IPageViewModelFactoryService
+{
+    private readonly TaskScheduler _scheduler;
+
+    public PageViewModelFactory(TaskScheduler scheduler)
+    {
+        _scheduler = scheduler;
+    }
+
+    public PageViewModel? TryCreatePageViewModel(IPage page, bool nested, AppExtensionHost host)
+    {
+        return page switch
+        {
+            IListPage listPage => new ListViewModel(listPage, _scheduler, host) { IsNested = nested },
+            IContentPage contentPage => new ContentPageViewModel(contentPage, _scheduler, host),
+            _ => null,
+        };
+    }
+}

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

@@ -24,7 +24,7 @@ public partial class ProgressViewModel : ExtensionObjectViewModel
     public override void InitializeProperties()
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -50,7 +50,7 @@ public partial class ProgressViewModel : ExtensionObjectViewModel
     protected virtual void FetchProperty(string propertyName)
     {
         var model = this.Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }

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

@@ -2,13 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class SeparatorContextItemViewModel() : IContextItemViewModel, ISeparatorContextItem
 {
 }

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

@@ -13,8 +13,7 @@ using Microsoft.CommandPalette.Extensions;
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class ShellViewModel : ObservableObject,
-    IRecipient<PerformCommandMessage>,
-    IRecipient<HandleCommandResultMessage>
+    IRecipient<PerformCommandMessage>
 {
     private readonly IRootPageService _rootPageService;
     private readonly IAppHostService _appHostService;
@@ -78,7 +77,6 @@ public partial class ShellViewModel : ObservableObject,
 
         // Register to receive messages
         WeakReferenceMessenger.Default.Register<PerformCommandMessage>(this);
-        WeakReferenceMessenger.Default.Register<HandleCommandResultMessage>(this);
     }
 
     [RelayCommand]
@@ -120,7 +118,7 @@ public partial class ShellViewModel : ObservableObject,
 
         ////LoadedState = ViewModelLoadedState.Loading;
         if (!viewModel.IsInitialized
-            && viewModel.InitializeCommand is not null)
+            && viewModel.InitializeCommand != null)
         {
             _ = Task.Run(async () =>
             {
@@ -185,7 +183,7 @@ public partial class ShellViewModel : ObservableObject,
     private void PerformCommand(PerformCommandMessage message)
     {
         var command = message.Command.Unsafe;
-        if (command is null)
+        if (command == null)
         {
             return;
         }
@@ -205,7 +203,7 @@ public partial class ShellViewModel : ObservableObject,
 
                 // Construct our ViewModel of the appropriate type and pass it the UI Thread context.
                 var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host);
-                if (pageViewModel is null)
+                if (pageViewModel == null)
                 {
                     Logger.LogError($"Failed to create ViewModel for page {page.GetType().Name}");
                     throw new NotSupportedException();
@@ -240,7 +238,7 @@ public partial class ShellViewModel : ObservableObject,
         // TODO GH #525 This needs more better locking.
         lock (_invokeLock)
         {
-            if (_handleInvokeTask is not null)
+            if (_handleInvokeTask != null)
             {
                 // do nothing - a command is already doing a thing
             }
@@ -280,7 +278,7 @@ public partial class ShellViewModel : ObservableObject,
 
     private void UnsafeHandleCommandResult(ICommandResult? result)
     {
-        if (result is null)
+        if (result == null)
         {
             // No result, nothing to do.
             return;
@@ -360,11 +358,6 @@ public partial class ShellViewModel : ObservableObject,
         WeakReferenceMessenger.Default.Send<GoBackMessage>(new(withAnimation, focusSearch));
     }
 
-    public void Receive(HandleCommandResultMessage message)
-    {
-        UnsafeHandleCommandResult(message.Result.Unsafe);
-    }
-
     private void OnUIThread(Action action)
     {
         _ = Task.Factory.StartNew(

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

@@ -17,7 +17,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
 
     public ProgressViewModel? Progress { get; private set; }
 
-    public bool HasProgress => Progress is not null;
+    public bool HasProgress => Progress != null;
 
     public StatusMessageViewModel(IStatusMessage message, WeakReference<IPageContext> context)
         : base(context)
@@ -28,7 +28,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
     public override void InitializeProperties()
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -36,7 +36,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
         Message = model.Message;
         State = model.State;
         var modelProgress = model.Progress;
-        if (modelProgress is not null)
+        if (modelProgress != null)
         {
             Progress = new(modelProgress, this.PageContext);
             Progress.InitializeProperties();
@@ -61,7 +61,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
     protected virtual void FetchProperty(string propertyName)
     {
         var model = this.Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -76,7 +76,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
                 break;
             case nameof(Progress):
                 var modelProgress = model.Progress;
-                if (modelProgress is not null)
+                if (modelProgress != null)
                 {
                     Progress = new(modelProgress, this.PageContext);
                     Progress.InitializeProperties();

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

@@ -28,7 +28,7 @@ public partial class TagViewModel(ITag _tag, WeakReference<IPageContext> context
     public override void InitializeProperties()
     {
         var model = _tagModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }

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

@@ -35,7 +35,7 @@ public partial class AliasManager : ObservableObject
             try
             {
                 var topLevelCommand = _topLevelCommandManager.LookupCommand(alias.CommandId);
-                if (topLevelCommand is not null)
+                if (topLevelCommand != null)
                 {
                     WeakReferenceMessenger.Default.Send<ClearSearchMessage>();
 
@@ -88,7 +88,7 @@ public partial class AliasManager : ObservableObject
         }
 
         // If we already have _this exact alias_, do nothing
-        if (newAlias is not null &&
+        if (newAlias != null &&
             _aliases.TryGetValue(newAlias.SearchPrefix, out var existingAlias))
         {
             if (existingAlias.CommandId == commandId)
@@ -113,7 +113,7 @@ public partial class AliasManager : ObservableObject
             _aliases.Remove(alias.SearchPrefix);
         }
 
-        if (newAlias is not null)
+        if (newAlias != null)
         {
             AddAlias(newAlias);
         }

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

@@ -55,7 +55,7 @@ public partial class AppStateModel : ObservableObject
 
             var loaded = JsonSerializer.Deserialize<AppStateModel>(jsonContent, JsonSerializationContext.Default.AppStateModel);
 
-            Debug.WriteLine(loaded is not null ? "Loaded settings file" : "Failed to parse");
+            Debug.WriteLine(loaded != null ? "Loaded settings file" : "Failed to parse");
 
             return loaded ?? new();
         }

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

@@ -15,7 +15,7 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public sealed class CommandProviderWrapper
 {
-    public bool IsExtension => Extension is not null;
+    public bool IsExtension => Extension != null;
 
     private readonly bool isValid;
 
@@ -188,14 +188,14 @@ public sealed class CommandProviderWrapper
 
             return topLevelViewModel;
         };
-        if (commands is not null)
+        if (commands != null)
         {
             TopLevelItems = commands
                 .Select(c => makeAndAdd(c, false))
                 .ToArray();
         }
 
-        if (fallbacks is not null)
+        if (fallbacks != null)
         {
             FallbackItems = fallbacks
                 .Select(c => makeAndAdd(c, true))

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

@@ -3,11 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using ManagedCommon;
-using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Models;
+using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CommandPalette.Extensions;
 
-namespace Microsoft.CmdPal.UI.ViewModels;
+namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings, CommandProviderWrapper provider, TaskScheduler mainThread)
 {
@@ -18,20 +18,20 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
     public bool Initialized { get; private set; }
 
     public bool HasSettings =>
-        _model.Unsafe is not null && // We have a settings model AND
-        (!Initialized || SettingsPage is not null); // we weren't initialized, OR we were, and we do have a settings page
+        _model.Unsafe != null && // We have a settings model AND
+        (!Initialized || SettingsPage != null); // we weren't initialized, OR we were, and we do have a settings page
 
     private void UnsafeInitializeProperties()
     {
         var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
-        if (model.SettingsPage is not null)
+        if (model.SettingsPage is IContentPage page)
         {
-            SettingsPage = new CommandPaletteContentPageViewModel(model.SettingsPage, mainThread, provider.ExtensionHost);
+            SettingsPage = new(page, mainThread, provider.ExtensionHost);
             SettingsPage.InitializeProperties();
         }
     }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/CreatedExtensionForm.cs

@@ -30,7 +30,7 @@ internal sealed partial class CreatedExtensionForm : NewExtensionFormBase
     public override ICommandResult SubmitForm(string inputs, string data)
     {
         var dataInput = JsonNode.Parse(data)?.AsObject();
-        if (dataInput is null)
+        if (dataInput == null)
         {
             return CommandResult.KeepOpen();
         }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/LogMessagesPage.cs

@@ -23,7 +23,7 @@ public partial class LogMessagesPage : ListPage
 
     private void LogMessages_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
-        if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems is not null)
+        if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems != null)
         {
             foreach (var item in e.NewItems)
             {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -6,10 +6,8 @@ using System.Collections.Immutable;
 using System.Collections.Specialized;
 using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Ext.Apps;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Microsoft.Extensions.DependencyInjection;
@@ -31,13 +29,9 @@ public partial class MainListPage : DynamicListPage,
     private bool _includeApps;
     private bool _filteredItemsIncludesApps;
 
-    private InterlockedBoolean _refreshRunning;
-    private InterlockedBoolean _refreshRequested;
-
     public MainListPage(IServiceProvider serviceProvider)
     {
         Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png");
-        PlaceholderText = Properties.Resources.builtin_main_list_page_searchbar_placeholder;
         _serviceProvider = serviceProvider;
 
         _tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
@@ -61,7 +55,6 @@ public partial class MainListPage : DynamicListPage,
         var settings = _serviceProvider.GetService<SettingsModel>()!;
         settings.SettingsChanged += SettingsChangedHandler;
         HotReloadSettings(settings);
-        _includeApps = _tlcManager.IsProviderActive(AllAppsCommandProvider.WellKnownId);
 
         IsLoading = true;
     }
@@ -89,47 +82,18 @@ public partial class MainListPage : DynamicListPage,
 
     private void ReapplySearchInBackground()
     {
-        _refreshRequested.Set();
-        if (!_refreshRunning.Set())
+        _ = Task.Run(() =>
         {
-            return;
-        }
-
-        _ = Task.Run(RunRefreshLoop);
-    }
-
-    private void RunRefreshLoop()
-    {
-        try
-        {
-            do
+            try
             {
-                _refreshRequested.Clear();
-                lock (_tlcManager.TopLevelCommands)
-                {
-                    if (_filteredItemsIncludesApps == _includeApps)
-                    {
-                        break;
-                    }
-                }
-
                 var currentSearchText = SearchText;
                 UpdateSearchText(currentSearchText, currentSearchText);
             }
-            while (_refreshRequested.Value);
-        }
-        catch (Exception e)
-        {
-            Logger.LogError("Failed to reload search", e);
-        }
-        finally
-        {
-            _refreshRunning.Clear();
-            if (_refreshRequested.Value && _refreshRunning.Set())
+            catch (Exception e)
             {
-                _ = Task.Run(RunRefreshLoop);
+                Logger.LogError("Failed to reload search", e);
             }
-        }
+        });
     }
 
     public override IListItem[] GetItems()
@@ -161,15 +125,6 @@ public partial class MainListPage : DynamicListPage,
             var aliases = _serviceProvider.GetService<AliasManager>()!;
             if (aliases.CheckAlias(newSearch))
             {
-                if (_filteredItemsIncludesApps != _includeApps)
-                {
-                    lock (_tlcManager.TopLevelCommands)
-                    {
-                        _filteredItemsIncludesApps = _includeApps;
-                        _filteredItems = null;
-                    }
-                }
-
                 return;
             }
         }
@@ -182,7 +137,6 @@ public partial class MainListPage : DynamicListPage,
             // Cleared out the filter text? easy. Reset _filteredItems, and bail out.
             if (string.IsNullOrEmpty(newSearch))
             {
-                _filteredItemsIncludesApps = _includeApps;
                 _filteredItems = null;
                 RaiseItemsChanged(commands.Count);
                 return;
@@ -203,18 +157,13 @@ public partial class MainListPage : DynamicListPage,
 
             // If we don't have any previous filter results to work with, start
             // with a list of all our commands & apps.
-            if (_filteredItems is null)
+            if (_filteredItems == null)
             {
                 _filteredItems = commands;
                 _filteredItemsIncludesApps = _includeApps;
                 if (_includeApps)
                 {
                     IEnumerable<IListItem> apps = AllAppsCommandProvider.Page.GetItems();
-                    var appIds = apps.Select(app => app.Command.Id).ToArray();
-
-                    // Remove any top level pinned apps and use the apps from AllAppsCommandProvider.Page.GetItems()
-                    // since they contain details.
-                    _filteredItems = _filteredItems.Where(item => item.Command is not AppCommand);
                     _filteredItems = _filteredItems.Concat(apps);
                 }
             }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/NewExtensionForm.cs

@@ -98,7 +98,7 @@ internal sealed partial class NewExtensionForm : NewExtensionFormBase
     public override CommandResult SubmitForm(string payload)
     {
         var formInput = JsonNode.Parse(payload)?.AsObject();
-        if (formInput is null)
+        if (formInput == null)
         {
             return CommandResult.KeepOpen();
         }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/NewExtensionPage.cs

@@ -14,7 +14,7 @@ public partial class NewExtensionPage : ContentPage
 
     public override IContent[] GetContent()
     {
-        return _resultForm is not null ? [_resultForm] : [_inputForm];
+        return _resultForm != null ? [_resultForm] : [_inputForm];
     }
 
     public NewExtensionPage()
@@ -28,13 +28,13 @@ public partial class NewExtensionPage : ContentPage
 
     private void FormSubmitted(NewExtensionFormBase sender, NewExtensionFormBase? args)
     {
-        if (_resultForm is not null)
+        if (_resultForm != null)
         {
             _resultForm.FormSubmitted -= FormSubmitted;
         }
 
         _resultForm = args;
-        if (_resultForm is not null)
+        if (_resultForm != null)
         {
             _resultForm.FormSubmitted += FormSubmitted;
         }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/OpenSettingsCommand.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.UI.Messages;
+using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/QuitAction.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
+using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/ReloadExtensionsCommand.cs

@@ -4,7 +4,6 @@
 
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 

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

@@ -98,107 +98,35 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
 
     public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
     {
-        // BODGY circa GH #40979
-        // Usually, you're supposed to try to cast the action to a specific
-        // type, and use those objects to get the data you need.
-        // However, there's something weird with AdaptiveCards and the way it
-        // works when we consume it when built in Release, with AOT (and
-        // trimming) enabled. Any sort of `action.As<IAdaptiveSubmitAction>()`
-        // or similar will throw a System.InvalidCastException.
-        //
-        // Instead we have this horror show.
-        //
-        // The `action.ToJson()` blob ACTUALLY CONTAINS THE `type` field, which
-        // we can use to determine what kind of action it is. Then we can parse
-        // the JSON manually based on the type.
-        var actionJson = action.ToJson();
-
-        if (actionJson.TryGetValue("type", out var actionTypeValue))
+        if (action is AdaptiveOpenUrlAction openUrlAction)
         {
-            var actionTypeString = actionTypeValue.GetString();
-            Logger.LogTrace($"atString={actionTypeString}");
-
-            var actionType = actionTypeString switch
-            {
-                "Action.Submit" => ActionType.Submit,
-                "Action.Execute" => ActionType.Execute,
-                "Action.OpenUrl" => ActionType.OpenUrl,
-                _ => ActionType.Unsupported,
-            };
-
-            Logger.LogDebug($"{actionTypeString}->{actionType}");
-
-            switch (actionType)
-            {
-                case ActionType.OpenUrl:
-                    {
-                        HandleOpenUrlAction(action, actionJson);
-                    }
-
-                    break;
-                case ActionType.Submit:
-                case ActionType.Execute:
-                    {
-                        HandleSubmitAction(action, actionJson, inputs);
-                    }
-
-                    break;
-                default:
-                    Logger.LogError($"{actionType} was an unexpected action `type`");
-                    break;
-            }
-        }
-        else
-        {
-            Logger.LogError($"actionJson.TryGetValue(type) failed");
-        }
-    }
-
-    private void HandleOpenUrlAction(IAdaptiveActionElement action, JsonObject actionJson)
-    {
-        if (actionJson.TryGetValue("url", out var actionUrlValue))
-        {
-            var actionUrl = actionUrlValue.GetString() ?? string.Empty;
-            if (Uri.TryCreate(actionUrl, default(UriCreationOptions), out var uri))
-            {
-                WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(uri));
-            }
-            else
-            {
-                Logger.LogError($"Failed to produce URI for {actionUrlValue}");
-            }
-        }
-    }
-
-    private void HandleSubmitAction(
-        IAdaptiveActionElement action,
-        JsonObject actionJson,
-        JsonObject inputs)
-    {
-        var dataString = string.Empty;
-        if (actionJson.TryGetValue("data", out var actionDataValue))
-        {
-            dataString = actionDataValue.Stringify() ?? string.Empty;
+            WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(openUrlAction.Url));
+            return;
         }
 
-        var inputString = inputs.Stringify();
-        _ = Task.Run(() =>
+        if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
         {
-            try
+            // Get the data and inputs
+            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
+            var inputString = inputs.Stringify();
+
+            _ = Task.Run(() =>
             {
-                var model = _formModel.Unsafe!;
-                if (model != null)
+                try
                 {
-                    var result = model.SubmitForm(inputString, dataString);
-                    Logger.LogDebug($"SubmitForm() returned {result}");
-                    WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                    var model = _formModel.Unsafe!;
+                    if (model != null)
+                    {
+                        var result = model.SubmitForm(inputString, dataString);
+                        WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                    }
                 }
-            }
-            catch (Exception ex)
-            {
-                ShowException(ex);
-            }
-        });
+                catch (Exception ex)
+                {
+                    ShowException(ex);
+                }
+            });
+        }
     }
 
     private static readonly string ErrorCardJson = """

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

@@ -20,7 +20,7 @@ public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakRe
     public override void InitializeProperties()
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
@@ -47,7 +47,7 @@ public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakRe
     protected void FetchProperty(string propertyName)
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -66,7 +66,7 @@ public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakRe
     {
         base.UnsafeCleanup();
         var model = Model.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.PropChanged -= Model_PropChanged;
         }

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

@@ -30,13 +30,13 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
     public override void InitializeProperties()
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
         var root = model.RootContent;
-        if (root is not null)
+        if (root != null)
         {
             RootContent = ViewModelFromContent(root, PageContext);
             RootContent?.InitializeProperties();
@@ -82,7 +82,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
     protected void FetchProperty(string propertyName)
     {
         var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return; // throw?
         }
@@ -91,7 +91,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
         {
             case nameof(RootContent):
                 var root = model.RootContent;
-                if (root is not null)
+                if (root != null)
                 {
                     RootContent = ViewModelFromContent(root, PageContext);
                 }
@@ -119,7 +119,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
             foreach (var item in newItems)
             {
                 var viewModel = ViewModelFromContent(item, PageContext);
-                if (viewModel is not null)
+                if (viewModel != null)
                 {
                     viewModel.InitializeProperties();
                     newContent.Add(viewModel);
@@ -153,7 +153,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
 
         Children.Clear();
         var model = Model.Unsafe;
-        if (model is not null)
+        if (model != null)
         {
             model.PropChanged -= Model_PropChanged;
             model.ItemsChanged -= Model_ItemsChanged;

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

@@ -29,7 +29,7 @@ public partial class HotkeyManager : ObservableObject
             }
         }
 
-        _commandHotkeys.RemoveAll(item => item.Hotkey is null);
+        _commandHotkeys.RemoveAll(item => item.Hotkey == null);
 
         foreach (var item in _commandHotkeys)
         {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using ManagedCommon;
 using Microsoft.CmdPal.Common.Services;
 using Microsoft.CommandPalette.Extensions;
 using Windows.ApplicationModel;
@@ -90,7 +89,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
         }).Result;
         var isExtension = isCmdPalExtensionResult.IsExtension;
         var extension = isCmdPalExtensionResult.Extension;
-        if (isExtension && extension is not null)
+        if (isExtension && extension != null)
         {
             CommandPaletteHost.Instance.DebugLog($"Installed new extension app {extension.DisplayName}");
 
@@ -152,7 +151,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
             {
                 var (cmdPalProvider, classId) = await GetCmdPalExtensionPropertiesAsync(extension);
 
-                return new(cmdPalProvider is not null && classId.Count != 0, extension);
+                return new(cmdPalProvider != null && classId.Count != 0, extension);
             }
         }
 
@@ -237,7 +236,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
     {
         var (cmdPalProvider, classIds) = await GetCmdPalExtensionPropertiesAsync(extension);
 
-        if (cmdPalProvider is null || classIds.Count == 0)
+        if (cmdPalProvider == null || classIds.Count == 0)
         {
             return [];
         }
@@ -288,17 +287,9 @@ public partial class ExtensionService : IExtensionService, IDisposable
         var installedExtensions = await GetInstalledExtensionsAsync();
         foreach (var installedExtension in installedExtensions)
         {
-            Logger.LogDebug($"Signaling dispose to {installedExtension.ExtensionUniqueId}");
-            try
+            if (installedExtension.IsRunning())
             {
-                if (installedExtension.IsRunning())
-                {
-                    installedExtension.SignalDispose();
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to send dispose signal to extension {installedExtension.ExtensionUniqueId}", ex);
+                installedExtension.SignalDispose();
             }
         }
     }
@@ -352,12 +343,12 @@ public partial class ExtensionService : IExtensionService, IDisposable
     {
         var propSetList = new List<string>();
         var singlePropertySet = GetSubPropertySet(activationPropSet, CreateInstanceProperty);
-        if (singlePropertySet is not null)
+        if (singlePropertySet != null)
         {
             var classId = GetProperty(singlePropertySet, ClassIdProperty);
 
             // If the instance has a classId as a single string, then it's only supporting a single instance.
-            if (classId is not null)
+            if (classId != null)
             {
                 propSetList.Add(classId);
             }
@@ -365,7 +356,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
         else
         {
             var propertySetArray = GetSubPropertySetArray(activationPropSet, CreateInstanceProperty);
-            if (propertySetArray is not null)
+            if (propertySetArray != null)
             {
                 foreach (var prop in propertySetArray)
                 {
@@ -375,7 +366,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
                     }
 
                     var classId = GetProperty(propertySet, ClassIdProperty);
-                    if (classId is not null)
+                    if (classId != null)
                     {
                         propSetList.Add(classId);
                     }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs

@@ -321,15 +321,6 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Search for apps, files and commands....
-        /// </summary>
-        public static string builtin_main_list_page_searchbar_placeholder {
-            get {
-                return ResourceManager.GetString("builtin_main_list_page_searchbar_placeholder", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Creates a project for a new Command Palette extension.
         /// </summary>

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx

@@ -227,7 +227,4 @@
   <data name="builtin_disabled_extension" xml:space="preserve">
     <value>Disabled</value>
   </data>
-  <data name="builtin_main_list_page_searchbar_placeholder" xml:space="preserve">
-    <value>Search for apps, files and commands...</value>
-  </data>
 </root>

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

@@ -35,7 +35,7 @@ public class ProviderSettings
     public void Connect(CommandProviderWrapper wrapper)
     {
         ProviderId = wrapper.ProviderId;
-        IsBuiltin = wrapper.Extension is null;
+        IsBuiltin = wrapper.Extension == null;
 
         ProviderDisplayName = wrapper.DisplayName;
 

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

@@ -7,7 +7,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
+using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Properties;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -33,7 +33,7 @@ public partial class ProviderSettingsViewModel(
         Resources.builtin_disabled_extension;
 
     [MemberNotNullWhen(true, nameof(Extension))]
-    public bool IsFromExtension => _provider.Extension is not null;
+    public bool IsFromExtension => _provider.Extension != null;
 
     public IExtensionWrapper? Extension => _provider.Extension;
 
@@ -76,7 +76,7 @@ public partial class ProviderSettingsViewModel(
     {
         get
         {
-            if (_provider.Settings is null)
+            if (_provider.Settings == null)
             {
                 return false;
             }
@@ -100,7 +100,7 @@ public partial class ProviderSettingsViewModel(
     {
         get
         {
-            if (_provider.Settings is null)
+            if (_provider.Settings == null)
             {
                 return null;
             }
@@ -126,7 +126,7 @@ public partial class ProviderSettingsViewModel(
     {
         get
         {
-            if (field is null)
+            if (field == null)
             {
                 field = BuildTopLevelViewModels();
             }
@@ -149,7 +149,7 @@ public partial class ProviderSettingsViewModel(
     {
         get
         {
-            if (field is null)
+            if (field == null)
             {
                 field = BuildFallbackViewModels();
             }
@@ -173,7 +173,7 @@ public partial class ProviderSettingsViewModel(
 
     private void InitializeSettingsPage()
     {
-        if (_provider.Settings is null)
+        if (_provider.Settings == null)
         {
             return;
         }

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

@@ -30,7 +30,7 @@ public partial class RecentCommandsManager : ObservableObject
             // These numbers are vaguely scaled so that "VS" will make "Visual Studio" the
             // match after one use.
             // Usually it has a weight of 84, compared to 109 for the VS cmd prompt
-            if (entry.Item is not null)
+            if (entry.Item != null)
             {
                 var index = entry.Index;
 
@@ -61,7 +61,7 @@ public partial class RecentCommandsManager : ObservableObject
             var entry = History
             .Where(item => item.CommandId == commandId)
             .FirstOrDefault();
-            if (entry is null)
+            if (entry == null)
             {
                 var newitem = new HistoryItem() { CommandId = commandId, Uses = 1 };
                 History.Insert(0, newitem);

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

@@ -95,7 +95,7 @@ public partial class SettingsModel : ObservableObject
 
             var loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel);
 
-            Debug.WriteLine(loaded is not null ? "Loaded settings file" : "Failed to parse");
+            Debug.WriteLine(loaded != null ? "Loaded settings file" : "Failed to parse");
 
             return loaded ?? new();
         }

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

@@ -9,10 +9,9 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
+using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Microsoft.Extensions.DependencyInjection;
@@ -21,8 +20,7 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class TopLevelCommandManager : ObservableObject,
     IRecipient<ReloadCommandsMessage>,
-    IPageContext,
-    IDisposable
+    IPageContext
 {
     private readonly IServiceProvider _serviceProvider;
     private readonly TaskScheduler _taskScheduler;
@@ -30,7 +28,6 @@ public partial class TopLevelCommandManager : ObservableObject,
     private readonly List<CommandProviderWrapper> _builtInCommands = [];
     private readonly List<CommandProviderWrapper> _extensionCommandProviders = [];
     private readonly Lock _commandProvidersLock = new();
-    private readonly SupersedingAsyncGate _reloadCommandsGate;
 
     TaskScheduler IPageContext.Scheduler => _taskScheduler;
 
@@ -39,7 +36,6 @@ public partial class TopLevelCommandManager : ObservableObject,
         _serviceProvider = serviceProvider;
         _taskScheduler = _serviceProvider.GetService<TaskScheduler>()!;
         WeakReferenceMessenger.Default.Register<ReloadCommandsMessage>(this);
-        _reloadCommandsGate = new(ReloadAllCommandsAsyncCore);
     }
 
     public ObservableCollection<TopLevelViewModel> TopLevelCommands { get; set; } = [];
@@ -148,10 +144,46 @@ public partial class TopLevelCommandManager : ObservableObject,
     /// <returns>an awaitable task</returns>
     private async Task UpdateCommandsForProvider(CommandProviderWrapper sender, IItemsChangedEventArgs args)
     {
+        // Work on a clone of the list, so that we can just do one atomic
+        // update to the actual observable list at the end
+        List<TopLevelViewModel> clone = [.. TopLevelCommands];
+        List<TopLevelViewModel> newItems = [];
+        var startIndex = -1;
+        var firstCommand = sender.TopLevelItems[0];
+        var commandsToRemove = sender.TopLevelItems.Length + sender.FallbackItems.Length;
+
+        // Tricky: all Commands from a single provider get added to the
+        // top-level list all together, in a row. So if we find just the first
+        // one, we can slice it out and insert the new ones there.
+        for (var i = 0; i < clone.Count; i++)
+        {
+            var wrapper = clone[i];
+            try
+            {
+                var isTheSame = wrapper == firstCommand;
+                if (isTheSame)
+                {
+                    startIndex = i;
+                    break;
+                }
+            }
+            catch
+            {
+            }
+        }
+
         WeakReference<IPageContext> weakSelf = new(this);
+
+        // Fetch the new items
         await sender.LoadTopLevelCommands(_serviceProvider, weakSelf);
 
-        List<TopLevelViewModel> newItems = [.. sender.TopLevelItems];
+        var settings = _serviceProvider.GetService<SettingsModel>()!;
+
+        foreach (var i in sender.TopLevelItems)
+        {
+            newItems.Add(i);
+        }
+
         foreach (var i in sender.FallbackItems)
         {
             if (i.IsEnabled)
@@ -160,60 +192,25 @@ public partial class TopLevelCommandManager : ObservableObject,
             }
         }
 
-        // modify the TopLevelCommands under shared lock; event if we clone it, we don't want
-        // TopLevelCommands to get modified while we're working on it. Otherwise, we might
-        // out clone would be stale at the end of this method.
-        lock (TopLevelCommands)
+        // Slice out the old commands
+        if (startIndex != -1)
         {
-            // Work on a clone of the list, so that we can just do one atomic
-            // update to the actual observable list at the end
-            // TODO: just added a lock around all of this anyway, but keeping the clone
-            // while looking on some other ways to improve this; can be removed later.
-            List<TopLevelViewModel> clone = [.. TopLevelCommands];
-
-            var startIndex = FindIndexForFirstProviderItem(clone, sender.ProviderId);
-            clone.RemoveAll(item => item.CommandProviderId == sender.ProviderId);
-            clone.InsertRange(startIndex, newItems);
-
-            ListHelpers.InPlaceUpdateList(TopLevelCommands, clone);
+            clone.RemoveRange(startIndex, commandsToRemove);
+        }
+        else
+        {
+            // ... or, just stick them at the end (this is unexpected)
+            startIndex = clone.Count;
         }
 
-        return;
+        // add the new commands into the list at the place we found the old ones
+        clone.InsertRange(startIndex, newItems);
 
-        static int FindIndexForFirstProviderItem(List<TopLevelViewModel> topLevelItems, string providerId)
-        {
-            // Tricky: all Commands from a single provider get added to the
-            // top-level list all together, in a row. So if we find just the first
-            // one, we can slice it out and insert the new ones there.
-            for (var i = 0; i < topLevelItems.Count; i++)
-            {
-                var wrapper = topLevelItems[i];
-                try
-                {
-                    if (providerId == wrapper.CommandProviderId)
-                    {
-                        return i;
-                    }
-                }
-                catch
-                {
-                }
-            }
-
-            // If we didn't find any, then we just append the new commands to the end of the list.
-            return topLevelItems.Count;
-        }
+        // now update the actual observable list with the new contents
+        ListHelpers.InPlaceUpdateList(TopLevelCommands, clone);
     }
 
     public async Task ReloadAllCommandsAsync()
-    {
-        // gate ensures that the reload is serialized and if multiple calls
-        // request a reload, only the first and the last one will be executed.
-        // this should be superseded with a cancellable version.
-        await _reloadCommandsGate.ExecuteAsync(CancellationToken.None);
-    }
-
-    private async Task ReloadAllCommandsAsyncCore(CancellationToken cancellationToken)
     {
         IsLoading = true;
         var extensionService = _serviceProvider.GetService<IExtensionService>()!;
@@ -249,7 +246,7 @@ public partial class TopLevelCommandManager : ObservableObject,
             _extensionCommandProviders.Clear();
         }
 
-        if (extensions is not null)
+        if (extensions != null)
         {
             await StartExtensionsAndGetCommands(extensions);
         }
@@ -283,7 +280,7 @@ public partial class TopLevelCommandManager : ObservableObject,
         var startTasks = extensions.Select(StartExtensionWithTimeoutAsync);
 
         // Wait for all extensions to start
-        var wrappers = (await Task.WhenAll(startTasks)).Where(wrapper => wrapper is not null).Select(w => w!).ToList();
+        var wrappers = (await Task.WhenAll(startTasks)).Where(wrapper => wrapper != null).Select(w => w!).ToList();
 
         lock (_commandProvidersLock)
         {
@@ -293,7 +290,7 @@ public partial class TopLevelCommandManager : ObservableObject,
         // Load the commands from the providers in parallel
         var loadTasks = wrappers.Select(LoadCommandsWithTimeoutAsync);
 
-        var commandSets = (await Task.WhenAll(loadTasks)).Where(results => results is not null).Select(r => r!).ToList();
+        var commandSets = (await Task.WhenAll(loadTasks)).Where(results => results != null).Select(r => r!).ToList();
 
         lock (TopLevelCommands)
         {
@@ -410,8 +407,8 @@ public partial class TopLevelCommandManager : ObservableObject,
 
     void IPageContext.ShowException(Exception ex, string? extensionHint)
     {
-        var message = DiagnosticsHelper.BuildExceptionMessage(ex, extensionHint ?? "TopLevelCommandManager");
-        CommandPaletteHost.Instance.Log(message);
+        var errorMessage = $"A bug occurred in {$"the \"{extensionHint}\"" ?? "an unknown's"} extension's code:\n{ex.Message}\n{ex.Source}\n{ex.StackTrace}\n\n";
+        CommandPaletteHost.Instance.Log(errorMessage);
     }
 
     internal bool IsProviderActive(string id)
@@ -422,10 +419,4 @@ public partial class TopLevelCommandManager : ObservableObject,
                    || _extensionCommandProviders.Any(wrapper => wrapper.Id == id && wrapper.IsActive);
         }
     }
-
-    public void Dispose()
-    {
-        _reloadCommandsGate.Dispose();
-        GC.SuppressFinalize(this);
-    }
 }

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

@@ -8,7 +8,6 @@ using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -48,8 +47,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 
     public CommandItemViewModel ItemViewModel => _commandItemViewModel;
 
-    public string CommandProviderId => _commandProviderId;
-
     ////// ICommandItem
     public string Title => _commandItemViewModel.Title;
 
@@ -66,13 +63,9 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
                                                         {
                                                             return item as IContextItem;
                                                         }
-                                                        else if (item is CommandContextItemViewModel commandItem)
-                                                        {
-                                                            return commandItem.Model.Unsafe;
-                                                        }
                                                         else
                                                         {
-                                                            return null;
+                                                            return ((CommandContextItemViewModel)item).Model.Unsafe;
                                                         }
                                                     }).ToArray();
 
@@ -240,7 +233,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     private void FetchAliasFromAliasManager()
     {
         var am = _serviceProvider.GetService<AliasManager>();
-        if (am is not null)
+        if (am != null)
         {
             var commandAlias = am.AliasFromId(Id);
             if (commandAlias is not null)
@@ -254,7 +247,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     private void UpdateHotkey()
     {
         var hotkey = _settings.CommandHotkeys.Where(hk => hk.CommandId == Id).FirstOrDefault();
-        if (hotkey is not null)
+        if (hotkey != null)
         {
             _hotkey = hotkey.Hotkey;
         }
@@ -264,12 +257,12 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     {
         List<Tag> tags = [];
 
-        if (Hotkey is not null)
+        if (Hotkey != null)
         {
             tags.Add(new Tag() { Text = Hotkey.ToString() });
         }
 
-        if (Alias is not null)
+        if (Alias != null)
         {
             tags.Add(new Tag() { Text = Alias.SearchPrefix });
         }
@@ -354,9 +347,4 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     {
         return new PerformCommandMessage(this.CommandViewModel.Model, new Core.ViewModels.Models.ExtensionObject<IListItem>(this));
     }
-
-    public override string ToString()
-    {
-        return $"{nameof(TopLevelViewModel)}: {Id} ({Title}) - display: {DisplayTitle} - fallback: {IsFallback} - enabled: {IsEnabled}";
-    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -64,9 +64,6 @@ public partial class App : Application
 
         this.InitializeComponent();
 
-        // Ensure types used in XAML are preserved for AOT compilation
-        TypePreservation.PreserveTypes();
-
         NativeEventWaiter.WaitForEventLoop(
             "Local\\PowerToysCmdPal-ExitEvent-eb73f6be-3f22-4b36-aee3-62924ba40bfd", () =>
             {

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml

@@ -47,8 +47,7 @@
             <Flyout
                 x:Name="ContextMenuFlyout"
                 FlyoutPresenterStyle="{StaticResource ContextMenuFlyoutStyle}"
-                Opened="ContextMenuFlyout_Opened"
-                ShouldConstrainToRootBounds="False">
+                Opened="ContextMenuFlyout_Opened">
                 <cpcontrols:ContextMenu x:Name="ContextControl" />
             </Flyout>
 
@@ -60,24 +59,8 @@
                     <Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
                     <Setter Property="BorderThickness" Value="1" />
                     <Setter Property="CornerRadius" Value="6" />
-                    <Setter Property="MinWidth" Value="20" />
                 </Style.Setters>
             </Style>
-
-            <Style x:Key="HotkeyTextBlockStyle" TargetType="TextBlock">
-                <Setter Property="FontSize" Value="10" />
-                <Setter Property="CharacterSpacing" Value="4" />
-                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-            </Style>
-
-            <Style x:Key="HotkeyFontIconStyle" TargetType="FontIcon">
-                <Setter Property="FontSize" Value="10" />
-                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -93,44 +76,44 @@
 
         <Grid
             x:Name="IconRoot"
-            Margin="3,0,-5,0"
+            Margin="8,0,0,0"
+            Tapped="PageIcon_Tapped"
             Visibility="{x:Bind CurrentPageViewModel.IsNested, Mode=OneWay}">
-            <Button
-                x:Name="StatusMessagesButton"
-                x:Uid="StatusMessagesButton"
-                Padding="4"
-                Style="{StaticResource SubtleButtonStyle}"
-                Visibility="{x:Bind CurrentPageViewModel.HasStatusMessage, Mode=OneWay}">
-                <InfoBadge Value="{x:Bind CurrentPageViewModel.StatusMessages.Count, Mode=OneWay}" />
-                <Button.Flyout>
-                    <Flyout x:Name="StatusMessagesFlyout" Placement="TopEdgeAlignedLeft">
-                        <ItemsRepeater
-                            x:Name="MessagesDropdown"
-                            Margin="-8"
-                            ItemsSource="{x:Bind CurrentPageViewModel.StatusMessages, Mode=OneWay}"
-                            Layout="{StaticResource VerticalStackLayout}">
-                            <ItemsRepeater.ItemTemplate>
-                                <DataTemplate x:DataType="coreViewModels:StatusMessageViewModel">
-                                    <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
-                                        <InfoBar
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            IsClosable="False"
-                                            IsOpen="True"
-                                            Message="{x:Bind Message, Mode=OneWay}"
-                                            Severity="{x:Bind State, Mode=OneWay, Converter={StaticResource MessageStateToSeverityConverter}}" />
-                                    </StackPanel>
-                                </DataTemplate>
-                            </ItemsRepeater.ItemTemplate>
-                        </ItemsRepeater>
-                    </Flyout>
-                </Button.Flyout>
-            </Button>
+            <InfoBadge Visibility="{x:Bind CurrentPageViewModel.HasStatusMessage, Mode=OneWay}" Value="{x:Bind CurrentPageViewModel.StatusMessages.Count, Mode=OneWay}" />
+            <Grid.ContextFlyout>
+                <Flyout x:Name="StatusMessagesFlyout" Placement="TopEdgeAlignedLeft">
+                    <ItemsRepeater
+                        x:Name="MessagesDropdown"
+                        Margin="-8"
+                        ItemsSource="{x:Bind CurrentPageViewModel.StatusMessages, Mode=OneWay}"
+                        Layout="{StaticResource VerticalStackLayout}">
+                        <ItemsRepeater.ItemTemplate>
+                            <DataTemplate x:DataType="coreViewModels:StatusMessageViewModel">
+                                <StackPanel
+                                    Grid.Row="0"
+                                    Margin="0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Bottom"
+                                    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+                                    CornerRadius="0">
+                                    <InfoBar
+                                        CornerRadius="{ThemeResource ControlCornerRadius}"
+                                        IsClosable="False"
+                                        IsOpen="True"
+                                        Message="{x:Bind Message, Mode=OneWay}"
+                                        Severity="{x:Bind State, Mode=OneWay, Converter={StaticResource MessageStateToSeverityConverter}}" />
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsRepeater.ItemTemplate>
+                    </ItemsRepeater>
+                </Flyout>
+            </Grid.ContextFlyout>
         </Grid>
         <Button
             x:Name="SettingsIconButton"
             x:Uid="SettingsButton"
-            Click="SettingsIcon_Clicked"
             Style="{StaticResource SubtleButtonStyle}"
+            Tapped="SettingsIcon_Tapped"
             Visibility="{x:Bind CurrentPageViewModel.IsNested, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
             <StackPanel Orientation="Horizontal" Spacing="8">
                 <FontIcon
@@ -163,8 +146,8 @@
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
                 AutomationProperties.Name="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}"
                 Background="Transparent"
-                Click="PrimaryButton_Clicked"
                 Style="{StaticResource SubtleButtonStyle}"
+                Tapped="PrimaryButton_Tapped"
                 Visibility="{x:Bind ViewModel.HasPrimaryCommand, Mode=OneWay}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <TextBlock
@@ -172,7 +155,12 @@
                         Style="{StaticResource CaptionTextBlockStyle}"
                         Text="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}" />
                     <Border Style="{StaticResource HotkeyStyle}">
-                        <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
+                        <FontIcon
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="10"
+                            Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                            Glyph="&#xE751;" />
                     </Border>
                 </StackPanel>
             </Button>
@@ -181,8 +169,8 @@
                 Padding="6,4,4,4"
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
                 AutomationProperties.Name="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}"
-                Click="SecondaryButton_Clicked"
                 Style="{StaticResource SubtleButtonStyle}"
+                Tapped="SecondaryButton_Tapped"
                 Visibility="{x:Bind ViewModel.HasSecondaryCommand, Mode=OneWay}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <TextBlock
@@ -191,10 +179,19 @@
                         Text="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}" />
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
-                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
+                            <TextBlock
+                                CharacterSpacing="4"
+                                FontSize="10"
+                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                                Text="Ctrl" />
                         </Border>
                         <Border Style="{StaticResource HotkeyStyle}">
-                            <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
+                            <FontIcon
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="10"
+                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                                Glyph="&#xE751;" />
                         </Border>
                     </StackPanel>
                 </StackPanel>
@@ -202,26 +199,13 @@
             <Button
                 x:Name="MoreCommandsButton"
                 x:Uid="MoreCommandsButton"
-                Padding="6,4,4,4"
-                Click="MoreCommandsButton_Clicked"
+                Padding="4"
+                Content="{ui:FontIcon Glyph=&#xE712;,
+                                      FontSize=16}"
                 Style="{StaticResource SubtleButtonStyle}"
+                Tapped="MoreCommandsButton_Tapped"
                 ToolTipService.ToolTip="Ctrl+K"
-                Visibility="{x:Bind ViewModel.ShouldShowContextMenu, Mode=OneWay}">
-                <StackPanel Orientation="Horizontal" Spacing="8">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="More" />
-                    <StackPanel Orientation="Horizontal" Spacing="4">
-                        <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
-                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
-                        </Border>
-                        <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
-                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="K" />
-                        </Border>
-                    </StackPanel>
-                </StackPanel>
-            </Button>
+                Visibility="{x:Bind ViewModel.ShouldShowContextMenu, Mode=OneWay}" />
         </StackPanel>
     </Grid>
 </UserControl>

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml.cs

@@ -5,11 +5,11 @@
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.Views;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
 using Windows.System;
 
 namespace Microsoft.CmdPal.UI.Controls;
@@ -49,7 +49,7 @@ public sealed partial class CommandBar : UserControl,
             return;
         }
 
-        if (message.Element is null)
+        if (message.Element == null)
         {
             _ = DispatcherQueue.TryEnqueue(
                 () =>
@@ -113,23 +113,34 @@ public sealed partial class CommandBar : UserControl,
     }
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "VS has a tendency to delete XAML bound methods over-aggressively")]
-    private void PrimaryButton_Clicked(object sender, RoutedEventArgs e)
+    private void PrimaryButton_Tapped(object sender, TappedRoutedEventArgs e)
     {
         ViewModel.InvokePrimaryCommand();
     }
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "VS has a tendency to delete XAML bound methods over-aggressively")]
-    private void SecondaryButton_Clicked(object sender, RoutedEventArgs e)
+    private void SecondaryButton_Tapped(object sender, TappedRoutedEventArgs e)
     {
         ViewModel.InvokeSecondaryCommand();
     }
 
-    private void SettingsIcon_Clicked(object sender, RoutedEventArgs e)
+    private void PageIcon_Tapped(object sender, TappedRoutedEventArgs e)
     {
-        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>();
+        if (CurrentPageViewModel?.StatusMessages.Count > 0)
+        {
+            StatusMessagesFlyout.ShowAt(
+                placementTarget: IconRoot,
+                showOptions: new FlyoutShowOptions() { ShowMode = FlyoutShowMode.Standard });
+        }
     }
 
-    private void MoreCommandsButton_Clicked(object sender, RoutedEventArgs e)
+    private void SettingsIcon_Tapped(object sender, TappedRoutedEventArgs e)
+    {
+        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>();
+        e.Handled = true;
+    }
+
+    private void MoreCommandsButton_Tapped(object sender, TappedRoutedEventArgs e)
     {
         WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml.cs

@@ -44,7 +44,7 @@ public sealed partial class ContentFormControl : UserControl
         // 5% BODGY: if we set this multiple times over the lifetime of the app,
         // then the second call will explode, because "CardOverrideStyles is already the child of another element".
         // SO only set this once.
-        if (_renderer.OverrideStyles is null)
+        if (_renderer.OverrideStyles == null)
         {
             _renderer.OverrideStyles = CardOverrideStyles;
         }
@@ -55,19 +55,19 @@ public sealed partial class ContentFormControl : UserControl
 
     private void AttachViewModel(ContentFormViewModel? vm)
     {
-        if (_viewModel is not null)
+        if (_viewModel != null)
         {
             _viewModel.PropertyChanged -= ViewModel_PropertyChanged;
         }
 
         _viewModel = vm;
 
-        if (_viewModel is not null)
+        if (_viewModel != null)
         {
             _viewModel.PropertyChanged += ViewModel_PropertyChanged;
 
             var c = _viewModel.Card;
-            if (c is not null)
+            if (c != null)
             {
                 DisplayCard(c);
             }
@@ -76,7 +76,7 @@ public sealed partial class ContentFormControl : UserControl
 
     private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
-        if (ViewModel is null)
+        if (ViewModel == null)
         {
             return;
         }
@@ -84,7 +84,7 @@ public sealed partial class ContentFormControl : UserControl
         if (e.PropertyName == nameof(ViewModel.Card))
         {
             var c = ViewModel.Card;
-            if (c is not null)
+            if (c != null)
             {
                 DisplayCard(c);
             }
@@ -95,7 +95,7 @@ public sealed partial class ContentFormControl : UserControl
     {
         _renderedCard = _renderer.RenderAdaptiveCard(result.AdaptiveCard);
         ContentGrid.Children.Clear();
-        if (_renderedCard.FrameworkElement is not null)
+        if (_renderedCard.FrameworkElement != null)
         {
             ContentGrid.Children.Add(_renderedCard.FrameworkElement);
 
@@ -148,7 +148,7 @@ public sealed partial class ContentFormControl : UserControl
 
             // Recursively check children
             var result = FindFirstFocusableElement(child);
-            if (result is not null)
+            if (result != null)
             {
                 return result;
             }