Final verification complete

Co-authored-by: shuaiyuanxx <128874481+shuaiyuanxx@users.noreply.github.com>
Fix excessive logging in Light Switch service
2026-01-24 13:07:04 +01:00 · 2025-10-28 08:09:41 +00:00 · 2025-10-28 08:05:05 +00:00 · 2025-10-28 07:58:08 +00:00 · 2025-10-28 09:40:20 +08:00 · 2025-10-27 09:33:26 +08:00
55 changed files with 476 additions and 405 deletions
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -1,6 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0"
  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Hybrid CRT configuration -->
+  <PropertyGroup Condition="'$(HybridCrtConfiguration)'==''">
+    <HybridCrtConfiguration>$(Configuration)</HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <!-- Skip Hybrid CRT for AppContainer/UWP projects as they require MultiThreadedDLL -->
+  <PropertyGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop'">
+    <HybridCrtConfiguration></HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Debug'">
+    <ClCompile>
+      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Release'">
+    <ClCompile>
+      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <!-- AppContainer/UWP projects must use MultiThreadedDLL -->
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>

  <!-- Project configurations -->
  <ItemGroup Label="ProjectConfigurations">
@@ -73,7 +123,6 @@
    <ClCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -83,7 +132,6 @@
    <ClCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Before you begin, make sure your device meets the system requirements:

 Choose one of the installation methods below:

-<details>
+<details open>
 <summary>Download .exe from GitHub</summary>

 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
