Update build-installer.ps1

## Summary of the Pull Request

Added more instructions to first time building command palette

## PR Checklist

- [ ] **Closes:** #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [X ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

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

@@ -218,6 +218,7 @@ coclass
 CODENAME
 codereview
 Codespaces
+Coen
 COINIT
 colid
 colorconv
@@ -1614,6 +1615,8 @@ svgz
 SVSI
 SWFO
 SWP
+SWPNOSIZE
+SWPNOZORDER
 SWRESTORE
 symbolrequestprod
 SYMCACHE

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

@@ -160,6 +160,7 @@ jobs:
         vsTestVersion: 'toolsInstaller'
         uiTests: true
         rerunFailedTests: true
+        testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
         # Since UITests-FancyZonesEditor.dll is generated in both UITests-FancyZonesEditor and UITests-FancyZones, removed one to avoid duplicate test runs
         testAssemblyVer2: |
           **\*UITest*.dll
@@ -182,6 +183,7 @@ jobs:
           vsTestVersion: 'toolsInstaller'
           uiTests: true
           rerunFailedTests: true
+          testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
           testAssemblyVer2: |
             **\*${{ module }}*.dll
             !**\obj\**

Directory.Packages.props

@@ -9,6 +9,7 @@
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
+    <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />

NOTICE.md

@@ -1496,6 +1496,7 @@ SOFTWARE.
 - AdaptiveCards.Templating 2.0.5
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.17
+- CoenM.ImageSharp.ImageHash 1.3.6
 - CommunityToolkit.Common 8.4.0
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock 0.1.250703-build.2173
 - CommunityToolkit.Mvvm 8.4.0

PowerToys.sln

