remove all

remove base line image
pdf need more time to load
2026-01-26 14:07:24 +01:00 · 2025-07-21 15:50:37 +08:00 · 2025-07-21 15:27:04 +08:00 · 2025-07-21 14:38:29 +08:00 · 2025-07-21 13:09:54 +08:00 · 2025-07-21 12:44:33 +08:00
138 changed files with 2182 additions and 1075 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.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
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.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\**
--- a/Directory.Packages.props
+++ b/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" />
--- a/NOTICE.md
+++ b/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
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -736,10 +736,14 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2738,6 +2742,22 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3025,6 +3045,8 @@ 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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ b/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" />
--- a/src/ActionRunner/actionRunner.vcxproj
+++ b/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>
--- a/src/Update/PowerToys.Update.vcxproj
+++ b/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>
--- a/src/common/COMUtils/COMUtils.vcxproj
+++ b/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">
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
+++ b/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 -->
--- a/src/common/Display/Display.vcxproj
+++ b/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">
--- a/src/common/GPOWrapper/GPOWrapper.vcxproj
+++ b/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>
--- a/src/common/SettingsAPI/SettingsAPI.vcxproj
+++ b/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">
--- a/src/common/Telemetry/EtwTrace/EtwTrace.vcxproj
+++ b/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">
--- a/src/common/Themes/Themes.vcxproj
+++ b/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">
--- a/src/common/UITestAutomation/Element/Element.cs
+++ b/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);
--- a/src/common/UITestAutomation/ModuleConfigData.cs
+++ b/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"),
            };
        }

--- a/src/common/UITestAutomation/SessionHelper.cs
+++ b/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)
                    {
--- a/src/common/UITestAutomation/UITestAutomation.csproj
+++ b/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>
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/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();
+                }
+            }
        }
    }
 }
--- a/src/common/UITestAutomation/VisualAssert.cs
+++ b/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);
        }
    }
 }
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
+++ b/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">
--- a/src/common/interop/PowerToys.Interop.vcxproj
+++ b/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">
--- a/src/common/logger/logger.vcxproj
+++ b/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" />
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
+++ b/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>
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
+++ b/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">
--- a/src/common/notifications/notifications.vcxproj
+++ b/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">
--- a/src/common/updating/updating.vcxproj
+++ b/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>
--- a/src/common/version/version.vcxproj
+++ b/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">
--- a/src/logging/logging.vcxproj
+++ b/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">
--- a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/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>
--- a/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj
+++ b/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">
--- a/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj
+++ b/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">
--- a/src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj
+++ b/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">
--- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
+++ b/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>
--- a/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/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" />
--- a/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/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">
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
+++ b/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">
--- a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
+++ b/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">
--- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
+++ b/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">
--- a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj
+++ b/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>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
+++ b/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>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
+++ b/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">
--- a/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj
+++ b/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>
--- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
+++ b/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">
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesLibUnitTests.vcxproj
+++ b/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>
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
+++ b/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">
--- a/src/modules/Workspaces/WorkspacesModuleInterface/WorkspacesModuleInterface.vcxproj
+++ b/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>
--- a/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
+++ b/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">
--- a/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
+++ b/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">
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
+++ b/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" />
--- a/src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj
+++ b/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>
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
+++ b/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">
--- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
+++ b/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 -->
--- a/src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj
+++ b/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">
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
+++ b/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
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
+++ b/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)
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml.cs
+++ b/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;

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
+++ b/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" />
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml.cs
+++ b/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;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs
@@ -0,0 +1,151 @@
+// 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 : UITestBase
+{
+    public BasicTests()
+        : base(PowerToysModule.CommandPalette)
+    {
+    }
+
+    private void SetSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Type here to search...").SetText(text, true).Text, text);
+    }
+
+    private void SetFilesExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Search for files and folders...").SetText(text, true).Text, text);
+    }
+
+    private void SetCalculatorExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Type an equation...").SetText(text, true).Text, text);
+    }
+
+    private void SetTimeAndDaterExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Search values or type a custom time stamp...").SetText(text, true).Text, text);
+    }
+
+    [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"));
+    }
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UITests/Microsoft.CmdPal.UITests.csproj
+++ b/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>
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/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>
--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
@@ -99,7 +99,7 @@ internal sealed partial class SampleListPage : ListPage
                            new CommandContextItem(
                                new ToastCommand("Nested B invoked") { Name = "Do it", Icon = new IconInfo("B") })
                            {
-                                Title = "Nested B...",
+                                Title = "Nested B with a really, really long title that should be trimmed",
                                RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, vkey: VirtualKey.B),
                                MoreCommands = [
                                    new CommandContextItem(
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
@@ -58,7 +58,6 @@
    <CharacterSet>Unicode</CharacterSet>
    <GenerateManifest>false</GenerateManifest>
    <DesktopCompatible>true</DesktopCompatible>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
    <UseDebugLibraries>true</UseDebugLibraries>
--- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj
+++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj
@@ -15,7 +15,6 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
+++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
@@ -60,7 +60,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">
--- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
@@ -15,7 +15,6 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj
+++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.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>
--- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj
+++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj
@@ -14,7 +14,6 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v143</PlatformToolset>
--- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
+++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
@@ -14,14 +14,12 @@
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj
+++ b/src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj
@@ -10,7 +10,6 @@
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
--- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
+++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
@@ -1,154 +1,153 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" 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')" />
-  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h ImageResizerExt.base.rc ImageResizerExt.rc" />
-  </Target>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0B43679E-EDFA-4DA0-AD30-F4628B308B1B}</ProjectGuid>
-    <Keyword>AtlProj</Keyword>
-    <CppWinRTModernIDL>false</CppWinRTModernIDL>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfAtl>Static</UseOfAtl>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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" />
-  <PropertyGroup>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
-    <TargetName>PowerToys.ImageResizerExt</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ImageResizerLib;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>.\ImageResizerExt.def</ModuleDefinitionFile>
-      <RegisterOutput>true</RegisterOutput>
-      <PerUserRedirection>true</PerUserRedirection>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <HeaderFileName>ImageResizerExt_i.h</HeaderFileName>
-      <InterfaceIdentifierFileName>ImageResizerExt_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ImageResizerExt_p.c</ProxyFileName>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ImageResizerExt.tlb</TypeLibraryName>
-      <DllDataFileName />
-      <ValidateAllParameters>true</ValidateAllParameters>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <HeaderFileName>ImageResizerExt_i.h</HeaderFileName>
-      <InterfaceIdentifierFileName>ImageResizerExt_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ImageResizerExt_p.c</ProxyFileName>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ImageResizerExt.tlb</TypeLibraryName>
-      <DllDataFileName />
-      <ValidateAllParameters>true</ValidateAllParameters>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="ContextMenuHandler.cpp" />
-    <ClCompile Include="dllmain.cpp">
-      <CompileAsManaged>false</CompileAsManaged>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="ImageResizerExt.cpp" />
-    <ClCompile Include="ImageResizerExt_i.c">
-      <CompileAsManaged>false</CompileAsManaged>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ContextMenuHandler.h" />
-    <ClInclude Include="dllmain.h" />
-    <None Include="packages.config" />
-    <None Include="resource.base.h" />
-    <ClInclude Include="Generated Files/resource.h" />
-    <ClInclude Include="ImageResizerExt_i.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Generated Files/ImageResizerExt.rc" />
-    <None Include="ImageResizerExt.base.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ContextMenuHandler.rgs" />
-    <None Include="ImageResizerExt.def" />
-    <None Include="ImageResizerExt.rgs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="ImageResizerExt.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
-      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
-      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\Themes\Themes.vcxproj">
-      <Project>{98537082-0fdb-40de-abd8-0dc5a4269bab}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\ImageResizerLib\ImageResizerLib.vcxproj">
-      <Project>{18b3db45-4ffe-4d01-97d6-5223feee1853}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\ui\Resources\ImageResizer.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources.resx" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
-  <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')" />
-  </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'))" />
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" 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')" />
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h ImageResizerExt.base.rc ImageResizerExt.rc" />
+  </Target>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0B43679E-EDFA-4DA0-AD30-F4628B308B1B}</ProjectGuid>
+    <Keyword>AtlProj</Keyword>
+    <CppWinRTModernIDL>false</CppWinRTModernIDL>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfAtl>Static</UseOfAtl>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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" />
+  <PropertyGroup>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
+    <TargetName>PowerToys.ImageResizerExt</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\ImageResizerLib;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>.\ImageResizerExt.def</ModuleDefinitionFile>
+      <RegisterOutput>true</RegisterOutput>
+      <PerUserRedirection>true</PerUserRedirection>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <HeaderFileName>ImageResizerExt_i.h</HeaderFileName>
+      <InterfaceIdentifierFileName>ImageResizerExt_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>ImageResizerExt_p.c</ProxyFileName>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <TypeLibraryName>$(IntDir)ImageResizerExt.tlb</TypeLibraryName>
+      <DllDataFileName />
+      <ValidateAllParameters>true</ValidateAllParameters>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <HeaderFileName>ImageResizerExt_i.h</HeaderFileName>
+      <InterfaceIdentifierFileName>ImageResizerExt_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>ImageResizerExt_p.c</ProxyFileName>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <TypeLibraryName>$(IntDir)ImageResizerExt.tlb</TypeLibraryName>
+      <DllDataFileName />
+      <ValidateAllParameters>true</ValidateAllParameters>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ContextMenuHandler.cpp" />
+    <ClCompile Include="dllmain.cpp">
+      <CompileAsManaged>false</CompileAsManaged>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ImageResizerExt.cpp" />
+    <ClCompile Include="ImageResizerExt_i.c">
+      <CompileAsManaged>false</CompileAsManaged>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ContextMenuHandler.h" />
+    <ClInclude Include="dllmain.h" />
+    <None Include="packages.config" />
+    <None Include="resource.base.h" />
+    <ClInclude Include="Generated Files/resource.h" />
+    <ClInclude Include="ImageResizerExt_i.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Generated Files/ImageResizerExt.rc" />
+    <None Include="ImageResizerExt.base.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ContextMenuHandler.rgs" />
+    <None Include="ImageResizerExt.def" />
+    <None Include="ImageResizerExt.rgs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="ImageResizerExt.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
+      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\Themes\Themes.vcxproj">
+      <Project>{98537082-0fdb-40de-abd8-0dc5a4269bab}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ImageResizerLib\ImageResizerLib.vcxproj">
+      <Project>{18b3db45-4ffe-4d01-97d6-5223feee1853}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\ui\Resources\ImageResizer.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources.resx" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <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')" />
+  </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'))" />
+  </Target>
 </Project>
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
@@ -66,7 +66,6 @@
    <SpectreMitigation>Spectre</SpectreMitigation>
    <ConfigurationType>Application</ConfigurationType>
    <TargetName>PowerToys.$(MSBuildProjectName)</TargetName>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <!-- Debug/Release props -->
  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