@@ -281,4 +281,4 @@ The application logs basic diagnostic data (telemetry). For more privacy informa
 [roadmap]: https://github.com/microsoft/PowerToys/wiki/Roadmap
 [privacy-link]: http://go.microsoft.com/fwlink/?LinkId=521839 
 [loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title= 
-[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
+[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
--- a/1
+++ b/1
@@ -0,0 +1 @@
+.
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -38,7 +38,6 @@
    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
-    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
    <NormalizedPerUserValue>false</NormalizedPerUserValue>
    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
  </PropertyGroup>
@@ -115,7 +114,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -128,7 +126,6 @@
      <Optimization>MaxSpeed</Optimization>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <Link>
--- a/installer/PowerToysSetupVNext/Directory.Build.props
+++ b/installer/PowerToysSetupVNext/Directory.Build.props
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\..\Directory.Build.props" Condition="Exists('..\..\Directory.Build.props')" />
  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
  <PropertyGroup>
    <!-- Set BaseIntermediateOutputPath for each project to avoid conflicts -->
@@ -8,4 +9,4 @@
    <!-- Set MSBuildProjectExtensionsPath to use the BaseIntermediateOutputPath -->
    <MSBuildProjectExtensionsPath Condition="'$(BaseIntermediateOutputPath)' != ''">$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
  </PropertyGroup>
-</Project>
+</Project>
--- a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
+++ b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
@@ -1,30 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-
  <PropertyGroup Label="Globals">
    <ProjectGuid>{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
    <TargetName>SilentFilesInUseBAFunction</TargetName>
    <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
    <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
@@ -33,7 +10,6 @@

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  
-  <!-- Configuration-specific property groups -->
  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -65,7 +41,10 @@
  </PropertyGroup>

  <ItemGroup>
-    <ClCompile Include="SilentFilesInUseBAFunctions.cpp" />
+    <ClCompile Include="SilentFilesInUseBAFunctions.cpp">
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+    </ClCompile>
    <ClCompile Include="bafunctions.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -92,31 +71,5 @@
    </Link>
  </ItemDefinitionGroup>

-  <!-- C++ source compile-specific things for Debug/Release configurations -->
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp
+++ b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp
@@ -18,7 +18,6 @@ public: // IBootstrapperApplication

        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running detect begin BA function. fCached=%d, registrationType=%d, cPackages=%u, fCancel=%d", fCached, registrationType, cPackages, *pfCancel);

-    LExit:
        return hr;
    }

@@ -32,12 +31,6 @@ public: // IBAFunctions

        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel);

-        //-------------------------------------------------------------------------------------------------
-        // YOUR CODE GOES HERE
-        // BalExitOnFailure(hr, "Change this message to represent real error handling.");
-        //-------------------------------------------------------------------------------------------------
-
-    LExit:
        return hr;
    }

@@ -63,6 +56,7 @@ public: // IBAFunctions
        )
    {
        HRESULT hr = S_OK;
+        UNREFERENCED_PARAMETER(source);

        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION CALLED *** Running OnExecuteFilesInUse BA function. packageId=%ls, cFiles=%u, recommendation=%d", wzPackageId, cFiles, nRecommendation);
        
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
@@ -9,12 +9,6 @@
    <RootNamespace>CalculatorEngineCommon</RootNamespace>
    <AppxPackage>false</AppxPackage>
  </PropertyGroup>
-  <!-- BEGIN common.build.pre.props -->
-  <PropertyGroup Label="Configuration">
-    <EnableHybridCRT>true</EnableHybridCRT>
-    <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-  </PropertyGroup>
-  <!-- END common.build.pre.props -->
  <!-- BEGIN cppwinrt.build.pre.props -->
  <PropertyGroup Label="Globals">
    <CppWinRTEnabled>true</CppWinRTEnabled>
@@ -25,11 +19,9 @@
  </PropertyGroup>
  <PropertyGroup>
    <MinimalCoreWin>true</MinimalCoreWin>
-    <AppContainerApplication>true</AppContainerApplication>
+    <AppContainerApplication>false</AppContainerApplication>
    <WindowsStoreApp>true</WindowsStoreApp>
    <ApplicationType>Windows Store</ApplicationType>
-    <UseCrtSDKReference Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReference>
-    <!-- The SDK reference breaks the Hybrid CRT -->
  </PropertyGroup>
  <PropertyGroup>
    <!-- We have to use the Desktop platform for Hybrid CRT to work. -->
@@ -148,43 +140,5 @@
    </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>
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
+  </Target>  <!-- END common.build.post.props -->
 </Project>
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -130,7 +130,7 @@ namespace ManagedCommon
                {
                    exMessage +=
                        "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + " (" + ex.InnerException.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
                }

                exMessage +=
--- a/src/common/interop/PowerToys.Interop.vcxproj
+++ b/src/common/interop/PowerToys.Interop.vcxproj
@@ -63,14 +63,12 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <UseDebugLibraries>true</UseDebugLibraries>
      <LinkIncremental>true</LinkIncremental>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <UseDebugLibraries>false</UseDebugLibraries>
      <WholeProgramOptimization>true</WholeProgramOptimization>
      <LinkIncremental>false</LinkIncremental>
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
+++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
@@ -46,16 +46,6 @@
  <PropertyGroup>
    <TargetName>notifications</TargetName>
  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
@@ -82,8 +82,6 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
@@ -95,8 +93,6 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MultiThreaded</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
@@ -20,7 +20,7 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
            <TitleBar.LeftHeader>
                <ImageIcon
--- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
+++ b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
@@ -39,7 +39,6 @@
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <UseDebugLibraries>true</UseDebugLibraries>
      <LinkIncremental>true</LinkIncremental>
    </ClCompile>
@@ -49,7 +48,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <UseDebugLibraries>false</UseDebugLibraries>
      <WholeProgramOptimization>true</WholeProgramOptimization>
      <LinkIncremental>false</LinkIncremental>
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
@@ -20,7 +20,7 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
            <TitleBar.LeftHeader>
                <ImageIcon
--- a/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
@@ -20,7 +20,7 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
            <TitleBar.LeftHeader>
                <ImageIcon
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -293,7 +293,7 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
                // --- Manual override triggered ---
                if (wait == WAIT_OBJECT_0 + (hParent ? 2 : 1))
                {
-                    Logger::info(L"[LightSwitchService] Manual override received while schedule OFF.");
+                    Logger::debug(L"[LightSwitchService] Manual override received while schedule OFF.");
                    ResetEvent(hManualOverride);
                    continue;
                }
@@ -301,7 +301,7 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
                // --- Settings file changed ---
                if (wait == WAIT_OBJECT_0 + (hParent ? 3 : 2))
                {
-                    Logger::trace(L"[LightSwitchService] Settings change event triggered, reloading settings...");
+                    Logger::debug(L"[LightSwitchService] Settings change event triggered, reloading settings...");

                    ResetEvent(LightSwitchSettings::instance().GetSettingsChangedEvent());

@@ -345,7 +345,7 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
                   currentSettings.darkTime / 60,
                   currentSettings.darkTime % 60,
                   static_cast<int>(currentSettings.scheduleMode));
-        Logger::info(msg);
+        Logger::debug(msg);

        // --- Manual override check ---
        bool manualOverrideActive = false;
@@ -360,11 +360,11 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
                nowMinutes == (currentSettings.darkTime + currentSettings.sunset_offset) % 1440)
            {
                ResetEvent(hManualOverride);
-                Logger::info(L"[LightSwitchService] Manual override cleared at boundary");
+                Logger::debug(L"[LightSwitchService] Manual override cleared at boundary");
            }
            else
            {
-                Logger::info(L"[LightSwitchService] Skipping schedule due to manual override");
+                Logger::debug(L"[LightSwitchService] Skipping schedule due to manual override");
                goto sleep_until_next_minute;
            }
        }
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
@@ -38,7 +38,7 @@ void LightSwitchSettings::InitFileWatcher()
        m_settingsFileWatcher = std::make_unique<FileWatcher>(
            GetSettingsFileName(),
            [this]() {
-                Logger::info(L"[LightSwitchSettings] Settings file changed, signaling event.");
+                Logger::debug(L"[LightSwitchSettings] Settings file changed, signaling event.");
                SetEvent(m_settingsChangedEvent);
            });
    }
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
@@ -189,7 +189,7 @@ bool SuperSonar<D>::Initialize(HINSTANCE hinst)
        return false;
    }