@@ -60,9 +60,6 @@ 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}") = "PowerRenameUnitTests", "src\modules\powerrename\unittests\PowerRenameLibUnitTests.vcxproj", "{2151F984-E006-4A9F-92EF-C6DDE3DC8413}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -736,10 +733,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCsWin32", "src\commo
 EndProject
 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("{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", "{15EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+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", "{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}"
+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", "{790247CB-2B95-E139-E933-09D10137EEAF}"
+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", "{18525614-CDB2-8BBE-B1B4-3812CD990C22}"
+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", "{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2738,6 +2749,54 @@ 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
+		{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
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Debug|x64.ActiveCfg = Debug|x64
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Debug|x64.Build.0 = Debug|x64
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Release|ARM64.Build.0 = Release|ARM64
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Release|x64.ActiveCfg = Release|x64
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7}.Release|x64.Build.0 = Release|x64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Debug|ARM64.Build.0 = Debug|ARM64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Debug|x64.ActiveCfg = Debug|x64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Debug|x64.Build.0 = Debug|x64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Release|ARM64.ActiveCfg = Release|ARM64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Release|ARM64.Build.0 = Release|ARM64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Release|x64.ActiveCfg = Release|x64
+		{790247CB-2B95-E139-E933-09D10137EEAF}.Release|x64.Build.0 = Release|x64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Debug|ARM64.Build.0 = Debug|ARM64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Debug|x64.ActiveCfg = Debug|x64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Debug|x64.Build.0 = Debug|x64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Release|ARM64.ActiveCfg = Release|ARM64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Release|ARM64.Build.0 = Release|ARM64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Release|x64.ActiveCfg = Release|x64
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22}.Release|x64.Build.0 = Release|x64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Debug|x64.ActiveCfg = Debug|x64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Debug|x64.Build.0 = Debug|x64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Release|ARM64.Build.0 = Release|ARM64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Release|x64.ActiveCfg = Release|x64
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3025,6 +3084,13 @@ Global
 		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{9D3F3793-EFE3-4525-8782-238015DABA62} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
+		{BCDC7246-F4F8-4EED-8DE6-037AA2E7C6D1} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
+		{15EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
+		{2CF0567E-1E00-4E3F-1561-BF85F5CE5FE7} = {15EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{790247CB-2B95-E139-E933-09D10137EEAF} = {15EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{18525614-CDB2-8BBE-B1B4-3812CD990C22} = {15EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{B0FE6EF3-5FB3-B8DC-7507-008BBB392FD8} = {15EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -14,14 +14,12 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v143</PlatformToolset>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="..\..\deps\spdlog.props" />

src/ActionRunner/actionRunner.vcxproj

@@ -13,7 +13,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="..\..\deps\expected.props" />
   <PropertyGroup>

src/Update/PowerToys.Update.vcxproj

@@ -13,7 +13,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="..\..\deps\expected.props" />
   <PropertyGroup>

src/common/COMUtils/COMUtils.vcxproj

@@ -11,7 +11,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -13,7 +13,6 @@
   <PropertyGroup Label="Configuration">
     <EnableHybridCRT>true</EnableHybridCRT>
     <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <!-- END common.build.pre.props -->
   <!-- BEGIN cppwinrt.build.pre.props -->

src/common/Display/Display.vcxproj

@@ -11,7 +11,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/GPOWrapper/GPOWrapper.vcxproj

@@ -23,7 +23,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
     <DesktopCompatible>true</DesktopCompatible>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/common/SettingsAPI/SettingsAPI.vcxproj

@@ -13,7 +13,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/Telemetry/EtwTrace/EtwTrace.vcxproj

@@ -12,7 +12,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/Themes/Themes.vcxproj

@@ -12,7 +12,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/UITestAutomation/Element/Element.cs

@@ -364,7 +364,7 @@ namespace Microsoft.PowerToys.UITest
         /// Save UI Element to a PNG file.
         /// </summary>
         /// <param name="path">the full path</param>
-        internal void SaveToPngFile(string path)
+        public void SaveToPngFile(string path)
         {
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method SaveToPngFile with parameter: path = {path}");
             this.windowsElement.GetScreenshot().SaveAsFile(path);

src/common/UITestAutomation/ModuleConfigData.cs

@@ -32,6 +32,7 @@ namespace Microsoft.PowerToys.UITest
         Runner,
         Workspaces,
         PowerRename,
+        CommandPalette,
     }
 
     /// <summary>
@@ -104,6 +105,7 @@ namespace Microsoft.PowerToys.UITest
                 [PowerToysModule.Runner] = new ModuleInfo("PowerToys.exe", "PowerToys"),
                 [PowerToysModule.Workspaces] = new ModuleInfo("PowerToys.WorkspacesEditor.exe", "Workspaces Editor"),
                 [PowerToysModule.PowerRename] = new ModuleInfo("PowerToys.PowerRename.exe", "PowerRename", "WinUI3Apps"),
+                [PowerToysModule.CommandPalette] = new ModuleInfo("Microsoft.CmdPal.UI.exe", "PowerToys Command Palette", "WinUI3Apps\\CmdPal"),
             };
         }
 

src/common/UITestAutomation/SessionHelper.cs

@@ -91,15 +91,12 @@ namespace Microsoft.PowerToys.UITest
         }
 
         /// <summary>
-        /// Exit a exe.
+        /// Exit a exe by Name.
         /// </summary>
-        /// <param name="appPath">The path to the application executable.</param>
-        public void ExitExe(string appPath)
+        /// <param name="processName">The path to the application executable.</param>
+        public void ExitExeByName(string processName)
         {
-            // Exit Exe
-            string exeName = Path.GetFileNameWithoutExtension(appPath);
-
-            Process[] processes = Process.GetProcessesByName(exeName);
+            Process[] processes = Process.GetProcessesByName(processName);
             foreach (Process process in processes)
             {
                 try
@@ -114,6 +111,18 @@ namespace Microsoft.PowerToys.UITest
             }
         }
 
+        /// <summary>
+        /// Exit a exe.
+        /// </summary>
+        /// <param name="appPath">The path to the application executable.</param>
+        public void ExitExe(string appPath)
+        {
+            // Exit Exe
+            string exeName = Path.GetFileNameWithoutExtension(appPath);
+
+            ExitExeByName(exeName);
+        }
+
         /// <summary>
         /// Starts a new exe and takes control of it.
         /// </summary>
@@ -122,26 +131,34 @@ namespace Microsoft.PowerToys.UITest
         public void StartExe(string appPath, string[]? args = null)
         {
             var opts = new AppiumOptions();
-            opts.AddAdditionalCapability("app", appPath);
 
-            if (args != null && args.Length > 0)
+            if (scope == PowerToysModule.PowerToysSettings)
             {
-                // Build command line arguments string
-                string argsString = string.Join(" ", args.Select(arg =>
+                TryLaunchPowerToysSettings(opts);
+            }
+            else
+            {
+                opts.AddAdditionalCapability("app", appPath);
+
+                if (args != null && args.Length > 0)
                 {
-                    // Quote arguments that contain spaces
-                    if (arg.Contains(' '))
+                    // Build command line arguments string
+                    string argsString = string.Join(" ", args.Select(arg =>
                     {
-                        return $"\"{arg}\"";
-                    }
+                        // Quote arguments that contain spaces
+                        if (arg.Contains(' '))
+                        {
+                            return $"\"{arg}\"";
+                        }
 
-                    return arg;
-                }));
+                        return arg;
+                    }));
 
-                opts.AddAdditionalCapability("appArguments", argsString);
+                    opts.AddAdditionalCapability("appArguments", argsString);
+                }
             }
 
-            this.Driver = NewWindowsDriver(opts);
+            Driver = NewWindowsDriver(opts);
         }
 
         private void TryLaunchPowerToysSettings(AppiumOptions opts)
@@ -150,15 +167,18 @@ namespace Microsoft.PowerToys.UITest
 
             var runnerProcessInfo = new ProcessStartInfo
             {
-                FileName = locationPath + this.runnerPath,
+                FileName = locationPath + runnerPath,
                 Verb = "runas",
                 Arguments = "--open-settings",
             };
 
-            this.ExitExe(runnerProcessInfo.FileName);
-            this.runner = Process.Start(runnerProcessInfo);
+            ExitExe(runnerProcessInfo.FileName);
+            runner = Process.Start(runnerProcessInfo);
             Thread.Sleep(5000);
 
+            // Exit CmdPal UI before launching new process if use installer for test
+            ExitExeByName("Microsoft.CmdPal.UI");
+
             if (root != null)
             {
                 const int maxRetries = 5;
@@ -168,7 +188,7 @@ namespace Microsoft.PowerToys.UITest
                 for (int attempt = 1; attempt <= maxRetries; attempt++)
                 {
                     var settingsWindow = ApiHelper.FindDesktopWindowHandler(
-                        new[] { windowName, AdministratorPrefix + windowName });
+                        [windowName, AdministratorPrefix + windowName]);
 
                     if (settingsWindow.Count > 0)
                     {

src/common/UITestAutomation/UITestAutomation.csproj

@@ -20,6 +20,7 @@
     <PackageReference Include="System.Net.Http" />
     <PackageReference Include="System.Private.Uri" />
     <PackageReference Include="System.Text.RegularExpressions" />
+    <PackageReference Include="CoenM.ImageSharp.ImageHash" />
   </ItemGroup>
 
 </Project>

src/common/UITestAutomation/UITestBase.cs

@@ -22,6 +22,8 @@ namespace Microsoft.PowerToys.UITest
 
         public bool IsInPipeline { get; }
 
+        public string? ScreenshotDirectory { get; set; }
+
         public static MonitorInfoData.ParamsWrapper MonitorInfoData { get; set; } = new MonitorInfoData.ParamsWrapper() { Monitors = new List<MonitorInfoData.MonitorInfoDataWrapper>() };
 
         private readonly PowerToysModule scope;
@@ -29,7 +31,6 @@ namespace Microsoft.PowerToys.UITest
         private readonly string[]? commandLineArgs;
         private SessionHelper? sessionHelper;
         private System.Threading.Timer? screenshotTimer;
-        private string? screenshotDirectory;
 
         public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings, WindowSize size = WindowSize.UnSpecified, string[]? commandLineArgs = null)
         {
@@ -58,11 +59,11 @@ namespace Microsoft.PowerToys.UITest
             CloseOtherApplications();
             if (IsInPipeline)
             {
-                screenshotDirectory = Path.Combine(this.TestContext.TestResultsDirectory ?? string.Empty, "UITestScreenshots_" + Guid.NewGuid().ToString());
-                Directory.CreateDirectory(screenshotDirectory);
+                ScreenshotDirectory = Path.Combine(this.TestContext.TestResultsDirectory ?? string.Empty, "UITestScreenshots_" + Guid.NewGuid().ToString());
+                Directory.CreateDirectory(ScreenshotDirectory);
 
                 // Take screenshot every 1 second
-                screenshotTimer = new System.Threading.Timer(ScreenCapture.TimerCallback, screenshotDirectory, TimeSpan.Zero, TimeSpan.FromMilliseconds(1000));
+                screenshotTimer = new System.Threading.Timer(ScreenCapture.TimerCallback, ScreenshotDirectory, TimeSpan.Zero, TimeSpan.FromMilliseconds(1000));
 
                 // Escape Popups before starting
                 System.Windows.Forms.SendKeys.SendWait("{ESC}");
@@ -415,9 +416,9 @@ namespace Microsoft.PowerToys.UITest
 
         protected void AddScreenShotsToTestResultsDirectory()
         {
-            if (screenshotDirectory != null)
+            if (ScreenshotDirectory != null)
             {
-                foreach (string file in Directory.GetFiles(screenshotDirectory))
+                foreach (string file in Directory.GetFiles(ScreenshotDirectory))
                 {
                     this.TestContext.AddResultFile(file);
                 }
@@ -627,6 +628,23 @@ namespace Microsoft.PowerToys.UITest
                     Console.WriteLine($"Failed to change display resolution. Error code: {result}");
                 }
             }
+
+            // Windows API for moving windows
+            [DllImport("user32.dll")]
+            private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags);
+
+            private const uint SWPNOSIZE = 0x0001;
+            private const uint SWPNOZORDER = 0x0004;
+
+            public static void MoveWindow(Element window, int x, int y)
+            {
+                var windowHandle = IntPtr.Parse(window.GetAttribute("NativeWindowHandle") ?? "0", System.Globalization.CultureInfo.InvariantCulture);
+                if (windowHandle != IntPtr.Zero)
+                {
+                    SetWindowPos(windowHandle, IntPtr.Zero, x, y, 0, 0, SWPNOSIZE | SWPNOZORDER);
+                    Task.Delay(500).Wait();
+                }
+            }
         }
     }
 }

