withoutext

Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com>

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

@@ -282,12 +282,3 @@ xef
 xes
 PACKAGEVERSIONNUMBER
 APPXMANIFESTVERSION
-
-# MRU lists
-CACHEWRITE
-MRUCMPPROC
-MRUINFO
-REGSTR
-
-# Misc Win32 APIs and PInvokes
-INVOKEIDLIST

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

@@ -38,7 +38,6 @@ ALLAPPS
 ALLCHILDREN
 ALLINPUT
 Allman
-Allmodule
 ALLOWUNDO
 ALLVIEW
 ALPHATYPE
@@ -247,7 +246,6 @@ CONTEXTMENUHANDLER
 contractversion
 CONTROLPARENT
 copiedcolorrepresentation
-coppied
 copyable
 COPYPEN
 COREWINDOW
@@ -446,7 +444,6 @@ ERRORIMAGE
 ERRORTITLE
 ESettings
 esrp
-etd
 ETDT
 etl
 etw
@@ -531,8 +528,8 @@ frm
 FROMTOUCH
 fsanitize
 fsmgmt
-fuzzingtesting
 fxf
+fuzzingtesting
 FZE
 gacutil
 Gaeilge
@@ -737,7 +734,6 @@ INSTALLSTARTMENUSHORTCUT
 INSTALLSTATE
 Inste
 Interlop
-intput
 INTRESOURCE
 INVALIDARG
 invalidoperatioexception
@@ -820,7 +816,6 @@ LMEM
 LMENU
 LOADFROMFILE
 LOBYTE
-localappdata
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
@@ -1123,7 +1118,6 @@ oldtheme
 oleaut
 OLECHAR
 onebranch
-OOBEUI
 openas
 opencode
 OPENFILENAME
@@ -1389,8 +1383,8 @@ RIDEV
 RIGHTSCROLLBAR
 riid
 RKey
-Rns
 RNumber
+Rns
 rop
 ROUNDSMALL
 ROWSETEXT
@@ -1401,7 +1395,6 @@ Rsp
 rstringalnum
 rstringalpha
 rstringdigit
-rtb
 RTB
 RTLREADING
 rtm
@@ -1536,7 +1529,6 @@ SLGP
 sln
 SMALLICON
 smartphone
-smileys
 SMTO
 SNAPPROCESS
 snk
@@ -1764,8 +1756,8 @@ Uptool
 urld
 Usb
 USEDEFAULT
-USEFILEATTRIBUTES
 USEINSTALLERFORTEST
+USEFILEATTRIBUTES
 USESHOWWINDOW
 USESTDHANDLES
 USRDLL

.github/pull_request_template.md

@@ -4,7 +4,7 @@
 <!-- Please review the items on the PR checklist before submitting-->
 ## PR Checklist
 
-- [ ] Closes: #xxx
+- [ ] **Closes:** #xxx
 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
 - [ ] **Localization:** All end-user-facing strings can be localized