-    DWORD exStyle = WS_EX_TOOLWINDOW | Shim()->GetExtendedStyle();
+    DWORD exStyle = WS_EX_TRANSPARENT | WS_EX_LAYERED | WS_EX_TOOLWINDOW | Shim()->GetExtendedStyle();
    HWND created = CreateWindowExW(exStyle, className, windowTitle, WS_POPUP, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, m_hwndOwner, nullptr, hinst, this);
    if (!created)
    {
@@ -269,10 +269,6 @@ LRESULT SuperSonar<D>::BaseWndProc(UINT message, WPARAM wParam, LPARAM lParam) n

    case WM_NCHITTEST:
        return HTTRANSPARENT;
-
-    case WM_SETCURSOR:
-        SetCursor(LoadCursor(nullptr, IDC_ARROW));
-        return TRUE;
    }

    if (message == WM_PRIV_SHORTCUT)
@@ -539,7 +535,7 @@ void SuperSonar<D>::StartSonar()
    Trace::MousePointerFocused();
    // Cover the entire virtual screen.
    // HACK: Draw with 1 pixel off. Otherwise, Windows glitches the task bar transparency when a transparent window fill the whole screen.
-    SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, SWP_NOACTIVATE);
+    SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, 0);
    m_sonarPos = ptNowhere;
    OnMouseTimer();
    UpdateMouseSnooping();
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -64,7 +64,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -82,7 +81,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
@@ -48,7 +48,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -66,7 +65,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
+++ b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
@@ -48,7 +48,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -66,7 +65,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
@@ -49,7 +49,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -67,7 +66,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
@@ -67,8 +67,6 @@
      <EnableUAC>false</EnableUAC>
      <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
      <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
    </Link>
    <PreBuildEvent>
      <Command>del $(OutDir)\NewPlusPackage.msix /q
@@ -100,8 +98,6 @@ MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
      <EnableUAC>false</EnableUAC>
      <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
      <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
    </Link>
    <PreBuildEvent>
      <Command>del $(OutDir)\NewPlusPackage.msix /q
--- a/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
+++ b/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
+++ b/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
+++ b/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
@@ -81,7 +81,6 @@
      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <ResourceCompile>
@@ -103,7 +102,6 @@
      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <ResourceCompile>
@@ -126,7 +124,6 @@
      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <ResourceCompile>
@@ -148,7 +145,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;_M_IX86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -169,7 +165,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,7 +186,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;_M_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
+++ b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
@@ -141,43 +141,4 @@
    <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>
-
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
-
 </Project>
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
@@ -68,7 +68,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
    // `IsLoading` property as a combo of this value and `IsInitialized`
    public bool ModelIsLoading { get; protected set; } = true;

-    public bool HasSearchBox { get; protected set; }
+    public bool HasSearchBox { get; protected set; } = true;

    public IconInfoViewModel Icon { get; protected set; }

--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -48,6 +49,9 @@ public partial class ShellViewModel : ObservableObject,
            var oldValue = _currentPage;
            if (SetProperty(ref _currentPage, value))
            {
+                oldValue.PropertyChanged -= CurrentPage_PropertyChanged;
+                value.PropertyChanged += CurrentPage_PropertyChanged;
+
                if (oldValue is IDisposable disposable)
                {
                    try
@@ -63,6 +67,14 @@ public partial class ShellViewModel : ObservableObject,
        }
    }

+    private void CurrentPage_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(PageViewModel.HasSearchBox))
+        {
+            IsSearchBoxVisible = CurrentPage.HasSearchBox;
+        }
+    }
+
    private IPage? _rootPage;

    private bool _isNested;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