src/common/UITestAutomation/VisualAssert.cs

@@ -6,7 +6,11 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.IO;
+using CoenM.ImageHash;
+using CoenM.ImageHash.HashAlgorithms;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace Microsoft.PowerToys.UITest
 {
@@ -127,34 +131,75 @@ namespace Microsoft.PowerToys.UITest
         }
 
         /// <summary>
-        /// Test if two images are equal bit-by-bit
+        /// Test if two images are equal using ImageHash comparison
         /// </summary>
         /// <param name="baselineImage">baseline image</param>
         /// <param name="testImage">test image</param>
         /// <returns>true if are equal,otherwise false</returns>
         private static bool AreEqual(Bitmap baselineImage, Bitmap testImage)
         {
-            if (baselineImage.Width != testImage.Width || baselineImage.Height != testImage.Height)
+            try
             {
-                return false;
+                // Define a threshold for similarity percentage
+                const int SimilarityThreshold = 95;
+
+                // Use CoenM.ImageHash for perceptual hash comparison
+                var hashAlgorithm = new AverageHash();
+
+                // Convert System.Drawing.Bitmap to SixLabors.ImageSharp.Image
+                using var baselineImageSharp = ConvertBitmapToImageSharp(baselineImage);
+                using var testImageSharp = ConvertBitmapToImageSharp(testImage);
+
+                // Calculate hashes for both images
+                var baselineHash = hashAlgorithm.Hash(baselineImageSharp);
+                var testHash = hashAlgorithm.Hash(testImageSharp);
+
+                // Compare hashes using CompareHash method
+                // Returns similarity percentage (0-100, where 100 is identical)
+                var similarity = CompareHash.Similarity(baselineHash, testHash);
+
+                // Consider images equal if similarity is very high
+                // Allow for minor rendering differences (threshold can be adjusted)
+                return similarity >= SimilarityThreshold; // 95% similarity threshold
             }
-
-            // WinAppDriver sometimes adds a border to the screenshot (around 2 pix width), and it is not always consistent.
-            // So we exclude the border when comparing the images, and usually it is the edge of the windows, won't affect the comparison.
-            int excludeBorderWidth = 5, excludeBorderHeight = 5;
-
-            for (int x = excludeBorderWidth; x < baselineImage.Width - excludeBorderWidth; x++)
+            catch
             {
-                for (int y = excludeBorderHeight; y < baselineImage.Height - excludeBorderHeight; y++)
+                // Fallback to pixel-by-pixel comparison if hash comparison fails
+                if (baselineImage.Width != testImage.Width || baselineImage.Height != testImage.Height)
                 {
-                    if (!VisualHelper.PixIsSame(baselineImage.GetPixel(x, y), testImage.GetPixel(x, y)))
+                    return false;
+                }
+
+                // WinAppDriver sometimes adds a border to the screenshot (around 2 pix width), and it is not always consistent.
+                // So we exclude the border when comparing the images, and usually it is the edge of the windows, won't affect the comparison.
+                int excludeBorderWidth = 5, excludeBorderHeight = 5;
+
+                for (int x = excludeBorderWidth; x < baselineImage.Width - excludeBorderWidth; x++)
+                {
+                    for (int y = excludeBorderHeight; y < baselineImage.Height - excludeBorderHeight; y++)
                     {
-                        return false;
+                        if (!VisualHelper.PixIsSame(baselineImage.GetPixel(x, y), testImage.GetPixel(x, y)))
+                        {
+                            return false;
+                        }
                     }
                 }
-            }
 
-            return true;
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Convert System.Drawing.Bitmap to SixLabors.ImageSharp.Image
+        /// </summary>
+        /// <param name="bitmap">The bitmap to convert</param>
+        /// <returns>ImageSharp Image</returns>
+        private static Image<Rgba32> ConvertBitmapToImageSharp(Bitmap bitmap)
+        {
+            using var memoryStream = new MemoryStream();
+            bitmap.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png);
+            memoryStream.Position = 0;
+            return SixLabors.ImageSharp.Image.Load<Rgba32>(memoryStream);
         }
     }
 }

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

@@ -14,7 +14,6 @@
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v143</PlatformToolset>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\tests\UnitTestsCommonLib\</OutDir>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/interop/PowerToys.Interop.vcxproj

@@ -44,7 +44,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/logger/logger.vcxproj

@@ -38,7 +38,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
     <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="..\..\..\deps\spdlog.props" />

src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj

@@ -21,7 +21,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj

@@ -11,7 +11,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/notifications/notifications.vcxproj

@@ -12,7 +12,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/updating/updating.vcxproj

@@ -1,72 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{17DA04DF-E393-4397-9CF0-84DABE11032E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>updating</RootNamespace>
-    <ProjectName>ApplicationUpdate</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\..\..\deps\expected.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>Version.lib</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="installer.h" />
-    <ClInclude Include="updating.h" />
-    <ClInclude Include="updateState.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="installer.cpp" />
-    <ClCompile Include="updating.cpp" />
-    <ClCompile Include="updateState.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{17DA04DF-E393-4397-9CF0-84DABE11032E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>updating</RootNamespace>
+    <ProjectName>ApplicationUpdate</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\..\deps\expected.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>Version.lib</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="installer.h" />
+    <ClInclude Include="updating.h" />
+    <ClInclude Include="updateState.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="installer.cpp" />
+    <ClCompile Include="updating.cpp" />
+    <ClCompile Include="updateState.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+  </Target>
 </Project>

src/common/version/version.vcxproj

@@ -48,7 +48,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/logging/logging.vcxproj

@@ -38,7 +38,6 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
     <OutDir>..\..\$(Platform)\$(Configuration)\</OutDir>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj

@@ -16,7 +16,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -40,7 +40,6 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj

@@ -14,7 +14,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -22,7 +21,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj

@@ -17,7 +17,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -25,7 +24,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj

@@ -22,7 +22,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -30,7 +29,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj

@@ -18,7 +18,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -26,7 +25,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj

@@ -14,14 +14,12 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj

@@ -35,7 +35,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>

src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj

@@ -17,7 +17,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -25,7 +24,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

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

@@ -30,7 +30,6 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <GenerateManifest>false</GenerateManifest>
     <DesktopCompatible>true</DesktopCompatible>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="..\..\..\..\deps\spdlog.props" />

src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj

@@ -14,7 +14,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -22,7 +21,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj

@@ -14,7 +14,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -22,7 +21,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj

@@ -14,7 +14,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -22,7 +21,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/MouseUtils/MouseJump/MouseJump.vcxproj

@@ -14,7 +14,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -22,7 +21,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj

@@ -15,7 +15,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -23,7 +22,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj

@@ -10,7 +10,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v143</PlatformToolset>

src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj

@@ -16,7 +16,6 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj

@@ -18,7 +18,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -26,7 +25,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj

@@ -16,7 +16,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj

@@ -21,7 +21,6 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj

@@ -18,7 +18,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -27,7 +26,6 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj

@@ -63,7 +63,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

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

@@ -10,7 +10,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup>
     <ConfigurationType>DynamicLibrary</ConfigurationType>

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj

@@ -12,7 +12,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/Workspaces/WorkspacesModuleInterface/WorkspacesModuleInterface.vcxproj

@@ -11,7 +11,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v143</PlatformToolset>

src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj

@@ -63,7 +63,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj

@@ -63,7 +63,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj

@@ -37,7 +37,6 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <UseOfMfc>false</UseOfMfc>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj

@@ -14,7 +14,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -22,7 +21,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj

@@ -22,7 +22,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj

@@ -63,7 +63,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj

@@ -12,7 +12,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj

@@ -13,7 +13,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj

@@ -15,14 +15,12 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj

@@ -15,7 +15,6 @@
   <PropertyGroup Label="Configuration">
     <EnableHybridCRT>true</EnableHybridCRT>
     <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <!-- END common.build.pre.props -->
   <!-- BEGIN cppwinrt.build.pre.props -->

src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj

@@ -17,7 +17,6 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -25,7 +24,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

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

@@ -149,6 +149,7 @@ public partial class CommandBarViewModel : ObservableObject,
 
         if (command.HasMoreCommands)
         {
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
             return ContextKeybindingResult.KeepOpen;
         }
         else

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

@@ -22,15 +22,8 @@ public partial class ContextMenuViewModel : ObservableObject,
         get => field;
         set
         {
-            if (field != null)
-            {
-                field.PropertyChanged -= SelectedItemPropertyChanged;
-            }
-
             field = value;
-            SetSelectedItem(value);
-
-            OnPropertyChanged(nameof(SelectedItem));
+            UpdateContextItems();
         }
     }
 