@@ -13,7 +13,6 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v143</PlatformToolset>
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj
@@ -43,7 +43,6 @@
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -51,21 +50,18 @@
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>NotSet</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>NotSet</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -73,7 +69,6 @@
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -81,7 +76,6 @@
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.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>
--- a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj
@@ -14,7 +14,6 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v143</PlatformToolset>
--- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
@@ -11,7 +11,6 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v143</PlatformToolset>
--- a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj
@@ -12,7 +12,6 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v143</PlatformToolset>
--- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
+++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
@@ -1,89 +1,88 @@
-<?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>{8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}</ProjectGuid>
-    <RootNamespace>KeyboardManagerCommon</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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" />
-  <PropertyGroup>
-    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\;..\..\..\;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\common\interop\keyboard_layout.cpp" />
-    <ClCompile Include="Helpers.cpp" />
-    <ClCompile Include="KeyboardEventHandlers.cpp" />
-    <ClCompile Include="MappingConfiguration.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Shortcut.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Input.h" />
-    <ClInclude Include="KeyboardEventHandlers.h" />
-    <ClInclude Include="MappingConfiguration.h" />
-    <ClInclude Include="ModifierKey.h" />
-    <ClInclude Include="InputInterface.h" />
-    <ClInclude Include="Helpers.h" />
-    <ClInclude Include="KeyboardManagerConstants.h" />
-    <ClInclude Include="Modifiers.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="RemapShortcut.h" />
-    <ClInclude Include="Shortcut.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\COMUtils\COMUtils.vcxproj">
-      <Project>{7319089e-46d6-4400-bc65-e39bdf1416ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
-      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
-  <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')" />
-  </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'))" />
-  </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>{8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}</ProjectGuid>
+    <RootNamespace>KeyboardManagerCommon</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\;..\..\..\;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\common\interop\keyboard_layout.cpp" />
+    <ClCompile Include="Helpers.cpp" />
+    <ClCompile Include="KeyboardEventHandlers.cpp" />
+    <ClCompile Include="MappingConfiguration.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Shortcut.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Input.h" />
+    <ClInclude Include="KeyboardEventHandlers.h" />
+    <ClInclude Include="MappingConfiguration.h" />
+    <ClInclude Include="ModifierKey.h" />
+    <ClInclude Include="InputInterface.h" />
+    <ClInclude Include="Helpers.h" />
+    <ClInclude Include="KeyboardManagerConstants.h" />
+    <ClInclude Include="Modifiers.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="RemapShortcut.h" />
+    <ClInclude Include="Shortcut.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\COMUtils\COMUtils.vcxproj">
+      <Project>{7319089e-46d6-4400-bc65-e39bdf1416ee}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <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')" />
+  </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'))" />
+  </Target>
 </Project>
--- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
@@ -1,86 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" 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>15.0</VCProjectVersion>
-    <ProjectGuid>{89f34af7-1c34-4a72-aa6e-534bcf972bd9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>KeyboardManager</RootNamespace>
-    <ProjectName>KeyboardManager</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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" />
-  <PropertyGroup>
-    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>PowerToys.KeyboardManager</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="Generated Files\resource.h" />
-    <ClInclude Include="trace.h" />
-    <None Include="packages.config" />
-    <None Include="resource.base.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="trace.cpp" />
-    <None Include="KeyboardManager.base.rc" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
-      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\common\KeyboardManagerCommon.vcxproj">
-      <Project>{8affa899-0b73-49ec-8c50-0fadda57b2fc}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Generated Files\KeyboardManager.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources.resx" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
-  <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')" />
-  </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'))" />
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" 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>15.0</VCProjectVersion>
+    <ProjectGuid>{89f34af7-1c34-4a72-aa6e-534bcf972bd9}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>KeyboardManager</RootNamespace>
+    <ProjectName>KeyboardManager</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>PowerToys.KeyboardManager</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <AdditionalDependencies>Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="Generated Files\resource.h" />
+    <ClInclude Include="trace.h" />
+    <None Include="packages.config" />
+    <None Include="resource.base.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="trace.cpp" />
+    <None Include="KeyboardManager.base.rc" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\common\KeyboardManagerCommon.vcxproj">
+      <Project>{8affa899-0b73-49ec-8c50-0fadda57b2fc}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Generated Files\KeyboardManager.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources.resx" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <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')" />
+  </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'))" />
+  </Target>
 </Project>
--- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
+++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
@@ -16,7 +16,6 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
-      <EnableControlFlowGuard>true</EnableControlFlowGuard>
  </PropertyGroup>
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v143</PlatformToolset>
--- a/src/modules/peek/Peek.UITests/Peek.UITests.csproj
+++ b/src/modules/peek/Peek.UITests/Peek.UITests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <PropertyGroup>
+    <RootNamespace>PowerToys.Peek.UITests</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+	<OutputType>Library</OutputType>
+    <RunVSTest>false</RunVSTest>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\Peek.UITests\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSTest" />
+    <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TestAssets\**\*">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
--- a/src/modules/peek/Peek.UITests/PeekFilePreviewTests.cs
+++ b/src/modules/peek/Peek.UITests/PeekFilePreviewTests.cs
@@ -0,0 +1,864 @@
+// 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.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Peek.UITests;
+
+[TestClass]
+public class PeekFilePreviewTests : UITestBase
+{
+    // Timeout constants for better maintainability
+    private const int ExplorerOpenTimeoutSeconds = 15;
+    private const int PeekWindowTimeoutSeconds = 15;
+    private const int ExplorerLoadDelayMs = 3000;
+    private const int ExplorerCheckIntervalMs = 1000;
+    private const int PeekCheckIntervalMs = 1000;
+    private const int PeekInitializeDelayMs = 3000;
+    private const int MaxRetryAttempts = 3;
+    private const int RetryDelayMs = 3000;
+    private const int PinActionDelayMs = 500;
+
+    public PeekFilePreviewTests()
+        : base(PowerToysModule.PowerToysSettings, WindowSize.Small_Vertical)
+    {
+    }
+
+    [TestInitialize]
+    public void TestInitialize()
+    {
+        Session.CloseMainWindow();
+        SendKeys(Key.Win, Key.M);
+    }
+
+    [TestMethod("Peek.FilePreview.Folder")]
+    [TestCategory("Preview files")]
+    public void PeekFolderFilePreview()
+    {
+        string folderFullPath = Path.GetFullPath(@".\TestAssets");
+
+        var peekWindow = OpenPeekWindow(folderFullPath);
+
+        Assert.IsNotNull(peekWindow);
+
+        Assert.IsNotNull(peekWindow.Find<TextBlock>("File Type: File folder", 500), "Folder preview should be loaded successfully");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test JPEG image preview
+    /// </summary>
+    [TestMethod("Peek.FilePreview.JPEGImage")]
+    [TestCategory("Preview files")]
+    public void PeekJPEGImagePreview()
+    {
+        string imagePath = Path.GetFullPath(@".\TestAssets\2.jpg");
+        TestSingleFilePreview(imagePath, "2");
+    }
+
+    /// <summary>
+    /// Test PDF document preview
+    /// </summary>
+    [TestMethod("Peek.FilePreview.PDFDocument")]
+    [TestCategory("Preview files")]
+    public void PeekPDFDocumentPreview()
+    {
+        string pdfPath = Path.GetFullPath(@".\TestAssets\3.pdf");
+        TestSingleFilePreview(pdfPath, "3", 10000);
+    }
+
+    /// <summary>
+    /// Test QOI image preview
+    /// </summary>
+    [TestMethod("Peek.FilePreview.QOIImage")]
+    [TestCategory("Preview files")]
+    public void PeekQOIImagePreview()
+    {
+        string qoiPath = Path.GetFullPath(@".\TestAssets\4.qoi");
+        TestSingleFilePreview(qoiPath, "4");
+    }
+
+    /// <summary>
+    /// Test C++ source code preview
+    /// </summary>
+    [TestMethod("Peek.FilePreview.CPPSourceCode")]
+    [TestCategory("Preview files")]
+    public void PeekCPPSourceCodePreview()
+    {
+        string cppPath = Path.GetFullPath(@".\TestAssets\5.cpp");
+        TestSingleFilePreview(cppPath, "5");
+    }
+
+    /// <summary>
+    /// Test Markdown document preview
+    /// </summary>
+    [TestMethod("Peek.FilePreview.MarkdownDocument")]
+    [TestCategory("Preview files")]
+    public void PeekMarkdownDocumentPreview()
+    {
+        string markdownPath = Path.GetFullPath(@".\TestAssets\6.md");
+        TestSingleFilePreview(markdownPath, "6");
+    }
+
+    /// <summary>
+    /// Test ZIP archive preview
+    /// </summary>
+    [TestMethod("Peek.FilePreview.ZIPArchive")]
+    [TestCategory("Preview files")]
+    public void PeekZIPArchivePreview()
+    {
+        string zipPath = Path.GetFullPath(@".\TestAssets\7.zip");
+        TestSingleFilePreview(zipPath, "7");
+    }
+
+    /// <summary>
+    /// Test PNG image preview
+    /// </summary>
+    [TestMethod("Peek.FilePreview.PNGImage")]
+    [TestCategory("Preview files")]
+    public void PeekPNGImagePreview()
+    {
+        string pngPath = Path.GetFullPath(@".\TestAssets\8.png");
+        TestSingleFilePreview(pngPath, "8");
+    }
+
+    /// <summary>
+    /// Test window pinning functionality - pin window and switch between different sized images
+    /// Verify the window stays at the same place and the same size
+    /// </summary>
+    [TestMethod("Peek.WindowPinning.PinAndSwitchImages")]
+    [TestCategory("Window Pinning")]
+    public void TestPinWindowAndSwitchImages()
+    {
+        // Use two different image files with different size
+        string firstImagePath = Path.GetFullPath(@".\TestAssets\8.png");
+        string secondImagePath = Path.GetFullPath(@".\TestAssets\2.jpg"); // Different format/size
+
+        // Open first image
+        var initialWindow = OpenPeekWindow(firstImagePath);
+
+        var originalBounds = GetWindowBounds(initialWindow);
+
+        // Move window to a custom position to test pin functionality
+        NativeMethods.MoveWindow(initialWindow, originalBounds.X + 100, originalBounds.Y + 50);
+        var movedBounds = GetWindowBounds(initialWindow);
+
+        // Pin the window
+        PinWindow();
+
+        // Close current peek
+        ClosePeekAndExplorer();
+
+        // Open second image with different size
+        var secondWindow = OpenPeekWindow(secondImagePath);
+        var finalBounds = GetWindowBounds(secondWindow);
+
+        // Verify window position and size remained the same as the moved position
+        Assert.AreEqual(movedBounds.X, finalBounds.X, 5, "Window X position should remain the same when pinned");
+        Assert.AreEqual(movedBounds.Y, finalBounds.Y, 5, "Window Y position should remain the same when pinned");
+        Assert.AreEqual(movedBounds.Width, finalBounds.Width, 10, "Window width should remain the same when pinned");
+        Assert.AreEqual(movedBounds.Height, finalBounds.Height, 10, "Window height should remain the same when pinned");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test window pinning persistence - pin window, close and reopen Peek
+    /// Verify the new window is opened at the same place and the same size as before
+    /// </summary>
+    [TestMethod("Peek.WindowPinning.PinAndReopen")]
+    [TestCategory("Window Pinning")]
+    public void TestPinWindowAndReopen()
+    {
+        string imagePath = Path.GetFullPath(@".\TestAssets\8.png");
+
+        // Open image and pin window
+        var initialWindow = OpenPeekWindow(imagePath);
+        var originalBounds = GetWindowBounds(initialWindow);
+
+        // Move window to a custom position to test pin persistence
+        NativeMethods.MoveWindow(initialWindow, originalBounds.X + 150, originalBounds.Y + 75);
+        var movedBounds = GetWindowBounds(initialWindow);
+
+        // Pin the window
+        PinWindow();
+
+        // Close peek
+        ClosePeekAndExplorer();
+        Thread.Sleep(1000); // Wait for window to close completely
+
+        // Reopen the same image
+        var reopenedWindow = OpenPeekWindow(imagePath);
+        var finalBounds = GetWindowBounds(reopenedWindow);
+
+        // Verify window position and size are restored to the moved position
+        Assert.AreEqual(movedBounds.X, finalBounds.X, 5, "Window X position should be restored when pinned");
+        Assert.AreEqual(movedBounds.Y, finalBounds.Y, 5, "Window Y position should be restored when pinned");
+        Assert.AreEqual(movedBounds.Width, finalBounds.Width, 10, "Window width should be restored when pinned");
+        Assert.AreEqual(movedBounds.Height, finalBounds.Height, 10, "Window height should be restored when pinned");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test window unpinning - unpin window and switch to different file
+    /// Verify the window is moved to the default place
+    /// </summary>
+    [TestMethod("Peek.WindowPinning.UnpinAndSwitchFiles")]
+    [TestCategory("Window Pinning")]
+    public void TestUnpinWindowAndSwitchFiles()
+    {
+        string firstFilePath = Path.GetFullPath(@".\TestAssets\8.png");
+        string secondFilePath = Path.GetFullPath(@".\TestAssets\2.jpg");
+
+        // Open first file and pin window
+        var pinnedWindow = OpenPeekWindow(firstFilePath);
+        var originalBounds = GetWindowBounds(pinnedWindow);
+
+        // Move window to a custom position
+        NativeMethods.MoveWindow(pinnedWindow, originalBounds.X + 200, originalBounds.Y + 100);
+        var movedBounds = GetWindowBounds(pinnedWindow);
+
+        // Calculate the center point of the moved window
+        var movedCenter = Session.GetMainWindowCenter();
+
+        // Pin the window first
+        PinWindow();
+
+        // Unpin the window
+        UnpinWindow();
+
+        // Close current peek
+        ClosePeekAndExplorer();
+
+        // Open different file (different size)
+        var unpinnedWindow = OpenPeekWindow(secondFilePath);
+        var unpinnedBounds = GetWindowBounds(unpinnedWindow);
+
+        // Calculate the center point of the unpinned window
+        var unpinnedCenter = Session.GetMainWindowCenter();
+
+        // Verify window size is different (since it's a different file type)
+        bool sizeChanged = Math.Abs(movedBounds.Width - unpinnedBounds.Width) > 10 ||
+                          Math.Abs(movedBounds.Height - unpinnedBounds.Height) > 10;
+
+        // Verify window center moved to default position (should be different from moved center)
+        bool centerChanged = Math.Abs(movedCenter.CenterX - unpinnedCenter.CenterX) > 50 ||
+                            Math.Abs(movedCenter.CenterY - unpinnedCenter.CenterY) > 50;
+
+        Assert.IsTrue(sizeChanged, "Window size should be different for different file types");
+        Assert.IsTrue(centerChanged, "Window center should move to default position when unpinned");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test unpinned window behavior - unpin window, close and reopen Peek
+    /// Verify the new window is opened on the default place
+    /// </summary>
+    [TestMethod("Peek.WindowPinning.UnpinAndReopen")]
+    [TestCategory("Window Pinning")]
+    public void TestUnpinWindowAndReopen()
+    {
+        string imagePath = Path.GetFullPath(@".\TestAssets\8.png");
+
+        // Open image, pin it first, then unpin
+        var initialWindow = OpenPeekWindow(imagePath);
+        var originalBounds = GetWindowBounds(initialWindow);
+
+        // Move window to a custom position
+        NativeMethods.MoveWindow(initialWindow, originalBounds.X + 250, originalBounds.Y + 125);
+        var movedBounds = GetWindowBounds(initialWindow);
+
+        // Pin then unpin to ensure we test the unpinned state
+        PinWindow();
+        UnpinWindow();
+
+        // Close peek
+        ClosePeekAndExplorer();
+
+        // Reopen the same image
+        var reopenedWindow = OpenPeekWindow(imagePath);
+        var reopenedBounds = GetWindowBounds(reopenedWindow);
+
+        // Verify window opened at default position (not the previous moved position)
+        bool openedAtDefault = Math.Abs(movedBounds.X - reopenedBounds.X) > 50 ||
+                              Math.Abs(movedBounds.Y - reopenedBounds.Y) > 50;
+
+        Assert.IsTrue(openedAtDefault, "Unpinned window should open at default position, not previous moved position");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test opening file with default program by clicking a button
+    /// </summary>
+    [TestMethod("Peek.OpenWithDefaultProgram.ClickButton")]
+    [TestCategory("Open with default program")]
+    public void TestOpenWithDefaultProgramByButton()
+    {
+        string zipPath = Path.GetFullPath(@".\TestAssets\7.zip");
+
+        // Open zip file with Peek
+        var peekWindow = OpenPeekWindow(zipPath);
+
+        // Find and click the "Open with default program" button
+        var openButton = FindLaunchButton();
+        Assert.IsNotNull(openButton, "Open with default program button should be found");
+
+        // Click the button to open with default program
+        openButton.Click();
+
+        // Wait a moment for the default program to launch
+        Thread.Sleep(2000);
+
+        // Verify that the default program process has started (check for Explorer opening 7-zip)
+        bool defaultProgramLaunched = CheckIfExplorerLaunched();
+        Assert.IsTrue(defaultProgramLaunched, "Default program (Explorer/7-zip) should be launched after clicking the button");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test opening file with default program by pressing Enter key
+    /// </summary>
+    [TestMethod("Peek.OpenWithDefaultProgram.PressEnter")]
+    [TestCategory("Open with default program")]
+    public void TestOpenWithDefaultProgramByEnter()
+    {
+        string zipPath = Path.GetFullPath(@".\TestAssets\7.zip");
+
+        // Open zip file with Peek
+        var peekWindow = OpenPeekWindow(zipPath);
+
+        // Press Enter key to open with default program
+        SendKeys(Key.Enter);
+
+        // Wait a moment for the default program to launch
+        Thread.Sleep(2000);
+
+        // Verify that the default program process has started (check for Explorer opening 7-zip)
+        bool defaultProgramLaunched = CheckIfExplorerLaunched();
+        Assert.IsTrue(defaultProgramLaunched, "Default program (Explorer/7-zip) should be launched after pressing Enter");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test switching between files in a folder using Left and Right arrow keys
+    /// </summary>
+    [TestMethod("Peek.FileNavigation.SwitchFilesWithArrowKeys")]
+    [TestCategory("File Navigation")]
+    public void TestSwitchFilesWithArrowKeys()
+    {
+        // Get all files in TestAssets folder, ordered alphabetically
+        var testFiles = GetTestAssetFiles();
+
+        // Start with the first file in the TestAssets folder
+        string firstFilePath = testFiles[0];
+        var peekWindow = OpenPeekWindow(firstFilePath);
+
+        // Keep track of visited files to ensure we can navigate through all
+        var visitedFiles = new List<string> { Path.GetFileNameWithoutExtension(firstFilePath) };
+
+        // Navigate forward through files using Right arrow
+        for (int i = 1; i < testFiles.Count; i++)
+        {
+            // Press Right arrow to go to next file
+            SendKeys(Key.Right);
+
+            // Wait for file to load
+            Thread.Sleep(2000);
+
+            // Try to determine current file from window title
+            var currentWindow = peekWindow.Name;
+            string expectedFileName = Path.GetFileNameWithoutExtension(testFiles[i]);
+            if (!string.IsNullOrEmpty(currentWindow) && currentWindow.StartsWith(expectedFileName, StringComparison.Ordinal))
+            {
+                visitedFiles.Add(expectedFileName);
+            }
+        }
+
+        // Verify we navigated through the expected number of files
+        Assert.AreEqual(testFiles.Count, visitedFiles.Count, $"Should have navigated through all {testFiles.Count} files, but only visited {visitedFiles.Count} files: {string.Join(", ", visitedFiles)}");
+
+        // Navigate backward using Left arrow to verify reverse navigation
+        for (int i = testFiles.Count - 2; i >= 0; i--)
+        {
+            SendKeys(Key.Left);
+
+            // Wait for file to load
+            Thread.Sleep(2000);
+
+            // Try to determine current file from window title during backward navigation
+            var currentWindow = peekWindow.Name;
+            string expectedFileName = Path.GetFileNameWithoutExtension(testFiles[i]);
+            if (!string.IsNullOrEmpty(currentWindow) && currentWindow.StartsWith(expectedFileName, StringComparison.Ordinal))
+            {
+                // Remove the last visited file (going backward)
+                if (visitedFiles.Count > 1)
+                {
+                    visitedFiles.RemoveAt(visitedFiles.Count - 1);
+                }
+            }
+        }
+
+        // Verify backward navigation worked - should be back to the first file
+        Assert.AreEqual(1, visitedFiles.Count, $"After backward navigation, should be back to first file only. Remaining files: {string.Join(", ", visitedFiles)}");
+
+        ClosePeekAndExplorer();
+    }
+
+    /// <summary>
+    /// Test switching between multiple selected files
+    /// Select first 3 files in Explorer, open with Peek, verify you can switch only between selected files using arrow keys
+    /// </summary>
+    [TestMethod("Peek.FileNavigation.SwitchBetweenSelectedFiles")]
+    [TestCategory("File Navigation")]
+    public void TestSwitchBetweenSelectedFiles()
+    {
+        // Get first 3 files in TestAssets folder, ordered alphabetically
+        var allFiles = GetTestAssetFiles();
+        var selectedFiles = allFiles.Take(3).ToList();
+
+        // Open Explorer and select the first file
+        Session.StartExe("explorer.exe", $"/select,\"{selectedFiles[0]}\"");
+
+        // Wait for Explorer to open and select the first file
+        WaitForExplorerWindow(selectedFiles[0]);
+
+        // Give Explorer time to fully load
+        Thread.Sleep(2000);
+
+        // Use Shift+Down to extend selection to include the next 2 files
+        SendKeys(Key.Shift, Key.Down); // Extend to second file
+        Thread.Sleep(300);
+        SendKeys(Key.Shift, Key.Down); // Extend to third file
+        Thread.Sleep(300);
+
+        // Now we should have the first 3 files selected, open Peek
+        SendPeekHotkeyWithRetry();
+
+        // Find the peek window (should open with last selected file when multiple files are selected)
+        var peekWindow = FindPeekWindow(selectedFiles[2]); // Third file (last selected)
+        string lastFileName = Path.GetFileNameWithoutExtension(selectedFiles[2]);
+
+        // Keep track of visited files during navigation (starting from the last file)
+        var visitedFiles = new List<string> { lastFileName };
+        var expectedFileNames = selectedFiles.Select(f => Path.GetFileNameWithoutExtension(f)).ToList();
+
+        // Test navigation by pressing Left arrow multiple times to verify we only cycle through 3 selected files
+        var windowTitles = new List<string> { peekWindow.Name };
+
+        // Press Left arrow 5 times (more than the 3 selected files) to see if we cycle through only the selected files
+        for (int i = 0; i < 5; i++)
+        {
+            SendKeys(Key.Left);
+            Thread.Sleep(2000); // Wait for file to load
+
+            var currentWindowTitle = peekWindow.Name;
+            windowTitles.Add(currentWindowTitle);
+        }
+
+        // Analyze the navigation pattern - we should see repetition indicating we're only cycling through 3 files
+        var uniqueWindowsVisited = windowTitles.Distinct().Count();
+
+        // We should see at most 3 unique windows (the 3 selected files), even after 6 navigation steps
+        Assert.IsTrue(uniqueWindowsVisited <= 3, $"Should only navigate through the 3 selected files, but found {uniqueWindowsVisited} unique windows. " + $"Window titles: {string.Join(" -> ", windowTitles)}");
+
+        ClosePeekAndExplorer();
+    }
+
+    private bool CheckIfExplorerLaunched()
+    {
+        var possibleTitles = new[]
+        {
+            "7.zip - File Explorer",
+            "7 - File Explorer",
+            "7",
+            "7.zip",
+        };
+
+        foreach (var title in possibleTitles)
+        {
+            try
+            {
+                var explorerWindow = Find(title, 5000, true);
+                if (explorerWindow != null)
+                {
+                    return true;
+                }
+            }
+            catch
+            {
+                // Continue to next title
+            }
+        }
+
+        return false;
+    }
+
+    private void OpenAndPeekFile(string fullPath)
+    {
+        Session.StartExe("explorer.exe", $"/select,\"{fullPath}\"");
+
+        // Wait for Explorer to open and become ready
+        WaitForExplorerWindow(fullPath);
+
+        // Send Peek hotkey with retry mechanism
+        SendPeekHotkeyWithRetry();
+    }
+
+    private void WaitForExplorerWindow(string filePath)
+    {
+        WaitForCondition(
+            condition: () =>
+            {
+                try
+                {
+                    // Check if Explorer window is open and responsive
+                    var explorerProcesses = Process.GetProcessesByName("explorer")
+                        .Where(p => p.MainWindowHandle != IntPtr.Zero)
+                        .ToList();
+
+                    if (explorerProcesses.Count != 0)
+                    {
+                        // Give Explorer a moment to fully load the file selection
+                        Thread.Sleep(ExplorerLoadDelayMs);
+
+                        // Verify the file is accessible
+                        return File.Exists(filePath) || Directory.Exists(filePath);
+                    }
+
+                    return false;
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"WaitForExplorerWindow exception: {ex.Message}");
+                    return false;
+                }
+            },
+            timeoutSeconds: ExplorerOpenTimeoutSeconds,
+            checkIntervalMs: ExplorerCheckIntervalMs,
+            timeoutMessage: $"Explorer window did not open for file: {filePath}");
+    }
+
+    private void SendPeekHotkeyWithRetry()
+    {
+        for (int attempt = 1; attempt <= MaxRetryAttempts; attempt++)
+        {
+            try
+            {
+                // Send the Peek hotkey
+                SendKeys(Key.LCtrl, Key.Space);
+
+                // Wait for Peek window to appear
+                if (WaitForPeekWindow())
+                {
+                    return; // Success
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"SendPeekHotkeyWithRetry attempt {attempt} failed: {ex.Message}");
+
+                if (attempt == MaxRetryAttempts)
+                {
+                    throw new InvalidOperationException($"Failed to open Peek after {MaxRetryAttempts} attempts. Last error: {ex.Message}", ex);
+                }
+            }
+
+            // Wait before retry using Thread.Sleep
+            Thread.Sleep(RetryDelayMs);
+        }
+
+        throw new InvalidOperationException($"Failed to open Peek after {MaxRetryAttempts} attempts");
+    }
+
+    private bool WaitForPeekWindow()
+    {
+        try
+        {
+            WaitForCondition(
+                condition: () =>
+                {
+                    if (TryFindPeekWindow())
+                    {
+                        // Give Peek a moment to fully initialize using Thread.Sleep
+                        Thread.Sleep(PeekInitializeDelayMs);
+                        return true;
+                    }
+
+                    return false;
+                },
+                timeoutSeconds: PeekWindowTimeoutSeconds,
+                checkIntervalMs: PeekCheckIntervalMs,
+                timeoutMessage: "Peek window did not appear");
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"WaitForPeekWindow failed: {ex.Message}");
+            return false;
+        }
+    }
+
+    private bool WaitForCondition(Func<bool> condition, int timeoutSeconds, int checkIntervalMs, string timeoutMessage)
+    {
+        var timeout = TimeSpan.FromSeconds(timeoutSeconds);
+        var startTime = DateTime.Now;
+
+        while (DateTime.Now - startTime < timeout)
+        {
+            try
+            {
+                if (condition())
+                {
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                // Log exception but continue waiting
+                Debug.WriteLine($"WaitForCondition exception: {ex.Message}");
+            }
+
+            // Use async delay to prevent blocking the thread
+            Thread.Sleep(checkIntervalMs);
+        }
+
+        throw new TimeoutException($"{timeoutMessage} (timeout: {timeoutSeconds}s)");
+    }
+
+    private bool TryFindPeekWindow()
+    {
+        try
+        {
+            // Check for Peek process with timeout
+            var peekProcesses = Process.GetProcessesByName("PowerToys.Peek.UI")
+                .Where(p => p.MainWindowHandle != IntPtr.Zero);
+
+            var foundProcess = peekProcesses.Any();
+
+            if (foundProcess)
+            {
+                // Additional validation - check if window is responsive
+                Thread.Sleep(100); // Small delay to ensure window is ready
+                return true;
+            }
+
+            return false;
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"TryFindPeekWindow exception: {ex.Message}");
+            return false;
+        }
+    }
+
+    private Element OpenPeekWindow(string filePath)
+    {
+        try
+        {
+            SendKeys(Key.Enter);
+
+            // Open file with Peek
+            OpenAndPeekFile(filePath);
+
+            // Find the Peek window using the common method with timeout
+            var peekWindow = FindPeekWindow(filePath);
+
+            // Attach to the found window with error handling
+            try
+            {
+                Session.Attach(peekWindow.Name);
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Failed to attach to window: {ex.Message}");
+            }
+
+            return peekWindow;
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"OpenPeekWindow failed for {filePath}: {ex.Message}");
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Test a single file preview with visual comparison
+    /// </summary>
+    /// <param name="filePath">Full path to the file to test</param>
+    /// <param name="expectedFileName">Expected file name for visual comparison</param>
+    private void TestSingleFilePreview(string filePath, string expectedFileName, int? delayMs = null)
+    {
+        Element? previewWindow = null;
+
+        try
+        {
+            Debug.WriteLine($"Testing file preview: {Path.GetFileName(filePath)}");
+
+            previewWindow = OpenPeekWindow(filePath);
+
+            if (delayMs.HasValue)
+            {
+                Thread.Sleep(delayMs.Value); // Allow time for the preview to load
+            }
+
+            Assert.IsNotNull(previewWindow, $"Should open Peek window for {Path.GetFileName(filePath)}");
+
+            // Perform visual comparison
+            VisualAssert.AreEqual(TestContext, previewWindow, expectedFileName);
+
+            Debug.WriteLine($"Successfully tested: {Path.GetFileName(filePath)}");
+        }
+        finally
+        {
+            // Always cleanup in finally block
+            ClosePeekAndExplorer();
+        }
+    }
+
+    private Rectangle GetWindowBounds(Element window)
+    {
+        if (window.Rect == null)
+        {
+            return Rectangle.Empty;
+        }
+        else
+        {
+            return window.Rect.Value;
+        }
+    }
+
+    private void PinWindow()
+    {
+        // Find pin button using AutomationId
+        var pinButton = Find(By.AccessibilityId("PinButton"), 2000);
+        Assert.IsNotNull(pinButton, "Pin button should be found");
+
+        pinButton.Click();
+        Thread.Sleep(PinActionDelayMs); // Wait for pin action to complete
+    }
+
+    private void UnpinWindow()
+    {
+        // Find pin button using AutomationId (same button, just toggle the state)
+        var pinButton = Find(By.AccessibilityId("PinButton"), 2000);
+        Assert.IsNotNull(pinButton, "Pin button should be found");
+
+        pinButton.Click();
+        Thread.Sleep(PinActionDelayMs); // Wait for unpin action to complete
+    }
+
+    private void ClosePeekAndExplorer()
+    {
+        try
+        {
+            // Close Peek window
+            Session.CloseMainWindow();
+            Thread.Sleep(500);
+            SendKeys(Key.Win, Key.M);
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error closing Peek window: {ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// Get all files in TestAssets folder, ordered alphabetically, excluding hidden files
+    /// </summary>
+    /// <returns>List of file paths in alphabetical order</returns>
+    private List<string> GetTestAssetFiles()
+    {
+        string testAssetsPath = Path.GetFullPath(@".\TestAssets");
+        return Directory.GetFiles(testAssetsPath, "*.*", SearchOption.TopDirectoryOnly)
+            .Where(file => !Path.GetFileName(file).StartsWith('.'))
+            .OrderBy(file => file)
+            .ToList();
+    }
+
+    /// <summary>
+    /// Find Peek window by trying both filename with and without extension
+    /// </summary>
+    /// <param name="filePath">Full path to the file</param>
+    /// <param name="timeout">Timeout in milliseconds</param>
+    /// <returns>The found Peek window element</returns>
+    private Element FindPeekWindow(string filePath, int timeout = 5000)
+    {
+        string fileName = Path.GetFileName(filePath);
+        string fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
+
+        // Try both window title formats since Windows may show or hide file extensions
+        string peekWindowTitleWithExt = $"{fileName} - Peek";
+        string peekWindowTitleWithoutExt = $"{fileNameWithoutExt} - Peek";
+
+        Element? peekWindow = null;
+
+        try
+        {
+            // First try to find the window with extension
+            peekWindow = Find(peekWindowTitleWithoutExt, timeout, true);
+        }
+        catch
+        {
+            try
+            {
+                // Then try without extension
+                peekWindow = Find(peekWindowTitleWithExt, timeout, true);
+            }
+            catch
+            {
+                // If neither works, let it fail with a clear message
+                Assert.Fail($"Could not find Peek window with title '{peekWindowTitleWithExt}' or '{peekWindowTitleWithoutExt}'");
+            }
+        }
+
+        Assert.IsNotNull(peekWindow, $"Should find Peek window for file: {Path.GetFileName(filePath)}");
+
+        return peekWindow;
+    }
+
+    /// <summary>
+    /// Helper method to find the launch button with different AccessibilityIds depending on window size
+    /// </summary>
+    /// <returns>The launch button element</returns>
+    private Element? FindLaunchButton()
+    {
+        try
+        {
+            // Try to find button with ID for larger window first
+            var button = Find(By.AccessibilityId("LaunchAppButton_Text"), 1000);
+            if (button != null)
+            {
+                return button;
+            }
+        }
+        catch
+        {
+            // Try to find button with ID for smaller window
+            var button = Find(By.AccessibilityId("LaunchAppButton"), 1000);
+            if (button != null)
+            {
+                return button;
+            }
+        }
+
+        return null;
+    }
+}
--- a/src/modules/peek/Peek.UITests/TestAssets/2.jpg
+++ b/src/modules/peek/Peek.UITests/TestAssets/2.jpg
--- a/src/modules/peek/Peek.UITests/TestAssets/3.pdf
+++ b/src/modules/peek/Peek.UITests/TestAssets/3.pdf
--- a/src/modules/peek/Peek.UITests/TestAssets/4.qoi
+++ b/src/modules/peek/Peek.UITests/TestAssets/4.qoi
--- a/src/modules/peek/Peek.UITests/TestAssets/5.cpp
+++ b/src/modules/peek/Peek.UITests/TestAssets/5.cpp
@@ -0,0 +1,6 @@
+#include <iostream>
+
+int main() {
+    std::cout << "Hello, world!" << std::endl;
+    return 0;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leilei Zhang	f8934769c9	remove all	2025-07-21 15:50:37 +08:00
Leilei Zhang	6d80dce74c	remove base line image	2025-07-21 15:27:04 +08:00
Leilei Zhang	393fb15019	pdf need more time to load	2025-07-21 14:38:29 +08:00
Leilei Zhang	1d0cee997b	use hot key clean screnn	2025-07-21 13:09:54 +08:00
Leilei Zhang	28d585fef6	don't close explorer	2025-07-21 12:44:33 +08:00
Leilei Zhang	65e67f4098	add diagnosticsEnabled	2025-07-21 11:26:02 +08:00
Leilei Zhang	68f474ef64	update project	2025-07-21 10:18:35 +08:00
Leilei Zhang	f1db717b6d	update baseline image name	2025-07-21 10:05:52 +08:00
Leilei Zhang	d90c1954b0	update close explorer logic	2025-07-18 18:43:31 +08:00
Leilei Zhang	b0d7bfef7c	Merge branch 'main' of https://github.com/microsoft/PowerToys into leilzh/peekuitests	2025-07-18 16:59:45 +08:00
Leilei Zhang	c8cea4a017	exit cmdpal	2025-07-18 16:57:00 +08:00
Yu Leng	ca473b488b	[CmdPal][UI Tests] Add basic test cases for cmdpal (#40694 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request 1. Create some basic cmdpal test cases. 2. Add ui tests support for cmdpal modules. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #40695 - [x] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [x] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [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 --------- Co-authored-by: Yu Leng <yuleng@microsoft.com>	2025-07-18 16:22:37 +08:00
Leilei Zhang	a16813b73b	fix error	2025-07-18 15:50:03 +08:00
Leilei Zhang	1fbb784bea	add win10 explorer find	2025-07-18 15:19:41 +08:00
Leilei Zhang	421a7a62d5	update logic	2025-07-18 14:27:00 +08:00
Leilei Zhang	1e0b6d5e38	fix merge error	2025-07-18 11:22:39 +08:00
Leilei Zhang	3bee31bfd7	Merge branch 'main' of https://github.com/microsoft/PowerToys into leilzh/peekuitests	2025-07-18 10:33:01 +08:00
leileizhang	d37105bf84	[UI Tests] Replace pixel-by-pixel image comparison with perceptual hash (pHash) for improved visual similarity detection (#40653 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This PR replaces the previous pixel-by-pixel image comparison logic with a perceptual hash (pHash)-based comparison using the CoenM.ImageSharp.ImageHash library. Removes the need for golden images from CI pipelines Since the comparison is perceptual rather than binary, we no longer need to fetch pixel-perfect golden images from pipelines for validation. Developers can now capture screenshots locally and still get meaningful, robust comparisons. ### Why pHash? Unlike direct pixel comparison (which fails on minor rendering differences), pHash focuses on the overall structure and visual perception of the image. This provides several benefits: - Robust to minor differences: tolerates compression artifacts, anti-aliasing, subtle rendering changes, and border padding. - Resilient to resolution or format changes: works even if images are scaled or compressed differently. - Closer to human perception: more accurately reflects whether two images "look" the same to a person. <!-- Please review the items on the PR checklist before submitting--> ## 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 - [ ] 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	2025-07-18 10:32:09 +08:00
Leilei Zhang	a89d8476f8	use compare	2025-07-18 09:53:42 +08:00
Leilei Zhang	19ada53ce3	get image for testing	2025-07-17 15:58:16 +08:00
Leilei Zhang	0654edb18a	update default program tests	2025-07-17 15:49:56 +08:00
Leilei Zhang	7d02867b60	add enter	2025-07-17 13:41:16 +08:00
Leilei Zhang	b05cf8bf9f	update common function	2025-07-17 12:23:03 +08:00
Leilei Zhang	522f12a0b2	clean windows	2025-07-17 11:21:30 +08:00
Leilei Zhang	d12bbf0cbf	close settings page before testing	2025-07-17 10:18:37 +08:00
Leilei Zhang	f067a925f6	add more tests	2025-07-16 20:41:35 +08:00
Michael Jolley	6642c805b7	Context menu cleanup (#40584 ) Addressing items in #40583 - [x] When navigating the context menu with the up/down keys, separators should not be selectable. - [x] [For context items with a super long title, we need to trim those with an ellipsis. Ideally, we'd show a tooltip for just those items.](https://github.com/microsoft/PowerToys/issues/40313) - [x] [Context menu search bar text size doesn't update after changing system text size](https://github.com/microsoft/PowerToys/issues/39648) - [x] Weird "kick out" on first context menu item - [x] [Primary button doesn't work if the command has more items (fix regression)](https://github.com/microsoft/PowerToys/issues/40624) Example of long context menu item titles with tooltips: (@niels9001, look okay?) https://github.com/user-attachments/assets/fc0a4034-9c22-48ee-a3f0-44fcc2f294a6 closes #40624	2025-07-16 06:25:24 -05:00
Leilei Zhang	37c690b216	update screenshot name	2025-07-16 17:49:08 +08:00
Leilei Zhang	f6ff5064a3	use all	2025-07-16 17:05:20 +08:00
Leilei Zhang	78884bb587	use wrong flag	2025-07-16 15:52:16 +08:00
Leilei Zhang	d2b81450e3	add retry	2025-07-16 14:59:18 +08:00
Leilei Zhang	425883508f	update image pipeline	2025-07-16 14:09:25 +08:00
Leilei Zhang	41ff1f8cf7	add more image and add long time	2025-07-16 13:57:53 +08:00
Leilei Zhang	2ee40a99d5	exit command paletter	2025-07-16 12:52:30 +08:00
leileizhang	d5b15026ae	[UI Test Pipeline] Add platform and installMode to testRunTitle for better test result distinction in pipeline (#40628 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Currently, all test runs appear under a generic name in the pipeline, making it hard to identify which platform or install mode caused failures. Adding this context improves debugging efficiency and report clarity. ### Before: <img width="288" height="217" alt="image" src="https://github.com/user-attachments/assets/5086e26a-7c42-4317-8f04-3db3d1dc5f0e" /> ### After: <img width="254" height="183" alt="image" src="https://github.com/user-attachments/assets/6e5961b6-aeb2-47d1-9a1a-ec0e9eac33b8" /> <!-- Please review the items on the PR checklist before submitting--> ## 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 - [ ] 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	2025-07-16 12:48:36 +08:00
Leilei Zhang	943d79bb83	clean code	2025-07-16 10:58:43 +08:00
Leilei Zhang	e42a1b8753	add test run title	2025-07-16 10:22:53 +08:00
Leilei Zhang	ed424faea5	add png	2025-07-16 10:11:56 +08:00
Leilei Zhang	85db62e946	add more time	2025-07-16 00:09:18 +08:00
Leilei Zhang	96de5d7a87	add png	2025-07-15 23:00:54 +08:00
Leilei Zhang	8a1aff68c1	add pin and unpin	2025-07-15 21:17:22 +08:00
Leilei Zhang	f19c2e1a78	create image	2025-07-15 09:34:33 +08:00
Leilei Zhang	1dab45c87c	check file	2025-07-14 21:44:43 +08:00
Leilei Zhang	0040112855	add delay	2025-07-14 19:48:00 +08:00
Leilei Zhang	6205e25eb5	add delay	2025-07-14 18:54:44 +08:00
Leilei Zhang	dbe3ac6077	add peek ui tests	2025-07-14 17:50:41 +08:00