@@ -219,7 +219,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
        {
            PropChanged?.Invoke(this, new PropChangedEventArgs(e.PropertyName));

-            if (e.PropertyName == "IsInitialized")
+            if (e.PropertyName is "IsInitialized" or nameof(CommandItemViewModel.Command))
            {
                GenerateId();

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -48,7 +48,8 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
    IRecipient<ShowConfirmationMessage>,
    IRecipient<ShowToastMessage>,
    IRecipient<NavigateToPageMessage>,
-    INotifyPropertyChanged
+    INotifyPropertyChanged,
+    IDisposable
 {
    private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();

@@ -65,6 +66,9 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,

    private SettingsWindow? _settingsWindow;

+    private CancellationTokenSource? _focusAfterLoadedCts;
+    private WeakReference<Page>? _lastNavigatedPageRef;
+
    public ShellViewModel ViewModel { get; private set; } = App.Current.Services.GetService<ShellViewModel>()!;

    public event PropertyChangedEventHandler? PropertyChanged;
@@ -447,7 +451,15 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
    {
        while (RootFrame.CanGoBack)
        {
-            GoBack(withAnimation, focusSearch);
+            // don't focus on each step, just at the end
+            GoBack(withAnimation, focusSearch: false);
+        }
+
+        // focus search box, even if we were already home
+        if (focusSearch)
+        {
+            SearchBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+            SearchBox.SelectSearch();
        }
    }

@@ -488,6 +500,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,

        if (e.Content is Page element)
        {
+            _lastNavigatedPageRef = new WeakReference<Page>(element);
            element.Loaded += FocusAfterLoaded;
        }
    }
@@ -497,6 +510,18 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
        var page = (Page)sender;
        page.Loaded -= FocusAfterLoaded;

+        // Only handle focus for the latest navigated page
+        if (_lastNavigatedPageRef is null || !_lastNavigatedPageRef.TryGetTarget(out var last) || !ReferenceEquals(page, last))
+        {
+            return;
+        }
+
+        // Cancel any previous pending focus work
+        _focusAfterLoadedCts?.Cancel();
+        _focusAfterLoadedCts?.Dispose();
+        _focusAfterLoadedCts = new CancellationTokenSource();
+        var token = _focusAfterLoadedCts.Token;
+
        AnnounceNavigationToPage(page);

        var shouldSearchBoxBeVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
@@ -509,34 +534,57 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
        }
        else
        {
-            _ = Task.Run(async () =>
-            {
-                await page.DispatcherQueue.EnqueueAsync(async () =>
+            _ = Task.Run(
+                async () =>
                {
-                    // I hate this so much, but it can take a while for the page to be ready to accept focus;
-                    // focusing page with MarkdownTextBlock takes up to 5 attempts (* 100ms delay between attempts)
-                    for (var i = 0; i < 10; i++)
+                    if (token.IsCancellationRequested)
                    {
-                        if (FocusManager.FindFirstFocusableElement(page) is FrameworkElement frameworkElement)
-                        {
-                            var set = frameworkElement.Focus(FocusState.Programmatic);
-                            if (set)
-                            {
-                                break;
-                            }
-                        }
-
-                        await Task.Delay(100);
+                        return;
                    }

-                    // Update the search box visibility based on the current page:
-                    // - We do this here after navigation so the focus is not jumping around too much,
-                    //   it messes with screen readers if we do it too early
-                    // - Since this should hide the search box on content pages, it's not a problem if we
-                    //   wait for the code above to finish trying to focus the content
-                    ViewModel.IsSearchBoxVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
-                });
-            });
+                    try
+                    {
+                        await page.DispatcherQueue.EnqueueAsync(
+                            async () =>
+                            {
+                                // I hate this so much, but it can take a while for the page to be ready to accept focus;
+                                // focusing page with MarkdownTextBlock takes up to 5 attempts (* 100ms delay between attempts)
+                                for (var i = 0; i < 10; i++)
+                                {
+                                    token.ThrowIfCancellationRequested();
+
+                                    if (FocusManager.FindFirstFocusableElement(page) is FrameworkElement frameworkElement)
+                                    {
+                                        var set = frameworkElement.Focus(FocusState.Programmatic);
+                                        if (set)
+                                        {
+                                            break;
+                                        }
+                                    }
+
+                                    await Task.Delay(100, token);
+                                }
+
+                                token.ThrowIfCancellationRequested();
+
+                                // Update the search box visibility based on the current page:
+                                // - We do this here after navigation so the focus is not jumping around too much,
+                                //   it messes with screen readers if we do it too early
+                                // - Since this should hide the search box on content pages, it's not a problem if we
+                                //   wait for the code above to finish trying to focus the content
+                                ViewModel.IsSearchBoxVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
+                            });
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // Swallow cancellation - another FocusAfterLoaded invocation superseded this one
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Error during FocusAfterLoaded async focus work", ex);
+                    }
+                },
+                token);
        }
    }

@@ -591,24 +639,31 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                         InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);

        var onlyAlt = altPressed && !ctrlPressed && !shiftPressed && !winPressed;
-        if (e.Key == VirtualKey.Left && onlyAlt)
+        var onlyCtrl = !altPressed && ctrlPressed && !shiftPressed && !winPressed;
+        switch (e.Key)
        {
-            WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
-            e.Handled = true;
-        }
-        else if (e.Key == VirtualKey.Home && onlyAlt)
-        {
-            WeakReferenceMessenger.Default.Send<GoHomeMessage>(new(WithAnimation: false));
-            e.Handled = true;
-        }
-        else
-        {
-            // The CommandBar is responsible for handling all the item keybindings,
-            // since the bound context item may need to then show another
-            // context menu
-            TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-            WeakReferenceMessenger.Default.Send(msg);
-            e.Handled = msg.Handled;
+            case VirtualKey.Left when onlyAlt: // Alt+Left arrow
+                WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
+                e.Handled = true;
+                break;
+            case VirtualKey.Home when onlyAlt: // Alt+Home
+                WeakReferenceMessenger.Default.Send<GoHomeMessage>(new(WithAnimation: false));
+                e.Handled = true;
+                break;
+            case (VirtualKey)188 when onlyCtrl: // Ctrl+,
+                WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
+                e.Handled = true;
+                break;
+            default:
+            {
+                // The CommandBar is responsible for handling all the item keybindings,
+                // since the bound context item may need to then show another
+                // context menu
+                TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+                WeakReferenceMessenger.Default.Send(msg);
+                e.Handled = msg.Handled;
+                break;
+            }
        }
    }