@@ -68,33 +61,6 @@ public partial class ContextMenuViewModel : ObservableObject,
         OnPropertyChanged(nameof(FilterOnTop));
     }
 
-    private void SetSelectedItem(ICommandBarContext? value)
-    {
-        if (value != null)
-        {
-            value.PropertyChanged += SelectedItemPropertyChanged;
-        }
-        else
-        {
-            if (SelectedItem != null)
-            {
-                SelectedItem.PropertyChanged -= SelectedItemPropertyChanged;
-            }
-        }
-
-        UpdateContextItems();
-    }
-
-    private void SelectedItemPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-    {
-        switch (e.PropertyName)
-        {
-            case nameof(SelectedItem.HasMoreCommands):
-                UpdateContextItems();
-                break;
-        }
-    }
-
     public void UpdateContextItems()
     {
         if (SelectedItem != null)

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

@@ -56,6 +56,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     public CommandItemViewModel EmptyContent { get; private set; }
 
+    public bool IsMainPage { get; init; }
+
     private bool _isDynamic;
 
     private Task? _initializeItemsTask;
@@ -370,6 +372,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                }
 
                TextToSuggest = item.TextToSuggest;
+               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(item.TextToSuggest));
            });
 
         _lastSelectedItem = item;
@@ -423,6 +426,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
                WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
 
+               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(string.Empty));
+
                TextToSuggest = string.Empty;
            });
     }

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

@@ -0,0 +1,9 @@
+// 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.UI.ViewModels/Commands/MainListPage.cs

@@ -263,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();
 
@@ -273,8 +273,7 @@ public partial class MainListPage : DynamicListPage,
         // above "git" from "whatever"
         max = max + extensionTitleMatch;
 
-        // ... but downweight them
-        var matchSomething = (max / (isFallback ? 3 : 1))
+        var matchSomething = max
             + (isAliasMatch ? 9001 : (isAliasSubstringMatch ? 1 : 0));
 
         // If we matched title, subtitle, or alias (something real), then

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

@@ -98,10 +98,12 @@ 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, IndexerCommandsProvider>();
+        services.AddSingleton<ICommandProvider>(files);
         services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
 
         services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();

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

@@ -6,13 +6,11 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Views;
-using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using Windows.System;
-using Windows.UI.Core;
 
 namespace Microsoft.CmdPal.UI.Controls;
 

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

@@ -20,6 +20,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <cmdpalUI:KeyChordToStringConverter x:Key="KeyChordToStringConverter" />
+            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 
             <cmdpalUI:ContextItemTemplateSelector
                 x:Key="ContextItemTemplateSelector"
@@ -43,9 +44,18 @@
                         SourceKey="{x:Bind Icon}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
+                        x:Name="TitleTextBlock"
                         Grid.Column="1"
+                        MaxWidth="200"
+                        HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{x:Bind Title}" />
+                        Text="{x:Bind Title}"
+                        TextTrimming="WordEllipsis"
+                        TextWrapping="NoWrap">
+                        <ToolTipService.ToolTip>
+                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                        </ToolTipService.ToolTip>
+                    </TextBlock>
                     <TextBlock
                         Grid.Column="2"
                         Margin="16,0,0,0"
@@ -74,10 +84,19 @@
                         SourceKey="{x:Bind Icon}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
+                        x:Name="TitleTextBlock"
                         Grid.Column="1"
+                        MaxWidth="200"
+                        HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Style="{StaticResource ContextItemTitleTextBlockCriticalStyle}"
-                        Text="{x:Bind Title}" />
+                        Text="{x:Bind Title}"
+                        TextTrimming="WordEllipsis"
+                        TextWrapping="NoWrap">
+                        <ToolTipService.ToolTip>
+                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                        </ToolTipService.ToolTip>
+                    </TextBlock>
                     <TextBlock
                         Grid.Column="2"
                         Margin="16,0,0,0"
@@ -129,6 +148,7 @@
             x:Name="ContextFilterBox"
             x:Uid="ContextFilterBox"
             Margin="4"
+            IsTextScaleFactorEnabled="True"
             KeyDown="ContextFilterBox_KeyDown"
             PreviewKeyDown="ContextFilterBox_PreviewKeyDown"
             TextChanged="ContextFilterBox_TextChanged" />

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

@@ -178,34 +178,97 @@ public sealed partial class ContextMenu : UserControl,
     {
         if (e.Key == VirtualKey.Up)
         {
-            // navigate previous
-            if (CommandsDropdown.SelectedIndex > 0)
-            {
-                CommandsDropdown.SelectedIndex--;
-            }
-            else
-            {
-                CommandsDropdown.SelectedIndex = CommandsDropdown.Items.Count - 1;
-            }
+            NavigateUp();
 
             e.Handled = true;
         }
         else if (e.Key == VirtualKey.Down)
         {
-            // navigate next
-            if (CommandsDropdown.SelectedIndex < CommandsDropdown.Items.Count - 1)
-            {
-                CommandsDropdown.SelectedIndex++;
-            }
-            else
-            {
-                CommandsDropdown.SelectedIndex = 0;
-            }
+            NavigateDown();
 
             e.Handled = true;
         }
     }
 