.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: []
@@ -45,7 +43,6 @@ jobs:
     BuildConfiguration: ${{ parameters.configuration }}
     SrcPath: $(Build.Repository.LocalPath)
     TestArtifactsName: build-${{ variables.BuildPlatform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
-    isBuildNow: ${{ eq(parameters.buildSource, 'buildNow') }}
   pool:
     ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
       ${{ if ne(parameters.platform, 'ARM64') }}:
@@ -116,17 +113,16 @@ jobs:
       & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
     displayName: Download and install WinAppDriver
 
-  - ${{ if not(variables.isBuildNow) }}:
+  - ${{ 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)'
@@ -137,7 +133,7 @@ jobs:
           patterns: |
             **/PowerToysSetup*.exe
 
-  - ${{ if not(variables.isBuildNow) }}:
+  - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
     - ${{ if eq(parameters.installMode, 'peruser') }}:
       - pwsh: |-
           & "$(build.sourcesdirectory)\.pipelines\installPowerToys.ps1" -InstallMode "PerUser"
@@ -173,7 +169,7 @@ jobs:
           !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
       env:
         platform: '$(TestPlatform)'
-        useInstallerForTest: ${{ not(variables.isBuildNow) }}
+        useInstallerForTest: ${{ parameters.useLatestOfficialBuild }}
 
   - ${{ if ne(length(parameters.uiTestModules), 0) }}:
     - ${{ each module in parameters.uiTestModules }}:
@@ -195,4 +191,4 @@ jobs:
             !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
         env:
           platform: '$(TestPlatform)'
-          useInstallerForTest: ${{ not(variables.isBuildNow) }}
+          useInstallerForTest: ${{ parameters.useLatestOfficialBuild }}

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

@@ -3,8 +3,6 @@ variables:
     value: false
   - name: EnablePipelineCache
     value: true
-  - name: isBuildNow
-    value: ${{ eq(parameters.buildSource, 'buildNow') }}
 
 parameters:
   - name: buildPlatforms
@@ -21,25 +19,22 @@ 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 }}:
-    - ${{ if variables.isBuildNow }}:
+    - ${{ if eq(parameters.useLatestOfficialBuild, false) }}:
       - stage: Build_${{ platform }}
         displayName: Build ${{ platform }}
         dependsOn: []
@@ -63,7 +58,7 @@ stages:
               useVSPreview: ${{ parameters.useVSPreview }}
               timeoutInMinutes: 90
 
-    - ${{ if not(variables.isBuildNow) }}:
+    - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
       - stage: BuildUITests_${{ platform }}
         displayName: Build UI Tests Only
         dependsOn: []
@@ -84,7 +79,7 @@ stages:
     - ${{ if eq(platform, 'x64') }}:
       - stage: Test_x64Win10
         displayName: Test x64Win10
-        ${{ if not(variables.isBuildNow) }}:
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
           dependsOn:
             - BuildUITests_${{ platform }}
         ${{ else }}:
@@ -96,19 +91,19 @@ stages:
                 platform: x64Win10
                 configuration: Release
                 useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-                buildSource: ${{ parameters.buildSource }}
-                specificBuildId: ${{ parameters.specificBuildId }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
                 uiTestModules: ${{ parameters.uiTestModules }}
 
-            # Additional per-user installation test
-            - ${{ if not(variables.isBuildNow) }}:
+            # 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 }}
-                  buildSource: ${{ parameters.buildSource }}
-                  specificBuildId: ${{ parameters.specificBuildId }}
+                  useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                  useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
                   uiTestModules: ${{ parameters.uiTestModules }}
                   installMode: 'peruser'
                   jobSuffix: '_PerUser'
@@ -116,7 +111,7 @@ stages:
     - ${{ if eq(platform, 'x64') }}:
       - stage: Test_x64Win11
         displayName: Test x64Win11
-        ${{ if not(variables.isBuildNow) }}:
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
           dependsOn:
             - BuildUITests_${{ platform }}
         ${{ else }}:
@@ -128,19 +123,19 @@ stages:
                 platform: x64Win11
                 configuration: Release
                 useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-                buildSource: ${{ parameters.buildSource }}
-                specificBuildId: ${{ parameters.specificBuildId }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
                 uiTestModules: ${{ parameters.uiTestModules }}
 
-            # Additional per-user installation test
-            - ${{ if not(variables.isBuildNow) }}:
+            # 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 }}
-                  buildSource: ${{ parameters.buildSource }}
-                  specificBuildId: ${{ parameters.specificBuildId }}
+                  useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                  useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
                   uiTestModules: ${{ parameters.uiTestModules }}
                   installMode: 'peruser'
                   jobSuffix: '_PerUser'
@@ -148,7 +143,7 @@ stages:
     - ${{ if ne(platform, 'x64') }}:
       - stage: Test_${{ platform }}
         displayName: Test ${{ platform }}
-        ${{ if not(variables.isBuildNow) }}:
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
           dependsOn:
             - BuildUITests_${{ platform }}
         ${{ else }}:
@@ -160,19 +155,19 @@ stages:
               platform: ${{ platform }}
               configuration: Release
               useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-              buildSource: ${{ parameters.buildSource }}
-              specificBuildId: ${{ parameters.specificBuildId }}
+              useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+              useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
               uiTestModules: ${{ parameters.uiTestModules }}
 
-          # Additional per-user installation test
-          - ${{ if not(variables.isBuildNow) }}:
+          # 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 }}
-                buildSource: ${{ parameters.buildSource }}
-                specificBuildId: ${{ parameters.specificBuildId }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
                 uiTestModules: ${{ parameters.uiTestModules }}
                 installMode: 'peruser'
-                jobSuffix: '_PerUser'
+                jobSuffix: '_PerUser'

PowerToys.sln

@@ -39,14 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fancyzones", "fancyzones",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FancyZonesLib", "src\modules\fancyzones\FancyZonesLib\FancyZonesLib.vcxproj", "{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FancyZones.UnitTests", "src\modules\fancyzones\FancyZonesTests\UnitTests\UnitTests.vcxproj", "{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests-FancyZones", "src\modules\fancyzones\FancyZonesTests\UnitTests\UnitTests.vcxproj", "{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{1AFB6476-670D-4E80-A464-657E01DFF482}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Lib.UnitTests", "src\common\UnitTests-CommonLib\UnitTests-CommonLib.vcxproj", "{1A066C63-64B3-45F8-92FE-664E1CCE8077}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests-CommonLib", "src\common\UnitTests-CommonLib\UnitTests-CommonLib.vcxproj", "{1A066C63-64B3-45F8-92FE-664E1CCE8077}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FancyZonesEditor", "src\modules\fancyzones\editor\FancyZonesEditor\FancyZonesEditor.csproj", "{5CCC8468-DEC8-4D36-99D4-5C891BEBD481}"
 EndProject
@@ -60,8 +60,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameLib", "src\modules\powerrename\lib\PowerRenameLib.vcxproj", "{51920F1F-C28C-4ADF-8660-4238766796C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameTest", "src\modules\powerrename\testapp\PowerRenameTest.vcxproj", "{A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.UnitTests", "src\modules\powerrename\unittests\PowerRenameLibUnitTests.vcxproj", "{2151F984-E006-4A9F-92EF-C6DDE3DC8413}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameUnitTests", "src\modules\powerrename\unittests\PowerRenameLibUnitTests.vcxproj", "{2151F984-E006-4A9F-92EF-C6DDE3DC8413}"
 	ProjectSection(ProjectDependencies) = postProject
 		{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
 		{B25AC7A5-FB9F-4789-B392-D5C85E948670} = {B25AC7A5-FB9F-4789-B392-D5C85E948670}
@@ -77,7 +80,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizerUI", "src\modul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageResizerExt", "src\modules\imageresizer\dll\ImageResizerExt.vcxproj", "{0B43679E-EDFA-4DA0-AD30-F4628B308B1B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizer.UnitTests", "src\modules\imageresizer\tests\ImageResizer.UnitTests.csproj", "{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizerUITest", "src\modules\imageresizer\tests\ImageResizerUITest.csproj", "{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.ActionRunner", "src\ActionRunner\ActionRunner.vcxproj", "{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -149,13 +152,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PreviewHandlerCommon", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkdownPreviewHandler", "src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj", "{6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.MarkdownPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-MarkdownPreviewHandler\Preview.MarkdownPreviewHandler.UnitTests.csproj", "{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-MarkdownPreviewHandler", "src\modules\previewpane\UnitTests-MarkdownPreviewHandler\UnitTests-MarkdownPreviewHandler.csproj", "{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SvgPreviewHandler", "src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj", "{DA425894-6E13-404F-8DCB-78584EC0557A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.SvgPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-SvgPreviewHandler\Preview.SvgPreviewHandler.UnitTests.csproj", "{060D75DA-2D1C-48E6-A4A1-6F0718B64661}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-SvgPreviewHandler", "src\modules\previewpane\UnitTests-SvgPreviewHandler\UnitTests-SvgPreviewHandler.csproj", "{060D75DA-2D1C-48E6-A4A1-6F0718B64661}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.PreviewHandlerCommon.UnitTests", "src\modules\previewpane\UnitTests-PreviewHandlerCommon\Preview.PreviewHandlerCommon.UnitTests.csproj", "{748417CA-F17E-487F-9411-CAFB6D3F4877}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-PreviewHandlerCommon", "src\modules\previewpane\UnitTests-PreviewHandlerCommon\UnitTests-PreviewHandlerCommon.csproj", "{748417CA-F17E-487F-9411-CAFB6D3F4877}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreview", "src\modules\previewpane\powerpreview\powerpreview.vcxproj", "{217DF501-135C-4E38-BFC8-99D4821032EA}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -192,7 +195,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCommon", "src\common
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Program.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Program.UnitTests\Microsoft.Plugin.Program.UnitTests.csproj", "{42851751-CBC8-45A6-97F5-7A0753F7B4D1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.SvgThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-SvgThumbnailProvider\Preview.SvgThumbnailProvider.UnitTests.csproj", "{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-SvgThumbnailProvider", "src\modules\previewpane\UnitTests-SvgThumbnailProvider\UnitTests-SvgThumbnailProvider.csproj", "{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SvgThumbnailProvider", "src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj", "{8FFE09DA-FA4F-4EE1-B3A2-AD5497FBD1AD}"
 EndProject
@@ -213,6 +216,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Settings.UI.UnitTests", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj", "{632BBE62-5421-49EA-835A-7FFA4F499BD6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj", "{4FA206A5-F69F-4193-BF8F-F6EEB496734C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest-ColorPickerUI", "src\modules\colorPicker\UnitTest-ColorPickerUI\UnitTest-ColorPickerUI.csproj", "{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.System", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.System\Microsoft.PowerToys.Run.Plugin.System.csproj", "{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B}"
@@ -228,7 +235,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "src\common\logger
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SettingsAPI", "src\common\SettingsAPI\SettingsAPI.vcxproj", "{6955446D-23F7-4023-9BB3-8657F904AF99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Interop.UnitTests", "src\common\interop\interop-tests\Common.Interop.UnitTests.csproj", "{58736667-1027-4AD7-BFDF-7A3A6474103A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.Tests", "src\common\interop\interop-tests\Microsoft.Interop.Tests.csproj", "{58736667-1027-4AD7-BFDF-7A3A6474103A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "notifications", "notifications", "{D92131D6-7610-4D60-A7DB-1C169783F83B}"
 EndProject
@@ -300,7 +307,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.UI", "src\common\Com
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfPreviewHandler", "src\modules\previewpane\PdfPreviewHandler\PdfPreviewHandler.csproj", "{69E1EE8D-143A-4060-9129-4658ACF14AAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.PdfPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-PdfPreviewHandler\Preview.PdfPreviewHandler.UnitTests.csproj", "{ECC20689-002A-4354-95A6-B58DF089C6FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-PdfPreviewHandler", "src\modules\previewpane\UnitTests-PdfPreviewHandler\UnitTests-PdfPreviewHandler.csproj", "{ECC20689-002A-4354-95A6-B58DF089C6FF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Registry", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Registry\Microsoft.PowerToys.Run.Plugin.Registry.csproj", "{4BABF3FE-3451-42FD-873F-3C332E18DCEF}"
 EndProject
@@ -310,13 +317,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEngine", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEngineLibrary", "src\modules\keyboardmanager\KeyboardManagerEngineLibrary\KeyboardManagerEngineLibrary.vcxproj", "{E496B7FC-1E99-4BAB-849B-0E8367040B02}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager.Engine.UnitTests", "src\modules\keyboardmanager\KeyboardManagerEngineTest\KeyboardManagerEngineTest.vcxproj", "{7F4B3A60-BC27-45A7-8000-68B0B6EA7466}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEngineTest", "src\modules\keyboardmanager\KeyboardManagerEngineTest\KeyboardManagerEngineTest.vcxproj", "{7F4B3A60-BC27-45A7-8000-68B0B6EA7466}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditor", "src\modules\keyboardmanager\KeyboardManagerEditor\KeyboardManagerEditor.vcxproj", "{8DF78B53-200E-451F-9328-01EB907193AE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorLibrary", "src\modules\keyboardmanager\KeyboardManagerEditorLibrary\KeyboardManagerEditorLibrary.vcxproj", "{23D2070D-E4AD-4ADD-85A7-083D9C76AD49}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager.Editor.UnitTests", "src\modules\keyboardmanager\KeyboardManagerEditorTest\KeyboardManagerEditorTest.vcxproj", "{62173D9A-6724-4C00-A1C8-FB646480A9EC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorTest", "src\modules\keyboardmanager\KeyboardManagerEditorTest\KeyboardManagerEditorTest.vcxproj", "{62173D9A-6724-4C00-A1C8-FB646480A9EC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "awake", "awake", "{127F38E0-40AA-4594-B955-5616BF206882}"
 EndProject
@@ -344,7 +351,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfThumbnailProvider", "src\modules\previewpane\PdfThumbnailProvider\PdfThumbnailProvider.csproj", "{11491FD8-F921-48BF-880C-7FEA185B80A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.PdfThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-PdfThumbnailProvider\Preview.PdfThumbnailProvider.UnitTests.csproj", "{F40C3397-1834-4530-B2D9-8F8B8456BCDF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-PdfThumbnailProvider", "src\modules\previewpane\UnitTests-PdfThumbnailProvider\UnitTests-PdfThumbnailProvider.csproj", "{F40C3397-1834-4530-B2D9-8F8B8456BCDF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.WindowsTerminal", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj", "{A2D583F0-B70C-4462-B1F0-8E81AFB7BA85}"
 EndProject
@@ -358,11 +365,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseHighlighter", "src\mod
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GcodeThumbnailProvider", "src\modules\previewpane\GcodeThumbnailProvider\GcodeThumbnailProvider.csproj", "{809AA252-E17A-4FA2-B0A1-0450976B763F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.GcodeThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-GcodeThumbnailProvider\Preview.GcodeThumbnailProvider.UnitTests.csproj", "{133281D8-1BCE-4D07-B31E-796612A9609E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-GcodeThumbnailProvider", "src\modules\previewpane\UnitTests-GcodeThumbnailProvider\UnitTests-GcodeThumbnailProvider.csproj", "{133281D8-1BCE-4D07-B31E-796612A9609E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GcodePreviewHandler", "src\modules\previewpane\GcodePreviewHandler\GcodePreviewHandler.csproj", "{805306FF-A562-4415-8DEF-E493BDC45918}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.GcodePreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-GcodePreviewHandler\Preview.GcodePreviewHandler.UnitTests.csproj", "{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-GcodePreviewHandler", "src\modules\previewpane\UnitTests-GcodePreviewHandler\UnitTests-GcodePreviewHandler.csproj", "{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AlwaysOnTop", "AlwaysOnTop", "{60CD2D4F-C3B9-4897-9821-FCA5098B41CE}"
 EndProject
@@ -376,7 +383,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MousePointerCrosshairs", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StlThumbnailProvider", "src\modules\previewpane\StlThumbnailProvider\StlThumbnailProvider.csproj", "{F7C8C0F1-5431-4347-89D0-8E5354F93CF2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.StlThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-StlThumbnailProvider\Preview.StlThumbnailProvider.UnitTests.csproj", "{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-StlThumbnailProvider", "src\modules\previewpane\UnitTests-StlThumbnailProvider\UnitTests-StlThumbnailProvider.csproj", "{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonacoPreviewHandler", "src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj", "{04B193D7-3E21-46B8-A958-89B63A8A69DE}"
 EndProject
@@ -412,8 +419,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerOCR", "src\modules\Pow
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerOCRModuleInterface", "src\modules\PowerOCR\PowerOCRModuleInterface\PowerOCRModuleInterface.vcxproj", "{6AB6A2D6-F859-4A82-9184-0BD29C9F07D1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B1234567-1234-1234-1234-123456789ABC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.History", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.History\Microsoft.PowerToys.Run.Plugin.History.csproj", "{212AD910-8488-4036-BE20-326931B75FB2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MeasureTool", "MeasureTool", "{7AC943C9-52E8-44CF-9083-744D8049667B}"
@@ -435,7 +440,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostsUILib", "src\modules\H
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostsEditor.UnitTests", "src\modules\Hosts\Hosts.Tests\HostsEditor.UnitTests.csproj", "{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hosts.Tests", "src\modules\Hosts\Hosts.Tests\Hosts.Tests.csproj", "{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostsModuleInterface", "src\modules\Hosts\HostsModuleInterface\HostsModuleInterface.vcxproj", "{B41B888C-7DB8-4747-B262-4062E05A230D}"
 EndProject
@@ -461,8 +466,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}"
@@ -527,6 +530,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CropAndLockModuleInterface"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cmdNotFound", "cmdNotFound", "{4C0D0746-BE5B-49EE-BD5D-A7811628AE8B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-FancyZonesEditor", "src\modules\fancyzones\UnitTests-FancyZonesEditor\UnitTests-FancyZonesEditor.csproj", "{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EnvironmentVariables", "EnvironmentVariables", "{538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvironmentVariablesUILib", "src\modules\EnvironmentVariables\EnvironmentVariablesUILib\EnvironmentVariablesUILib.csproj", "{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}"
@@ -541,9 +546,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoiPreviewHandlerCpp", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QoiPreviewHandler", "src\modules\previewpane\QoiPreviewHandler\QoiPreviewHandler.csproj", "{6B04803D-B418-4833-A67E-B0FC966636A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.QoiPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-QoiPreviewHandler\Preview.QoiPreviewHandler.UnitTests.csproj", "{3940AD4D-F748-4BE4-9083-85769CD553EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-QoiPreviewHandler", "src\modules\previewpane\UnitTests-QoiPreviewHandler\UnitTests-QoiPreviewHandler.csproj", "{3940AD4D-F748-4BE4-9083-85769CD553EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.QoiThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-QoiThumbnailProvider\Preview.QoiThumbnailProvider.UnitTests.csproj", "{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-QoiThumbnailProvider", "src\modules\previewpane\UnitTests-QoiThumbnailProvider\UnitTests-QoiThumbnailProvider.csproj", "{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdNotFoundModuleInterface", "src\modules\cmdNotFound\CmdNotFoundModuleInterface\CmdNotFoundModuleInterface.vcxproj", "{0014D652-901F-4456-8D65-06FC5F997FB0}"
 EndProject
@@ -559,6 +564,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegistryPreview", "src\modu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvironmentVariables", "src\modules\EnvironmentVariables\EnvironmentVariables\EnvironmentVariables.csproj", "{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests-FancyZones", "src\modules\fancyzones\UITests-FancyZones\UITests-FancyZones.csproj", "{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests-FancyZonesEditor", "src\modules\fancyzones\UITests-FancyZonesEditor\UITests-FancyZonesEditor.csproj", "{3A9A791E-94A9-49F8-8401-C11CE288D5FB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FancyZonesEditorCommon", "src\modules\fancyzones\FancyZonesEditorCommon\FancyZonesEditorCommon.csproj", "{C0974915-8A1D-4BF0-977B-9587D3807AB7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DSC", "DSC", "{557C4636-D7E1-4838-A504-7D19B725EE95}"
@@ -595,7 +604,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowProperties", "WindowP
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLib", "src\modules\Workspaces\WorkspacesLib\WorkspacesLib.vcxproj", "{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Workspaces.Lib.UnitTests", "src\modules\Workspaces\WorkspacesLib.UnitTests\WorkspacesLibUnitTests.vcxproj", "{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLibUnitTests", "src\modules\Workspaces\WorkspacesLib.UnitTests\WorkspacesLibUnitTests.vcxproj", "{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesLauncherUI", "src\modules\Workspaces\WorkspacesLauncherUI\WorkspacesLauncherUI.csproj", "{9C53CC25-0623-4569-95BC-B05410675EE3}"
 EndProject
@@ -671,6 +680,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSea
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZoomIt", "ZoomIt", "{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomIt", "src\modules\ZoomIt\ZoomIt\ZoomIt.vcxproj", "{0A84F764-3A88-44CD-AA96-41BDBD48627B}"
@@ -687,17 +700,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardManagerEditorUI", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorLibraryWrapper", "src\modules\keyboardmanager\KeyboardManagerEditorLibraryWrapper\KeyboardManagerEditorLibraryWrapper.vcxproj", "{4382A954-179A-4078-92AF-715187DFFF50}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostsEditor.FuzzTests", "src\modules\Hosts\Hosts.FuzzTests\HostsEditor.FuzzTests.csproj", "{EBED240C-8702-452D-B764-6DB9DA9179AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.FuzzTests", "src\modules\Hosts\Hosts.FuzzTests\Hosts.FuzzTests.csproj", "{EBED240C-8702-452D-B764-6DB9DA9179AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostsEditor.UITests", "src\modules\Hosts\Hosts.UITests\HostsEditor.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.UITests", "src\modules\Hosts\Hosts.UITests\Hosts.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests", "src\modules\registrypreview\RegistryPreview.FuzzTests\RegistryPreview.FuzzTests.csproj", "{5702B3CC-8575-48D5-83D8-15BB42269CD3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{0217E86E-3476-9946-DE8E-9D200CEBD47A}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzTests", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BgcodePreviewHandler", "src\modules\previewpane\BgcodePreviewHandler\BgcodePreviewHandler.csproj", "{9E0CBC06-F29A-4810-B93C-97D53863B95E}"
 EndProject
@@ -707,86 +722,35 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BgcodeThumbnailProviderCpp"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BgcodeThumbnailProvider", "src\modules\previewpane\BgcodeThumbnailProvider\BgcodeThumbnailProvider.csproj", "{9BC1C986-1E97-4D07-A7B1-CE226C239EFA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodePreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-BgcodePreviewHandler\Preview.BgcodePreviewHandler.UnitTests.csproj", "{99CA1509-FB73-456E-AFAF-AB89C017BD72}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-BgcodePreviewHandler", "src\modules\previewpane\UnitTests-BgcodePreviewHandler\UnitTests-BgcodePreviewHandler.csproj", "{99CA1509-FB73-456E-AFAF-AB89C017BD72}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodeThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-BgcodeThumbnailProvider\Preview.BgcodeThumbnailProvider.UnitTests.csproj", "{61CBF221-9452-4934-B685-146285E080D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-BgcodeThumbnailProvider", "src\modules\previewpane\UnitTests-BgcodeThumbnailProvider\UnitTests-BgcodeThumbnailProvider.csproj", "{61CBF221-9452-4934-B685-146285E080D7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseUtils.UITests", "src\modules\MouseUtils\MouseUtils.UITests\MouseUtils.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Workspaces.Editor.UITests", "src\modules\Workspaces\WorkspacesEditorUITest\Workspaces.Editor.UITests.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesEditorUITest", "src\modules\Workspaces\WorkspacesEditorUITest\WorkspacesEditorUITest.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorEngineCommon", "src\common\CalculatorEngineCommon\CalculatorEngineCommon.vcxproj", "{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCsWin32", "src\common\ManagedCsWin32\ManagedCsWin32.csproj", "{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerRename.UITests", "src\modules\powerrename\PowerRenameUITest\PowerRename.UITests.csproj", "{9D3F3793-EFE3-4525-8782-238015DABA62}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerRenameUITest", "src\modules\powerrename\PowerRenameUITest\PowerRenameUITest.csproj", "{9D3F3793-EFE3-4525-8782-238015DABA62}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Peek.UITests", "src\modules\peek\Peek.UITests\Peek.UITests.csproj", "{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Core.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj", "{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0E556541-6A45-42CB-AE49-EE5A9BE05E7C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UITests", "src\modules\cmdpal\Microsoft.CmdPal.UITests\Microsoft.CmdPal.UITests.csproj", "{840455DF-5634-51BB-D937-9D7D32F0B0C2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{27D9CB3A-46D1-402C-9273-F88CB8AC42F7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITest-Settings", "src\settings-ui\UITest-Settings\UITest-Settings.csproj", "{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B9617A31-0F0A-4397-851D-BF2FBEE32D7F}"
-	ProjectSection(SolutionItems) = preProject
-		src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj = src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITest-ColorPicker", "src\modules\colorPicker\UITest-ColorPicker\UITest-ColorPicker.csproj", "{E4BAAD93-A499-42FD-A741-7E9591594B61}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1C48CD47-D610-463A-A53C-AF82DD6C47E7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste-UITests", "src\modules\AdvancedPaste\UITest-AdvancedPaste\AdvancedPaste-UITests.csproj", "{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D9BD324E-1D80-44AA-8E7B-73EB00944434}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8EF25507-2575-4ADE-BF7E-D23376903AB8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerOCR.UITests", "src\modules\PowerOCR\PowerOCR-UITests\PowerOCR.UITests.csproj", "{070AC093-C9F2-20AD-0BCD-F318FC2761EA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2C318EC3-BA86-4372-B1BC-DB0F33C208B2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BFFB607F-7C78-434B-86B9-DA4C8196A1B5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{66E1534A-1587-42B2-912F-45C994D32904}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E885E71F-0B34-4A03-B13B-20F4E05E90BB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{264B412F-DB8B-4CF8-A74B-96998B183045}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3527BF37-DFC5-4309-A032-29278CA21328}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{68328142-5B31-4715-BCBB-7B6345EE0971}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{4122388B-59E4-CDB0-0338-EA6881DF86F0}"
-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}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{6EABCF9A-6526-441F-932F-658B1DC3E403}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.UITests", "src\modules\fancyzones\FancyZones.UITests\FancyZones.UITests.csproj", "{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZonesEditor.UITests", "src\modules\fancyzones\FancyZonesEditor.UITests\FancyZonesEditor.UITests.csproj", "{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZonesEditor.UnitTests", "src\modules\fancyzones\FancyZonesEditor.UnitTests\FancyZonesEditor.UnitTests.csproj", "{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPickerUI.UnitTests", "src\modules\colorPicker\ColorPickerUI.UnitTests\ColorPickerUI.UnitTests.csproj", "{F93C2817-C846-4259-84D8-B39A6B57C8DE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{8131151D-B0E9-4E18-84A5-E5F946C4480A}"
-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}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9B3962F4-AB69-4C2A-8917-2C8448AC6960}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1188,6 +1152,22 @@ Global
 		{632BBE62-5421-49EA-835A-7FFA4F499BD6}.Release|ARM64.Build.0 = Release|ARM64
 		{632BBE62-5421-49EA-835A-7FFA4F499BD6}.Release|x64.ActiveCfg = Release|x64
 		{632BBE62-5421-49EA-835A-7FFA4F499BD6}.Release|x64.Build.0 = Release|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|x64.ActiveCfg = Debug|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|x64.Build.0 = Debug|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|ARM64.Build.0 = Release|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|x64.ActiveCfg = Release|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|x64.Build.0 = Release|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|ARM64.Build.0 = Debug|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|x64.ActiveCfg = Debug|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|x64.Build.0 = Debug|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|ARM64.Build.0 = Release|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|x64.ActiveCfg = Release|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|x64.Build.0 = Release|x64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.Build.0 = Debug|ARM64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
@@ -1856,14 +1836,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
@@ -2080,6 +2052,14 @@ Global
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|ARM64.Build.0 = Release|ARM64
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x64.ActiveCfg = Release|x64
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x64.Build.0 = Release|x64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|x64.ActiveCfg = Debug|x64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|x64.Build.0 = Debug|x64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|ARM64.Build.0 = Release|ARM64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|x64.ActiveCfg = Release|x64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|x64.Build.0 = Release|x64
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2204,6 +2184,22 @@ Global
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}.Release|ARM64.Build.0 = Release|ARM64
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}.Release|x64.ActiveCfg = Release|x64
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}.Release|x64.Build.0 = Release|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|x64.ActiveCfg = Debug|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|x64.Build.0 = Debug|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|ARM64.Build.0 = Release|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|x64.ActiveCfg = Release|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|x64.Build.0 = Release|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|x64.ActiveCfg = Debug|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|x64.Build.0 = Debug|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|ARM64.Build.0 = Release|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|x64.ActiveCfg = Release|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|x64.Build.0 = Release|x64
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7}.Debug|x64.ActiveCfg = Debug|x64
@@ -2528,6 +2524,22 @@ Global
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.ActiveCfg = Release|x64
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Build.0 = Release|x64
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Deploy.0 = Release|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.ActiveCfg = Debug|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.Build.0 = Debug|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|ARM64.Build.0 = Release|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|x64.ActiveCfg = Release|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|x64.Build.0 = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x64.ActiveCfg = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x64.Build.0 = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|ARM64.Build.0 = Release|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x64.ActiveCfg = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x64.Build.0 = Release|x64
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B}.Debug|ARM64.Build.0 = Debug|ARM64
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B}.Debug|x64.ActiveCfg = Debug|x64
@@ -2620,6 +2632,14 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2722,6 +2742,14 @@ Global
 		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|ARM64.Build.0 = Release|ARM64
 		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|x64.ActiveCfg = Release|x64
 		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|x64.Build.0 = Release|x64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Debug|ARM64.Build.0 = Debug|ARM64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Debug|x64.ActiveCfg = Debug|x64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Debug|x64.Build.0 = Debug|x64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Release|ARM64.Build.0 = Release|ARM64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Release|x64.ActiveCfg = Release|x64
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1}.Release|x64.Build.0 = Release|x64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Debug|ARM64.Build.0 = Debug|ARM64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Debug|x64.ActiveCfg = Debug|x64
@@ -2730,126 +2758,38 @@ Global
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Release|ARM64.Build.0 = Release|ARM64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Release|x64.ActiveCfg = Release|x64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Release|x64.Build.0 = Release|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|ARM64.Build.0 = Debug|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|x64.ActiveCfg = Debug|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|x64.Build.0 = Debug|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|ARM64.ActiveCfg = Release|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|ARM64.Build.0 = Release|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|x64.ActiveCfg = Release|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|x64.Build.0 = Release|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|x64.ActiveCfg = Debug|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|x64.Build.0 = Debug|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|ARM64.Build.0 = Release|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|x64.ActiveCfg = Release|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|x64.Build.0 = Release|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|ARM64.Build.0 = Debug|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|x64.ActiveCfg = Debug|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|x64.Build.0 = Debug|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|ARM64.ActiveCfg = Release|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|ARM64.Build.0 = Release|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|x64.ActiveCfg = Release|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|x64.Build.0 = Release|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|x64.ActiveCfg = Debug|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|x64.Build.0 = Debug|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|ARM64.Build.0 = Release|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|x64.ActiveCfg = Release|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|x64.Build.0 = Release|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|x64.ActiveCfg = Debug|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|x64.Build.0 = Debug|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|ARM64.Build.0 = Release|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|x64.ActiveCfg = Release|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|x64.Build.0 = Release|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|ARM64.Build.0 = Debug|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|x64.ActiveCfg = Debug|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|x64.Build.0 = Debug|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|ARM64.ActiveCfg = Release|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|ARM64.Build.0 = Release|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|x64.ActiveCfg = Release|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|x64.Build.0 = Release|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|x64.ActiveCfg = Debug|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|x64.Build.0 = Debug|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|ARM64.Build.0 = Release|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|x64.ActiveCfg = Release|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|x64.Build.0 = Release|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|x64.ActiveCfg = Debug|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|x64.Build.0 = Debug|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|ARM64.Build.0 = Release|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|x64.ActiveCfg = Release|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|x64.Build.0 = Release|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|x64.ActiveCfg = Debug|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|x64.Build.0 = Debug|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|ARM64.Build.0 = Release|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|x64.ActiveCfg = Release|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|x64.Build.0 = Release|x64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|x64.Build.0 = Debug|x64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|ARM64.ActiveCfg = Release|ARM64
-		{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
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|x64.ActiveCfg = Debug|x64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|x64.Build.0 = Debug|x64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|ARM64.Build.0 = Release|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|x64.ActiveCfg = Release|x64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|x64.Build.0 = Release|x64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Debug|x64.ActiveCfg = Debug|x64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Debug|x64.Build.0 = Debug|x64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Release|ARM64.Build.0 = Release|ARM64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Release|x64.ActiveCfg = Release|x64
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A}.Release|x64.Build.0 = Release|x64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Debug|ARM64.Build.0 = Debug|ARM64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Debug|x64.ActiveCfg = Debug|x64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Debug|x64.Build.0 = Debug|x64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Release|ARM64.Build.0 = Release|ARM64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Release|x64.ActiveCfg = Release|x64
+		{E4BAAD93-A499-42FD-A741-7E9591594B61}.Release|x64.Build.0 = Release|x64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Debug|x64.ActiveCfg = Debug|x64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Debug|x64.Build.0 = Debug|x64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Release|ARM64.Build.0 = Release|ARM64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Release|x64.ActiveCfg = Release|x64
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2858,26 +2798,26 @@ Global
 		{3BB8493E-D18E-4485-A320-CB40F90F55AE} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
-		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
+		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{B25AC7A5-FB9F-4789-B392-D5C85E948670} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{51920F1F-C28C-4ADF-8660-4238766796C2} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{A3935CF4-46C5-4A88-84D3-6B12E16E6BA2} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{2151F984-E006-4A9F-92EF-C6DDE3DC8413} = {66E1534A-1587-42B2-912F-45C994D32904}
+		{2151F984-E006-4A9F-92EF-C6DDE3DC8413} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{6C7F47CC-2151-44A3-A546-41C70025132C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34} = {6C7F47CC-2151-44A3-A546-41C70025132C}
 		{0B43679E-EDFA-4DA0-AD30-F4628B308B1B} = {6C7F47CC-2151-44A3-A546-41C70025132C}
-		{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8} = {0E556541-6A45-42CB-AE49-EE5A9BE05E7C}
+		{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8} = {6C7F47CC-2151-44A3-A546-41C70025132C}
 		{17DA04DF-E393-4397-9CF0-84DABE11032E} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{38BDB927-829B-4C65-9CD9-93FB05D66D65} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{8AFFA899-0B73-49EC-8C50-0FADDA57B2FC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{8451ECDD-2EA4-4966-BB0A-7BBC40138E80} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
-		{FF742965-9A80-41A5-B042-D6C7D3A21708} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{FF742965-9A80-41A5-B042-D6C7D3A21708} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{4AFC9975-2456-4C70-94A4-84073C1CED93} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{59BD9891-3837-438A-958D-ADC7F91F6F7E} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{4D971245-7A70-41D5-BAA0-DDB5684CAF51} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
@@ -2890,29 +2830,31 @@ Global
 		{2F305555-C296-497E-AC20-5FA1B237996A} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{AF2349B8-E5B6-4004-9502-687C1C7730B1} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{DA425894-6E13-404F-8DCB-78584EC0557A} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{060D75DA-2D1C-48E6-A4A1-6F0718B64661} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{748417CA-F17E-487F-9411-CAFB6D3F4877} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{060D75DA-2D1C-48E6-A4A1-6F0718B64661} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{748417CA-F17E-487F-9411-CAFB6D3F4877} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{217DF501-135C-4E38-BFC8-99D4821032EA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{08C8C05F-0362-41BC-818C-724572DF8B06} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{5D00D290-4016-4CFE-9E41-1E7C724509BA} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{4AED67B6-55FD-486F-B917-E543DEE2CB3C} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{42851751-CBC8-45A6-97F5-7A0753F7B4D1} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
-		{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{42851751-CBC8-45A6-97F5-7A0753F7B4D1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{8FFE09DA-FA4F-4EE1-B3A2-AD5497FBD1AD} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{655C9AF2-18D3-4DA6-80E4-85504A7722BA} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
 		{BA58206B-1493-4C75-BFEA-A85768A1E156} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
 		{1D78B84B-CA39-406C-98F4-71F7EC266CC0} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{03276A39-D4E9-417C-8FFD-200B0EE5E871} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{B81FB7B6-D30E-428F-908A-41422EFC1172} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
-		{0F85E674-34AE-443D-954C-8321EB8B93B1} = {E885E71F-0B34-4A03-B13B-20F4E05E90BB}
-		{632BBE62-5421-49EA-835A-7FFA4F499BD6} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{B81FB7B6-D30E-428F-908A-41422EFC1172} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{0F85E674-34AE-443D-954C-8321EB8B93B1} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
+		{632BBE62-5421-49EA-835A-7FFA4F499BD6} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F} = {E4E03FE0-94FD-47C7-88C5-F17D0AA549D3}
 		{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{DA5A6FE9-0040-40CC-83CC-764AE5306590} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{DA5A6FE9-0040-40CC-83CC-764AE5306590} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{0351ADA4-0C32-4652-9BA0-41F7B602372B} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD} = {E4E03FE0-94FD-47C7-88C5-F17D0AA549D3}
 		{6955446D-23F7-4023-9BB3-8657F904AF99} = {1AFB6476-670D-4E80-A464-657E01DFF482}
@@ -2931,20 +2873,20 @@ Global
 		{8F62026A-294B-41C6-8839-87463613F216} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{C3A17DCA-217B-462C-BB0C-BE086AF80081} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{69E1EE8D-143A-4060-9129-4658ACF14AAF} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{ECC20689-002A-4354-95A6-B58DF089C6FF} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{ECC20689-002A-4354-95A6-B58DF089C6FF} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{4BABF3FE-3451-42FD-873F-3C332E18DCEF} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{0648DF05-5DDA-4BE1-B5F2-584926EBDB65} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{0648DF05-5DDA-4BE1-B5F2-584926EBDB65} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{BA661F5B-1D5A-4FFC-9BF1-FC39DF280BDD} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{E496B7FC-1E99-4BAB-849B-0E8367040B02} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{7F4B3A60-BC27-45A7-8000-68B0B6EA7466} = {D9BD324E-1D80-44AA-8E7B-73EB00944434}
+		{7F4B3A60-BC27-45A7-8000-68B0B6EA7466} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{8DF78B53-200E-451F-9328-01EB907193AE} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{23D2070D-E4AD-4ADD-85A7-083D9C76AD49} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{62173D9A-6724-4C00-A1C8-FB646480A9EC} = {D9BD324E-1D80-44AA-8E7B-73EB00944434}
+		{62173D9A-6724-4C00-A1C8-FB646480A9EC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{127F38E0-40AA-4594-B955-5616BF206882} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{5E7360A8-D048-4ED3-8F09-0BFD64C5529A} = {127F38E0-40AA-4594-B955-5616BF206882}
 		{D940E07F-532C-4FF3-883F-790DA014F19A} = {127F38E0-40AA-4594-B955-5616BF206882}
 		{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{3E424AD2-19E5-4AE6-B833-F53963EB5FC1} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{3E424AD2-19E5-4AE6-B833-F53963EB5FC1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{106CBECA-0701-4FC3-838C-9DF816A19AE2} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{2D604C07-51FC-46BB-9EB7-75AECC7F5E81} = {106CBECA-0701-4FC3-838C-9DF816A19AE2}
 		{2EDB3EB4-FA92-4BFF-B2D8-566584837231} = {106CBECA-0701-4FC3-838C-9DF816A19AE2}
@@ -2952,27 +2894,27 @@ Global
 		{FF1D7936-842A-4BBB-8BEA-E9FE796DE700} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5043CECE-E6A7-4867-9CBE-02D27D83747A} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{11491FD8-F921-48BF-880C-7FEA185B80A1} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{F40C3397-1834-4530-B2D9-8F8B8456BCDF} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{F40C3397-1834-4530-B2D9-8F8B8456BCDF} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{A2D583F0-B70C-4462-B1F0-8E81AFB7BA85} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{4ED320BC-BA04-4D42-8D15-CBE62151F08B} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{4ED320BC-BA04-4D42-8D15-CBE62151F08B} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{322566EF-20DC-43A6-B9F8-616AF942579A} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{E94FD11C-0591-456F-899F-EFC0CA548336} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{782A61BE-9D85-4081-B35C-1CCC9DCC1E88} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{809AA252-E17A-4FA2-B0A1-0450976B763F} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{133281D8-1BCE-4D07-B31E-796612A9609E} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{133281D8-1BCE-4D07-B31E-796612A9609E} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{805306FF-A562-4415-8DEF-E493BDC45918} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{60CD2D4F-C3B9-4897-9821-FCA5098B41CE} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{1DC3BE92-CE89-43FB-8110-9C043A2FE7A2} = {60CD2D4F-C3B9-4897-9821-FCA5098B41CE}
 		{48A0A19E-A0BE-4256-ACF8-CC3B80291AF9} = {60CD2D4F-C3B9-4897-9821-FCA5098B41CE}
 		{9F94B303-5E21-4364-9362-64426F8DB932} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{EAE14C0E-7A6B-45DA-9080-A7D8C077BA6E} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{F7C8C0F1-5431-4347-89D0-8E5354F93CF2} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{04B193D7-3E21-46B8-A958-89B63A8A69DE} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{5BDBD6C9-A31F-4CEB-871A-5E9E709197EF} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{FD464B4C-2F68-4D06-91E7-4208146C41F5} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
-		{8FE5A5EE-1B59-401C-9FB3-B04ECD3E29C1} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{FD464B4C-2F68-4D06-91E7-4208146C41F5} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{8FE5A5EE-1B59-401C-9FB3-B04ECD3E29C1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{020A7474-3601-4160-A159-D7B70B77B15F} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{27718999-C175-450A-861C-89F911E16A88} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{1DBBB112-4BB1-444B-8EBB-E66555C76BA6} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
@@ -2986,7 +2928,6 @@ Global
 		{A50C70A6-2DA0-4027-B90E-B1A40755A8A5} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{25C91A4E-BA4E-467A-85CD-8B62545BF674} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
 		{6AB6A2D6-F859-4A82-9184-0BD29C9F07D1} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
-		{B1234567-1234-1234-1234-123456789ABC} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
 		{212AD910-8488-4036-BE20-326931B75FB2} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{7AC943C9-52E8-44CF-9083-744D8049667B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{54A93AF7-60C7-4F6C-99D2-FBB1F75F853A} = {7AC943C9-52E8-44CF-9083-744D8049667B}
@@ -2995,7 +2936,7 @@ Global
 		{C97D9A5D-206C-454E-997E-009E227D7F02} = {0F14491C-6369-4C45-AAA8-135814E66E6B}
 		{31D1C81D-765F-4446-AA62-E743F6325049} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{F05E590D-AD46-42BE-9C25-6A63ADD2E3EA} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
-		{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A} = {1C48CD47-D610-463A-A53C-AF82DD6C47E7}
+		{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{B41B888C-7DB8-4747-B262-4062E05A230D} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{AB82E5DD-C32D-4F28-9746-2C780846188E} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{57175EC7-92A5-4C1E-8244-E3FBCA2A81DE} = {AB82E5DD-C32D-4F28-9746-2C780846188E}
@@ -3008,7 +2949,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}
@@ -3025,7 +2965,7 @@ Global
 		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{8A08D663-4995-40E3-B42C-3F910625F284} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{923DF87C-CA99-4D1C-B1D2-959174E95BFA} = {322566EF-20DC-43A6-B9F8-616AF942579A}
-		{D5E42C63-57C5-4EF6-AECE-1E2FCA725B77} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
+		{D5E42C63-57C5-4EF6-AECE-1E2FCA725B77} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{D962A009-834F-4EEC-AABB-430DF8F98E39} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{9873BA05-4C41-4819-9283-CF45D795431B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{FC373B24-3293-453C-AAF5-CF2909DCEE6A} = {9873BA05-4C41-4819-9283-CF45D795431B}
@@ -3036,11 +2976,12 @@ Global
 		{9EBAA524-0EDA-470B-95D4-39383285CBB2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{D095BE44-1F2E-463E-A494-121892A75EA2} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{90F9FA90-2C20-4004-96E6-F3B78151F5A5} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{3B227528-4BA6-4CAF-B44A-A10C78A64849} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F5E1146E-B7B3-4E11-85FD-270A500BD78C} = {3B227528-4BA6-4CAF-B44A-A10C78A64849}
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6} = {3B227528-4BA6-4CAF-B44A-A10C78A64849}
 		{4C0D0746-BE5B-49EE-BD5D-A7811628AE8B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{538ED0BB-B863-4B20-98CC-BCDF7FA0B68A} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA} = {538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}
 		{B9420661-B0E4-4241-ABD4-4A27A1F64250} = {538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}
@@ -3048,8 +2989,8 @@ Global
 		{D949EC7D-48A9-4279-95D5-078E7FD1F048} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{3BAF9C81-A194-4925-A035-5E24A5D1E542} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{6B04803D-B418-4833-A67E-B0FC966636A5} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{3940AD4D-F748-4BE4-9083-85769CD553EF} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{3940AD4D-F748-4BE4-9083-85769CD553EF} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{0014D652-901F-4456-8D65-06FC5F997FB0} = {4C0D0746-BE5B-49EE-BD5D-A7811628AE8B}
 		{799A50D8-DE89-4ED1-8FF8-AD5A9ED8C0CA} = {AB82E5DD-C32D-4F28-9746-2C780846188E}
 		{9D52FD25-EF90-4F9A-A015-91EFC5DAF54F} = {AB82E5DD-C32D-4F28-9746-2C780846188E}
@@ -3057,6 +2998,8 @@ Global
 		{02DD46D3-F761-47D9-8894-2D6DA0124650} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{8E23E173-7127-4A5F-9F93-3049F2B68047} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8} = {538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95}
 		{8ACB33D9-C95B-47D4-8363-9731EE0930A0} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
@@ -3066,7 +3009,7 @@ Global
 		{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{14CB58B7-D280-4A7A-95DE-4B2DF14EA000} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C} = {68328142-5B31-4715-BCBB-7B6345EE0971}
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{9C53CC25-0623-4569-95BC-B05410675EE3} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{45285DF2-9742-4ECA-9AC9-58951FC26489} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{3D63307B-9D27-44FD-B033-B26F39245B85} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
@@ -3074,7 +3017,7 @@ Global
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD} = {8F62026A-294B-41C6-8839-87463613F216}
-		{66614C26-314C-4B91-9071-76133422CFEF} = {BFFB607F-7C78-434B-86B9-DA4C8196A1B5}
+		{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{3846508C-77EB-4034-A702-F8BB263C4F79} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{6CE438DF-C245-4997-A360-0A0939E4BA34} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
@@ -3104,6 +3047,8 @@ Global
 		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9B3962F4-AB69-4C2A-8917-2C8448AC6960}
+		{7F5B9557-5878-4438-A721-3E28296BA193} = {9B3962F4-AB69-4C2A-8917-2C8448AC6960}
 		{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{E4585179-2AC1-4D5F-A3FF-CFC5392F694C} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
@@ -3112,55 +3057,32 @@ Global
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{4382A954-179A-4078-92AF-715187DFFF50} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{EBED240C-8702-452D-B764-6DB9DA9179AF} = {1C48CD47-D610-463A-A53C-AF82DD6C47E7}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {1C48CD47-D610-463A-A53C-AF82DD6C47E7}
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {8131151D-B0E9-4E18-84A5-E5F946C4480A}
+		{EBED240C-8702-452D-B764-6DB9DA9179AF} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
+		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {66E1534A-1587-42B2-912F-45C994D32904}
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{9E0CBC06-F29A-4810-B93C-97D53863B95E} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{F6088A11-1C9E-4420-AA90-CF7E78DD7F1C} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{47B0678C-806B-4FE1-9F50-46BA88989532} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{9BC1C986-1E97-4D07-A7B1-CE226C239EFA} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
+		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{61CBF221-9452-4934-B685-146285E080D7} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{9D3F3793-EFE3-4525-8782-238015DABA62} = {66E1534A-1587-42B2-912F-45C994D32904}
+		{9D3F3793-EFE3-4525-8782-238015DABA62} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{0E556541-6A45-42CB-AE49-EE5A9BE05E7C} = {6C7F47CC-2151-44A3-A546-41C70025132C}
-		{27D9CB3A-46D1-402C-9273-F88CB8AC42F7} = {9873BA05-4C41-4819-9283-CF45D795431B}
-		{B9617A31-0F0A-4397-851D-BF2FBEE32D7F} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
-		{1C48CD47-D610-463A-A53C-AF82DD6C47E7} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
-		{D9BD324E-1D80-44AA-8E7B-73EB00944434} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{8EF25507-2575-4ADE-BF7E-D23376903AB8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA} = {B1234567-1234-1234-1234-123456789ABC}
-		{2C318EC3-BA86-4372-B1BC-DB0F33C208B2} = {322566EF-20DC-43A6-B9F8-616AF942579A}
-		{BFFB607F-7C78-434B-86B9-DA4C8196A1B5} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
-		{66E1534A-1587-42B2-912F-45C994D32904} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{E885E71F-0B34-4A03-B13B-20F4E05E90BB} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
-		{264B412F-DB8B-4CF8-A74B-96998B183045} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
-		{3527BF37-DFC5-4309-A032-29278CA21328} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
-		{6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{68328142-5B31-4715-BCBB-7B6345EE0971} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0} = {27D9CB3A-46D1-402C-9273-F88CB8AC42F7}
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55} = {27D9CB3A-46D1-402C-9273-F88CB8AC42F7}
-		{6748A29D-DA6A-033A-825B-752295FF6AA0} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{6EABCF9A-6526-441F-932F-658B1DC3E403} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{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}
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
+		{129A8FCD-CB54-4AD1-AC42-2BFCE159107A} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
+		{E4BAAD93-A499-42FD-A741-7E9591594B61} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
+		{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D} = {9B3962F4-AB69-4C2A-8917-2C8448AC6960}
+		{9B3962F4-AB69-4C2A-8917-2C8448AC6960} = {9873BA05-4C41-4819-9283-CF45D795431B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

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,25 +50,25 @@ 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
 
 ## How to add the first UI tests for your modules
-- Follow the naming convention: ![{ModuleFolder}/Tests/{ModuleName}-{TestType(Fuzz/UI/Unit)}Tests](images/uitests/naming.png)
+
 - Create a new project and add the following references to the project file. Change the OutputPath to your own module's path.
   ```
     <Project Sdk="Microsoft.NET.Sdk">

doc/devdocs/readme.md

@@ -67,7 +67,10 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 - When you'd like the team to take a look (even if the work is not yet fully complete) mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
 - When the PR is approved, let the owner of the PR merge it. For community contributions, the reviewer who approved the PR can also merge it.
 - Use the `Squash and merge` option to merge a PR. If you don't want to squash it because there are logically different commits, use `Rebase and merge`.
-- Close issues automatically when referenced in a PR. You can use [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in the body of the PR to have GitHub automatically link your PR to the issue.
+- We don't close issues automatically when referenced in a PR, so after the PR is merged:
+  - mark the issue(s) that the PR solved with the `Resolution-Fix-Committed` label, remove the `In progress` label and if the issue is assigned to a project, move the item to the `Done` status.
+  - don't close the issue if it's a bug in the current released version; since users tend to not search for closed issues, we will close the resolved issues when a new version is released.
+  - if it's not a code fix that effects the end user, the issue can be closed (for example a fix in the build or a code refactoring and so on).
 
 ## Compiling PowerToys
 

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
 

src/codeAnalysis/GlobalSuppressions.cs

@@ -120,3 +120,5 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1025:Code should not contain multiple whitespace in a row", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
 [assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1028:Code should not contain trailing whitespace", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
 [assembly: SuppressMessage("Usage", "CsWinRT1028:Class is not marked partial", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
+[assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "none", Scope = "member", Target = "~M:Microsoft.AdvancedPaste.UITests.WordManager.PasteTextToTarget(System.Int32)")]
+[assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "none", Scope = "member", Target = "~M:Microsoft.AdvancedPaste.UITests.WordManager.CopyTextFromSource(System.Int32,System.Int32)~System.String")]

src/common/UITestAutomation/Element/TextBox.cs

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

src/common/UITestAutomation/EnvironmentConfig.cs

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

src/common/UITestAutomation/ModuleConfigData.cs

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

src/common/UITestAutomation/SessionHelper.cs

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

src/common/UITestAutomation/UITestBase.cs

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

src/common/UITestAutomation/VisualAssert.cs

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

src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj

@@ -7,7 +7,6 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UnitTestsCommonLib</RootNamespace>
     <ProjectSubType>NativeUnitTestProject</ProjectSubType>
-    <ProjectName>Common.Lib.UnitTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">

src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPasteUITest.cs

@@ -80,7 +80,6 @@ namespace Microsoft.AdvancedPaste.UITests
         [TestMethod]
         [TestCategory("AdvancedPasteUITest")]
         [TestCategory("PasteAsPlainText")]
-        [Ignore("Temporarily disabled due to wordpad.exe is missing in pipeline.")]
         public void TestCasePasteAsPlainText()
         {
             // Copy some rich text(e.g word of the text is different color, another work is bold, underlined, etd.).
@@ -128,14 +127,16 @@ namespace Microsoft.AdvancedPaste.UITests
 
         [TestMethod]
         [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsMarkdownCase1")]
-        public void TestCasePasteAsMarkdownCase1()
+        [TestCategory("PasteAsMarkdown")]
+        public void TestCasePasteAsMarkdown()
         {
             if (_notepadSettingsChanged == false)
             {
                 ChangeNotePadSettings();
             }
 
+            // TODO: Open Settings and set Paste as Markdown directly hotkey
+
             // Copy some text(e.g.some HTML text - convertible to Markdown)
             // Paste the text using set hotkey and confirm that pasted text is converted to markdown
             DeleteAndCopyFile(pasteAsMarkdownSrcFile, tempTxtFileName);
@@ -145,44 +146,22 @@ namespace Microsoft.AdvancedPaste.UITests
                 Path.Combine(testFilesFolderPath, pasteAsMarkdownResultFile),
                 compareFormatting: true);
             Assert.IsTrue(result.IsConsistent, "Paste as markdown using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsMarkdownCase2")]
-        public void TestCasePasteAsMarkdownCase2()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
 
             // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted Markdown text will be picked up from clipboard and converted again to nested Markdown).
             // Open Advanced Paste window using hotkey, click Paste as markdown button and confirm that pasted text is converted to markdown
             DeleteAndCopyFile(pasteAsMarkdownSrcFile, tempTxtFileName);
             ContentCopyAndPasteAsMarkdownCase2(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
+            result = FileReader.CompareRtfFiles(
                 Path.Combine(testFilesFolderPath, tempTxtFileName),
                 Path.Combine(testFilesFolderPath, pasteAsMarkdownResultFile),
                 compareFormatting: true);
             Assert.IsTrue(result.IsConsistent, "Paste as markdown using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsMarkdownCase3")]
-        public void TestCasePasteAsMarkdownCase3()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
 
             // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted Markdown text will be picked up from clipboard and converted again to nested Markdown).
             // Open Advanced Paste window using hotkey, press Ctrl + 2 and confirm that pasted text is converted to markdown
             DeleteAndCopyFile(pasteAsMarkdownSrcFile, tempTxtFileName);
             ContentCopyAndPasteAsMarkdownCase3(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
+            result = FileReader.CompareRtfFiles(
                 Path.Combine(testFilesFolderPath, tempTxtFileName),
                 Path.Combine(testFilesFolderPath, pasteAsMarkdownResultFile),
                 compareFormatting: true);
@@ -191,14 +170,16 @@ namespace Microsoft.AdvancedPaste.UITests
 
         [TestMethod]
         [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsJSONCase1")]
-        public void TestCasePasteAsJSONCase1()
+        [TestCategory("PasteAsJSON")]
+        public void TestCasePasteAsJSON()
         {
             if (_notepadSettingsChanged == false)
             {
                 ChangeNotePadSettings();
             }
 
+            // TODO: Open Settings and set Paste as JSON directly hotkey
+
             // Copy some XML or CSV text(or any other text, it will be converted to simple JSON object)
             // Paste the text using set hotkey and confirm that pasted text is converted to JSON
             DeleteAndCopyFile(pasteAsJsonFileName, tempTxtFileName);
@@ -208,44 +189,22 @@ namespace Microsoft.AdvancedPaste.UITests
                 Path.Combine(testFilesFolderPath, pasteAsJsonResultFile),
                 compareFormatting: true);
             Assert.IsTrue(result.IsConsistent, "Paste as Json using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsJSONCase2")]
-        public void TestCasePasteAsJSONCase2()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
 
             // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted JSON text will be picked up from clipboard and converted again to nested JSON).
             // Open Advanced Paste window using hotkey, click Paste as markdown button and confirm that pasted text is converted to markdown
             DeleteAndCopyFile(pasteAsJsonFileName, tempTxtFileName);
             ContentCopyAndPasteAsJsonCase2(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
+            result = FileReader.CompareRtfFiles(
                 Path.Combine(testFilesFolderPath, tempTxtFileName),
                 Path.Combine(testFilesFolderPath, pasteAsJsonResultFile),
                 compareFormatting: true);
             Assert.IsTrue(result.IsConsistent, "Paste as Json using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsJSONCase3")]
-        public void TestCasePasteAsJSONCase3()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
 
             // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted JSON text will be picked up from clipboard and converted again to nested JSON).
             // Open Advanced Paste window using hotkey, press Ctrl + 3 and confirm that pasted text is converted to markdown
             DeleteAndCopyFile(pasteAsJsonFileName, tempTxtFileName);
             ContentCopyAndPasteAsJsonCase3(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
+            result = FileReader.CompareRtfFiles(
                 Path.Combine(testFilesFolderPath, tempTxtFileName),
                 Path.Combine(testFilesFolderPath, pasteAsJsonResultFile),
                 compareFormatting: true);
@@ -273,9 +232,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -306,9 +273,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -341,9 +316,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -381,8 +364,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -420,9 +412,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -453,9 +453,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -491,8 +499,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -506,7 +523,7 @@ namespace Microsoft.AdvancedPaste.UITests
 
             // Open Advanced Paste window using hotkey
             this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(15000);
+            Thread.Sleep(1000);
 
             this.SendKeys(Key.LCtrl, Key.Num2);
             Thread.Sleep(1000);
@@ -529,9 +546,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -562,9 +587,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -600,9 +633,17 @@ namespace Microsoft.AdvancedPaste.UITests
                 throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
             }
 
+            string windowTitle = Path.GetFileNameWithoutExtension(tempFile) + (isRTF ? " - WordPad" : " - Notepad");
+
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
+            // Replace SetForegroundWindow with the improved function
+            var window = this.Find<Window>(windowTitle, global: true);
+
+            if (window == null)
+            {
+                throw new InvalidOperationException($"Failed to set focus to {(isRTF ? "WordPad" : "Notepad")} window.");
+            }
 
             window.Click();
             Thread.Sleep(1000);
@@ -616,7 +657,7 @@ namespace Microsoft.AdvancedPaste.UITests
 
             // Open Advanced Paste window using hotkey
             this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(15000);
+            Thread.Sleep(1000);
 
             this.SendKeys(Key.LCtrl, Key.Num3);
             Thread.Sleep(1000);
@@ -674,8 +715,7 @@ namespace Microsoft.AdvancedPaste.UITests
 
             Thread.Sleep(15000);
 
-            var window = FindWindowWithFlexibleTitle("Untitled", false);
-
+            var window = this.Find<Window>("Untitled - Notepad", global: true);
             window.Find<PowerToys.UITest.Button>("Settings").Click();
             var combobox = window.Find<PowerToys.UITest.ComboBox>("Opening files");
             combobox.SelectTxt("Open in a new window");
@@ -688,50 +728,6 @@ namespace Microsoft.AdvancedPaste.UITests
             window.Close();
         }
 
-        /// <summary>
-        /// Finds a window with flexible title matching, trying multiple title variations
-        /// </summary>
-        /// <param name="baseTitle">The base title to search for</param>
-        /// <param name="isRTF">Whether the window is a WordPad window</param>
-        /// <returns>The found Window element or throws an exception if not found</returns>
-        private Window FindWindowWithFlexibleTitle(string baseTitle, bool isRTF)
-        {
-            Window? window = null;
-            string appType = isRTF ? "WordPad" : "Notepad";
-
-            // Try different title variations
-            string[] titleVariations = new string[]
-            {
-                baseTitle + (isRTF ? " - WordPad" : " - Notepad"),  // With suffix
-                baseTitle,                                          // Without suffix
-                Path.GetFileNameWithoutExtension(baseTitle) + (isRTF ? " - WordPad" : " - Notepad"),  // Without extension, with suffix
-                Path.GetFileNameWithoutExtension(baseTitle),        // Without extension, without suffix
-            };
-
-            Exception? lastException = null;
-
-            foreach (string title in titleVariations)
-            {
-                try
-                {
-                    window = this.Find<Window>(title, global: true);
-                    if (window != null)
-                    {
-                        return window;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // Save the exception, but continue trying other variations
-                    lastException = ex;
-                }
-            }
-
-            // If we couldn't find the window with any variation, throw an exception with details
-            throw new InvalidOperationException(
-                $"Failed to find {appType} window with title containing '{baseTitle}'. ");
-        }
-
         private static void CopySettingsFileBeforeTests()
         {
             try

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

@@ -4,8 +4,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv4",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -35,8 +35,8 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "WinRT.Runtime.dll"
       ],
@@ -45,8 +45,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv6",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -76,8 +76,8 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "WinRT.Runtime.dll"
       ],
@@ -86,8 +86,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidHosts",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -117,8 +117,8 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "WinRT.Runtime.dll"
       ],
@@ -127,8 +127,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzWriteAsync",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -160,8 +160,8 @@
         // (globs are supported)
         "Castle.Core.dll",
         "CommunityToolkit.Mvvm.dll",
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "Moq.dll",
         "System.IO.Abstractions.dll",

src/modules/PowerOCR/PowerOCR-UITests/PowerOCR.UITests.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
-    <RootNamespace>PowerOCR.UITests</RootNamespace>
-	<ImplicitUsings>enable</ImplicitUsings>
-	<Nullable>enable</Nullable>
-	<OutputType>Library</OutputType>
-	<RunVSTest>false</RunVSTest>
-  </PropertyGroup>
-
-  <PropertyGroup>
-	<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\PowerOCR.UITests\</OutputPath>
-  </PropertyGroup>
-	
-  <ItemGroup>
-    <PackageReference Include="MSTest" />
-	<ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
-  </ItemGroup>
-</Project>

src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using static Microsoft.PowerToys.UITest.UITestBase;
-
-namespace PowerOCR.UITests;
-
-[TestClass]
-public class PowerOCRTests : UITestBase
-{
-    public PowerOCRTests()
-        : base(PowerToysModule.PowerToysSettings, WindowSize.Medium)
-    {
-    }
-
-    [TestInitialize]
-    public void TestInitialize()
-    {
-        if (FindAll<NavigationViewItem>("Text Extractor").Count == 0)
-        {
-            // Expand Advanced list-group if needed
-            Find<NavigationViewItem>("System Tools").Click();
-        }
-
-        Find<NavigationViewItem>("Text Extractor").Click();
-
-        Find<ToggleSwitch>("Enable Text Extractor").Toggle(true);
-
-        SendKeys(Key.Win, Key.D);
-    }
-
-    [TestMethod("PowerOCR.DetectTextExtractor")]
-    [TestCategory("PowerOCR Detection")]
-    public void DetectTextExtractorTest()
-    {
-        try
-        {
-            SendKeys(Key.Win, Key.Shift, Key.T);
-
-            Thread.Sleep(5000);
-
-            var textExtractorWindow = Find("TextExtractor", 10000, true);
-
-            Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
-
-            Console.WriteLine("✓ TextExtractor window detected successfully after hotkey activation");
-
-            SendKeys(Key.Esc);
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"Failed to detect TextExtractor window: {ex.Message}");
-            Assert.Fail("TextExtractor window was not found after hotkey activation");
-        }
-    }
-}

src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesLibUnitTests.vcxproj

@@ -5,7 +5,7 @@
     <ProjectGuid>{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>WorkspacesLibUnitTests</RootNamespace>
-    <ProjectName>Workspaces.Lib.UnitTests</ProjectName>
+    <ProjectName>WorkspacesLibUnitTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">

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.SetCanceled(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.Common/Services/IRunHistoryService.cs

@@ -1,27 +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.Collections.Generic;
-
-namespace Microsoft.CmdPal.Common.Services;
-
-public interface IRunHistoryService
-{
-    /// <summary>
-    /// Gets the run history.
-    /// </summary>
-    /// <returns>A list of run history items.</returns>
-    IReadOnlyList<string> GetRunHistory();
-
-    /// <summary>
-    /// Clears the run history.
-    /// </summary>
-    void ClearRunHistory();
-
-    /// <summary>
-    /// Adds a run history item.
-    /// </summary>
-    /// <param name="item">The run history item to add.</param>
-    void AddRunHistoryItem(string item);
-}

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

@@ -313,10 +313,6 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
                 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));
@@ -342,7 +338,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                     var newContextMenu = more
                         .Select(item =>
                         {
-                            if (item is ICommandContextItem contextItem)
+                            if (item is CommandContextItem contextItem)
                             {
                                 return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                             }
@@ -389,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 != null)
-                {
-                    _itemTitle = model.Title;
-                }
-
                 UpdateProperty(nameof(Title));
                 UpdateProperty(nameof(Name));
                 break;

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;
 
@@ -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);
                     }
@@ -172,7 +172,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
                             .ToList()
                             .Select(item =>
                             {
-                                if (item is ICommandContextItem contextItem)
+                                if (item is CommandContextItem contextItem)
                                 {
                                     return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                                 }

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

@@ -14,7 +14,8 @@ using Windows.System;
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class ContextMenuViewModel : ObservableObject,
-    IRecipient<UpdateCommandBarMessage>
+    IRecipient<UpdateCommandBarMessage>,
+    IRecipient<OpenContextMenuMessage>
 {
     public ICommandBarContext? SelectedItem
     {
@@ -42,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)
@@ -49,6 +51,16 @@ 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 != null)
@@ -180,7 +192,7 @@ public partial class ContextMenuViewModel : ObservableObject,
         ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
     }
 
-    public void ResetContextMenu()
+    private void ResetContextMenu()
     {
         while (ContextMenuStack.Count > 1)
         {

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;
@@ -57,8 +56,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     public CommandItemViewModel EmptyContent { get; private set; }
 
-    public bool IsMainPage { get; init; }
-
     private bool _isDynamic;
 
     private Task? _initializeItemsTask;
@@ -122,7 +119,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
             ItemsUpdated?.Invoke(this, EventArgs.Empty);
             UpdateEmptyContent();
-            _isLoading.Clear();
+            _isLoading = false;
         }
     }
 
@@ -222,7 +219,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 }
 
                 ItemsUpdated?.Invoke(this, EventArgs.Empty);
-                _isLoading.Clear();
+                _isLoading = false;
             });
     }
 
@@ -373,7 +370,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
                }
 
                TextToSuggest = item.TextToSuggest;
-               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(item.TextToSuggest));
            });
 
         _lastSelectedItem = item;
@@ -427,8 +423,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
                WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
 
-               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(string.Empty));
-
                TextToSuggest = string.Empty;
            });
     }
@@ -470,38 +464,21 @@ public partial class ListViewModel : PageViewModel, IDisposable
             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)

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

@@ -1,9 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.CmdPal.Core.ViewModels.Messages;
-
-public record UpdateSuggestionMessage(string TextToSuggest)
-{
-}

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/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/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]
@@ -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.UI.ViewModels/AppStateModel.cs

@@ -21,12 +21,8 @@ public partial class AppStateModel : ObservableObject
 
     ///////////////////////////////////////////////////////////////////////////
     // STATE HERE
-    // Make sure that you make the setters public (JsonSerializer.Deserialize will fail silently otherwise)!
-    // Make sure that any new types you add are added to JsonSerializationContext!
     public RecentCommandsManager RecentCommands { get; set; } = new();
 
-    public List<string> RunHistory { get; set; } = [];
-
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 
@@ -90,7 +86,7 @@ public partial class AppStateModel : ObservableObject
                 {
                     foreach (var item in newSettings)
                     {
-                        savedSettings[item.Key] = item.Value?.DeepClone();
+                        savedSettings[item.Key] = item.Value != null ? item.Value.DeepClone() : null;
                     }
 
                     var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
@@ -125,4 +121,20 @@ public partial class AppStateModel : ObservableObject
         // now, the settings is just next to the exe
         return Path.Combine(directory, "state.json");
     }
+
+    // [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
+    // private static readonly JsonSerializerOptions _serializerOptions = new()
+    // {
+    //    WriteIndented = true,
+    //    Converters = { new JsonStringEnumConverter() },
+    // };
+
+    // private static readonly JsonSerializerOptions _deserializerOptions = new()
+    // {
+    //    PropertyNameCaseInsensitive = true,
+    //    IncludeFields = true,
+    //    AllowTrailingCommas = true,
+    //    PreferredObjectCreationHandling = JsonObjectCreationHandling.Populate,
+    //    ReadCommentHandling = JsonCommentHandling.Skip,
+    // };
 }

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)
 {
@@ -29,9 +29,9 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
             return;
         }
 
-        if (model.SettingsPage != 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/MainListPage.cs

@@ -164,11 +164,6 @@ public partial class MainListPage : DynamicListPage,
                 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);
                 }
             }
@@ -268,7 +263,7 @@ public partial class MainListPage : DynamicListPage,
         {
              nameMatch,
              descriptionMatch,
-             isFallback ? 1 : 0, // Always give fallbacks a chance
+             isFallback ? 1 : 0, // Always give fallbacks a chance...
         };
         var max = scores.Max();
 
@@ -278,7 +273,8 @@ public partial class MainListPage : DynamicListPage,
         // above "git" from "whatever"
         max = max + extensionTitleMatch;
 
-        var matchSomething = max
+        // ... but downweight them
+        var matchSomething = (max / (isFallback ? 3 : 1))
             + (isAliasMatch ? 9001 : (isAliasSubstringMatch ? 1 : 0));
 
         // If we matched title, subtitle, or alias (something real), then

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;
@@ -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();
             }
         }
     }

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

@@ -9,7 +9,6 @@ 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.Core.ViewModels.Messages;
@@ -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,52 +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 = -1;
-
-            // 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
-                {
-                    if (sender.ProviderId == wrapper.CommandProviderId)
-                    {
-                        startIndex = i;
-                        break;
-                    }
-                }
-                catch
-                {
-                }
-            }
-
-            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;
+        }
+
+        // add the new commands into the list at the place we found the old ones
+        clone.InsertRange(startIndex, newItems);
+
+        // 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>()!;
@@ -414,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

@@ -47,8 +47,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 
     public CommandItemViewModel ItemViewModel => _commandItemViewModel;
 
-    public string CommandProviderId => _commandProviderId;
-
     ////// ICommandItem
     public string Title => _commandItemViewModel.Title;
 
@@ -65,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();
 
@@ -353,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

@@ -98,13 +98,10 @@ public partial class App : Application
 
         // Built-in Commands. Order matters - this is the order they'll be presented by default.
         var allApps = new AllAppsCommandProvider();
-        var files = new IndexerCommandsProvider();
-        files.SuppressFallbackWhen(ShellCommandsProvider.SuppressFileFallbackIf);
         services.AddSingleton<ICommandProvider>(allApps);
-
         services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
         services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
-        services.AddSingleton<ICommandProvider>(files);
+        services.AddSingleton<ICommandProvider, IndexerCommandsProvider>();
         services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
 
         services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
@@ -147,7 +144,6 @@ public partial class App : Application
         services.AddSingleton(state);
         services.AddSingleton<IExtensionService, ExtensionService>();
         services.AddSingleton<TrayIconService>();
-        services.AddSingleton<IRunHistoryService, RunHistoryService>();
 
         services.AddSingleton<IRootPageService, PowerToysRootPageService>();
         services.AddSingleton<IAppHostService, PowerToysAppHostService>();

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

@@ -76,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
@@ -146,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
@@ -169,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
@@ -200,45 +200,12 @@
                 x:Name="MoreCommandsButton"
                 x:Uid="MoreCommandsButton"
                 Padding="4"
-                Click="MoreCommandsButton_Clicked"
+                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="2">
-                        <Border
-                            Padding="4,2,4,2"
-                            VerticalAlignment="Center"
-                            Background="{ThemeResource SubtleFillColorSecondaryBrush}"
-                            BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                            BorderThickness="1"
-                            CornerRadius="4">
-                            <TextBlock
-                                CharacterSpacing="4"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="Ctrl" />
-                        </Border>
-                        <Border
-                            Padding="4,2,4,2"
-                            VerticalAlignment="Center"
-                            Background="{ThemeResource SubtleFillColorSecondaryBrush}"
-                            BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                            BorderThickness="1"
-                            CornerRadius="4">
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                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,7 +5,6 @@
 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;
@@ -114,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/ContentIcon.cs

@@ -2,7 +2,9 @@
 // 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.Runtime.InteropServices;
 using CommunityToolkit.WinUI;
+using ManagedCommon;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
@@ -35,7 +37,14 @@ public partial class ContentIcon : FontIcon
     {
         if (this.FindDescendants().OfType<Grid>().FirstOrDefault() is Grid grid && Content is not null)
         {
-            grid.Children.Add(Content);
+            try
+            {
+                grid.Children.Add(Content);
+            }
+            catch (COMException ex)
+            {
+                Logger.LogError(ex.ToString());
+            }
         }
     }
 }

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

@@ -131,7 +131,7 @@
                 ItemClick="CommandsDropdown_ItemClick"
                 ItemTemplateSelector="{StaticResource ContextItemTemplateSelector}"
                 ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
-                PreviewKeyDown="CommandsDropdown_PreviewKeyDown"
+                KeyDown="CommandsDropdown_KeyDown"
                 SelectionMode="Single">
                 <ListView.ItemContainerStyle>
                     <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">

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

@@ -5,7 +5,6 @@
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CmdPal.UI.Messages;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -39,9 +38,6 @@ public sealed partial class ContextMenu : UserControl,
 
     public void Receive(OpenContextMenuMessage message)
     {
-        ViewModel.FilterOnTop = message.ContextMenuFilterLocation == ContextMenuFilterLocation.Top;
-        ViewModel.ResetContextMenu();
-
         UpdateUiForStackChange();
     }
 
@@ -84,7 +80,7 @@ public sealed partial class ContextMenu : UserControl,
         }
     }
 
-    private void CommandsDropdown_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    private void CommandsDropdown_KeyDown(object sender, KeyRoutedEventArgs e)
     {
         if (e.Handled)
         {
@@ -174,6 +170,8 @@ public sealed partial class ContextMenu : UserControl,
 
             e.Handled = true;
         }
+
+        CommandsDropdown_KeyDown(sender, e);
     }
 
     private void ContextFilterBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
@@ -190,8 +188,6 @@ public sealed partial class ContextMenu : UserControl,
 
             e.Handled = true;
         }
-
-        CommandsDropdown_PreviewKeyDown(sender, e);
     }
 
     private void NavigateUp()

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconBox.cs

@@ -7,8 +7,6 @@ using Microsoft.CmdPal.UI.Deferred;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-
 using Windows.Foundation;
 
 namespace Microsoft.CmdPal.UI.Controls;
@@ -51,12 +49,6 @@ public partial class IconBox : ContentControl
     /// </summary>
     public event TypedEventHandler<IconBox, SourceRequestedEventArgs>? SourceRequested;
 
-    public IconBox()
-    {
-        TabFocusNavigation = KeyboardNavigationMode.Once;
-        IsTabStop = false;
-    }
-
     private static void OnSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is IconBox @this)

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

@@ -2,11 +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;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.Views;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Input;
@@ -21,7 +21,6 @@ namespace Microsoft.CmdPal.UI.Controls;
 public sealed partial class SearchBar : UserControl,
     IRecipient<GoHomeMessage>,
     IRecipient<FocusSearchBoxMessage>,
-    IRecipient<UpdateSuggestionMessage>,
     ICurrentPageAware
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
@@ -32,10 +31,6 @@ public sealed partial class SearchBar : UserControl,
     private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
     private bool _isBackspaceHeld;
 
-    private bool _inSuggestion;
-    private string? _lastText;
-    private string? _deletedSuggestion;
-
     public PageViewModel? CurrentPageViewModel
     {
         get => (PageViewModel?)GetValue(CurrentPageViewModelProperty);
@@ -74,7 +69,6 @@ public sealed partial class SearchBar : UserControl,
         this.InitializeComponent();
         WeakReferenceMessenger.Default.Register<GoHomeMessage>(this);
         WeakReferenceMessenger.Default.Register<FocusSearchBoxMessage>(this);
-        WeakReferenceMessenger.Default.Register<UpdateSuggestionMessage>(this);
     }
 
     public void ClearSearch()
@@ -131,6 +125,15 @@ public sealed partial class SearchBar : UserControl,
             WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
             e.Handled = true;
         }
+        else if (e.Key == VirtualKey.Right)
+        {
+            if (CurrentPageViewModel != null && !string.IsNullOrEmpty(CurrentPageViewModel.TextToSuggest))
+            {
+                FilterBox.Text = CurrentPageViewModel.TextToSuggest;
+                FilterBox.Select(FilterBox.Text.Length, 0);
+                e.Handled = true;
+            }
+        }
         else if (e.Key == VirtualKey.Escape)
         {
             if (string.IsNullOrEmpty(FilterBox.Text))
@@ -159,6 +162,16 @@ public sealed partial class SearchBar : UserControl,
                 CurrentPageViewModel.Filter = FilterBox.Text;
             }
         }
+
+        if (!e.Handled)
+        {
+            // The CommandBar is responsible for handling all the item keybindings,
+            // since the bound context item may need to then show another
+            // context menu
+            TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+            WeakReferenceMessenger.Default.Send(msg);
+            e.Handled = msg.Handled;
+        }
     }
 
     private void FilterBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
@@ -187,81 +200,12 @@ public sealed partial class SearchBar : UserControl,
 
             e.Handled = true;
         }
-        else if (e.Key == VirtualKey.Right)
-        {
-            if (_inSuggestion)
-            {
-                _inSuggestion = false;
-                _lastText = null;
-                DoFilterBoxUpdate();
-            }
-        }
         else if (e.Key == VirtualKey.Down)
         {
             WeakReferenceMessenger.Default.Send<NavigateNextCommand>();
 
             e.Handled = true;
         }
-
-        if (_inSuggestion)
-        {
-            if (
-                 e.Key == VirtualKey.Back ||
-                 e.Key == VirtualKey.Delete
-                 )
-            {
-                _deletedSuggestion = FilterBox.Text;
-
-                FilterBox.Text = _lastText ?? string.Empty;
-                FilterBox.Select(FilterBox.Text.Length, 0);
-
-                // Logger.LogInfo("deleting suggestion");
-                _inSuggestion = false;
-                _lastText = null;
-
-                e.Handled = true;
-                return;
-            }
-
-            var ignoreLeave =
-
-                e.Key == VirtualKey.Up ||
-                e.Key == VirtualKey.Down ||
-
-                e.Key == VirtualKey.RightMenu ||
-                e.Key == VirtualKey.LeftMenu ||
-                e.Key == VirtualKey.Menu ||
-                e.Key == VirtualKey.Shift ||
-                e.Key == VirtualKey.RightShift ||
-                e.Key == VirtualKey.LeftShift ||
-                e.Key == VirtualKey.RightControl ||
-                e.Key == VirtualKey.LeftControl ||
-                e.Key == VirtualKey.Control;
-            if (ignoreLeave)
-            {
-                return;
-            }
-
-            // Logger.LogInfo("leaving suggestion");
-            _inSuggestion = false;
-            _lastText = null;
-        }
-
-        if (!e.Handled)
-        {
-            var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-            var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-            var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-            var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-                InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
-
-            // The CommandBar is responsible for handling all the item keybindings,
-            // since the bound context item may need to then show another
-            // context menu
-            TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-            WeakReferenceMessenger.Default.Send(msg);
-            e.Handled = msg.Handled;
-        }
     }
 
     private void FilterBox_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
@@ -275,7 +219,7 @@ public sealed partial class SearchBar : UserControl,
 
     private void FilterBox_TextChanged(object sender, TextChangedEventArgs e)
     {
-        // Logger.LogInfo($"FilterBox_TextChanged: {FilterBox.Text}");
+        Debug.WriteLine($"FilterBox_TextChanged: {FilterBox.Text}");
 
         // TERRIBLE HACK TODO GH #245
         // There's weird wacky bugs with debounce currently. We're trying
@@ -284,22 +228,23 @@ public sealed partial class SearchBar : UserControl,
         // (otherwise aliases just stop working)
         if (FilterBox.Text.Length == 1)
         {
-            DoFilterBoxUpdate();
+            if (CurrentPageViewModel != null)
+            {
+                CurrentPageViewModel.Filter = FilterBox.Text;
+            }
 
             return;
         }
 
-        if (_inSuggestion)
-        {
-            // Logger.LogInfo($"-- skipping, in suggestion --");
-            return;
-        }
-
         // TODO: We could encapsulate this in a Behavior if we wanted to bind to the Filter property.
         _debounceTimer.Debounce(
             () =>
             {
-                DoFilterBoxUpdate();
+                // Actually plumb Filtering to the view model
+                if (CurrentPageViewModel != null)
+                {
+                    CurrentPageViewModel.Filter = FilterBox.Text;
+                }
             },
             //// Couldn't find a good recommendation/resource for value here. PT uses 50ms as default, so that is a reasonable default
             //// This seems like a useful testing site for typing times: https://keyboardtester.info/keyboard-latency-test/
@@ -309,21 +254,6 @@ public sealed partial class SearchBar : UserControl,
             immediate: FilterBox.Text.Length <= 1);
     }
 
-    private void DoFilterBoxUpdate()
-    {
-        if (_inSuggestion)
-        {
-            // Logger.LogInfo($"--- skipping ---");
-            return;
-        }
-
-        // Actually plumb Filtering to the view model
-        if (CurrentPageViewModel != null)
-        {
-            CurrentPageViewModel.Filter = FilterBox.Text;
-        }
-    }
-
     // Used to handle the case when a ListPage's `SearchText` may have changed
     private void Page_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
@@ -360,96 +290,4 @@ public sealed partial class SearchBar : UserControl,
     public void Receive(GoHomeMessage message) => ClearSearch();
 
     public void Receive(FocusSearchBoxMessage message) => FilterBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
-
-    public void Receive(UpdateSuggestionMessage message)
-    {
-        var suggestion = message.TextToSuggest;
-
-        _queue.TryEnqueue(new(() =>
-        {
-            var clearSuggestion = string.IsNullOrEmpty(suggestion);
-
-            if (clearSuggestion && _inSuggestion)
-            {
-                // Logger.LogInfo($"Cleared suggestion \"{_lastText}\" to {suggestion}");
-                _inSuggestion = false;
-                FilterBox.Text = _lastText ?? string.Empty;
-                _lastText = null;
-                return;
-            }
-
-            if (clearSuggestion)
-            {
-                _deletedSuggestion = null;
-                return;
-            }
-
-            if (suggestion == _deletedSuggestion)
-            {
-                return;
-            }
-            else
-            {
-                _deletedSuggestion = null;
-            }
-
-            var currentText = _lastText ?? FilterBox.Text;
-
-            _lastText = currentText;
-
-            // if (_inSuggestion)
-            // {
-            //     Logger.LogInfo($"Suggestion from \"{_lastText}\" to {suggestion}");
-            // }
-            // else
-            // {
-            //     Logger.LogInfo($"Entering suggestion from \"{_lastText}\" to {suggestion}");
-            // }
-            _inSuggestion = true;
-
-            var matchedChars = 0;
-            var suggestionStartsWithQuote = suggestion.Length > 0 && suggestion[0] == '"';
-            var currentStartsWithQuote = currentText.Length > 0 && currentText[0] == '"';
-            var skipCheckingFirst = suggestionStartsWithQuote && !currentStartsWithQuote;
-            for (int i = skipCheckingFirst ? 1 : 0, j = 0;
-                 i < suggestion.Length && j < currentText.Length;
-                 i++, j++)
-            {
-                if (string.Equals(
-                    suggestion[i].ToString(),
-                    currentText[j].ToString(),
-                    StringComparison.OrdinalIgnoreCase))
-                {
-                    matchedChars++;
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            var first = skipCheckingFirst ? "\"" : string.Empty;
-            var second = currentText.AsSpan(0, matchedChars);
-            var third = suggestion.AsSpan(matchedChars + (skipCheckingFirst ? 1 : 0));
-
-            var newText = string.Concat(
-                first,
-                second,
-                third);
-
-            FilterBox.Text = newText;
-
-            var wrappedInQuotes = suggestionStartsWithQuote && suggestion.Last() == '"';
-            if (wrappedInQuotes)
-            {
-                FilterBox.Select(
-                    (skipCheckingFirst ? 1 : 0) + matchedChars,
-                    Math.Max(0, suggestion.Length - matchedChars - 1 + (skipCheckingFirst ? -1 : 0)));
-            }
-            else
-            {
-                FilterBox.Select(matchedChars, suggestion.Length - matchedChars);
-            }
-        }));
-    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/ContextItemTemplateSelector.cs

@@ -33,14 +33,9 @@ internal sealed partial class ContextItemTemplateSelector : DataTemplateSelector
                 li.AllowFocusOnInteraction = false;
                 dataTemplate = Separator;
             }
-            else if (item is CommandContextItemViewModel commandItem)
-            {
-                dataTemplate = commandItem.IsCritical ? Critical : Default;
-            }
             else
             {
-                // Fallback for unknown types
-                dataTemplate = Default;
+                dataTemplate = ((CommandContextItemViewModel)item).IsCritical ? Critical : Default;
             }
         }
 

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml

@@ -113,14 +113,13 @@
                 <ListView
                     x:Name="ItemsList"
                     Padding="0,2,0,0"
-                    ContextCanceled="ItemsList_OnContextCanceled"
-                    ContextRequested="ItemsList_OnContextRequested"
                     DoubleTapped="ItemsList_DoubleTapped"
                     IsDoubleTapEnabled="True"
                     IsItemClickEnabled="True"
                     ItemClick="ItemsList_ItemClick"
                     ItemTemplate="{StaticResource ListItemViewModelTemplate}"
                     ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
+                    RightTapped="ItemsList_RightTapped"
                     SelectionChanged="ItemsList_SelectionChanged">
                     <ListView.ItemContainerTransitions>
                         <TransitionCollection />

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs

@@ -7,7 +7,6 @@ using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
@@ -145,18 +144,6 @@ public sealed partial class ListPage : Page,
         if (ItemsList.SelectedItem != null)
         {
             ItemsList.ScrollIntoView(ItemsList.SelectedItem);
-
-            // Automation notification for screen readers
-            var listViewPeer = Microsoft.UI.Xaml.Automation.Peers.ListViewAutomationPeer.CreatePeerForElement(ItemsList);
-            if (listViewPeer != null && li != null)
-            {
-                var notificationText = li.Title;
-                listViewPeer.RaiseNotificationEvent(
-                    Microsoft.UI.Xaml.Automation.Peers.AutomationNotificationKind.Other,
-                    Microsoft.UI.Xaml.Automation.Peers.AutomationNotificationProcessing.MostRecent,
-                    notificationText,
-                    "CommandPaletteSelectedItemChanged");
-            }
         }
     }
 
@@ -278,13 +265,6 @@ public sealed partial class ListPage : Page,
         {
             ItemsList.SelectedIndex = 0;
         }
-
-        // Always reset the selected item when the top-level list page changes
-        // its items
-        if (!sender.IsNested)
-        {
-            ItemsList.SelectedIndex = 0;
-        }
     }
 
     private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -316,51 +296,30 @@ public sealed partial class ListPage : Page,
         return null;
     }
 
-    private void ItemsList_OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
+    private void ItemsList_RightTapped(object sender, RightTappedRoutedEventArgs e)
     {
-        var (item, element) = e.OriginalSource switch
+        if (e.OriginalSource is FrameworkElement element &&
+            element.DataContext is ListItemViewModel item)
         {
-            // caused by keyboard shortcut (e.g. Context menu key or Shift+F10)
-            ListViewItem listViewItem => (ItemsList.ItemFromContainer(listViewItem) as ListItemViewModel, listViewItem),
-
-            // caused by right-click on the ListViewItem
-            FrameworkElement { DataContext: ListItemViewModel itemViewModel } frameworkElement => (itemViewModel, frameworkElement),
-
-            _ => (null, null),
-        };
-
-        if (item == null || element == null)
-        {
-            return;
-        }
-
-        if (ItemsList.SelectedItem != item)
-        {
-            ItemsList.SelectedItem = item;
-        }
-
-        ViewModel?.UpdateSelectedItemCommand.Execute(item);
-
-        if (!e.TryGetPosition(element, out var pos))
-        {
-            pos = new(0, element.ActualHeight);
-        }
-
-        _ = DispatcherQueue.TryEnqueue(
-            () =>
+            if (ItemsList.SelectedItem != item)
             {
-                WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(
-                    new OpenContextMenuMessage(
-                        element,
-                        Microsoft.UI.Xaml.Controls.Primitives.FlyoutPlacementMode.BottomEdgeAlignedLeft,
-                        pos,
-                        ContextMenuFilterLocation.Top));
-            });
-        e.Handled = true;
-    }
+                ItemsList.SelectedItem = item;
+            }
 
-    private void ItemsList_OnContextCanceled(UIElement sender, RoutedEventArgs e)
-    {
-        _ = DispatcherQueue.TryEnqueue(() => WeakReferenceMessenger.Default.Send<CloseContextMenuMessage>());
+            ViewModel?.UpdateSelectedItemCommand.Execute(item);
+
+            var pos = e.GetPosition(element);
+
+            _ = DispatcherQueue.TryEnqueue(
+                () =>
+                    {
+                        WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(
+                            new OpenContextMenuMessage(
+                                element,
+                                Microsoft.UI.Xaml.Controls.Primitives.FlyoutPlacementMode.BottomEdgeAlignedLeft,
+                                pos,
+                                ContextMenuFilterLocation.Top));
+                    });
+        }
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/IconCacheService.cs

@@ -34,9 +34,9 @@ public sealed class IconCacheService(DispatcherQueue dispatcherQueue)
                 {
                     return await StreamToIconSource(icon.Data.Unsafe!);
                 }
-                catch (Exception ex)
+                catch
                 {
-                    Debug.WriteLine("Failed to load icon from stream: " + ex);
+                    Debug.WriteLine("Failed to load icon from stream");
                 }
             }
         }
@@ -63,37 +63,17 @@ public sealed class IconCacheService(DispatcherQueue dispatcherQueue)
     {
         // Return the bitmap image via TaskCompletionSource. Using WCT's EnqueueAsync does not suffice here, since if
         // we're already on the thread of the DispatcherQueue then it just directly calls the function, with no async involved.
-        return await TryEnqueueAsync(dispatcherQueue, async () =>
+        var completionSource = new TaskCompletionSource<BitmapImage>();
+        dispatcherQueue.TryEnqueue(async () =>
         {
             using var bitmapStream = await iconStreamRef.OpenReadAsync();
             var itemImage = new BitmapImage();
             await itemImage.SetSourceAsync(bitmapStream);
-            return itemImage;
-        });
-    }
-
-    private static Task<T> TryEnqueueAsync<T>(DispatcherQueue dispatcher, Func<Task<T>> function)
-    {
-        var completionSource = new TaskCompletionSource<T>();
-
-        var enqueued = dispatcher.TryEnqueue(DispatcherQueuePriority.Normal, async void () =>
-        {
-            try
-            {
-                var result = await function();
-                completionSource.SetResult(result);
-            }
-            catch (Exception ex)
-            {
-                completionSource.SetException(ex);
-            }
+            completionSource.TrySetResult(itemImage);
         });
 
-        if (!enqueued)
-        {
-            completionSource.SetException(new InvalidOperationException("Failed to enqueue the operation on the UI dispatcher"));
-        }
+        var bitmapImage = await completionSource.Task;
 
-        return completionSource.Task;
+        return bitmapImage;
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml

@@ -225,11 +225,11 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
-                        Click="BackButton_Clicked"
                         Content="{ui:FontIcon Glyph=,
                                               FontSize=14}"
                         FontSize="16"
                         Style="{StaticResource SubtleButtonStyle}"
+                        Tapped="BackButton_Tapped"
                         Visibility="{x:Bind ViewModel.CurrentPage.IsNested, Mode=OneWay}">
                         <animations:Implicit.ShowAnimations>
                             <animations:OpacityAnimation

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -413,7 +413,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         }
     }
 
-    private void BackButton_Clicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) => WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
+    private void BackButton_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e) => WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
 
     private void RootFrame_Navigated(object sender, Microsoft.UI.Xaml.Navigation.NavigationEventArgs e)
     {

src/modules/cmdpal/Microsoft.CmdPal.UI/RunHistoryService.cs

@@ -1,50 +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 Microsoft.CmdPal.Common.Services;
-using Microsoft.CmdPal.UI.ViewModels;
-
-namespace Microsoft.CmdPal.UI;
-
-internal sealed class RunHistoryService : IRunHistoryService
-{
-    private readonly AppStateModel _appStateModel;
-
-    public RunHistoryService(AppStateModel appStateModel)
-    {
-        _appStateModel = appStateModel;
-    }
-
-    public IReadOnlyList<string> GetRunHistory()
-    {
-        if (_appStateModel.RunHistory.Count == 0)
-        {
-            var history = Microsoft.Terminal.UI.RunHistory.CreateRunHistory();
-            _appStateModel.RunHistory.AddRange(history);
-        }
-
-        return _appStateModel.RunHistory;
-    }
-
-    public void ClearRunHistory()
-    {
-        _appStateModel.RunHistory.Clear();
-    }
-
-    public void AddRunHistoryItem(string item)
-    {
-        // insert at the beginning of the list
-        if (string.IsNullOrWhiteSpace(item))
-        {
-            return; // Do not add empty or whitespace items
-        }
-
-        _appStateModel.RunHistory.Remove(item);
-
-        // Add the item to the front of the history
-        _appStateModel.RunHistory.Insert(0, item);
-
-        AppStateModel.SaveState(_appStateModel);
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -428,10 +428,4 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_ExtensionPage_Alias_ToggleSwitch.OffContent" xml:space="preserve">
     <value>Indirect</value>
   </data>
-  <data name="StatusMessagesButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Show status messages</value>
-  </data>
-  <data name="StatusMessagesButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Show status messages</value>
-  </data>
 </root>

src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/TextBox.xaml

@@ -186,8 +186,6 @@
                             x:Load="False"
                             AutomationProperties.AccessibilityView="Raw"
                             CharacterSpacing="15"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
                             Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}"
                             Text="{TemplateBinding Description}"
                             TextWrapping="{TemplateBinding TextWrapping}" />

src/modules/cmdpal/Microsoft.CmdPal.UI/rd.xml

@@ -2,22 +2,6 @@
 	<Application>
 		<Assembly Name="Microsoft.WinUI">
 			<Type Name="Microsoft.UI.Xaml.Controls.FontIconSource" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.DataTemplate" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.Controls.DataTemplateSelector" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.Controls.ListViewItem" Dynamic="Required All" />
-		</Assembly>
-
-		<!-- Add ViewModel types for AOT compatibility -->
-		<Assembly Name="Microsoft.CmdPal.Core.ViewModels">
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.CommandContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.SeparatorContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.IContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.CommandItemViewModel" Dynamic="Required All" />
-		</Assembly>
-
-		<!-- Add UI types for AOT compatibility -->
-		<Assembly Name="Microsoft.CmdPal.UI">
-			<Type Name="Microsoft.CmdPal.UI.ContextItemTemplateSelector" Dynamic="Required All" />
 		</Assembly>
 	</Application>
 </Directives>

src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs

@@ -67,8 +67,9 @@ public class BasicTests : CommandPaletteTestBase
         Assert.AreEqual(searchFileItem.Name, "Open Windows Terminal Profiles");
         searchFileItem.DoubleClick();
 
-        // SetSearchBox("PowerShell");
-        // Assert.IsNotNull(this.Find<NavigationViewItem>("PowerShell"));
+        SetSearchBox("PowerShell");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("PowerShell"));
     }
 
     [TestMethod]
@@ -94,9 +95,9 @@ public class BasicTests : CommandPaletteTestBase
         Assert.AreEqual(searchFileItem.Name, "Registry");
         searchFileItem.DoubleClick();
 
-        // Type the string will cause strange behavior.so comment it out for now.
-        // SetSearchBox(@"HKEY_LOCAL_MACHINE");
-        // Assert.IsNotNull(this.Find<NavigationViewItem>(@"HKEY_LOCAL_MACHINE\SECURITY"));
+        SetSearchBox("HKEY_LOCAL_MACHINE");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("HKEY_LOCAL_MACHINE\\SECURITY"));
     }
 
     [TestMethod]

src/modules/cmdpal/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs

@@ -45,27 +45,4 @@ public class CommandPaletteTestBase : UITestBase
         Assert.IsNotNull(contextMenuButton, "Context menu button not found.");
         contextMenuButton.Click();
     }
-
-    protected void FindDefaultAppDialogAndClickButton()
-    {
-        try
-        {
-            // win11
-            var chooseDialog = FindByClassName("NamedContainerAutomationPeer", global: true);
-
-            chooseDialog.Find<Button>("Just once").Click();
-        }
-        catch
-        {
-            try
-            {
-                // win10
-                var chooseDialog = FindByClassName("Shell_Flyout", global: true);
-                chooseDialog.Find<Button>("OK").Click();
-            }
-            catch
-            {
-            }
-        }
-    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UITests/IndexerTests.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -19,7 +18,6 @@ public class IndexerTests : CommandPaletteTestBase
 {
     private const string TestFileContent = "This is Indexer UI test sample";
     private const string TestFileName = "indexer_test_item.txt";
-    private const string TestFileBaseName = "indexer_test_item";
     private const string TestFolderName = "Downloads";
 
     public IndexerTests()
@@ -69,14 +67,11 @@ public class IndexerTests : CommandPaletteTestBase
 
         searchItem.Click();
 
-        var openButton = this.Find<Button>("Open with");
+        var openButton = this.Find<Button>("Open");
         Assert.IsNotNull(openButton);
 
         openButton.Click();
-
-        FindDefaultAppDialogAndClickButton();
-
-        var notepadWindow = FindNotepadWindow(TestFileBaseName, global: true);
+        var notepadWindow = this.Find<Window>($"{TestFileName} - Notepad", global: true);
 
         Assert.IsNotNull(notepadWindow);
     }
@@ -93,9 +88,7 @@ public class IndexerTests : CommandPaletteTestBase
 
         searchItem.DoubleClick();
 
-        FindDefaultAppDialogAndClickButton();
-
-        var notepadWindow = FindNotepadWindow(TestFileBaseName, global: true);
+        var notepadWindow = this.Find<Window>($"{TestFileName} - Notepad", global: true);
 
         Assert.IsNotNull(notepadWindow);
     }
@@ -114,9 +107,9 @@ public class IndexerTests : CommandPaletteTestBase
         Assert.IsNotNull(openButton);
 
         openButton.Click();
-        var fileExplorer = FindExplorerWindow(TestFolderName, global: true);
+        var notepadWindow = this.Find<Window>($"{TestFolderName} - File Explorer", global: true);
 
-        Assert.IsNotNull(fileExplorer);
+        Assert.IsNotNull(notepadWindow);
     }
 
     [TestMethod]
@@ -129,7 +122,7 @@ public class IndexerTests : CommandPaletteTestBase
         Assert.IsNotNull(searchItem);
         searchItem.DoubleClick();
 
-        var fileExplorer = FindExplorerWindow(TestFolderName, global: true);
+        var fileExplorer = this.Find<Window>($"{TestFolderName} - File Explorer", global: true);
 
         Assert.IsNotNull(fileExplorer);
     }
@@ -188,7 +181,7 @@ public class IndexerTests : CommandPaletteTestBase
         Assert.IsNotNull(showInFolderButton);
         showInFolderButton.Click();
 
-        var fileExplorer = FindExplorerWindow(TestFolderName, global: true, timeoutMS: 20000);
+        var fileExplorer = this.Find<Window>($"{TestFolderName} - File Explorer", global: true, timeoutMS: 20000);
 
         Assert.IsNotNull(fileExplorer);
     }
@@ -208,7 +201,7 @@ public class IndexerTests : CommandPaletteTestBase
         Assert.IsNotNull(copyPathButton);
         copyPathButton.Click();
 
-        var textItem = FindByPartialName("C:\\Windows\\system32\\cmd.exe", global: true);
+        var textItem = this.Find<Window>("C:\\Windows\\system32\\cmd.exe", global: true);
         Assert.IsNotNull(textItem, "The console did not open with the expected path.");
     }
 
@@ -227,7 +220,7 @@ public class IndexerTests : CommandPaletteTestBase
         Assert.IsNotNull(copyPathButton);
         copyPathButton.Click();
 
-        var propertiesWindow = FindByClassNameAndNamePattern<Window>("#32770", "Properties", global: true);
+        var propertiesWindow = this.Find<Window>($"{TestFileName} Properties", global: true);
         Assert.IsNotNull(propertiesWindow, "The properties window did not open for the selected file.");
     }
 }

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

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
+	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
 
 	<PropertyGroup>
 		<RootNamespace>Microsoft.CmdPal.UITests</RootNamespace>
@@ -21,6 +21,6 @@
 		<PackageReference Include="System.Net.Http" />
 		<PackageReference Include="System.Private.Uri" />
 		<PackageReference Include="System.Text.RegularExpressions" />
-		<ProjectReference Include="..\..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+		<ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
 	</ItemGroup>
 </Project>

src/modules/cmdpal/Microsoft.Terminal.UI/IconPathConverter.cpp

@@ -383,5 +383,4 @@ namespace winrt::Microsoft::Terminal::UI::implementation
         icon.Height(targetSize);
         return icon;
     }
-
 }

src/modules/cmdpal/Microsoft.Terminal.UI/IconPathConverter.h

@@ -13,7 +13,6 @@ namespace winrt::Microsoft::Terminal::UI::implementation
         static Microsoft::UI::Xaml::Controls::IconSource IconSourceMUX(const winrt::hstring& iconPath, bool convertToGrayscale, const int targetSize=24);
         static Microsoft::UI::Xaml::Controls::IconElement IconMUX(const winrt::hstring& iconPath);
         static Microsoft::UI::Xaml::Controls::IconElement IconMUX(const winrt::hstring& iconPath, const int targetSize);
-
     };
 }
 

src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj

@@ -153,9 +153,6 @@
     <ClInclude Include="IconPathConverter.h">
       <DependentUpon>IconPathConverter.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="RunHistory.h">
-      <DependentUpon>RunHistory.idl</DependentUpon>
-    </ClInclude>
     <ClInclude Include="ResourceString.h">
       <DependentUpon>ResourceString.idl</DependentUpon>
     </ClInclude>
@@ -171,9 +168,6 @@
     <ClCompile Include="IconPathConverter.cpp">
       <DependentUpon>IconPathConverter.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="RunHistory.cpp">
-      <DependentUpon>RunHistory.idl</DependentUpon>
-    </ClCompile>
     <ClCompile Include="ResourceString.cpp">
       <DependentUpon>ResourceString.idl</DependentUpon>
     </ClCompile>
@@ -182,7 +176,6 @@
   <ItemGroup>
     <Midl Include="Converters.idl" />
     <Midl Include="IconPathConverter.idl" />
-    <Midl Include="RunHistory.idl" />
     <Midl Include="IDirectKeyListener.idl" />
     <Midl Include="ResourceString.idl" />
   </ItemGroup>

src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.cpp

@@ -1,87 +0,0 @@
-#include "pch.h"
-#include "RunHistory.h"
-#include "RunHistory.g.cpp"
-
-
-using namespace winrt::Windows;
-
-namespace winrt::Microsoft::Terminal::UI::implementation
-{
-    // Run history
-    // Largely copied from the Run work circa 2022.
-
-    winrt::Windows::Foundation::Collections::IVector<hstring> RunHistory::CreateRunHistory()
-    {
-        // Load MRU history
-        std::vector<hstring> history;
-
-        wil::unique_hmodule _comctl;
-        HANDLE(WINAPI* _createMRUList)(MRUINFO* lpmi);
-        int(WINAPI* _enumMRUList)(HANDLE hMRU,int nItem,void* lpData,UINT uLen);
-        void(WINAPI *_freeMRUList)(HANDLE hMRU);
-        int(WINAPI *_addMRUString)(HANDLE hMRU, LPCWSTR szString);
-
-        // Lazy load comctl32.dll
-        // Theoretically, we could cache this into a magic static, but we shouldn't need to actually do this more than once in CmdPal
-        _comctl.reset(LoadLibraryExW(L"comctl32.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32));
-
-        _createMRUList = reinterpret_cast<decltype(_createMRUList)>(GetProcAddress(_comctl.get(), "CreateMRUListW"));
-        FAIL_FAST_LAST_ERROR_IF(!_createMRUList);
-
-        _enumMRUList = reinterpret_cast<decltype(_enumMRUList)>(GetProcAddress(_comctl.get(), "EnumMRUListW"));
-        FAIL_FAST_LAST_ERROR_IF(!_enumMRUList);
-
-        _freeMRUList = reinterpret_cast<decltype(_freeMRUList)>(GetProcAddress(_comctl.get(), "FreeMRUList"));
-        FAIL_FAST_LAST_ERROR_IF(!_freeMRUList);
-
-        _addMRUString = reinterpret_cast<decltype(_addMRUString)>(GetProcAddress(_comctl.get(), "AddMRUStringW"));
-        FAIL_FAST_LAST_ERROR_IF(!_addMRUString);
-
-        static const WCHAR c_szRunMRU[] = REGSTR_PATH_EXPLORER L"\\RunMRU";
-        MRUINFO mi = {
-            sizeof(mi),
-            26,
-            MRU_CACHEWRITE,
-            HKEY_CURRENT_USER,
-            c_szRunMRU,
-            NULL // NOTE: use default string compare
-            // since this is a GLOBAL MRU
-        };
-
-        if (const auto hMruList = _createMRUList(&mi))
-        {
-            auto freeMRUList = wil::scope_exit([=]() {
-                _freeMRUList(hMruList);
-            });
-
-            for (int nMax = _enumMRUList(hMruList, -1, NULL, 0), i = 0; i < nMax; ++i)
-            {
-                WCHAR szCommand[MAX_PATH + 2];
-
-                const auto length = _enumMRUList(hMruList, i, szCommand, ARRAYSIZE(szCommand));
-                if (length > 1)
-                {
-                    // clip off the null-terminator
-                    std::wstring_view text{ szCommand, wil::safe_cast<size_t>(length - 1) };
-//#pragma disable warning(C26493)
-#pragma warning( push )
-#pragma warning( disable : 26493 )
-                    if (text.back() == L'\\')
-                    {
-                        // old MRU format has a slash at the end with the show cmd
-                        text = { szCommand, wil::safe_cast<size_t>(length - 2) };
-#pragma warning( pop )
-                        if (text.empty())
-                        {
-                            continue;
-                        }
-                    }
-                    history.emplace_back(text);
-                }
-            }
-        }
-
-        // Update dropdown & initial value
-        return winrt::single_threaded_observable_vector<winrt::hstring>(std::move(history));
-    }
-}

src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "RunHistory.g.h"
-#include "types.h"
-
-namespace winrt::Microsoft::Terminal::UI::implementation
-{
-    struct RunHistory
-    {
-        RunHistory() = default;
-        static winrt::Windows::Foundation::Collections::IVector<hstring> CreateRunHistory();
-
-    private:
-        winrt::Windows::Foundation::Collections::IVector<hstring> _mruHistory;
-    };
-}
-
-namespace winrt::Microsoft::Terminal::UI::factory_implementation
-{
-    BASIC_FACTORY(RunHistory);
-}

src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.idl

@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.UI
-{
-    static runtimeclass RunHistory
-    {
-        static Windows.Foundation.Collections.IVector<String> CreateRunHistory();
-    };
-
-}

src/modules/cmdpal/Microsoft.Terminal.UI/pch.h

@@ -64,8 +64,6 @@
 
 // WIL
 #include <wil/com.h>
-#include <wil/resource.h>
-#include <wil/safecast.h>
 #include <wil/stl.h>
 #include <wil/filesystem.h>
 // Due to the use of RESOURCE_SUPPRESS_STL in result.h, we need to include resource.h first, which happens
@@ -92,7 +90,6 @@
 
 #include <winrt/Windows.ApplicationModel.Resources.h>
 #include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
 
 #include <winrt/Windows.Graphics.Imaging.h>
 #include <Windows.Graphics.Imaging.Interop.h>

src/modules/cmdpal/Microsoft.Terminal.UI/types.h

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#define MRU_CACHEWRITE 0x0002
-#define REGSTR_PATH_EXPLORER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
-
-// https://learn.microsoft.com/en-us/windows/win32/shell/mrucmpproc
-typedef int(CALLBACK* MRUCMPPROC)(
-    LPCTSTR pString1,
-    LPCTSTR pString2);
-
-// https://learn.microsoft.com/en-us/windows/win32/shell/mruinfo
-struct MRUINFO
-{
-    DWORD cbSize;
-    UINT uMax;
-    UINT fFlags;
-    HKEY hKey;
-    LPCTSTR lpszSubKey;
-    MRUCMPPROC lpfnCompare;
-};

src/modules/cmdpal/README.md

@@ -2,15 +2,16 @@
 
 Windows Command Palette ("CmdPal") is the next iteration of PowerToys Run. With extensibility at its core, the Command Palette is your one-stop launcher to start _anything_.
 
-By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>.
+By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>. 
+
 
 ## Creating an extension
 
-The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂.
+The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂. 
 
 The official API documentation can be found [on this docs site](https://learn.microsoft.com/windows/powertoys/command-palette/extensibility-overview).
 
-We've also got samples, so that you can see how the APIs in-action.
+We've also got samples, so that you can see how the APIs in-action. 
 
 * We've got [generic samples] in the repo
 * We've got [real samples] in the repo too
@@ -21,22 +22,14 @@ We've also got samples, so that you can see how the APIs in-action.
 
 ## Building CmdPal
 
-### Install & Build PowerToys
-
-1. Follow the install and build instructions for [PowerToys](https://github.com/microsoft/PowerToys/tree/main/doc/devdocs#compiling-powertoys)
-
-### Load & Build
-
-1. In Visual Studio, in the Solution Explorer Pane, confirm that all of the files/projects in `src\modules\CommandPalette` and `src\common\CalculatorEngineCommon` do not have `(unloaded)` on the right side
-    1. If any file has `(unloaded)`, right click on file and select `Reload Project`
-1. Now you can right click on one of the project below to `Build` and then `Deploy`:
+The Command Palette is included as a part of PowerToys. To get started building, open up the root `PowerToys.sln`, to get started building. 
 
 Projects of interest are:
 * `Microsoft.CmdPal.UI`: This is the main project for CmdPal. Build and run this to get the CmdPal.
 * `Microsoft.CommandPalette.Extensions`: This is the official extension interface. 
   * This is designed to be language-agnostic. Any programming language which supports implementing WinRT interfaces should be able to implement the WinRT interface. 
 * `Microsoft.CommandPalette.Extensions.Toolkit`: This is a C# helper library for creating extensions. This makes writing extensions easier.
-* Everything under "SampleExtensions": These are example plugins to demo how to author extensions. Deploy any number of these, to get a feel for how the extension API works.
+* Everything under "SampleExtensions": These are example plugins to demo how to author extensions. Deploy any number of these, to get a feel for how the extension API works. 
 
 ### Footnotes and other links
 

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/BracketHelperTests.cs

@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
-
-[TestClass]
-public class BracketHelperTests
-{
-    [DataTestMethod]
-    [DataRow(null)]
-    [DataRow("")]
-    [DataRow("\t \r\n")]
-    [DataRow("none")]
-    [DataRow("()")]
-    [DataRow("(())")]
-    [DataRow("()()")]
-    [DataRow("(()())")]
-    [DataRow("([][])")]
-    [DataRow("([(()[])[](([]()))])")]
-    public void IsBracketComplete_TestValid_WhenCalled(string input)
-    {
-        // Arrange
-
-        // Act
-        var result = BracketHelper.IsBracketComplete(input);
-
-        // Assert
-        Assert.IsTrue(result);
-    }
-
-    [DataTestMethod]
-    [DataRow("((((", "only opening brackets")]
-    [DataRow("]]]", "only closing brackets")]
-    [DataRow("([)(])", "inner bracket mismatch")]
-    [DataRow(")(", "opening and closing reversed")]
-    [DataRow("(]", "mismatch in bracket type")]
-    public void IsBracketComplete_TestInvalid_WhenCalled(string input, string invalidReason)
-    {
-        // Arrange
-
-        // Act
-        var result = BracketHelper.IsBracketComplete(input);
-
-        // Assert
-        Assert.IsFalse(result, invalidReason);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/ExtendedCalculatorParserTests.cs

@@ -1,389 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
-
-[TestClass]
-public class ExtendedCalculatorParserTests
-{
-    [DataTestMethod]
-    [DataRow(null)]
-    [DataRow("")]
-    [DataRow("  ")]
-    public void InputValid_ThrowError_WhenCalledNullOrEmpty(string input)
-    {
-        // Act
-        Assert.IsTrue(!CalculateHelper.InputValid(input));
-    }
-
-    [DataTestMethod]
-    [DataRow("test")]
-    [DataRow("[10,10]")] // '[10,10]' is interpreted as array by mages engine
-    public void Interpret_NoResult_WhenCalled(string input)
-    {
-        var settings = new SettingsManager();
-
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.CurrentCulture, out _);
-
-        // Assert
-        Assert.AreEqual(default(CalculateResult), result);
-    }
-
-    private static IEnumerable<object[]> Interpret_NoErrors_WhenCalledWithRounding_Data =>
-        [
-            ["2 * 2", 4M],
-            ["-2 ^ 2", -4M],
-            ["-(2 ^ 2)", -4M],
-            ["2 * pi", 6.28318530717959M],
-            ["round(2 * pi)", 6M],
-
-            // ["1 == 2", default(decimal)],
-            ["pi * ( sin ( cos ( 2)))", -1.26995475603563M],
-            ["5.6/2", 2.8M],
-            ["123 * 4.56", 560.88M],
-            ["1 - 9.0 / 10", 0.1M],
-            ["0.5 * ((2*-395.2)+198.2)", -296.1M],
-            ["2+2.11", 4.11M],
-            ["8.43 + 4.43 - 12.86", 0M],
-            ["8.43 + 4.43 - 12.8", 0.06M],
-            ["exp(5)", 148.413159102577M],
-            ["e^5", 148.413159102577M],
-            ["e*2", 5.43656365691809M],
-            ["ln(3)", 1.09861228866811M],
-            ["log(3)", 0.47712125471966M],
-            ["log2(3)", 1.58496250072116M],
-            ["log10(3)", 0.47712125471966M],
-            ["ln(e)", 1M],
-            ["cosh(0)", 1M],
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_NoErrors_WhenCalledWithRounding_Data))]
-    public void Interpret_NoErrors_WhenCalledWithRounding(string input, decimal expectedResult)
-    {
-        var settings = new SettingsManager();
-
-        // Act
-        // Using InvariantCulture since this is internal
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.InvariantCulture, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(CalculateEngine.FormatMax15Digits(expectedResult, new CultureInfo("en-US")), result.RoundedResult);
-    }
-
-    private static IEnumerable<object[]> Interpret_GreaterPrecision_WhenCalled_Data =>
-        [
-            ["0.100000000000000000000", 0.1M],
-            ["0.200000000000000000000000", 0.2M],
-        ];
-
-    [DynamicData(nameof(Interpret_GreaterPrecision_WhenCalled_Data))]
-    [DataTestMethod]
-    public void Interpret_GreaterPrecision_WhenCalled(string input, decimal expectedResult)
-    {
-        // Arrange
-        var settings = new SettingsManager();
-
-        // Act
-        // Using InvariantCulture since this is internal
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.InvariantCulture, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result.Result);
-    }
-
-    private static IEnumerable<object[]> Interpret_DifferentCulture_WhenCalled_Data =>
-        [
-            ["4.5/3", 1.5M, "nl-NL"],
-            ["4.5/3", 1.5M, "en-EN"],
-            ["4.5/3", 1.5M, "de-DE"],
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_DifferentCulture_WhenCalled_Data))]
-    public void Interpret_DifferentCulture_WhenCalled(string input, decimal expectedResult, string cultureName)
-    {
-        // Arrange
-        var cultureInfo = CultureInfo.GetCultureInfo(cultureName);
-        var settings = new SettingsManager();
-
-        // Act
-        var result = CalculateEngine.Interpret(settings, input, cultureInfo, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(CalculateEngine.Round(expectedResult), result.RoundedResult);
-    }
-
-    [DataTestMethod]
-    [DataRow("log(3)", true)]
-    [DataRow("ln(3)", true)]
-    [DataRow("log2(3)", true)]
-    [DataRow("log10(3)", true)]
-    [DataRow("log2", false)]
-    [DataRow("log10", false)]
-    [DataRow("log", false)]
-    [DataRow("ln", false)]
-    [DataRow("ceil(2 * (pi ^ 2))", true)]
-    [DataRow("((1 * 2)", false)]
-    [DataRow("(1 * 2)))", false)]
-    [DataRow("abcde", false)]
-    [DataRow("1 + 2 +", false)]
-    [DataRow("1+2*", false)]
-    [DataRow("1+2/", false)]
-    [DataRow("1+2%", false)]
-    [DataRow("1 && 3 &&", false)]
-    [DataRow("sqrt( 36)", true)]
-    [DataRow("max 4", false)]
-    [DataRow("sin(0)", true)]
-    [DataRow("sinh(1)", true)]
-    [DataRow("tanh(0)", true)]
-    [DataRow("artanh(pi/2)", true)]
-    [DataRow("cosh", false)]
-    [DataRow("cos", false)]
-    [DataRow("abs", false)]
-    [DataRow("1+1.1e3", true)]
-    [DataRow("randi(8)", true)]
-    [DataRow("randi()", false)]
-    [DataRow("randi(0.5)", true)]
-    [DataRow("rand()", true)]
-    [DataRow("rand(0.5)", false)]
-    [DataRow("0X78AD+0o123", true)]
-    [DataRow("0o9", false)]
-    public void InputValid_TestValid_WhenCalled(string input, bool valid)
-    {
-        // Act
-        var result = CalculateHelper.InputValid(input);
-
-        // Assert
-        Assert.AreEqual(valid, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("1-1")]
-    [DataRow("sin(0)")]
-    [DataRow("sinh(0)")]
-    public void Interpret_MustReturnResult_WhenResultIsZero(string input)
-    {
-        // Arrange
-        var settings = new SettingsManager();
-
-        // Act
-        // Using InvariantCulture since this is internal
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.InvariantCulture, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0.0M, result.Result);
-    }
-
-    private static IEnumerable<object[]> Interpret_MustReturnExpectedResult_WhenCalled_Data =>
-        [
-
-            // ["factorial(5)", 120M], ToDo: this don't support now
-            // ["sign(-2)", -1M],
-            // ["sign(2)", +1M],
-            ["abs(-2)", 2M],
-            ["abs(2)", 2M],
-            ["0+(1*2)/(0+1)", 2M], // Validate that division by "(0+1)" is not interpret as division by zero.
-            ["0+(1*2)/0.5", 4M], // Validate that division by number with decimal digits is not interpret as division by zero.
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_MustReturnExpectedResult_WhenCalled_Data))]
-    public void Interpret_MustReturnExpectedResult_WhenCalled(string input, decimal expectedResult)
-    {
-        // Arrange
-        var settings = new SettingsManager();
-
-        // Act
-        // Using en-us culture to have a fixed number style
-        var result = CalculateEngine.Interpret(settings, input, new CultureInfo("en-us", false), out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result.Result);
-    }
-
-    private static IEnumerable<object[]> Interpret_TestScientificNotation_WhenCalled_Data =>
-        [
-            ["0.2E1", "en-US", 2M],
-            ["0,2E1", "pt-PT", 2M],
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_TestScientificNotation_WhenCalled_Data))]
-    public void Interpret_TestScientificNotation_WhenCalled(string input, string sourceCultureName, decimal expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo(sourceCultureName, false), new CultureInfo("en-US", false));
-        var settings = new SettingsManager();
-
-        // Act
-        // Using en-us culture to have a fixed number style
-        var translatedInput = translator.Translate(input);
-        var result = CalculateEngine.Interpret(settings, translatedInput, new CultureInfo("en-US", false), out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result.Result);
-    }
-
-    [DataTestMethod]
-    [DataRow("sin(90)", "sin((pi / 180) * (90))")]
-    [DataRow("arcsin(0.5)", "(180 / pi) * (arcsin(0.5))")]
-    [DataRow("sin(sin(30))", "sin((pi / 180) * (sin((pi / 180) * (30))))")]
-    [DataRow("cos(tan(45))", "cos((pi / 180) * (tan((pi / 180) * (45))))")]
-    [DataRow("arctan(sin(30))", "(180 / pi) * (arctan(sin((pi / 180) * (30))))")]
-    [DataRow("sin(cos(tan(30)))", "sin((pi / 180) * (cos((pi / 180) * (tan((pi / 180) * (30))))))")]
-    [DataRow("sin(arcsin(0.5))", "sin((pi / 180) * ((180 / pi) * (arcsin(0.5))))")]
-    [DataRow("sin(30) + cos(60)", "sin((pi / 180) * (30)) + cos((pi / 180) * (60))")]
-    [DataRow("sin(30 + 15)", "sin((pi / 180) * (30 + 15))")]
-    [DataRow("sin(45) * cos(45) - tan(30)", "sin((pi / 180) * (45)) * cos((pi / 180) * (45)) - tan((pi / 180) * (30))")]
-    [DataRow("arcsin(arccos(0.5))", "(180 / pi) * (arcsin((180 / pi) * (arccos(0.5))))")]
-    [DataRow("sin(sin(sin(30)))", "sin((pi / 180) * (sin((pi / 180) * (sin((pi / 180) * (30))))))")]
-    [DataRow("log(10)", "log(10)")]
-    [DataRow("sin(30) + pi", "sin((pi / 180) * (30)) + pi")]
-    [DataRow("sin(-30)", "sin((pi / 180) * (-30))")]
-    [DataRow("sin((30))", "sin((pi / 180) * ((30)))")]
-    [DataRow("arcsin(1) * 2", "(180 / pi) * (arcsin(1)) * 2")]
-    [DataRow("cos(1/2)", "cos((pi / 180) * (1/2))")]
-    [DataRow("sin ( 90 )", "sin ((pi / 180) * ( 90 ))")]
-    [DataRow("cos(arcsin(sin(45)))", "cos((pi / 180) * ((180 / pi) * (arcsin(sin((pi / 180) * (45))))))")]
-    public void UpdateTrigFunctions_Degrees(string input, string expectedResult)
-    {
-        // Call UpdateTrigFunctions in degrees mode
-        var result = CalculateHelper.UpdateTrigFunctions(input, CalculateEngine.TrigMode.Degrees);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("sin(90)", "sin((pi / 200) * (90))")]
-    [DataRow("arcsin(0.5)", "(200 / pi) * (arcsin(0.5))")]
-    [DataRow("sin(sin(30))", "sin((pi / 200) * (sin((pi / 200) * (30))))")]
-    [DataRow("cos(tan(45))", "cos((pi / 200) * (tan((pi / 200) * (45))))")]
-    [DataRow("arctan(sin(30))", "(200 / pi) * (arctan(sin((pi / 200) * (30))))")]
-    [DataRow("sin(cos(tan(30)))", "sin((pi / 200) * (cos((pi / 200) * (tan((pi / 200) * (30))))))")]
-    [DataRow("sin(arcsin(0.5))", "sin((pi / 200) * ((200 / pi) * (arcsin(0.5))))")]
-    [DataRow("sin(30) + cos(60)", "sin((pi / 200) * (30)) + cos((pi / 200) * (60))")]
-    [DataRow("sin(30 + 15)", "sin((pi / 200) * (30 + 15))")]
-    [DataRow("sin(45) * cos(45) - tan(30)", "sin((pi / 200) * (45)) * cos((pi / 200) * (45)) - tan((pi / 200) * (30))")]
-    [DataRow("arcsin(arccos(0.5))", "(200 / pi) * (arcsin((200 / pi) * (arccos(0.5))))")]
-    [DataRow("sin(sin(sin(30)))", "sin((pi / 200) * (sin((pi / 200) * (sin((pi / 200) * (30))))))")]
-    [DataRow("log(10)", "log(10)")]
-    [DataRow("sin(30) + pi", "sin((pi / 200) * (30)) + pi")]
-    [DataRow("sin(-30)", "sin((pi / 200) * (-30))")]
-    [DataRow("sin((30))", "sin((pi / 200) * ((30)))")]
-    [DataRow("arcsin(1) * 2", "(200 / pi) * (arcsin(1)) * 2")]
-    [DataRow("cos(1/2)", "cos((pi / 200) * (1/2))")]
-    [DataRow("sin ( 90 )", "sin ((pi / 200) * ( 90 ))")]
-    [DataRow("cos(arcsin(sin(45)))", "cos((pi / 200) * ((200 / pi) * (arcsin(sin((pi / 200) * (45))))))")]
-    public void UpdateTrigFunctions_Gradians(string input, string expectedResult)
-    {
-        // Call UpdateTrigFunctions in gradians mode
-        var result = CalculateHelper.UpdateTrigFunctions(input, CalculateEngine.TrigMode.Gradians);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("rad(30)", "(180 / pi) * (30)")]
-    [DataRow("rad( 30 )", "(180 / pi) * ( 30 )")]
-    [DataRow("deg(30)", "(30)")]
-    [DataRow("grad(30)", "(9 / 10) * (30)")]
-    [DataRow("rad(  30)", "(180 / pi) * (  30)")]
-    [DataRow("rad(30  )", "(180 / pi) * (30  )")]
-    [DataRow("rad(  30  )", "(180 / pi) * (  30  )")]
-    [DataRow("rad(deg(30))", "(180 / pi) * ((30))")]
-    [DataRow("deg(rad(30))", "((180 / pi) * (30))")]
-    [DataRow("grad(rad(30))", "(9 / 10) * ((180 / pi) * (30))")]
-    [DataRow("rad(grad(30))", "(180 / pi) * ((9 / 10) * (30))")]
-    [DataRow("rad(30) + deg(45)", "(180 / pi) * (30) + (45)")]
-    [DataRow("sin(rad(30))", "sin((180 / pi) * (30))")]
-    [DataRow("cos( rad( 45 ) )", "cos( (180 / pi) * ( 45 ) )")]
-    [DataRow("tan(rad(grad(90)))", "tan((180 / pi) * ((9 / 10) * (90)))")]
-    [DataRow("rad(30) + rad(45)", "(180 / pi) * (30) + (180 / pi) * (45)")]
-    [DataRow("rad(30) * grad(90)", "(180 / pi) * (30) * (9 / 10) * (90)")]
-    [DataRow("rad(30)/rad(45)", "(180 / pi) * (30)/(180 / pi) * (45)")]
-    public void ExpandTrigConversions_Degrees(string input, string expectedResult)
-    {
-        // Call ExpandTrigConversions in degrees mode
-        var result = CalculateHelper.ExpandTrigConversions(input, CalculateEngine.TrigMode.Degrees);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("rad(30)", "(30)")]
-    [DataRow("rad( 30 )", "( 30 )")]
-    [DataRow("deg(30)", "(pi / 180) * (30)")]
-    [DataRow("grad(30)", "(pi / 200) * (30)")]
-    [DataRow("rad(  30)", "(  30)")]
-    [DataRow("rad(30  )", "(30  )")]
-    [DataRow("rad(  30  )", "(  30  )")]
-    [DataRow("rad(deg(30))", "((pi / 180) * (30))")]
-    [DataRow("deg(rad(30))", "(pi / 180) * ((30))")]
-    [DataRow("grad(rad(30))", "(pi / 200) * ((30))")]
-    [DataRow("rad(grad(30))", "((pi / 200) * (30))")]
-    [DataRow("rad(30) + deg(45)", "(30) + (pi / 180) * (45)")]
-    [DataRow("sin(rad(30))", "sin((30))")]
-    [DataRow("cos( rad( 45 ) )", "cos( ( 45 ) )")]
-    [DataRow("tan(rad(grad(90)))", "tan(((pi / 200) * (90)))")]
-    [DataRow("rad(30) + rad(45)", "(30) + (45)")]
-    [DataRow("rad(30) * grad(90)", "(30) * (pi / 200) * (90)")]
-    [DataRow("rad(30)/rad(45)", "(30)/(45)")]
-    public void ExpandTrigConversions_Radians(string input, string expectedResult)
-    {
-        // Call ExpandTrigConversions in radians mode
-        var result = CalculateHelper.ExpandTrigConversions(input, CalculateEngine.TrigMode.Radians);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("rad(30)", "(200 / pi) * (30)")]
-    [DataRow("rad( 30 )", "(200 / pi) * ( 30 )")]
-    [DataRow("deg(30)", "(10 / 9) * (30)")]
-    [DataRow("grad(30)", "(30)")]
-    [DataRow("rad(  30)", "(200 / pi) * (  30)")]
-    [DataRow("rad(30  )", "(200 / pi) * (30  )")]
-    [DataRow("rad(  30  )", "(200 / pi) * (  30  )")]
-    [DataRow("rad(deg(30))", "(200 / pi) * ((10 / 9) * (30))")]
-    [DataRow("deg(rad(30))", "(10 / 9) * ((200 / pi) * (30))")]
-    [DataRow("grad(rad(30))", "((200 / pi) * (30))")]
-    [DataRow("rad(grad(30))", "(200 / pi) * ((30))")]
-    [DataRow("rad(30) + deg(45)", "(200 / pi) * (30) + (10 / 9) * (45)")]
-    [DataRow("sin(rad(30))", "sin((200 / pi) * (30))")]
-    [DataRow("cos( rad( 45 ) )", "cos( (200 / pi) * ( 45 ) )")]
-    [DataRow("tan(rad(grad(90)))", "tan((200 / pi) * ((90)))")]
-    [DataRow("rad(30) + rad(45)", "(200 / pi) * (30) + (200 / pi) * (45)")]
-    [DataRow("rad(30) * grad(90)", "(200 / pi) * (30) * (90)")]
-    [DataRow("rad(30)/rad(45)", "(200 / pi) * (30)/(200 / pi) * (45)")]
-    public void ExpandTrigConversions_Gradians(string input, string expectedResult)
-    {
-        // Call ExpandTrigConversions in gradians mode
-        var result = CalculateHelper.ExpandTrigConversions(input, CalculateEngine.TrigMode.Gradians);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/Microsoft.CmdPal.Ext.Calc.UnitTests.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-		<RootNamespace>Microsoft.CmdPal.Ext.Calc.UnitTests</RootNamespace>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Moq" />
-		<PackageReference Include="MSTest" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj" />
-	</ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/NumberTranslatorTests.cs

@@ -1,185 +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.Globalization;
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
-
-[TestClass]
-public class NumberTranslatorTests
-{
-    [DataTestMethod]
-    [DataRow(null, "en-US")]
-    [DataRow("de-DE", null)]
-    public void Create_ThrowError_WhenCalledNullOrEmpty(string sourceCultureName, string targetCultureName)
-    {
-        // Arrange
-        CultureInfo sourceCulture = sourceCultureName != null ? new CultureInfo(sourceCultureName) : null;
-        CultureInfo targetCulture = targetCultureName != null ? new CultureInfo(targetCultureName) : null;
-
-        // Act
-        Assert.ThrowsException<ArgumentNullException>(() => NumberTranslator.Create(sourceCulture, targetCulture));
-    }
-
-    [DataTestMethod]
-    [DataRow("en-US", "en-US")]
-    [DataRow("en-EN", "en-US")]
-    [DataRow("de-DE", "en-US")]
-    public void Create_WhenCalled(string sourceCultureName, string targetCultureName)
-    {
-        // Arrange
-        CultureInfo sourceCulture = new CultureInfo(sourceCultureName);
-        CultureInfo targetCulture = new CultureInfo(targetCultureName);
-
-        // Act
-        var translator = NumberTranslator.Create(sourceCulture, targetCulture);
-
-        // Assert
-        Assert.IsNotNull(translator);
-    }
-
-    [DataTestMethod]
-    [DataRow(null)]
-    public void Translate_ThrowError_WhenCalledNull(string input)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        Assert.ThrowsException<ArgumentNullException>(() => translator.Translate(input));
-    }
-
-    [DataTestMethod]
-    [DataRow("")]
-    [DataRow(" ")]
-    public void Translate_WhenCalledEmpty(string input)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.AreEqual(input, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("2,0 * 2", "2.0 * 2")]
-    [DataRow("4 * 3,6 + 9", "4 * 3.6 + 9")]
-    [DataRow("5,2+6", "5.2+6")]
-    [DataRow("round(2,5)", "round(2.5)")]
-    [DataRow("3,3333", "3.3333")]
-    [DataRow("max(2;3)", "max(2,3)")]
-    public void Translate_NoErrors_WhenCalled(string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("2.0 * 2", "2,0 * 2")]
-    [DataRow("4 * 3.6 + 9", "4 * 3,6 + 9")]
-    [DataRow("5.2+6", "5,2+6")]
-    [DataRow("round(2.5)", "round(2,5)")]
-    [DataRow("3.3333", "3,3333")]
-    public void TranslateBack_NoErrors_WhenCalled(string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.TranslateBack(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow(".", ",", "2,000,000", "2000000")]
-    [DataRow(".", ",", "2,000,000.6", "2000000.6")]
-    [DataRow(",", ".", "2.000.000", "2000000")]
-    [DataRow(",", ".", "2.000.000,6", "2000000.6")]
-    public void Translate_RemoveNumberGroupSeparator_WhenCalled(string decimalSeparator, string groupSeparator, string input, string expectedResult)
-    {
-        // Arrange
-        var sourceCulture = new CultureInfo("en-US", false)
-        {
-            NumberFormat =
-            {
-                NumberDecimalSeparator = decimalSeparator,
-                NumberGroupSeparator = groupSeparator,
-            },
-        };
-        var translator = NumberTranslator.Create(sourceCulture, new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("de-DE", "12,0004", "12.0004")]
-    [DataRow("de-DE", "0xF000", "61440")]
-    [DataRow("de-DE", "0", "0")]
-    [DataRow("de-DE", "00", "0")]
-    [DataRow("de-DE", "12.004", "12004")] // . is the group separator in de-DE
-    [DataRow("de-DE", "12.04", "1204")]
-    [DataRow("de-DE", "12.4", "124")]
-    [DataRow("de-DE", "3.004.044.444,05", "3004044444.05")]
-    [DataRow("de-DE", "123.01 + 52.30", "12301 + 5230")]
-    [DataRow("de-DE", "123.001 + 52.30", "123001 + 5230")]
-    [DataRow("fr-FR", "0", "0")]
-    [DataRow("fr-FR", "00", "0")]
-    [DataRow("fr-FR", "12.004", "12.004")] // . is not decimal or group separator in fr-FR
-    [DataRow("fr-FR", "12.04", "12.04")]
-    [DataRow("fr-FR", "12.4", "12.4")]
-    [DataRow("fr-FR", "12.0004", "12.0004")]
-
-    // [DataRow("fr-FR", "123.01 + 52.30", "123.01 + 52.30")]
-    // [DataRow("fr-FR", "123.001 + 52.30", "123.001 + 52.30")] passed locally, failed in CI
-    public void Translate_NoRemovalOfLeadingZeroesOnEdgeCases(string sourceCultureName, string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo(sourceCultureName, false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("en-US", "0xF000", "61440")]
-    [DataRow("en-US", "0xf4572220", "4099351072")]
-    [DataRow("en-US", "0x12345678", "305419896")]
-    public void Translate_LargeHexadecimalNumbersToDecimal(string sourceCultureName, string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo(sourceCultureName, false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/BasicStructureTest.cs

@@ -1,18 +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 Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class BasicStructureTest
-{
-    [TestMethod]
-    public void CanCreateTestClass()
-    {
-        // This is a basic test to verify the test project structure is correct
-        Assert.IsTrue(true);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/KeyNameTest.cs

@@ -1,26 +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 Microsoft.CmdPal.Ext.Registry.Constants;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class KeyNameTest
-{
-    [TestMethod]
-    [DataRow("HKEY", KeyName.FirstPart)]
-    [DataRow("HKEY_", KeyName.FirstPartUnderscore)]
-    [DataRow("HKCR", KeyName.ClassRootShort)]
-    [DataRow("HKCC", KeyName.CurrentConfigShort)]
-    [DataRow("HKCU", KeyName.CurrentUserShort)]
-    [DataRow("HKLM", KeyName.LocalMachineShort)]
-    [DataRow("HKPD", KeyName.PerformanceDataShort)]
-    [DataRow("HKU", KeyName.UsersShort)]
-    public void TestConstants(string shortName, string baseName)
-    {
-        Assert.AreEqual(shortName, baseName);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/Microsoft.CmdPal.Ext.Registry.UnitTests.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>Microsoft.CmdPal.Ext.Registry.UnitTests</RootNamespace>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="MSTest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj" />
-  </ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/QueryHelperTest.cs

@@ -1,52 +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 Microsoft.CmdPal.Ext.Registry.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class QueryHelperTest
-{
-    [TestMethod]
-    [DataRow(@"HKLM", false, @"HKLM", "")]
-    [DataRow(@"HKLM\", false, @"HKLM\", "")]
-    [DataRow(@"HKLM\\", true, @"HKLM", "")]
-    [DataRow(@"HKLM\\Test", true, @"HKLM", "Test")]
-    [DataRow(@"HKLM\Test\\TestTest", true, @"HKLM\Test", "TestTest")]
-    [DataRow(@"HKLM\Test\\\TestTest", true, @"HKLM\Test", @"\TestTest")]
-    [DataRow("HKLM/\"Software\"/", false, @"HKLM\Software\", "")]
-    [DataRow("HKLM/\"Software\"//test", true, @"HKLM\Software", "test")]
-    [DataRow("HKLM/\"Software\"//test/123", true, @"HKLM\Software", "test/123")]
-    [DataRow("HKLM/\"Software\"//test\\123", true, @"HKLM\Software", @"test\123")]
-    [DataRow("HKLM/\"Software\"/test", false, @"HKLM\Software\test", "")]
-    [DataRow("HKLM\\Software\\\"test\"", false, @"HKLM\Software\test", "")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"", false, @"HKLM\Software\test", "")]
-    [DataRow("HKLM\\\"Software\"\\\"test/software\"", false, @"HKLM\Software\test/software", "")]
-    [DataRow("HKLM\\\"Software\"/\"test\"\\hello", false, @"HKLM\Software\test\hello", "")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"\\hello\\\\\"some/value\"", true, @"HKLM\Software\test\hello", "some/value")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"/hello\\\\\"some/value\"", true, @"HKLM\Software\test\hello", "some/value")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"\\hello\\\\some\\value", true, @"HKLM\Software\test\hello", @"some\value")]
-    public void GetQueryPartsTest(string query, bool expectedHasValueName, string expectedQueryKey, string expectedQueryValueName)
-    {
-        var hasValueName = QueryHelper.GetQueryParts(query, out var queryKey, out var queryValueName);
-
-        Assert.AreEqual(expectedHasValueName, hasValueName);
-        Assert.AreEqual(expectedQueryKey, queryKey);
-        Assert.AreEqual(expectedQueryValueName, queryValueName);
-    }
-
-    [TestMethod]
-    [DataRow(@"HKCR\*\OpenWithList", @"HKEY_CLASSES_ROOT\*\OpenWithList")]
-    [DataRow(@"HKCU\Control Panel\Accessibility", @"HKEY_CURRENT_USER\Control Panel\Accessibility")]
-    [DataRow(@"HKLM\HARDWARE\UEFI", @"HKEY_LOCAL_MACHINE\HARDWARE\UEFI")]
-    [DataRow(@"HKU\.DEFAULT\Environment", @"HKEY_USERS\.DEFAULT\Environment")]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", @"HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control")]
-    [DataRow(@"HKPD\???", @"HKEY_PERFORMANCE_DATA\???")]
-    public void GetShortBaseKeyTest(string registryKeyShort, string registryKeyFull)
-    {
-        Assert.AreEqual(registryKeyShort, QueryHelper.GetKeyWithShortBaseKey(registryKeyFull));
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/RegistryHelperTest.cs

@@ -1,75 +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.Collections;
-using System.Linq;
-
-using Microsoft.CmdPal.Ext.Registry.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class RegistryHelperTest
-{
-    [TestMethod]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", "HKEY_CURRENT_CONFIG")]
-    [DataRow(@"HKCR\*\OpenWithList", "HKEY_CLASSES_ROOT")]
-    [DataRow(@"HKCU\Control Panel\Accessibility", "HKEY_CURRENT_USER")]
-    [DataRow(@"HKLM\HARDWARE\UEFI", "HKEY_LOCAL_MACHINE")]
-    [DataRow(@"HKPD\???", "HKEY_PERFORMANCE_DATA")]
-    [DataRow(@"HKU\.DEFAULT\Environment", "HKEY_USERS")]
-    public void GetRegistryBaseKeyTestOnlyOneBaseKey(string query, string expectedBaseKey)
-    {
-        var (baseKeyList, _) = RegistryHelper.GetRegistryBaseKey(query);
-        Assert.IsNotNull(baseKeyList);
-        Assert.IsTrue(baseKeyList.Count() == 1);
-        Assert.AreEqual(expectedBaseKey, baseKeyList.First().Name);
-    }
-
-    [TestMethod]
-    public void GetRegistryBaseKeyTestMoreThanOneBaseKey()
-    {
-        var (baseKeyList, _) = RegistryHelper.GetRegistryBaseKey("HKC\\Control Panel\\Accessibility"); /* #no-spell-check-line */
-
-        Assert.IsNotNull(baseKeyList);
-        Assert.IsTrue(baseKeyList.Count() > 1);
-
-        var list = baseKeyList.Select(found => found.Name);
-        Assert.IsTrue(list.Contains("HKEY_CLASSES_ROOT"));
-        Assert.IsTrue(list.Contains("HKEY_CURRENT_CONFIG"));
-        Assert.IsTrue(list.Contains("HKEY_CURRENT_USER"));
-    }
-
-    [TestMethod]
-    [DataRow(@"HKCR\*\OpenWithList", @"*\OpenWithList")]
-    [DataRow(@"HKCU\Control Panel\Accessibility", @"Control Panel\Accessibility")]
-    [DataRow(@"HKLM\HARDWARE\UEFI", @"HARDWARE\UEFI")]
-    [DataRow(@"HKU\.DEFAULT\Environment", @".DEFAULT\Environment")]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", @"System\CurrentControlSet\Control")]
-    [DataRow(@"HKPD\???", @"???")]
-    public void GetRegistryBaseKeyTestSubKey(string query, string expectedSubKey)
-    {
-        var (_, subKey) = RegistryHelper.GetRegistryBaseKey(query);
-        Assert.AreEqual(expectedSubKey, subKey);
-    }
-
-    [TestMethod]
-    public void GetAllBaseKeysTest()
-    {
-        var list = RegistryHelper.GetAllBaseKeys();
-
-        CollectionAssert.AllItemsAreNotNull((ICollection)list);
-        CollectionAssert.AllItemsAreUnique((ICollection)list);
-
-        var keys = list.Select(found => found.Key).ToList() as ICollection;
-
-        CollectionAssert.Contains(keys, Win32.Registry.ClassesRoot);
-        CollectionAssert.Contains(keys, Win32.Registry.CurrentConfig);
-        CollectionAssert.Contains(keys, Win32.Registry.CurrentUser);
-        CollectionAssert.Contains(keys, Win32.Registry.LocalMachine);
-        CollectionAssert.Contains(keys, Win32.Registry.PerformanceData);
-        CollectionAssert.Contains(keys, Win32.Registry.Users);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/ResultHelperTest.cs

@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CmdPal.Ext.Registry.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class ResultHelperTest
-{
-    [TestMethod]
-    [DataRow(@"HKEY_CLASSES_ROOT\*\OpenWithList", @"HKEY_CLASSES_ROOT\*\OpenWithList")]
-    [DataRow(@"HKEY_CURRENT_USER\Control Panel\Accessibility", @"HKEY_CURRENT_USER\Control Panel\Accessibility")]
-    [DataRow(@"HKEY_LOCAL_MACHINE\HARDWARE\UEFI", @"HKEY_LOCAL_MACHINE\HARDWARE\UEFI")]
-    [DataRow(@"HKEY_USERS\.DEFAULT\Environment", @"HKEY_USERS\.DEFAULT\Environment")]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", @"HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control")]
-    [DataRow(@"HKEY_PERFORMANCE_DATA\???", @"HKEY_PERFORMANCE_DATA\???")]
-    [DataRow(@"HKCR\*\shell\Open with VS Code\command", @"HKEY_CLASSES_ROOT\*\shell\Open with VS Code\command")]
-    [DataRow(@"...ndows\CurrentVersion\Explorer\StartupApproved", @"HKEY_CURRENT_USER\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved")]
-    [DataRow(@"...p\Upgrade\NetworkDriverBackup\Control\Network", @"HKEY_LOCAL_MACHINE\SYSTEM\Setup\Upgrade\NetworkDriverBackup\Control\Network")]
-    [DataRow(@"...anel\International\User Profile System Backup", @"HKEY_USERS\.DEFAULT\Control Panel\International\User Profile System Backup")]
-    [DataRow(@"...stem\CurrentControlSet\Control\Print\Printers", @"HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control\Print\Printers")]
-    public void GetTruncatedTextTest_StandardCases(string registryKeyShort, string registryKeyFull)
-    {
-        Assert.AreEqual(registryKeyShort, ResultHelper.GetTruncatedText(registryKeyFull, 45));
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/BasicTests.cs

@@ -1,73 +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 Microsoft.CmdPal.Ext.System.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.System.UnitTests;
-
-[TestClass]
-public class BasicTests
-{
-    [TestMethod]
-    public void IconsHelperTest()
-    {
-        // Assert
-        Assert.IsNotNull(Icons.FirmwareSettingsIcon);
-        Assert.IsNotNull(Icons.LockIcon);
-        Assert.IsNotNull(Icons.LogoffIcon);
-        Assert.IsNotNull(Icons.NetworkAdapterIcon);
-        Assert.IsNotNull(Icons.RecycleBinIcon);
-        Assert.IsNotNull(Icons.RestartIcon);
-        Assert.IsNotNull(Icons.RestartShellIcon);
-        Assert.IsNotNull(Icons.ShutdownIcon);
-        Assert.IsNotNull(Icons.SleepIcon);
-    }
-
-    [TestMethod]
-    public void Win32HelpersTest()
-    {
-        // Setup & Act
-        // These methods should not throw exceptions
-        var firmwareType = Win32Helpers.GetSystemFirmwareType();
-
-        // Assert
-        // Just testing that they don't throw exceptions
-        Assert.IsTrue(Enum.IsDefined(typeof(FirmwareType), firmwareType));
-    }
-
-    [TestMethod]
-    public void NetworkConnectionPropertiesTest()
-    {
-        // Test that network connection properties can be accessed without throwing exceptions
-        try
-        {
-            var networkPropertiesList = NetworkConnectionProperties.GetList();
-
-            // If we have network connections, test accessing their properties
-            if (networkPropertiesList.Count > 0)
-            {
-                var networkProperties = networkPropertiesList[0];
-
-                // Access properties (these used to be methods)
-                var ipv4 = networkProperties.IPv4;
-                var ipv6 = networkProperties.IPv6Primary;
-                var macAddress = networkProperties.PhysicalAddress;
-
-                // Test passes if no exceptions are thrown
-                Assert.IsTrue(true);
-            }
-            else
-            {
-                // If no network connections, test still passes
-                Assert.IsTrue(true);
-            }
-        }
-        catch
-        {
-            Assert.Fail("Network properties should not throw exceptions");
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/ImageTests.cs

@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Linq;
-using System.Reflection;
-using Microsoft.CmdPal.Ext.System.Helpers;
-using Microsoft.CmdPal.Ext.System.Pages;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.System.UnitTests;
-
-[TestClass]
-public class ImageTests
-{
-    [DataRow(true)]
-    [DataRow(false)]
-    [TestMethod]
-    public void IconThemeTest(bool isDarkIcon)
-    {
-        var systemPage = new SystemCommandPage(new Settings());
-        var commands = systemPage.GetItems();
-
-        foreach (var item in commands)
-        {
-            var icon = item.Icon;
-            Assert.IsNotNull(icon, $"Icon for '{item.Title}' should not be null.");
-            if (isDarkIcon)
-            {
-                Assert.IsNotEmpty(icon.Dark.Icon, $"Icon for '{item.Title}' should not be empty.");
-            }
-            else
-            {
-                Assert.IsNotEmpty(icon.Light.Icon, $"Icon for '{item.Title}' should not be empty.");
-            }
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/Microsoft.CmdPal.Ext.System.UnitTests.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>Microsoft.CmdPal.Ext.System.UnitTests</RootNamespace>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="MSTest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
-    <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
-  </ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs

@@ -1,152 +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.Linq;
-using Microsoft.CmdPal.Ext.System.Helpers;
-using Microsoft.CmdPal.Ext.System.Pages;
-using Microsoft.CmdPal.Ext.UnitTestBase;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.System.UnitTests;
-
-[TestClass]
-public class QueryTests : CommandPaletteUnitTestBase
-{
-    [DataTestMethod]
-    [DataRow("shutdown", "Shutdown")]
-    [DataRow("restart", "Restart")]
-    [DataRow("sign out", "Sign out")]
-    [DataRow("lock", "Lock")]
-    [DataRow("sleep", "Sleep")]
-    [DataRow("hibernate", "Hibernate")]
-    [DataRow("open recycle", "Open Recycle Bin")]
-    [DataRow("empty recycle", "Empty Recycle Bin")]
-    [DataRow("uefi", "UEFI Firmware Settings")]
-    public void TopLevelPageQueryTest(string input, string matchedTitle)
-    {
-        var settings = new Settings();
-        var pages = new SystemCommandPage(settings);
-        var allCommands = pages.GetItems();
-
-        var result = Query(input, allCommands);
-
-        // Empty recycle bin command should exist
-        Assert.IsNotNull(result);
-
-        var firstItem = result.FirstOrDefault();
-
-        Assert.IsNotNull(firstItem, "No items matched the query.");
-        Assert.AreEqual(matchedTitle, firstItem.Title, $"Expected to match '{input}' but got '{firstItem.Title}'");
-    }
-
-    [TestMethod]
-    public void RecycleBinCommandTest()
-    {
-        var settings = new Settings(hideEmptyRecycleBin: true);
-        var pages = new SystemCommandPage(settings);
-        var allCommands = pages.GetItems();
-
-        var result = Query("recycle", allCommands);
-
-        // Empty recycle bin command should exist
-        Assert.IsNotNull(result);
-
-        foreach (var item in result)
-        {
-            if (item.Title.Contains("Open Recycle Bin") || item.Title.Contains("Empty Recycle Bin"))
-            {
-                Assert.Fail("Recycle Bin commands should not be available when hideEmptyRecycleBin is true.");
-            }
-        }
-
-        var firstItem = result.FirstOrDefault();
-        Assert.IsNotNull(firstItem, "No items matched the query.");
-        Assert.IsTrue(
-            firstItem.Title.Contains("Recycle Bin", StringComparison.OrdinalIgnoreCase),
-            $"Expected to match 'Recycle Bin' but got '{firstItem.Title}'");
-    }
-
-    [TestMethod]
-    public void NetworkCommandsTest()
-    {
-        var settings = new Settings();
-        var pages = new SystemCommandPage(settings);
-        var allCommands = pages.GetItems();
-
-        var ipv4Result = Query("IPv4", allCommands);
-
-        Assert.IsNotNull(ipv4Result);
-        Assert.IsTrue(ipv4Result.Length > 0, "No IPv4 commands matched the query.");
-
-        var ipv6Result = Query("IPv6", allCommands);
-        Assert.IsNotNull(ipv6Result);
-        Assert.IsTrue(ipv6Result.Length > 0, "No IPv6 commands matched the query.");
-
-        var macResult = Query("MAC", allCommands);
-        Assert.IsNotNull(macResult);
-        Assert.IsTrue(macResult.Length > 0, "No MAC commands matched the query.");
-
-        var findDisconnectedMACResult = false;
-        foreach (var item in macResult)
-        {
-            if (item.Details.Body.Contains("Disconnected"))
-            {
-                findDisconnectedMACResult = true;
-                break;
-            }
-        }
-
-        Assert.IsTrue(findDisconnectedMACResult, "No disconnected MAC address found in the results.");
-    }
-
-    [TestMethod]
-    public void HideDisconnectedNetworkInfoTest()
-    {
-        var settings = new Settings(hideDisconnectedNetworkInfo: true);
-        var pages = new SystemCommandPage(settings);
-        var allCommands = pages.GetItems();
-
-        var macResult = Query("MAC", allCommands);
-        Assert.IsNotNull(macResult);
-        Assert.IsTrue(macResult.Length > 0, "No MAC commands matched the query.");
-
-        var findDisconnectedMACResult = false;
-        foreach (var item in macResult)
-        {
-            if (item.Details.Body.Contains("Disconnected"))
-            {
-                findDisconnectedMACResult = true;
-                break;
-            }
-        }
-
-        Assert.IsTrue(!findDisconnectedMACResult, "Disconnected MAC address found in the results.");
-    }
-
-    [TestMethod]
-    [DataRow(FirmwareType.Uefi, true)]
-    [DataRow(FirmwareType.Bios, false)]
-    [DataRow(FirmwareType.Max, false)]
-    [DataRow(FirmwareType.Unknown, false)]
-    public void FirmwareSettingsTest(FirmwareType firmwareType, bool hasCommand)
-    {
-        var settings = new Settings(firmwareType: firmwareType);
-        var pages = new SystemCommandPage(settings);
-        var allCommands = pages.GetItems();
-        var result = Query("UEFI", allCommands);
-
-        // UEFI Firmware Settings command should exist
-        Assert.IsNotNull(result);
-        var firstItem = result.FirstOrDefault();
-        Assert.IsNotNull(firstItem, "No items matched the query.");
-        var containsFirmwareSettings = firstItem.Title.Contains("UEFI Firmware Settings", StringComparison.OrdinalIgnoreCase);
-
-        Assert.IsTrue(
-            containsFirmwareSettings == hasCommand,
-            $"Expected to match 'UEFI Firmware Settings' but got '{firstItem.Title}'");
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/Settings.cs

@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.System.Helpers;
-
-namespace Microsoft.CmdPal.Ext.System.UnitTests;
-
-public class Settings : ISettingsInterface
-{
-    private bool hideDisconnectedNetworkInfo;
-    private bool hideEmptyRecycleBin;
-    private bool showDialogToConfirmCommand;
-    private bool showSuccessMessageAfterEmptyingRecycleBin;
-    private FirmwareType firmwareType;
-
-    public Settings(bool hideDisconnectedNetworkInfo = false, bool hideEmptyRecycleBin = false, bool showDialogToConfirmCommand = false, bool showSuccessMessageAfterEmptyingRecycleBin = false, FirmwareType firmwareType = FirmwareType.Uefi)
-    {
-        this.hideDisconnectedNetworkInfo = hideDisconnectedNetworkInfo;
-        this.hideEmptyRecycleBin = hideEmptyRecycleBin;
-        this.showDialogToConfirmCommand = showDialogToConfirmCommand;
-        this.showSuccessMessageAfterEmptyingRecycleBin = showSuccessMessageAfterEmptyingRecycleBin;
-        this.firmwareType = firmwareType;
-    }
-
-    public bool HideDisconnectedNetworkInfo() => hideDisconnectedNetworkInfo;
-
-    public bool HideEmptyRecycleBin() => hideEmptyRecycleBin;
-
-    public bool ShowDialogToConfirmCommand() => showDialogToConfirmCommand;
-
-    public bool ShowSuccessMessageAfterEmptyingRecycleBin() => showSuccessMessageAfterEmptyingRecycleBin;
-
-    public FirmwareType GetSystemFirmwareType() => firmwareType;
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/AvailableResultsListTests.cs

@@ -1,494 +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.Globalization;
-using System.Linq;
-using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class AvailableResultsListTests
-{
-    private CultureInfo originalCulture;
-    private CultureInfo originalUiCulture;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        // Set culture to 'en-us'
-        originalCulture = CultureInfo.CurrentCulture;
-        CultureInfo.CurrentCulture = new CultureInfo("en-us", false);
-        originalUiCulture = CultureInfo.CurrentUICulture;
-        CultureInfo.CurrentUICulture = new CultureInfo("en-us", false);
-    }
-
-    [TestCleanup]
-    public void CleanUp()
-    {
-        // Set culture to original value
-        CultureInfo.CurrentCulture = originalCulture;
-        CultureInfo.CurrentUICulture = originalUiCulture;
-    }
-
-    private DateTime GetDateTimeForTest(bool embedUtc = false)
-    {
-        var dateTime = new DateTime(2022, 03, 02, 22, 30, 45);
-        if (embedUtc)
-        {
-            return DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);
-        }
-        else
-        {
-            return dateTime;
-        }
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30 PM")]
-    [DataRow("date", "3/2/2022")]
-    [DataRow("date and time", "3/2/2022 10:30 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithShortTimeAndShortDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, false, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value, $"Culture {CultureInfo.CurrentCulture.Name}, Culture UI: {CultureInfo.CurrentUICulture.Name}, Calendar: {CultureInfo.CurrentCulture.Calendar}, Region: {RegionInfo.CurrentRegion.Name}");
-    }
-
-    [TestMethod]
-    public void GetList_WithKeywordSearch_ReturnsResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should return at least some results for keyword search");
-    }
-
-    [TestMethod]
-    public void GetList_WithoutKeywordSearch_ReturnsResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(false, settings);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should return at least some results for non-keyword search");
-    }
-
-    [TestMethod]
-    public void GetList_WithSpecificDateTime_ReturnsFormattedResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var specificDateTime = GetDateTimeForTest();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings, null, null, specificDateTime);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should return results for specific datetime");
-
-        // Verify that all results have values
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.Label, "Result label should not be null");
-            Assert.IsNotNull(result.Value, "Result value should not be null");
-        }
-    }
-
-    [TestMethod]
-    public void GetList_ResultsHaveRequiredProperties()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Assert
-        Assert.IsTrue(results.Count > 0, "Should have results");
-
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.Label, "Each result should have a label");
-            Assert.IsNotNull(result.Value, "Each result should have a value");
-            Assert.IsFalse(string.IsNullOrWhiteSpace(result.Label), "Label should not be empty");
-            Assert.IsFalse(string.IsNullOrWhiteSpace(result.Value), "Value should not be empty");
-        }
-    }
-
-    [TestMethod]
-    public void GetList_WithDifferentCalendarSettings_ReturnsResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act & Assert - Test with different settings
-        var results1 = AvailableResultsList.GetList(true, settings);
-        Assert.IsNotNull(results1);
-        Assert.IsTrue(results1.Count > 0);
-
-        // Test that the method can handle different calendar settings
-        var results2 = AvailableResultsList.GetList(false, settings);
-        Assert.IsNotNull(results2);
-        Assert.IsTrue(results2.Count > 0);
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30 PM")]
-    [DataRow("date", "Wednesday, March 2, 2022")]
-    [DataRow("date and time", "Wednesday, March 2, 2022 10:30 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithShortTimeAndLongDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, true, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30:45 PM")]
-    [DataRow("date", "3/2/2022")]
-    [DataRow("date and time", "3/2/2022 10:30:45 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithLongTimeAndShortDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, false, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30:45 PM")]
-    [DataRow("date", "Wednesday, March 2, 2022")]
-    [DataRow("date and time", "Wednesday, March 2, 2022 10:30:45 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithLongTimeAndLongDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, true, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "t")]
-    [DataRow("date and time utc", "g")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithShortTimeAndShortDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, false, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "t")]
-    [DataRow("date and time utc", "f")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithShortTimeAndLongDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, true, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "T")]
-    [DataRow("date and time utc", "G")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithLongTimeAndShortDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, false, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "T")]
-    [DataRow("date and time utc", "F")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithLongTimeAndLongDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, true, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [TestMethod]
-    public void UnixTimestampSecondsFormat()
-    {
-        // Setup
-        string formatLabel = "Unix epoch time";
-        DateTime timeValue = DateTime.Now.ToUniversalTime();
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = (long)timeValue.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult.ToString(CultureInfo.CurrentCulture), result?.Value);
-    }
-
-    [TestMethod]
-    public void UnixTimestampMillisecondsFormat()
-    {
-        // Setup
-        string formatLabel = "Unix epoch time in milliseconds";
-        DateTime timeValue = DateTime.Now.ToUniversalTime();
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = (long)timeValue.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds;
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult.ToString(CultureInfo.CurrentCulture), result?.Value);
-    }
-
-    [TestMethod]
-    public void WindowsFileTimeFormat()
-    {
-        // Setup
-        string formatLabel = "Windows file time (Int64 number)";
-        DateTime timeValue = DateTime.Now;
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = timeValue.ToFileTime().ToString(CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [TestMethod]
-    public void ValidateEraResult()
-    {
-        // Setup
-        string formatLabel = "Era";
-        DateTime timeValue = DateTime.Now;
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = DateTimeFormatInfo.CurrentInfo.GetEraName(CultureInfo.CurrentCulture.Calendar.GetEra(timeValue));
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [TestMethod]
-    public void ValidateEraAbbreviationResult()
-    {
-        // Setup
-        string formatLabel = "Era abbreviation";
-        DateTime timeValue = DateTime.Now;
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedEraName(CultureInfo.CurrentCulture.Calendar.GetEra(timeValue));
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow(CalendarWeekRule.FirstDay, "3")]
-    [DataRow(CalendarWeekRule.FirstFourDayWeek, "2")]
-    [DataRow(CalendarWeekRule.FirstFullWeek, "2")]
-    public void DifferentFirstWeekSettingConfigurations(CalendarWeekRule weekRule, string expectedWeekOfYear)
-    {
-        // Setup
-        DateTime timeValue = new DateTime(2021, 1, 12);
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue, weekRule, DayOfWeek.Sunday);
-
-        // Act
-        var resultWeekOfYear = helperResults.FirstOrDefault(x => x.Label.Equals("week of the year (calendar week, week number)", StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedWeekOfYear, resultWeekOfYear?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow(DayOfWeek.Monday, "2", "2", "5")]
-    [DataRow(DayOfWeek.Tuesday, "3", "3", "4")]
-    [DataRow(DayOfWeek.Wednesday, "3", "3", "3")]
-    [DataRow(DayOfWeek.Thursday, "3", "3", "2")]
-    [DataRow(DayOfWeek.Friday, "3", "3", "1")]
-    [DataRow(DayOfWeek.Saturday, "2", "2", "7")]
-    [DataRow(DayOfWeek.Sunday, "2", "2", "6")]
-    public void DifferentFirstDayOfWeekSettingConfigurations(DayOfWeek dayOfWeek, string expectedWeekOfYear, string expectedWeekOfMonth, string expectedDayInWeek)
-    {
-        // Setup
-        DateTime timeValue = new DateTime(2024, 1, 12); // Friday
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue, CalendarWeekRule.FirstDay, dayOfWeek);
-
-        // Act
-        var resultWeekOfYear = helperResults.FirstOrDefault(x => x.Label.Equals("week of the year (calendar week, week number)", StringComparison.OrdinalIgnoreCase));
-        var resultWeekOfMonth = helperResults.FirstOrDefault(x => x.Label.Equals("week of the month", StringComparison.OrdinalIgnoreCase));
-        var resultDayInWeek = helperResults.FirstOrDefault(x => x.Label.Equals("day of the week (week day)", StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedWeekOfYear, resultWeekOfYear?.Value);
-        Assert.AreEqual(expectedWeekOfMonth, resultWeekOfMonth?.Value);
-        Assert.AreEqual(expectedDayInWeek, resultDayInWeek?.Value);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/BasicTests.cs

@@ -1,28 +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 Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class BasicTests
-{
-    [TestMethod]
-    public void BasicTest()
-    {
-        // This is a basic test to verify the test project can run
-        Assert.IsTrue(true);
-    }
-
-    [TestMethod]
-    public void DateTimeTest()
-    {
-        // Test basic DateTime functionality
-        var now = DateTime.Now;
-        Assert.IsNotNull(now);
-        Assert.IsTrue(now > DateTime.MinValue);
-    }
-}