@@ -658,4 +713,11 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
            Logger.LogError("Error handling mouse button press event", ex);
        }
    }
+
+    public void Dispose()
+    {
+        _focusAfterLoadedCts?.Cancel();
+        _focusAfterLoadedCts?.Dispose();
+        _focusAfterLoadedCts = null;
+    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
@@ -25,7 +25,10 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="AppTitleBar" PaneToggleRequested="AppTitleBar_PaneToggleRequested">
+        <TitleBar
+            x:Name="AppTitleBar"
+            IsTabStop="False"
+            PaneToggleRequested="AppTitleBar_PaneToggleRequested">
            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
            <TitleBar.LeftHeader>
                <ImageIcon
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -471,4 +471,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
  <data name="ScreenReader_Announcement_NavigatedToPage0" xml:space="preserve">
    <value>Navigated to {0} page</value>
  </data>
+  <data name="SettingsButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Settings (Ctrl+,)</value>
+  </data>
 </root>
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -74,35 +74,11 @@
    <ClCompile>
      <LanguageStandard>stdcpp20</LanguageStandard>
    </ClCompile>
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
    <ClCompile>
      <LanguageStandard>stdcpp20</LanguageStandard>
    </ClCompile>
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs
@@ -186,4 +186,48 @@ public class BookmarkManagerTests
        Assert.AreEqual("D:\\UpdatedPath", updatedBookmark.Bookmark);
        Assert.IsTrue(bookmarkUpdatedEventFired);
    }
+
+    [TestMethod]
+    public void BookmarkManager_LegacyData_IdsArePersistedAcrossLoads()
+    {
+        // Arrange
+        const string json = """
+                            {
+                                "Data": 
+                                [
+                                    { "Name": "C:\\","Bookmark": "C:\\" },
+                                    { "Name": "Bing.com","Bookmark": "https://bing.com" }
+                                ]
+                            }
+                            """;
+
+        var dataSource = new MockBookmarkDataSource(json);
+
+        // First load: IDs should be generated for legacy entries
+        var manager1 = new BookmarksManager(dataSource);
+        var firstLoad = manager1.Bookmarks.ToList();
+        Assert.AreEqual(2, firstLoad.Count);
+        Assert.AreNotEqual(Guid.Empty, firstLoad[0].Id);
+        Assert.AreNotEqual(Guid.Empty, firstLoad[1].Id);
+
+        // Keep a name->id map to be insensitive to ordering
+        var firstIdsByName = firstLoad.ToDictionary(b => b.Name, b => b.Id);
+
+        // Wait deterministically for async persistence to complete
+        var wasSaved = dataSource.WaitForSave(1, 5000);
+        Assert.IsTrue(wasSaved, "Data was not saved within the expected time.");
+
+        // Second load: should read back the same IDs from persisted data
+        var manager2 = new BookmarksManager(dataSource);
+        var secondLoad = manager2.Bookmarks.ToList();
+        Assert.AreEqual(2, secondLoad.Count);
+
+        var secondIdsByName = secondLoad.ToDictionary(b => b.Name, b => b.Id);
+
+        foreach (var kvp in firstIdsByName)
+        {
+            Assert.IsTrue(secondIdsByName.ContainsKey(kvp.Key), $"Missing bookmark '{kvp.Key}' after reload.");
+            Assert.AreEqual(kvp.Value, secondIdsByName[kvp.Key], $"Bookmark '{kvp.Key}' upgraded ID was not persisted across loads.");
+        }
+    }
 }
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
@@ -2,6 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System;
+using System.Threading;
 using Microsoft.CmdPal.Ext.Bookmarks.Persistence;

 namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