+    private void NavigateUp()
+    {
+        var newIndex = CommandsDropdown.SelectedIndex;
+
+        if (CommandsDropdown.SelectedIndex > 0)
+        {
+            newIndex--;
+
+            while (
+                newIndex >= 0 &&
+                IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                newIndex != CommandsDropdown.SelectedIndex)
+            {
+                newIndex--;
+            }
+
+            if (newIndex < 0)
+            {
+                newIndex = CommandsDropdown.Items.Count - 1;
+
+                while (
+                    newIndex >= 0 &&
+                    IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                    newIndex != CommandsDropdown.SelectedIndex)
+                {
+                    newIndex--;
+                }
+            }
+        }
+        else
+        {
+            newIndex = CommandsDropdown.Items.Count - 1;
+        }
+
+        CommandsDropdown.SelectedIndex = newIndex;
+    }
+
+    private void NavigateDown()
+    {
+        var newIndex = CommandsDropdown.SelectedIndex;
+
+        if (CommandsDropdown.SelectedIndex == CommandsDropdown.Items.Count - 1)
+        {
+            newIndex = 0;
+        }
+        else
+        {
+            newIndex++;
+
+            while (
+                newIndex < CommandsDropdown.Items.Count &&
+                IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                newIndex != CommandsDropdown.SelectedIndex)
+            {
+                newIndex++;
+            }
+
+            if (newIndex >= CommandsDropdown.Items.Count)
+            {
+                newIndex = 0;
+
+                while (
+                    newIndex < CommandsDropdown.Items.Count &&
+                    IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                    newIndex != CommandsDropdown.SelectedIndex)
+                {
+                    newIndex++;
+                }
+            }
+        }
+
+        CommandsDropdown.SelectedIndex = newIndex;
+    }
+
+    private bool IsSeparator(object item)
+    {
+        return item is SeparatorContextItemViewModel;
+    }
+
     private void UpdateUiForStackChange()
     {
         ContextFilterBox.Text = string.Empty;

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

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
 using Microsoft.CmdPal.Core.ViewModels;
@@ -21,6 +20,7 @@ namespace Microsoft.CmdPal.UI.Controls;
 public sealed partial class SearchBar : UserControl,
     IRecipient<GoHomeMessage>,
     IRecipient<FocusSearchBoxMessage>,
+    IRecipient<UpdateSuggestionMessage>,
     ICurrentPageAware
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
@@ -31,6 +31,10 @@ 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);
@@ -69,6 +73,7 @@ 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()
@@ -125,15 +130,6 @@ 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))
@@ -200,12 +196,65 @@ 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;
+        }
     }
 
     private void FilterBox_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
@@ -219,7 +268,7 @@ public sealed partial class SearchBar : UserControl,
 
     private void FilterBox_TextChanged(object sender, TextChangedEventArgs e)
     {
-        Debug.WriteLine($"FilterBox_TextChanged: {FilterBox.Text}");
+        // Logger.LogInfo($"FilterBox_TextChanged: {FilterBox.Text}");
 
         // TERRIBLE HACK TODO GH #245
         // There's weird wacky bugs with debounce currently. We're trying
@@ -228,23 +277,22 @@ public sealed partial class SearchBar : UserControl,
         // (otherwise aliases just stop working)
         if (FilterBox.Text.Length == 1)
         {
-            if (CurrentPageViewModel != null)
-            {
-                CurrentPageViewModel.Filter = FilterBox.Text;
-            }
+            DoFilterBoxUpdate();
 
             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(
             () =>
             {
-                // Actually plumb Filtering to the view model
-                if (CurrentPageViewModel != null)
-                {
-                    CurrentPageViewModel.Filter = FilterBox.Text;
-                }
+                DoFilterBoxUpdate();
             },
             //// 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/
@@ -254,6 +302,21 @@ 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)
     {
@@ -273,6 +336,8 @@ public sealed partial class SearchBar : UserControl,
                     // ... Move the cursor to the end of the input
                     FilterBox.Select(FilterBox.Text.Length, 0);
                 }
+
+                // TODO! deal with suggestion
             }
             else if (property == nameof(ListViewModel.InitialSearchText))
             {
@@ -290,4 +355,96 @@ 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/ExtViews/ListPage.xaml.cs

@@ -265,6 +265,13 @@ 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)

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

@@ -411,7 +411,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Back</value>
   </data>
   <data name="BackButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Back</value>
+    <value>Back (Alt + Left arrow)</value>
   </data>
   <data name="MoreCommandsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More</value>

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

@@ -186,6 +186,8 @@
                             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

@@ -3,5 +3,8 @@
 		<Assembly Name="Microsoft.WinUI">
 			<Type Name="Microsoft.UI.Xaml.Controls.FontIconSource" Dynamic="Required All" />
 		</Assembly>
+		<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

@@ -0,0 +1,130 @@
+// 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.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.UITests;
+
+[TestClass]
+public class BasicTests : CommandPaletteTestBase
+{
+    public BasicTests()
+    {
+    }
+
+    [TestMethod]
+    public void BasicFileSearchTest()
+    {
+        SetSearchBox("files");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Search files");
+        Assert.AreEqual(searchFileItem.Name, "Search files");
+        searchFileItem.DoubleClick();
+
+        SetFilesExtensionSearchBox("AppData");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("AppData"));
+    }
+
+    [TestMethod]
+    public void BasicCalculatorTest()
+    {
+        SetSearchBox("calculator");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Calculator");
+        Assert.AreEqual(searchFileItem.Name, "Calculator");
+        searchFileItem.DoubleClick();
+
+        SetCalculatorExtensionSearchBox("1+2");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("3"));
+    }
+
+    [TestMethod]
+    public void BasicTimeAndDateTest()
+    {
+        SetSearchBox("time and date");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Time and Date");
+        Assert.AreEqual(searchFileItem.Name, "Time and Date");
+        searchFileItem.DoubleClick();
+
+        SetTimeAndDaterExtensionSearchBox("year");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("2025"));
+    }
+
+    [TestMethod]
+    public void BasicWindowsTerminalTest()
+    {
+        SetSearchBox("Windows Terminal");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Open Windows Terminal Profiles");
+        Assert.AreEqual(searchFileItem.Name, "Open Windows Terminal Profiles");
+        searchFileItem.DoubleClick();
+
+        SetSearchBox("PowerShell");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("PowerShell"));
+    }
+
+    [TestMethod]
+    public void BasicWindowsSettingsTest()
+    {
+        SetSearchBox("Windows Settings");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Windows Settings");
+        Assert.AreEqual(searchFileItem.Name, "Windows Settings");
+        searchFileItem.DoubleClick();
+
+        SetSearchBox("power");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("Power and sleep"));
+    }
+
+    [TestMethod]
+    public void BasicRegistryTest()
+    {
+        SetSearchBox("Registry");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Registry");
+        Assert.AreEqual(searchFileItem.Name, "Registry");
+        searchFileItem.DoubleClick();
+
+        SetSearchBox("HKEY_LOCAL_MACHINE");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("HKEY_LOCAL_MACHINE\\SECURITY"));
+    }
+
+    [TestMethod]
+    public void BasicWindowsServicesTest()
+    {
+        SetSearchBox("Windows Services");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Windows Services");
+        Assert.AreEqual(searchFileItem.Name, "Windows Services");
+        searchFileItem.DoubleClick();
+
+        SetSearchBox("hyper-v");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("Hyper-V Heartbeat Service"));
+    }
+
+    [TestMethod]
+    public void BasicWindowsSystemCommandsTest()
+    {
+        SetSearchBox("Windows System Commands");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Windows System Commands");
+        Assert.AreEqual(searchFileItem.Name, "Windows System Commands");
+        searchFileItem.DoubleClick();
+
+        SetSearchBox("Sleep");
+
+        Assert.IsNotNull(this.Find<NavigationViewItem>("Sleep"));
+    }
+}

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

@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.UITests;
+
+public class CommandPaletteTestBase : UITestBase
+{
+    public CommandPaletteTestBase()
+        : base(PowerToysModule.CommandPalette)
+    {
+    }
+
+    protected void SetSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Type here to search...").SetText(text, true).Text, text);
+    }
+
+    protected void SetFilesExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Search for files and folders...").SetText(text, true).Text, text);
+    }
+
+    protected void SetCalculatorExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Type an equation...").SetText(text, true).Text, text);
+    }
+
+    protected void SetTimeAndDaterExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Search values or type a custom time stamp...").SetText(text, true).Text, text);
+    }
+
+    protected void OpenContextMenu()
+    {
+        var contextMenuButton = this.Find<Button>("More");
+        Assert.IsNotNull(contextMenuButton, "Context menu button not found.");
+        contextMenuButton.Click();
+    }
+}

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

@@ -0,0 +1,226 @@
+// 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 System.Xml.Linq;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.UITests;
+
+[TestClass]
+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 TestFolderName = "Downloads";
+
+    public IndexerTests()
+        : base()
+    {
+        // create a empty file in Downloads folder
+        // to ensure that the indexer has something to search for
+        var downloadsPath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\Downloads";
+        var emptyFilePath = System.IO.Path.Combine(downloadsPath, TestFileName);
+        if (!System.IO.File.Exists(emptyFilePath))
+        {
+            using (var fileStream = System.IO.File.Create(emptyFilePath))
+            {
+                var content = TestFileContent;
+                var contentBytes = Encoding.UTF8.GetBytes(content);
+                fileStream.Write(contentBytes, 0, contentBytes.Length);
+            }
+        }
+    }
+
+    public void EnterIndexerExtension()
+    {
+        SetSearchBox("files");
+
+        var searchFileItem = this.Find<NavigationViewItem>("Search files");
+        Assert.AreEqual(searchFileItem.Name, "Search files");
+        searchFileItem.DoubleClick();
+    }
+
+    [TestMethod]
+    public void BasicIndexerSearchTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox("Downloads");
+        Assert.IsNotNull(this.Find<NavigationViewItem>("Downloads"));
+    }
+
+    [TestMethod]
+    public void IndexerOpenFileTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFileName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFileName);
+
+        Assert.IsNotNull(searchItem);
+
+        searchItem.Click();
+
+        var openButton = this.Find<Button>("Open");
+        Assert.IsNotNull(openButton);
+
+        openButton.Click();
+        var notepadWindow = this.Find<Window>($"{TestFileName} - Notepad", global: true);
+
+        Assert.IsNotNull(notepadWindow);
+    }
+
+    [TestMethod]
+    public void IndexerDoubleClickOpenFileTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFileName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFileName);
+
+        Assert.IsNotNull(searchItem);
+
+        searchItem.DoubleClick();
+
+        var notepadWindow = this.Find<Window>($"{TestFileName} - Notepad", global: true);
+
+        Assert.IsNotNull(notepadWindow);
+    }
+
+    [TestMethod]
+    public void IndexerOpenFolderTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFolderName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFolderName);
+        Assert.IsNotNull(searchItem);
+        searchItem.Click();
+
+        var openButton = this.Find<Button>("Open");
+        Assert.IsNotNull(openButton);
+
+        openButton.Click();
+        var notepadWindow = this.Find<Window>($"{TestFolderName} - File Explorer", global: true);
+
+        Assert.IsNotNull(notepadWindow);
+    }
+
+    [TestMethod]
+    public void IndexerDoubleClickOpenFolderTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFolderName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFolderName);
+        Assert.IsNotNull(searchItem);
+        searchItem.DoubleClick();
+
+        var fileExplorer = this.Find<Window>($"{TestFolderName} - File Explorer", global: true);
+
+        Assert.IsNotNull(fileExplorer);
+    }
+
+    [TestMethod]
+    public void IndexerBrowseFolderTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFolderName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFolderName);
+        Assert.IsNotNull(searchItem);
+        searchItem.Click();
+
+        var openButton = this.Find<Button>("Browse");
+        Assert.IsNotNull(openButton);
+
+        openButton.Click();
+
+        var testItem = this.Find<NavigationViewItem>(TestFileName);
+        Assert.IsNotNull(testItem);
+    }
+
+    [STATestMethod]
+    [TestMethod]
+    public void IndexerCopyPathTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFileName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFileName);
+        Assert.IsNotNull(searchItem);
+        searchItem.Click();
+
+        OpenContextMenu();
+        var copyPathButton = this.Find<NavigationViewItem>("Copy path");
+        Assert.IsNotNull(copyPathButton);
+        copyPathButton.Click();
+
+        var clipboardContent = System.Windows.Forms.Clipboard.GetText();
+        Assert.IsTrue(clipboardContent.Contains(TestFileName), $"Clipboard content does not contain the expected file name. clipboard: {clipboardContent}");
+    }
+
+    [TestMethod]
+    public void IndexerShowInFolderTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFileName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFileName);
+        Assert.IsNotNull(searchItem);
+        searchItem.Click();
+
+        OpenContextMenu();
+        var showInFolderButton = this.Find<NavigationViewItem>("Show in folder");
+        Assert.IsNotNull(showInFolderButton);
+        showInFolderButton.Click();
+
+        var fileExplorer = this.Find<Window>($"{TestFolderName} - File Explorer", global: true, timeoutMS: 20000);
+
+        Assert.IsNotNull(fileExplorer);
+    }
+
+    [TestMethod]
+    public void IndexerOpenPathInConsoleTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFileName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFileName);
+        Assert.IsNotNull(searchItem);
+        searchItem.Click();
+
+        OpenContextMenu();
+        var copyPathButton = this.Find<NavigationViewItem>("Open path in console");
+        Assert.IsNotNull(copyPathButton);
+        copyPathButton.Click();
+
+        var textItem = this.Find<Window>("C:\\Windows\\system32\\cmd.exe", global: true);
+        Assert.IsNotNull(textItem, "The console did not open with the expected path.");
+    }
+
+    [TestMethod]
+    public void IndexerOpenPropertiesTest()
+    {
+        EnterIndexerExtension();
+        SetFilesExtensionSearchBox(TestFileName);
+
+        var searchItem = this.Find<NavigationViewItem>(TestFileName);
+        Assert.IsNotNull(searchItem);
+        searchItem.Click();
+
+        OpenContextMenu();
+        var copyPathButton = this.Find<NavigationViewItem>("Properties");
+        Assert.IsNotNull(copyPathButton);
+        copyPathButton.Click();
+
+        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

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+
+	<PropertyGroup>
+		<RootNamespace>Microsoft.CmdPal.UITests</RootNamespace>
+		<AssemblyName>Microsoft.CmdPal.UITests</AssemblyName>
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+		<Nullable>enable</Nullable>
+		<OutputType>Library</OutputType>
+		<!-- This is a UI test, so don't run as part of MSBuild -->
+		<RunVSTest>false</RunVSTest>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\Microsoft.CmdPal.UITests\</OutputPath>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="MSTest" />
+		<PackageReference Include="System.Net.Http" />
+		<PackageReference Include="System.Private.Uri" />
+		<PackageReference Include="System.Text.RegularExpressions" />
+		<ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+	</ItemGroup>
+</Project>

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

@@ -54,7 +54,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
     <DesktopCompatible>true</DesktopCompatible>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>

src/modules/cmdpal/README.md

@@ -2,16 +2,15 @@
 
 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
@@ -22,14 +21,22 @@ We've also got samples, so that you can see how the APIs in-action.
 
 ## Building CmdPal
 
-The Command Palette is included as a part of PowerToys. To get started building, open up the root `PowerToys.sln`, to get started building. 
+### 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`:
 
 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.Registry.UnitTests/BasicStructureTest.cs

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+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

@@ -0,0 +1,26 @@
+// 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

@@ -0,0 +1,22 @@
+<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

@@ -0,0 +1,52 @@
+// 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

@@ -0,0 +1,75 @@
+// 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

@@ -0,0 +1,32 @@
+// 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

@@ -0,0 +1,84 @@
+// 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 CommandsHelperTest()
+    {
+        // Setup & Act
+        var commands = Commands.GetSystemCommands(false, false, false, false);
+
+        // Assert
+        Assert.IsNotNull(commands);
+        Assert.IsTrue(commands.Count > 0);
+    }
+
+    [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

@@ -0,0 +1,72 @@
+// 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
+{
+    [DataTestMethod]
+    [DataRow("shutdown", "ShutdownIcon")]
+    [DataRow("restart", "RestartIcon")]
+    [DataRow("sign out", "LogoffIcon")]
+    [DataRow("lock", "LockIcon")]
+    [DataRow("sleep", "SleepIcon")]
+    [DataRow("hibernate", "SleepIcon")]
+    [DataRow("recycle bin", "RecycleBinIcon")]
+    [DataRow("uefi firmware settings", "FirmwareSettingsIcon")]
+    [DataRow("IPv4 addr", "NetworkAdapterIcon")]
+    [DataRow("IPV6 addr", "NetworkAdapterIcon")]
+    [DataRow("MAC addr", "NetworkAdapterIcon")]
+    public void IconThemeDarkTest(string typedString, string expectedIconPropertyName)
+    {
+        var systemPage = new SystemCommandPage(new SettingsManager());
+
+        foreach (var item in systemPage.GetItems())
+        {
+            if (item.Title.Contains(typedString, StringComparison.OrdinalIgnoreCase) || item.Subtitle.Contains(typedString, StringComparison.OrdinalIgnoreCase))
+            {
+                var icon = item.Icon;
+                Assert.IsNotNull(icon, $"Icon for '{typedString}' should not be null.");
+                Assert.IsNotEmpty(icon.Dark.Icon, $"Icon for '{typedString}' should not be empty.");
+            }
+        }
+    }
+
+    [DataTestMethod]
+    [DataRow("shutdown", "ShutdownIcon")]
+    [DataRow("restart", "RestartIcon")]
+    [DataRow("sign out", "LogoffIcon")]
+    [DataRow("lock", "LockIcon")]
+    [DataRow("sleep", "SleepIcon")]
+    [DataRow("hibernate", "SleepIcon")]
+    [DataRow("recycle bin", "RecycleBinIcon")]
+    [DataRow("uefi firmware settings", "FirmwareSettingsIcon")]
+    [DataRow("IPv4 addr", "NetworkAdapterIcon")]
+    [DataRow("IPV6 addr", "NetworkAdapterIcon")]
+    [DataRow("MAC addr", "NetworkAdapterIcon")]
+    public void IconThemeLightTest(string typedString, string expectedIconPropertyName)
+    {
+        var systemPage = new SystemCommandPage(new SettingsManager());
+
+        foreach (var item in systemPage.GetItems())
+        {
+            if (item.Title.Contains(typedString, StringComparison.OrdinalIgnoreCase) || item.Subtitle.Contains(typedString, StringComparison.OrdinalIgnoreCase))
+            {
+                var icon = item.Icon;
+                Assert.IsNotNull(icon, $"Icon for '{typedString}' should not be null.");
+                Assert.IsNotEmpty(icon.Light.Icon, $"Icon for '{typedString}' should not be empty.");
+            }
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+<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" />
+  </ItemGroup>
+</Project>

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

@@ -0,0 +1,105 @@
+// 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.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.System.UnitTests;
+
+[TestClass]
+public class QueryTests
+{
+    [DataTestMethod]
+    [DataRow("shutdown", "Shutdown")]
+    [DataRow("restart", "Restart")]
+    [DataRow("sign out", "Sign out")]
+    [DataRow("lock", "Lock")]
+    [DataRow("sleep", "Sleep")]
+    [DataRow("hibernate", "Hibernate")]
+    public void SystemCommandsTest(string typedString, string expectedCommand)
+    {
+        // Setup
+        var commands = Commands.GetSystemCommands(false, false, false, false);
+
+        // Act
+        var result = commands.Where(c => c.Title.Contains(expectedCommand, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+        // Assert
+        Assert.IsNotNull(result);
+        Assert.IsTrue(result.Title.Contains(expectedCommand, StringComparison.OrdinalIgnoreCase));
+    }
+
+    [TestMethod]
+    public void RecycleBinCommandTest()
+    {
+        // Setup
+        var commands = Commands.GetSystemCommands(false, false, false, false);
+
+        // Act
+        var result = commands.Where(c => c.Title.Contains("Recycle", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+        // Assert
+        Assert.IsNotNull(result);
+    }
+
+    [TestMethod]
+    public void NetworkCommandsTest()
+    {
+        // Test that network commands can be retrieved
+        try
+        {
+            var networkPropertiesList = NetworkConnectionProperties.GetList();
+            Assert.IsTrue(networkPropertiesList.Count >= 0); // Should not throw exceptions
+        }
+        catch (Exception ex)
+        {
+            Assert.Fail($"Network commands should not throw exceptions: {ex.Message}");
+        }
+    }
+
+    [TestMethod]
+    public void UefiCommandIsAvailableTest()
+    {
+        // Setup
+        var firmwareType = Win32Helpers.GetSystemFirmwareType();
+        var isUefiMode = firmwareType == FirmwareType.Uefi;
+
+        // Act
+        var commands = Commands.GetSystemCommands(isUefiMode, false, false, false);
+        var uefiCommand = commands.Where(c => c.Title.Contains("UEFI", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+        // Assert
+        if (isUefiMode)
+        {
+            Assert.IsNotNull(uefiCommand);
+        }
+        else
+        {
+            // UEFI command may still exist but be disabled on non-UEFI systems
+            Assert.IsTrue(true); // Test environment independent
+        }
+    }
+
+    [TestMethod]
+    public void FirmwareTypeTest()
+    {
+        // Test that GetSystemFirmwareType returns a valid enum value
+        var firmwareType = Win32Helpers.GetSystemFirmwareType();
+        Assert.IsTrue(Enum.IsDefined(typeof(FirmwareType), firmwareType));
+    }
+
+    [TestMethod]
+    public void EmptyRecycleBinCommandTest()
+    {
+        // Test that empty recycle bin command exists
+        var commands = Commands.GetSystemCommands(false, false, false, false);
+        var result = commands.Where(c => c.Title.Contains("Empty", StringComparison.OrdinalIgnoreCase) &&
+                                         c.Title.Contains("Recycle", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+        // Empty recycle bin command should exist
+        Assert.IsNotNull(result);
+    }
+}

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

@@ -0,0 +1,494 @@
+// 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

@@ -0,0 +1,28 @@
+// 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);
+    }
+}

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

@@ -0,0 +1,86 @@
+// 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.TimeDate.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
+
+[TestClass]
+public class FallbackTimeDateItemTests
+{
+    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()
+    {
+        // Restore original culture
+        CultureInfo.CurrentCulture = originalCulture;
+        CultureInfo.CurrentUICulture = originalUiCulture;
+    }
+
+    [DataTestMethod]
+    [DataRow("time", "12:00 PM")]
+    [DataRow("date", "7/1/2025")]
+    [DataRow("week", "27")]
+    public void FallbackQueryTests(string query, string expectedTitle)
+    {
+        // Setup
+        var settingsManager = new SettingsManager();
+        DateTime now = new DateTime(2025, 7, 1, 12, 0, 0); // Fixed date for testing
+        var fallbackItem = new FallbackTimeDateItem(settingsManager, now);
+
+        // Act & Assert - Test that UpdateQuery doesn't throw exceptions
+        try
+        {
+            fallbackItem.UpdateQuery(query);
+            Assert.IsTrue(
+                fallbackItem.Title.Contains(expectedTitle, StringComparison.OrdinalIgnoreCase),
+                $"Expected title to contain '{expectedTitle}', but got '{fallbackItem.Title}'");
+            Assert.IsNotNull(fallbackItem.Subtitle, "Subtitle should not be null");
+            Assert.IsNotNull(fallbackItem.Icon, "Icon should not be null");
+        }
+        catch (Exception ex)
+        {
+            Assert.Fail($"UpdateQuery should not throw exceptions: {ex.Message}");
+        }
+    }
+
+    [DataTestMethod]
+    [DataRow(null)]
+    [DataRow("invalid input")]
+    public void InvalidQueryTests(string query)
+    {
+        // Setup
+        var settingsManager = new SettingsManager();
+        DateTime now = new DateTime(2025, 7, 1, 12, 0, 0); // Fixed date for testing
+        var fallbackItem = new FallbackTimeDateItem(settingsManager, now);
+
+        // Act & Assert - Test that UpdateQuery doesn't throw exceptions
+        try
+        {
+            fallbackItem.UpdateQuery(query);
+
+            Assert.AreEqual(string.Empty, fallbackItem.Title, "Title should be empty for invalid queries");
+            Assert.AreEqual(string.Empty, fallbackItem.Subtitle, "Subtitle should be empty for invalid queries");
+        }
+        catch (Exception ex)
+        {
+            Assert.Fail($"UpdateQuery should not throw exceptions: {ex.Message}");
+        }
+    }
+}

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

@@ -0,0 +1,127 @@
+// 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.TimeDate.Helpers;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
+
+[TestClass]
+public class IconTests
+{
+    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;
+    }
+
+    [TestMethod]
+    public void TimeDateCommandsProvider_HasIcon()
+    {
+        // Setup
+        var provider = new TimeDateCommandsProvider();
+
+        // Act
+        var icon = provider.Icon;
+
+        // Assert
+        Assert.IsNotNull(icon, "Provider should have an icon");
+    }
+
+    [TestMethod]
+    public void TimeDateCommandsProvider_TopLevelCommands_HaveIcons()
+    {
+        // Setup
+        var provider = new TimeDateCommandsProvider();
+
+        // Act
+        var commands = provider.TopLevelCommands();
+
+        // Assert
+        Assert.IsNotNull(commands);
+        Assert.IsTrue(commands.Length > 0, "Should have at least one top-level command");
+
+        foreach (var command in commands)
+        {
+            Assert.IsNotNull(command.Icon, "Each command should have an icon");
+        }
+    }
+
+    [TestMethod]
+    public void AvailableResults_HaveIcons()
+    {
+        // Setup
+        var settings = new SettingsManager();
+
+        // Act
+        var results = AvailableResultsList.GetList(true, settings);
+
+        // Assert
+        Assert.IsNotNull(results);
+        Assert.IsTrue(results.Count > 0, "Should have results");
+
+        foreach (var result in results)
+        {
+            Assert.IsNotNull(result.GetIconInfo(), $"Result '{result.Label}' should have an icon");
+        }
+    }
+
+    [DataTestMethod]
+    [DataRow(ResultIconType.Time, "\uE823")]
+    [DataRow(ResultIconType.Date, "\uE787")]
+    [DataRow(ResultIconType.DateTime, "\uEC92")]
+    public void ResultHelper_CreateListItem_PreservesIcon(ResultIconType resultIconType, string expectedIcon)
+    {
+        // Setup
+        var availableResult = new AvailableResult
+        {
+            Label = "Test Label",
+            Value = "Test Value",
+            IconType = resultIconType,
+        };
+
+        // Act
+        var listItem = availableResult.ToListItem();
+
+        var icon = listItem.Icon;
+
+        // Assert
+        Assert.IsNotNull(listItem);
+        Assert.IsNotNull(listItem.Icon, "ListItem should preserve the icon from AvailableResult");
+        Assert.AreEqual(expectedIcon, icon.Dark.Icon, $"Icon for {resultIconType} should match expected value");
+    }
+
+    [TestMethod]
+    public void Icons_AreNotEmpty()
+    {
+        // Setup
+        var settings = new SettingsManager();
+        var results = AvailableResultsList.GetList(true, settings);
+
+        // Act & Assert
+        foreach (var result in results)
+        {
+            Assert.IsNotNull(result.GetIconInfo(), $"Result '{result.Label}' should have an icon");
+            Assert.IsFalse(string.IsNullOrWhiteSpace(result.GetIconInfo().ToString()), $"Icon for '{result.Label}' should not be empty");
+        }
+    }
+}