@@ -9,6 +11,7 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
 internal sealed class MockBookmarkDataSource : IBookmarkDataSource
 {
    private string _jsonData;
+    private int _saveCount;

    public MockBookmarkDataSource(string initialJsonData = "[]")
    {
@@ -23,5 +26,26 @@ internal sealed class MockBookmarkDataSource : IBookmarkDataSource
    public void SaveBookmarkData(string jsonData)
    {
        _jsonData = jsonData;
+        Interlocked.Increment(ref _saveCount);
+    }
+
+    public int SaveCount => Volatile.Read(ref _saveCount);
+
+    // Waits until at least expectedMinSaves have occurred or the timeout elapses.
+    // Returns true if the condition was met, false on timeout.
+    public bool WaitForSave(int expectedMinSaves = 1, int timeoutMs = 2000)
+    {
+        var start = Environment.TickCount;
+        while (Volatile.Read(ref _saveCount) < expectedMinSaves)
+        {
+            if (Environment.TickCount - start > timeoutMs)
+            {
+                return false;
+            }
+
+            Thread.Sleep(50);
+        }
+
+        return true;
    }
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs
@@ -103,7 +103,33 @@ internal sealed partial class BookmarksManager : IDisposable, IBookmarksManager
        try
        {
            var jsonData = _dataSource.GetBookmarkData();
-            _bookmarksData = _parser.ParseBookmarks(jsonData);
+            var bookmarksData = _parser.ParseBookmarks(jsonData);
+
+            // Upgrade old bookmarks if necessary
+            // Pre .95 versions did not assign IDs to bookmarks
+            var upgraded = false;
+            for (var index = 0; index < bookmarksData.Data.Count; index++)
+            {
+                var bookmark = bookmarksData.Data[index];
+                if (bookmark.Id == Guid.Empty)
+                {
+                    bookmarksData.Data[index] = bookmark with { Id = Guid.NewGuid() };
+                    upgraded = true;
+                }
+            }
+
+            lock (_lock)
+            {
+                _bookmarksData = bookmarksData;
+            }
+
+            // LOAD BEARING: Save upgraded data back to file
+            // This ensures that old bookmarks are not repeatedly upgraded on each load,
+            // as the hotkeys and aliases are tied to the generated bookmark IDs.
+            if (upgraded)
+            {
+                _ = SaveChangesAsync();
+            }
        }
        catch (Exception ex)
        {
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs
@@ -19,7 +19,7 @@ public sealed record BookmarkData
    [SetsRequiredMembers]
    public BookmarkData(Guid id, string? name, string? bookmark)
    {
-        Id = id == Guid.Empty ? Guid.NewGuid() : id;
+        Id = id;
        Name = name ?? string.Empty;
        Bookmark = bookmark ?? string.Empty;
    }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
@@ -6,7 +6,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.Ext.Indexer;

-internal sealed class Icons
+internal static class Icons
 {
    internal static IconInfo FileExplorerSegoeIcon { get; } = new("\uEC50");

@@ -19,4 +19,8 @@ internal sealed class Icons
    internal static IconInfo DocumentIcon { get; } = new("\uE8A5"); // Document

    internal static IconInfo FolderOpenIcon { get; } = new("\uE838"); // FolderOpen
+
+    internal static IconInfo FilesIcon { get; } = new("\uF571"); // PrintAllPages
+
+    internal static IconInfo FilterIcon { get; } = new("\uE71C"); // Filter
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Ext.Indexer.Properties;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
+
+internal sealed partial class SearchFilters : Filters
+{
+    public SearchFilters()
+    {
+        CurrentFilterId = "all";
+    }
+
+    public override IFilterItem[] GetFilters()
+    {
+        return [
+            new Filter() { Id = "all", Name = Resources.Indexer_Filter_All, Icon = Icons.FilterIcon },
+            new Separator(),
+            new Filter() { Id = "folders", Name = Resources.Indexer_Filter_Folders_Only, Icon = Icons.FolderOpenIcon },
+            new Filter() { Id = "files", Name = Resources.Indexer_Filter_Files_Only, Icon = Icons.FilesIcon },
+        ];
+    }
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Indexer.Indexer;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -36,6 +37,11 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
        PlaceholderText = Resources.Indexer_PlaceholderText;
        _searchEngine = new();
        _queryCookie = 10;
+
+        var filters = new SearchFilters();
+        filters.PropChanged += Filters_PropChanged;
+        Filters = filters;
+
        CreateEmptyContent();
    }

@@ -49,6 +55,11 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
        initialQuery = query;
        SearchText = query;
        disposeSearchEngine = false;
+
+        var filters = new SearchFilters();
+        filters.PropChanged += Filters_PropChanged;
+        Filters = filters;
+
        CreateEmptyContent();
    }

@@ -79,30 +90,56 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
    {
        // {20D04FE0-3AEA-1069-A2D8-08002B30309D} is CLSID for "This PC"
        const string template = "search-ms:query={0}&crumb=location:::{{20D04FE0-3AEA-1069-A2D8-08002B30309D}}";
-        var encodedSearchText = UrlEncoder.Default.Encode(SearchText);
+        var fullSearchText = FullSearchString(SearchText);
+        var encodedSearchText = UrlEncoder.Default.Encode(fullSearchText);
        var command = string.Format(CultureInfo.CurrentCulture, template, encodedSearchText);
        ShellHelpers.OpenInShell(command);
    }

    public override ICommandItem EmptyContent => _isEmptyQuery ? _noSearchEmptyContent : _nothingFoundEmptyContent;

+    private void Filters_PropChanged(object sender, IPropChangedEventArgs args)
+    {
+        PerformSearch(SearchText);
+    }
+
    public override void UpdateSearchText(string oldSearch, string newSearch)
    {
        if (oldSearch != newSearch && newSearch != initialQuery)
        {
-            _ = Task.Run(() =>
-            {
-                _isEmptyQuery = string.IsNullOrWhiteSpace(newSearch);
-                Query(newSearch);
-                LoadMore();
-                OnPropertyChanged(nameof(EmptyContent));
-                initialQuery = null;
-            });
+            PerformSearch(newSearch);
        }
    }

+    private void PerformSearch(string newSearch)
+    {
+        var actualSearch = FullSearchString(newSearch);
+        _ = Task.Run(() =>
+        {
+            _isEmptyQuery = string.IsNullOrWhiteSpace(actualSearch);
+            Query(actualSearch);
+            LoadMore();
+            OnPropertyChanged(nameof(EmptyContent));
+            initialQuery = null;
+        });
+    }
+
    public override IListItem[] GetItems() => [.. _indexerListItems];

+    private string FullSearchString(string query)
+    {
+        switch (Filters.CurrentFilterId)
+        {
+            case "folders":
+                return $"{query} kind:folders";
+            case "files":
+                return $"{query} kind:NOT folders";
+            case "all":
+            default:
+                return query;
+        }
+    }
+
    public override void LoadMore()
    {
        IsLoading = true;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
@@ -177,6 +177,33 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Files and folders.
+        /// </summary>
+        internal static string Indexer_Filter_All {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_All", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Files.
+        /// </summary>
+        internal static string Indexer_Filter_Files_Only {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_Files_Only", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folders.
+        /// </summary>
+        internal static string Indexer_Filter_Folders_Only {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_Folders_Only", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Find file from path.
        /// </summary>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx
@@ -196,4 +196,13 @@ You can try searching all files on this PC or adjust your indexing settings.</va
  <data name="Indexer_Command_SearchAllFiles" xml:space="preserve">
    <value>Search all files</value>
  </data>
+  <data name="Indexer_Filter_All" xml:space="preserve">
+    <value>Files and folders</value>
+  </data>
+  <data name="Indexer_Filter_Folders_Only" xml:space="preserve">
+    <value>Folders</value>
+  </data>
+  <data name="Indexer_Filter_Files_Only" xml:space="preserve">
+    <value>Files</value>
+  </data>
 </root>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
@@ -28,9 +28,10 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
    public bool HasTag => !string.IsNullOrEmpty(_tag);

    private readonly Lock _resultsLock = new();
+    private readonly Lock _taskLock = new();

-    private CancellationTokenSource? _cancellationTokenSource;
-    private Task<IEnumerable<CatalogPackage>>? _currentSearchTask;
+    private string? _nextSearchQuery;
+    private bool _isTaskRunning;

    private List<CatalogPackage>? _results;

@@ -85,7 +86,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable

                stopwatch.Stop();
                Logger.LogDebug($"Building ListItems took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(GetItems));
-                IsLoading = false;
                return results;
            }
        }
@@ -98,8 +98,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
                            Properties.Resources.winget_no_packages_found,
        };

-        IsLoading = false;
-
        return [];
    }

@@ -117,64 +115,70 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable

    private void DoUpdateSearchText(string newSearch)
    {
-        // Cancel any ongoing search
-        if (_cancellationTokenSource is not null)
+        lock (_taskLock)
        {
-            Logger.LogDebug("Cancelling old search", memberName: nameof(DoUpdateSearchText));
-            _cancellationTokenSource.Cancel();
-        }
-
-        _cancellationTokenSource = new CancellationTokenSource();
-
-        var cancellationToken = _cancellationTokenSource.Token;
-
-        IsLoading = true;
-
-        try
-        {
-            // Save the latest search task
-            _currentSearchTask = DoSearchAsync(newSearch, cancellationToken);
-        }
-        catch (OperationCanceledException)
-        {
-            // DO NOTHING HERE
-            return;
-        }
-        catch (Exception ex)
-        {
-            // Handle other exceptions
-            ExtensionHost.LogMessage($"[WinGet] DoUpdateSearchText throw exception: {ex.Message}");
-            return;
-        }
-
-        // Await the task to ensure only the latest one gets processed
-        _ = ProcessSearchResultsAsync(_currentSearchTask, newSearch);
-    }
-
-    private async Task ProcessSearchResultsAsync(
-        Task<IEnumerable<CatalogPackage>> searchTask,
-        string newSearch)
-    {
-        try
-        {
-            var results = await searchTask;
-
-            // Ensure this is still the latest task
-            if (_currentSearchTask == searchTask)
+            if (_isTaskRunning)
            {
-                // Process the results (e.g., update UI)
-                UpdateWithResults(results, newSearch);
+                // If a task is running, queue the next search query
+                // Keep IsLoading = true since we still have work to do
+                Logger.LogDebug($"Task is running, queueing next search: '{newSearch}'", memberName: nameof(DoUpdateSearchText));
+                _nextSearchQuery = newSearch;
+            }
+            else
+            {
+                // No task is running, start a new search
+                Logger.LogDebug($"Starting new search: '{newSearch}'", memberName: nameof(DoUpdateSearchText));
+                _isTaskRunning = true;
+                _nextSearchQuery = null;
+                IsLoading = true;
+
+                _ = ExecuteSearchChainAsync(newSearch);
            }
        }
-        catch (OperationCanceledException)
+    }
+
+    private async Task ExecuteSearchChainAsync(string query)
+    {
+        while (true)
        {
-            // Handle cancellation gracefully (e.g., log or ignore)
-            Logger.LogDebug($"  Cancelled search for '{newSearch}'");
-        }
-        catch (Exception ex)
-        {
-            // Handle other exceptions
-            Logger.LogError("Unexpected error while processing results", ex);
+            try
+            {
+                Logger.LogDebug($"Executing search for '{query}'", memberName: nameof(ExecuteSearchChainAsync));
+
+                var results = await DoSearchAsync(query);
+
+                // Update UI with results
+                UpdateWithResults(results, query);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Unexpected error while searching for '{query}'", ex);
+            }
+
+            // Check if there's a next query to process
+            string? nextQuery;
+            lock (_taskLock)
+            {
+                if (_nextSearchQuery is not null)
+                {
+                    // There's a queued search, execute it
+                    nextQuery = _nextSearchQuery;
+                    _nextSearchQuery = null;
+
+                    Logger.LogDebug($"Found queued search, continuing with: '{nextQuery}'", memberName: nameof(ExecuteSearchChainAsync));
+                }
+                else
+                {
+                    // No more searches queued, mark task as completed
+                    _isTaskRunning = false;
+                    IsLoading = false;
+                    Logger.LogDebug("No more queued searches, task chain completed", memberName: nameof(ExecuteSearchChainAsync));
+                    break;
+                }
+            }
+
+            // Continue with the next query
+            query = nextQuery;
        }
    }

@@ -189,11 +193,8 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
        RaiseItemsChanged();
    }

-    private async Task<IEnumerable<CatalogPackage>> DoSearchAsync(string query, CancellationToken ct)
+    private async Task<IEnumerable<CatalogPackage>> DoSearchAsync(string query)
    {
-        // Were we already canceled?
-        ct.ThrowIfCancellationRequested();
-
        Stopwatch stopwatch = new();
        stopwatch.Start();

@@ -230,9 +231,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
            opts.Filters.Add(tagFilter);
        }

-        // Clean up here, then...
-        ct.ThrowIfCancellationRequested();
-
        var catalogTask = HasTag ? WinGetStatics.CompositeWingetCatalog : WinGetStatics.CompositeAllCatalog;

        // Both these catalogs should have been instantiated by the
@@ -251,13 +249,11 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
            findPackages_stopwatch.Start();
            Logger.LogDebug($"  Searching {catalog.Info.Name} ({query})", memberName: nameof(DoSearchAsync));

-            ct.ThrowIfCancellationRequested();
-
            Logger.LogDebug($"Preface for \"{searchDebugText}\" took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(DoSearchAsync));

            // BODGY, re: microsoft/winget-cli#5151
            // FindPackagesAsync isn't actually async.
-            var internalSearchTask = Task.Run(() => catalog.FindPackages(opts), ct);
+            var internalSearchTask = Task.Run(() => catalog.FindPackages(opts));
            var searchResults = await internalSearchTask;

            findPackages_stopwatch.Stop();
@@ -271,8 +267,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
                return [];
            }

-            ct.ThrowIfCancellationRequested();
-
            Logger.LogDebug($"    got results for ({query})", memberName: nameof(DoSearchAsync));

            // FYI Using .ToArray or any other kind of enumerable loop
@@ -282,8 +276,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
            {
                var match = searchResults.Matches[i];

-                ct.ThrowIfCancellationRequested();
-
                var package = match.CatalogPackage;
                results.Add(package);
            }
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
@@ -68,34 +68,6 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
--- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
+++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
@@ -26,7 +26,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -37,7 +36,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
@@ -30,7 +30,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -41,7 +40,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
+++ b/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
@@ -44,7 +44,6 @@
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
      <AdditionalOptions>/fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div %(AdditionalOptions)</AdditionalOptions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
      <AdditionalIncludeDirectories>..\;..\lib\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml
+++ b/src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml
@@ -17,7 +17,7 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
            <TitleBar.LeftHeader>
                <ImageIcon
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
@@ -94,6 +94,7 @@
        <controls:TitleBar
            x:Name="AppTitleBar"
            AutoConfigureCustomTitleBar="True"
+            IsTabStop="False"
            PaneButtonClick="PaneToggleBtn_Click">
            <controls:TitleBar.Resources>
                <x:Double x:Key="TitleBarContentMinWidth">516</x:Double>
--- a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj
+++ b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj
@@ -46,7 +46,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -64,7 +63,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
+++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
@@ -47,7 +47,6 @@
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -64,7 +63,6 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>