fix comments

.pipelines/ESRPSigning_core.json

@@ -131,6 +131,8 @@
 
             "PowerToys.ImageResizer.exe",
             "PowerToys.ImageResizer.dll",
+            "WinUI3Apps\\PowerToys.ImageResizerCLI.exe",
+            "WinUI3Apps\\PowerToys.ImageResizerCLI.dll",
             "PowerToys.ImageResizerExt.dll",
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",

Cpp.Build.props

@@ -53,15 +53,9 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <BuildStlModules>false</BuildStlModules>
-      <!-- Use C++20 for test projects for modern features, latest for production -->
-      <LanguageStandard Condition="$(MSBuildProjectName.ToLower().Contains('test'))">stdcpp20</LanguageStandard>
-      <LanguageStandard Condition="!$(MSBuildProjectName.ToLower().Contains('test'))">stdcpplatest</LanguageStandard>
-      <!-- Disable strict coroutine mode for test projects -->
-      <UseStandardCoroutine Condition="!$(MSBuildProjectName.Contains('Test'))">true</UseStandardCoroutine>
-      <AdditionalOptions Condition="!$(MSBuildProjectName.Contains('Test'))">/await:strict %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <!-- TODO: _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING for compatibility with VS 17.8. Check if we can remove. -->
-      <PreprocessorDefinitions Condition="!$(MSBuildProjectName.Contains('Test'))">_COROUTINE_ABI=2;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="$(MSBuildProjectName.Contains('Test'))">_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- CLR + CFG are not compatible >:{ -->
       <ControlFlowGuard Condition="'$(CLRSupport)' == ''">Guard</ControlFlowGuard>
       <DebugInformationFormat Condition="'%(ControlFlowGuard)' == 'Guard'">ProgramDatabase</DebugInformationFormat>
@@ -110,8 +104,7 @@
 
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v145</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <DesktopCompatible>true</DesktopCompatible>
     <SpectreMitigation>Spectre</SpectreMitigation>

PowerToys.slnx

@@ -442,6 +442,10 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
+    <Project Path="src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
   </Folder>
   <Folder Name="/modules/imageresizer/Tests/">
     <Project Path="src/modules/imageresizer/tests/ImageResizer.UnitTests.csproj">

doc/devdocs/cli-conventions.md

@@ -0,0 +1,93 @@
+# CLI Conventions
+
+This document describes the conventions for implementing command-line interfaces (CLI) in PowerToys modules.
+
+## Library
+
+Use the **System.CommandLine** library for CLI argument parsing. This is already defined in `Directory.Packages.props`:
+
+```xml
+<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+```
+
+Add the reference to your project:
+
+```xml
+<PackageReference Include="System.CommandLine" />
+```
+
+## Option Naming and Definition
+
+- Use `--kebab-case` for long form (e.g., `--shrink-only`).
+- Use single `-x` for short form (e.g., `-s`, `-w`).
+- Define aliases as static readonly arrays: `["--silent", "-s"]`.
+- Create options using `Option<T>` with descriptive help text.
+- Add validators for options that require range or format checking.
+
+## RootCommand Setup
+
+- Create a `RootCommand` with a brief description.
+- Add all options and arguments to the command.
+
+## Parsing
+
+- Use `Parser(rootCommand).Parse(args)` to parse CLI arguments.
+- Extract option values using `parseResult.GetValueForOption()`.
+- Note: Use `Parser` directly; `RootCommand.Parse()` may not be available with the pinned System.CommandLine version.
+
+### Parse/Validation Errors
+
+- On parse/validation errors, print error messages and usage, then exit with non-zero code.
+
+## Examples
+
+Reference implementations:
+- Awake: `src/modules/Awake/Awake/Program.cs`
+- ImageResizer: `src/modules/imageresizer/ui/Cli/`
+
+## Help Output
+
+- Provide a `PrintUsage()` method for custom help formatting if needed.
+
+## Best Practices
+
+1. **Consistency**: Follow existing module patterns.
+2. **Documentation**: Always provide help text for each option.
+3. **Validation**: Validate input and provide clear error messages.
+4. **Atomicity**: Make one logical change per PR; avoid drive-by refactors.
+5. **Build/Test Discipline**: Build and test synchronously, one terminal per operation.
+6. **Style**: Follow repo analyzers (`.editorconfig`, StyleCop) and formatting rules.
+
+## Logging Requirements
+
+- Use `ManagedCommon.Logger` for consistent logging.
+- Initialize logging early in `Main()`.
+- Use dual output (console + log file) for errors and warnings to ensure visibility.
+- Reference: `src/modules/imageresizer/ui/Cli/CliLogger.cs`
+
+## Error Handling
+
+### Exit Codes
+
+- `0`: Success
+- `1`: General error (parsing, validation, runtime)
+- `2`: Invalid arguments (optional)
+
+### Exception Handling
+
+- Always wrap `Main()` in try-catch for unhandled exceptions.
+- Log exceptions before exiting with non-zero code.
+- Display user-friendly error messages to stderr.
+- Preserve detailed stack traces in log files only.
+
+## Testing Requirements
+
+- Include tests for argument parsing, validation, and edge cases.
+- Place CLI tests in module-specific test projects (e.g., `src/modules/[module]/tests/*CliTests.cs`).
+
+## Signing and Deployment
+
+- CLI executables are signed automatically in CI/CD.
+- **New CLI tools**: Add your executable and dll to `.pipelines/ESRPSigning_core.json` in the signing list.
+- CLI executables are deployed alongside their parent module (e.g., `C:\Program Files\PowerToys\modules\[ModuleName]\`).
+- Use self-contained deployment (import `Common.SelfContained.props`).

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -14,13 +14,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="..\..\deps\spdlog.props" />
@@ -88,7 +88,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>inc;..\..\src\;..\..\src\common\Telemetry;telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/await:strict /Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await /Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>

installer/PowerToysSetupVNext/Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\Directory.Build.props" />
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
   <PropertyGroup>
     <!-- Set BaseIntermediateOutputPath for each project to avoid conflicts -->
     <BaseIntermediateOutputPath Condition="'$(MSBuildProjectName)' == 'PowerToysInstallerVNext'">obj\Installer\</BaseIntermediateOutputPath>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj

@@ -37,14 +37,14 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -68,10 +68,11 @@
     <ClCompile Include="SilentFilesInUseBAFunctions.cpp" />
     <ClCompile Include="bafunctions.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="pch.h" />
+    <ClInclude Include="precomp.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp

@@ -1,6 +1,6 @@
 // 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.
 
-#include "pch.h"
+#include "precomp.h"
 #include "BalBaseBAFunctions.h"
 #include "BalBaseBAFunctionsProc.h"
 
@@ -18,6 +18,7 @@ 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;
     }
 
@@ -36,6 +37,7 @@ public: // IBAFunctions
         // BalExitOnFailure(hr, "Change this message to represent real error handling.");
         //-------------------------------------------------------------------------------------------------
 
+    LExit:
         return hr;
     }
 
@@ -56,7 +58,7 @@ public: // IBAFunctions
         __in DWORD cFiles,
         __in_ecount_z(cFiles) LPCWSTR* rgwzFiles,
         __in int nRecommendation,
-        __in BOOTSTRAPPER_FILES_IN_USE_TYPE /* source */,
+        __in BOOTSTRAPPER_FILES_IN_USE_TYPE source,
         __inout int* pResult
         )
     {

installer/PowerToysSetupVNext/SilentFilesInUseBA/bafunctions.cpp

@@ -1,6 +1,6 @@
 // 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.
 
-#include "pch.h"
+#include "precomp.h"
 
 static HINSTANCE vhInstance = NULL;
 

src/ActionRunner/actionRunner.vcxproj

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

src/PackageIdentity/PackageIdentity.vcxproj

@@ -55,26 +55,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
 

src/Update/PowerToys.Update.vcxproj

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

src/common/COMUtils/COMUtils.vcxproj

@@ -10,7 +10,7 @@
   <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">

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -40,7 +40,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/common/Display/Display.vcxproj

@@ -1,6 +1,5 @@
 <?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>{CABA8DFB-823B-4BF2-93AC-3F31984150D9}</ProjectGuid>
@@ -11,7 +10,7 @@
   <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">
@@ -40,18 +39,5 @@
     <ClCompile Include="monitors.cpp" />
     <ClCompile Include="dpi_aware.cpp" />
   </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')" />
-  </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>

src/common/Display/DisplayUtils.cpp

@@ -46,7 +46,7 @@ namespace DisplayUtils
         dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
             SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
             SetThreadDpiHostingBehavior(DPI_HOSTING_BEHAVIOR_MIXED);
-        } }).get();
+        } }).wait();
 
         for (auto& monitorData : allMonitors)
         {
@@ -59,7 +59,7 @@ namespace DisplayUtils
                 {
                     return;
                 }
-            } }).get();
+            } }).wait();
 
             UINT dpi = 0;
             if (DPIAware::GetScreenDPIForMonitor(monitorData.first, dpi) != S_OK)

src/common/Display/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-</packages>

src/common/GPOWrapper/GPOWrapper.vcxproj

@@ -19,7 +19,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
     <DesktopCompatible>true</DesktopCompatible>

src/common/SettingsAPI/SettingsAPI.vcxproj

@@ -12,7 +12,7 @@
   <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">

src/common/Telemetry/EtwTrace/EtwTrace.vcxproj

@@ -11,7 +11,7 @@
   <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">

src/common/Themes/Themes.vcxproj

@@ -11,7 +11,7 @@
   <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">

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

@@ -13,7 +13,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\tests\UnitTestsCommonLib\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/common/interop/PowerToys.Interop.vcxproj

@@ -41,7 +41,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/common/logger/logger.vcxproj

@@ -36,7 +36,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj

@@ -18,7 +18,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj

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

src/common/notifications/notifications.vcxproj

@@ -11,7 +11,7 @@
   <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">

src/common/updating/installer.cpp

@@ -18,7 +18,7 @@ namespace // Strings in this namespace should not be localized
 
 namespace updating
 {
-    winrt::Windows::Foundation::IAsyncOperation<bool> uninstall_previous_msix_version_async()
+    std::future<bool> uninstall_previous_msix_version_async()
     {
         winrt::Windows::Management::Deployment::PackageManager package_manager;
 

src/common/updating/installer.h

@@ -8,5 +8,5 @@
 
 namespace updating
 {
-    winrt::Windows::Foundation::IAsyncOperation<bool> uninstall_previous_msix_version_async();
+    std::future<bool> uninstall_previous_msix_version_async();
 }

src/common/updating/updating.cpp

@@ -88,78 +88,70 @@ namespace updating
     std::future<nonstd::expected<github_version_info, std::wstring>> get_github_version_info_async(const bool prerelease)
 #endif
     {
-        return std::async(std::launch::async, [prerelease]() ->
-#if USE_STD_EXPECTED
-            std::expected<github_version_info, std::wstring>
-#else
-            nonstd::expected<github_version_info, std::wstring>
-#endif
+        // If the current version starts with 0.0.*, it means we're on a local build from a farm and shouldn't check for updates.
+        if constexpr (VERSION_MAJOR == 0 && VERSION_MINOR == 0)
         {
-            // If the current version starts with 0.0.*, it means we're on a local build from a farm and shouldn't check for updates.
-            if constexpr (VERSION_MAJOR == 0 && VERSION_MINOR == 0)
-            {
 #if USE_STD_EXPECTED
-                return std::unexpected(LOCAL_BUILD_ERROR);
+            co_return std::unexpected(LOCAL_BUILD_ERROR);
 #else
-                return nonstd::make_unexpected(LOCAL_BUILD_ERROR);
+            co_return nonstd::make_unexpected(LOCAL_BUILD_ERROR);
 #endif
-            }
+        }
 
-            try
+        try
+        {
+            http::HttpClient client;
+            json::JsonObject release_object;
+            const VersionHelper current_version(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION);
+            VersionHelper github_version = current_version;
+
+            if (prerelease)
             {
-                http::HttpClient client;
-                json::JsonObject release_object;
-                const VersionHelper current_version(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION);
-                VersionHelper github_version = current_version;
-
-                if (prerelease)
+                const auto body = co_await client.request(Uri{ ALL_RELEASES_ENDPOINT });
+                for (const auto& json : json::JsonValue::Parse(body).GetArray())
                 {
-                    const auto body = client.request(Uri{ ALL_RELEASES_ENDPOINT }).get();
-                    for (const auto& json : json::JsonValue::Parse(body).GetArray())
+                    auto potential_release_object = json.GetObjectW();
+                    const bool is_prerelease = potential_release_object.GetNamedBoolean(L"prerelease", false);
+                    auto extracted_version = extract_version_from_release_object(potential_release_object);
+                    if (!is_prerelease || !extracted_version || *extracted_version <= github_version)
                     {
-                        auto potential_release_object = json.GetObjectW();
-                        const bool is_prerelease = potential_release_object.GetNamedBoolean(L"prerelease", false);
-                        auto extracted_version = extract_version_from_release_object(potential_release_object);
-                        if (!is_prerelease || !extracted_version || *extracted_version <= github_version)
-                        {
-                            continue;
-                        }
-                        // Do not break, since https://developer.github.com/v3/repos/releases/#list-releases
-                        // doesn't specify the order in which release object appear
-                        github_version = std::move(*extracted_version);
-                        release_object = std::move(potential_release_object);
+                        continue;
                     }
+                    // Do not break, since https://developer.github.com/v3/repos/releases/#list-releases
+                    // doesn't specify the order in which release object appear
+                    github_version = std::move(*extracted_version);
+                    release_object = std::move(potential_release_object);
                 }
-                else
-                {
-                    const auto body = client.request(Uri{ LATEST_RELEASE_ENDPOINT }).get();
-                    release_object = json::JsonValue::Parse(body).GetObjectW();
-                    if (auto extracted_version = extract_version_from_release_object(release_object))
-                    {
-                        github_version = *extracted_version;
-                    }
-                }
-
-                if (github_version <= current_version)
-                {
-                    return version_up_to_date{};
-                }
-
-                auto [installer_download_url, installer_filename] = extract_installer_asset_download_info(release_object);
-                return new_version_download_info{ extract_release_page_url(release_object),
-                                                     std::move(github_version),
-                                                     std::move(installer_download_url),
-                                                     std::move(installer_filename) };
             }
-            catch (...)
+            else
             {
+                const auto body = co_await client.request(Uri{ LATEST_RELEASE_ENDPOINT });
+                release_object = json::JsonValue::Parse(body).GetObjectW();
+                if (auto extracted_version = extract_version_from_release_object(release_object))
+                {
+                    github_version = *extracted_version;
+                }
             }
+
+            if (github_version <= current_version)
+            {
+                co_return version_up_to_date{};
+            }
+
+            auto [installer_download_url, installer_filename] = extract_installer_asset_download_info(release_object);
+            co_return new_version_download_info{ extract_release_page_url(release_object),
+                                                 std::move(github_version),
+                                                 std::move(installer_download_url),
+                                                 std::move(installer_filename) };
+        }
+        catch (...)
+        {
+        }
 #if USE_STD_EXPECTED
-            return std::unexpected(NETWORK_ERROR);
+        co_return std::unexpected(NETWORK_ERROR);
 #else
-            return nonstd::make_unexpected(NETWORK_ERROR);
+        co_return nonstd::make_unexpected(NETWORK_ERROR);
 #endif
-        });
     }
 #pragma warning(pop)
 
@@ -180,32 +172,30 @@ namespace updating
 
     std::future<std::optional<std::filesystem::path>> download_new_version(const new_version_download_info& new_version)
     {
-        return std::async(std::launch::async, [new_version]() -> std::optional<std::filesystem::path> {
-            auto installer_download_path = create_download_path();
-            if (!installer_download_path)
-            {
-                return std::nullopt;
-            }
+        auto installer_download_path = create_download_path();
+        if (!installer_download_path)
+        {
+            co_return std::nullopt;
+        }
 
-            *installer_download_path /= new_version.installer_filename;
+        *installer_download_path /= new_version.installer_filename;
 
-            bool download_success = false;
-            for (size_t i = 0; i < MAX_DOWNLOAD_ATTEMPTS; ++i)
+        bool download_success = false;
+        for (size_t i = 0; i < MAX_DOWNLOAD_ATTEMPTS; ++i)
+        {
+            try
             {
-                try
-                {
-                    http::HttpClient client;
-                    client.download(new_version.installer_download_url, *installer_download_path).get();
-                    download_success = true;
-                    break;
-                }
-                catch (...)
-                {
-                    // reattempt to download or do nothing
-                }
+                http::HttpClient client;
+                co_await client.download(new_version.installer_download_url, *installer_download_path);
+                download_success = true;
+                break;
             }
-            return download_success ? installer_download_path : std::nullopt;
-        });
+            catch (...)
+            {
+                // reattempt to download or do nothing
+            }
+        }
+        co_return download_success ? installer_download_path : std::nullopt;
     }
 
     void cleanup_updates()

src/common/updating/updating.vcxproj

@@ -12,7 +12,7 @@
   <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" />

src/common/utils/HttpClient.h

@@ -21,15 +21,15 @@ namespace http
             headers.UserAgent().TryParseAdd(USER_AGENT);
         }
 
-        winrt::Windows::Foundation::IAsyncOperation<winrt::hstring> request(const winrt::Windows::Foundation::Uri& url)
+        std::future<std::wstring> request(const winrt::Windows::Foundation::Uri& url)
         {
             auto response = co_await m_client.GetAsync(url);
             (void)response.EnsureSuccessStatusCode();
             auto body = co_await response.Content().ReadAsStringAsync();
-            co_return body;
+            co_return std::wstring(body);
         }
 
-        winrt::Windows::Foundation::IAsyncAction download(const winrt::Windows::Foundation::Uri& url, const std::wstring& dstFilePath)
+        std::future<void> download(const winrt::Windows::Foundation::Uri& url, const std::wstring& dstFilePath)
         {
             auto response = co_await m_client.GetAsync(url);
             (void)response.EnsureSuccessStatusCode();
@@ -38,7 +38,7 @@ namespace http
             file_stream.Close();
         }
 
-        winrt::Windows::Foundation::IAsyncAction download(const winrt::Windows::Foundation::Uri& url, const std::wstring& dstFilePath, const std::function<void(float)>& progressUpdateCallback)
+        std::future<void> download(const winrt::Windows::Foundation::Uri& url, const std::wstring& dstFilePath, const std::function<void(float)>& progressUpdateCallback)
         {
             auto response = co_await m_client.GetAsync(url, HttpCompletionOption::ResponseHeadersRead);
             response.EnsureSuccessStatusCode();

src/common/utils/OnThreadExecutor.h

@@ -5,7 +5,6 @@
 #include <functional>
 #include <queue>
 #include <atomic>
-#include <winrt/Windows.Foundation.h>
 
 // OnThreadExecutor allows its caller to off-load some work to a persistently running background thread.
 // This might come in handy if you use the API which sets thread-wide global state and the state needs
@@ -29,17 +28,13 @@ public:
         _worker_thread.join();
     }
 
-    winrt::Windows::Foundation::IAsyncAction submit(task_t task)
+    std::future<void> submit(task_t task)
     {
         auto future = task.get_future();
-        {
-            std::lock_guard lock{ _task_mutex };
-            _task_queue.emplace(std::move(task));
-            _task_cv.notify_one();
-        }
-
-        co_await winrt::resume_background();
-        future.wait();
+        std::lock_guard lock{ _task_mutex };
+        _task_queue.emplace(std::move(task));
+        _task_cv.notify_one();
+        return future;
     }
 
     void cancel()

src/common/version/version.vcxproj

@@ -47,7 +47,7 @@
   <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">

src/logging/logging.vcxproj

@@ -36,7 +36,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <OutDir>..\..\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj

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

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp

@@ -312,39 +312,13 @@ private:
         return false;
     }
 
-    void read_settings(PowerToysSettings::PowerToyValues& settings)
+        void read_settings(PowerToysSettings::PowerToyValues& settings)
     {
         const auto settingsObject = settings.get_raw_json();
 
         // Migrate Paste As Plain text shortcut
         Hotkey old_paste_as_plain_hotkey;
         bool old_data_migrated = migrate_data_and_remove_data_file(old_paste_as_plain_hotkey);
-
-        if (settingsObject.GetView().Size())
-        {
-            const auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
-
-            m_is_advanced_ai_enabled = has_advanced_ai_provider(propertiesObject);
-
-            if (propertiesObject.HasKey(JSON_KEY_IS_AI_ENABLED))
-            {
-                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
-            }
-            else if (propertiesObject.HasKey(JSON_KEY_IS_OPEN_AI_ENABLED))
-            {
-                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_OPEN_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
-            }
-            else
-            {
-                m_is_ai_enabled = false;
-            }
-
-            if (propertiesObject.HasKey(JSON_KEY_SHOW_CUSTOM_PREVIEW))
-            {
-                m_preview_custom_format_output = propertiesObject.GetNamedObject(JSON_KEY_SHOW_CUSTOM_PREVIEW).GetNamedBoolean(JSON_KEY_VALUE);
-            }
-        }
-
         if (old_data_migrated)
         {
             m_paste_as_plain_hotkey = old_paste_as_plain_hotkey;
@@ -431,6 +405,31 @@ private:
                 }
             }
         }
+
+        if (settingsObject.GetView().Size())
+        {
+            const auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
+
+            m_is_advanced_ai_enabled = has_advanced_ai_provider(propertiesObject);
+
+            if (propertiesObject.HasKey(JSON_KEY_IS_AI_ENABLED))
+            {
+                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
+            }
+            else if (propertiesObject.HasKey(JSON_KEY_IS_OPEN_AI_ENABLED))
+            {
+                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_OPEN_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
+            }
+            else
+            {
+                m_is_ai_enabled = false;
+            }
+
+            if (propertiesObject.HasKey(JSON_KEY_SHOW_CUSTOM_PREVIEW))
+            {
+                m_preview_custom_format_output = propertiesObject.GetNamedObject(JSON_KEY_SHOW_CUSTOM_PREVIEW).GetNamedBoolean(JSON_KEY_VALUE);
+            }
+        }
     }
 
     // Load the settings file.

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -34,7 +34,7 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v143</PlatformToolset>

src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj

@@ -15,13 +15,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj

@@ -20,13 +20,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj

@@ -16,13 +16,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj

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

src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj

@@ -32,7 +32,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj

@@ -15,13 +15,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -31,13 +31,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj

@@ -13,13 +13,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj

@@ -27,13 +27,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/MouseJump/MouseJump.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj

@@ -13,13 +13,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj

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

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

@@ -14,7 +14,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj

@@ -16,13 +16,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj

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

src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj

@@ -17,7 +17,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>

src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj

@@ -15,14 +15,14 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>

src/modules/Workspaces/WorkspacesLauncher/LauncherUIHelper.cpp

@@ -35,7 +35,7 @@ LauncherUIHelper::~LauncherUIHelper()
         {
             Logger::error(L"Unable to find UI process: {}", get_last_error_or_default(GetLastError()));
         }
-    } }).get();
+    } }).wait();
 }
 
 void LauncherUIHelper::LaunchUI()

src/modules/Workspaces/WorkspacesLauncher/WindowArrangerHelper.cpp

@@ -60,7 +60,7 @@ void WindowArrangerHelper::Launch(const std::wstring& projectId, bool elevated,
                 
                 Logger::trace(L"Finished waiting WorkspacesWindowArranger");
                 CloseHandle(process);
-            }}).get();
+            }}).wait();
 
         timeoutExpired = true;
     }

src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj

@@ -13,7 +13,7 @@
       <ConformanceMode>false</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalOptions>/await:strict %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -60,7 +60,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

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

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

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj

@@ -11,7 +11,7 @@
   <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">

src/modules/Workspaces/WorkspacesModuleInterface/WorkspacesModuleInterface.vcxproj

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

src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj

@@ -13,7 +13,7 @@
       <ConformanceMode>false</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalOptions>/await:strict %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -60,7 +60,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj

@@ -13,7 +13,7 @@
       <ConformanceMode>false</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalOptions>/await:strict %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -60,7 +60,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

src/modules/ZoomIt/ZoomIt/Zoomit.cpp

@@ -3222,7 +3222,7 @@ bool IsPenInverted( WPARAM wParam )
 // Captures the specified screen using the capture APIs
 //
 //----------------------------------------------------------------------------
-winrt::com_ptr<ID3D11Texture2D> CaptureScreenshotAsync(winrt::IDirect3DDevice const& device, winrt::GraphicsCaptureItem const& item, winrt::DirectXPixelFormat const& pixelFormat)
+std::future<winrt::com_ptr<ID3D11Texture2D>> CaptureScreenshotAsync(winrt::IDirect3DDevice const& device, winrt::GraphicsCaptureItem const& item, winrt::DirectXPixelFormat const& pixelFormat)
 {
     auto d3dDevice = GetDXGIInterfaceFromObject<ID3D11Device>(device);
     winrt::com_ptr<ID3D11DeviceContext> d3dContext;
@@ -3251,7 +3251,7 @@ winrt::com_ptr<ID3D11Texture2D> CaptureScreenshotAsync(winrt::IDirect3DDevice co
 
     session.IsCursorCaptureEnabled( false );
     session.StartCapture();
-    captureEvent.wait();
+    co_await winrt::resume_on_signal(captureEvent.get());
 
     // End the capture
     session.Close();
@@ -3260,7 +3260,7 @@ winrt::com_ptr<ID3D11Texture2D> CaptureScreenshotAsync(winrt::IDirect3DDevice co
     auto texture = GetDXGIInterfaceFromObject<ID3D11Texture2D>(frame.Surface());
     auto result = util::CopyD3DTexture(d3dDevice, texture, true);
 
-    return result;
+    co_return result;
 }
 
 //----------------------------------------------------------------------------
@@ -3288,8 +3288,9 @@ winrt::com_ptr<ID3D11Texture2D>CaptureScreenshot(winrt::DirectXPixelFormat const
     auto item = util::CreateCaptureItemForMonitor(hMon);
 
     auto capture = CaptureScreenshotAsync(device, item, pixelFormat);
+    capture.wait();
 
-    return capture;
+    return capture.get();
 }
 
 

src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj

@@ -19,7 +19,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj

@@ -13,7 +13,7 @@
       <ConformanceMode>false</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalOptions>/await:strict %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -60,7 +60,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj

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

src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj

@@ -8,7 +8,7 @@
     <RootNamespace>Awake</RootNamespace>
     <ProjectName>AwakeModuleInterface</ProjectName>
     <TargetName>PowerToys.AwakeModuleInterface</TargetName>
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">

src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{0014d652-901f-4456-8d65-06fc5f997fb0}</ProjectGuid>
     <RootNamespace>CmdNotFoundModuleInterface</RootNamespace>
     <TargetName>PowerToys.CmdNotFoundModuleInterface</TargetName>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <ProjectName>CmdNotFoundModuleInterface</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj

@@ -42,7 +42,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj

@@ -15,13 +15,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

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

@@ -53,8 +53,10 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    
-   
+    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
     <DesktopCompatible>true</DesktopCompatible>

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj

@@ -51,6 +51,10 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
     <DesktopCompatible>true</DesktopCompatible>

src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj

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

src/modules/fancyzones/FancyZones/FancyZones.vcxproj

@@ -10,7 +10,7 @@
       <ConformanceMode>false</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalOptions>/await:strict %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -57,7 +57,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

src/modules/fancyzones/FancyZonesLib/EditorParameters.cpp

@@ -136,7 +136,7 @@ bool EditorParameters::Save(const WorkAreaConfiguration& configuration, OnThread
         dpiUnawareThread.submit(OnThreadExecutor::task_t{
             [&]() {
                 combinedWorkArea = FancyZonesUtils::GetAllMonitorsCombinedRect<&MONITORINFOEX::rcWork>();
-        } }).get();
+        } }).wait();
         RECT combinedMonitorArea = FancyZonesUtils::GetAllMonitorsCombinedRect<&MONITORINFOEX::rcMonitor>();
 
         // use dpi-unaware values
@@ -198,7 +198,7 @@ bool EditorParameters::Save(const WorkAreaConfiguration& configuration, OnThread
                 {
                     return;
                 }
-            } }).get();
+            } }).wait();
 
             float width = static_cast<float>(monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left);
             float height = static_cast<float>(monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top);

src/modules/fancyzones/FancyZonesLib/FancyZones.cpp

@@ -259,7 +259,7 @@ FancyZones::Run() noexcept
                           SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
                           SetThreadDpiHostingBehavior(DPI_HOSTING_BEHAVIOR_MIXED);
                       } })
-        .get();
+        .wait();
 
     m_toggleEditorEventWaiter = EventWaiter(CommonSharedConstants::FANCY_ZONES_EDITOR_TOGGLE_EVENT, [&](int err) {
         if (err == ERROR_SUCCESS)
@@ -463,7 +463,7 @@ void FancyZones::WindowCreated(HWND window) noexcept
         if (!isMoved)
         {
             FancyZonesWindowProperties::StampMovedOnOpeningProperty(window);
-            m_dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] { MonitorUtils::OpenWindowOnActiveMonitor(window, active); } }).get();
+            m_dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] { MonitorUtils::OpenWindowOnActiveMonitor(window, active); } }).wait();
         }
     }
 }

src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj

@@ -14,7 +14,7 @@
   <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">

src/modules/fancyzones/FancyZonesLib/OnThreadExecutor.cpp

@@ -9,17 +9,13 @@ OnThreadExecutor::OnThreadExecutor() :
 {
 }
 
-winrt::Windows::Foundation::IAsyncAction OnThreadExecutor::submit(task_t task)
+std::future<void> OnThreadExecutor::submit(task_t task)
 {
     auto future = task.get_future();
-    {
-        std::lock_guard lock{ _task_mutex };
-        _task_queue.emplace(std::move(task));
-        _task_cv.notify_one();
-    }
-    
-    co_await winrt::resume_background();
-    future.wait();
+    std::lock_guard lock{ _task_mutex };
+    _task_queue.emplace(std::move(task));
+    _task_cv.notify_one();
+    return future;
 }
 
 void OnThreadExecutor::cancel()

src/modules/fancyzones/FancyZonesLib/on_thread_executor.h

@@ -5,7 +5,6 @@
 #include <functional>
 #include <queue>
 #include <atomic>
-#include <winrt/Windows.Foundation.h>
 
 // OnThreadExecutor allows its caller to off-load some work to a persistently running background thread.
 // This might come in handy if you use the API which sets thread-wide global state and the state needs
@@ -18,7 +17,7 @@ public:
 
     OnThreadExecutor();
     ~OnThreadExecutor();
-    winrt::Windows::Foundation::IAsyncAction submit(task_t task);
+    std::future<void> submit(task_t task);
     void cancel();
 
 private:

src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj

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

src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj

@@ -15,7 +15,7 @@
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\..\Common.SelfContained.props" />
+  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
+
+  <PropertyGroup>
+    <AssemblyTitle>PowerToys.ImageResizerCLI</AssemblyTitle>
+    <AssemblyDescription>PowerToys Image Resizer Command Line Interface</AssemblyDescription>
+    <Description>PowerToys Image Resizer CLI</Description>
+    <OutputType>Exe</OutputType>
+    <Platforms>x64;ARM64</Platforms>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutputPath>
+    <AssemblyName>PowerToys.ImageResizerCLI</AssemblyName>
+    <NoWarn>$(NoWarn);SA1500;SA1402;CA1852</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ui\ImageResizerUI.csproj" />
+  </ItemGroup>
+
+  <!-- Force using WindowsDesktop runtime to ensure consistent dll versions with other projects -->
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App.WPF" />
+  </ItemGroup>
+</Project>

src/modules/imageresizer/ImageResizerCLI/Program.cs

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.Text;
+
+using ImageResizer.Cli;
+using ManagedCommon;
+
+namespace ImageResizerCLI;
+
+internal static class Program
+{
+    private static int Main(string[] args)
+    {
+        try
+        {
+            string appLanguage = LanguageHelper.LoadLanguage();
+            if (!string.IsNullOrEmpty(appLanguage))
+            {
+                System.Threading.Thread.CurrentThread.CurrentUICulture = new CultureInfo(appLanguage);
+            }
+        }
+        catch (CultureNotFoundException)
+        {
+            // Ignore invalid culture and fall back to default.
+        }
+
+        Console.InputEncoding = Encoding.Unicode;
+
+        // Initialize logger to file (same as other modules)
+        CliLogger.Initialize("\\ImageResizer\\Logs");
+        CliLogger.Info($"ImageResizerCLI started with {args.Length} argument(s)");
+
+        try
+        {
+            var executor = new ImageResizerCliExecutor();
+            return executor.Run(args);
+        }
+        catch (Exception ex)
+        {
+            CliLogger.Error($"Unhandled exception: {ex.Message}");
+            CliLogger.Error($"Stack trace: {ex.StackTrace}");
+            Console.Error.WriteLine($"Fatal error: {ex.Message}");
+            return 1;
+        }
+    }
+}

src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj

@@ -13,12 +13,12 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

src/modules/imageresizer/dll/ImageResizerExt.vcxproj

@@ -15,7 +15,7 @@
     <UseOfAtl>Static</UseOfAtl>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/imageresizer/tests/Cli/CliSettingsApplierTests.cs

@@ -0,0 +1,320 @@
+// 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 ImageResizer.Cli;
+using ImageResizer.Models;
+using ImageResizer.Properties;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace ImageResizer.Tests.Cli
+{
+    [TestClass]
+    public class CliSettingsApplierTests
+    {
+        private Settings CreateDefaultSettings()
+        {
+            var settings = new Settings();
+            settings.Sizes.Add(new ResizeSize(0, "Small", ResizeFit.Fit, 854, 480, ResizeUnit.Pixel));
+            settings.Sizes.Add(new ResizeSize(1, "Medium", ResizeFit.Fit, 1366, 768, ResizeUnit.Pixel));
+            settings.Sizes.Add(new ResizeSize(2, "Large", ResizeFit.Fit, 1920, 1080, ResizeUnit.Pixel));
+            return settings;
+        }
+
+        [TestMethod]
+        public void Apply_WithCustomWidth_SetsCustomSizeWidth()
+        {
+            var options = new CliOptions { Width = 800 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(800.0, settings.CustomSize.Width);
+        }
+
+        [TestMethod]
+        public void Apply_WithCustomHeight_SetsCustomSizeHeight()
+        {
+            var options = new CliOptions { Height = 600 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(600.0, settings.CustomSize.Height);
+        }
+
+        [TestMethod]
+        public void Apply_WithCustomSize_SelectsCustomSizeIndex()
+        {
+            var options = new CliOptions { Width = 800, Height = 600 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            // Custom size index should be settings.Sizes.Count
+            Assert.AreEqual(settings.Sizes.Count, settings.SelectedSizeIndex);
+        }
+
+        [TestMethod]
+        public void Apply_WithZeroWidth_SetsZeroForAutoCalculation()
+        {
+            var options = new CliOptions { Width = 0, Height = 600 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(0.0, settings.CustomSize.Width);
+            Assert.AreEqual(600.0, settings.CustomSize.Height);
+        }
+
+        [TestMethod]
+        public void Apply_WithZeroHeight_SetsZeroForAutoCalculation()
+        {
+            var options = new CliOptions { Width = 800, Height = 0 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(800.0, settings.CustomSize.Width);
+            Assert.AreEqual(0.0, settings.CustomSize.Height);
+        }
+
+        [TestMethod]
+        public void Apply_WithNullWidthAndHeight_DoesNotModifyCustomSize()
+        {
+            var options = new CliOptions { Width = null, Height = null };
+            var settings = CreateDefaultSettings();
+            var originalWidth = settings.CustomSize.Width;
+            var originalHeight = settings.CustomSize.Height;
+
+            CliSettingsApplier.Apply(options, settings);
+
+            // When both null, should not modify CustomSize (keeps default 1024x640)
+            Assert.AreEqual(originalWidth, settings.CustomSize.Width);
+            Assert.AreEqual(originalHeight, settings.CustomSize.Height);
+        }
+
+        [TestMethod]
+        public void Apply_WithUnit_SetsCustomSizeUnit()
+        {
+            var options = new CliOptions { Width = 100, Unit = ResizeUnit.Percent };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(ResizeUnit.Percent, settings.CustomSize.Unit);
+        }
+
+        [TestMethod]
+        public void Apply_WithFit_SetsCustomSizeFit()
+        {
+            var options = new CliOptions { Width = 800, Fit = ResizeFit.Fill };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(ResizeFit.Fill, settings.CustomSize.Fit);
+        }
+
+        [TestMethod]
+        public void Apply_WithValidSizeIndex_SetsSelectedSizeIndex()
+        {
+            var options = new CliOptions { SizeIndex = 1 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(1, settings.SelectedSizeIndex);
+        }
+
+        [TestMethod]
+        public void Apply_WithInvalidSizeIndex_DoesNotChangeSelection()
+        {
+            var options = new CliOptions { SizeIndex = 99 };
+            var settings = CreateDefaultSettings();
+            var originalIndex = settings.SelectedSizeIndex;
+
+            CliSettingsApplier.Apply(options, settings);
+
+            // Should remain unchanged when invalid
+            Assert.AreEqual(originalIndex, settings.SelectedSizeIndex);
+        }
+
+        [TestMethod]
+        public void Apply_WithNegativeSizeIndex_DoesNotChangeSelection()
+        {
+            var options = new CliOptions { SizeIndex = -1 };
+            var settings = CreateDefaultSettings();
+            var originalIndex = settings.SelectedSizeIndex;
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(originalIndex, settings.SelectedSizeIndex);
+        }
+
+        [TestMethod]
+        public void Apply_WithShrinkOnly_SetsShrinkOnly()
+        {
+            var options = new CliOptions { ShrinkOnly = true };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.IsTrue(settings.ShrinkOnly);
+        }
+
+        [TestMethod]
+        public void Apply_WithReplace_SetsReplace()
+        {
+            var options = new CliOptions { Replace = true };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.IsTrue(settings.Replace);
+        }
+
+        [TestMethod]
+        public void Apply_WithIgnoreOrientation_SetsIgnoreOrientation()
+        {
+            var options = new CliOptions { IgnoreOrientation = true };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.IsTrue(settings.IgnoreOrientation);
+        }
+
+        [TestMethod]
+        public void Apply_WithRemoveMetadata_SetsRemoveMetadata()
+        {
+            var options = new CliOptions { RemoveMetadata = true };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.IsTrue(settings.RemoveMetadata);
+        }
+
+        [TestMethod]
+        public void Apply_WithJpegQualityLevel_SetsJpegQualityLevel()
+        {
+            var options = new CliOptions { JpegQualityLevel = 85 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(85, settings.JpegQualityLevel);
+        }
+
+        [TestMethod]
+        public void Apply_WithKeepDateModified_SetsKeepDateModified()
+        {
+            var options = new CliOptions { KeepDateModified = true };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.IsTrue(settings.KeepDateModified);
+        }
+
+        [TestMethod]
+        public void Apply_WithFileName_SetsFileName()
+        {
+            var options = new CliOptions { FileName = "%1 (%2)" };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual("%1 (%2)", settings.FileName);
+        }
+
+        [TestMethod]
+        public void Apply_WithEmptyFileName_DoesNotChangeFileName()
+        {
+            var options = new CliOptions { FileName = string.Empty };
+            var settings = CreateDefaultSettings();
+            var originalFileName = settings.FileName;
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(originalFileName, settings.FileName);
+        }
+
+        [TestMethod]
+        public void Apply_WithMultipleOptions_AppliesAllOptions()
+        {
+            var options = new CliOptions
+            {
+                Width = 800,
+                Height = 600,
+                Unit = ResizeUnit.Percent,
+                Fit = ResizeFit.Fill,
+                ShrinkOnly = true,
+                Replace = true,
+                IgnoreOrientation = true,
+                RemoveMetadata = true,
+                JpegQualityLevel = 90,
+                KeepDateModified = true,
+                FileName = "test_%2",
+            };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(800.0, settings.CustomSize.Width);
+            Assert.AreEqual(600.0, settings.CustomSize.Height);
+            Assert.AreEqual(ResizeUnit.Percent, settings.CustomSize.Unit);
+            Assert.AreEqual(ResizeFit.Fill, settings.CustomSize.Fit);
+            Assert.IsTrue(settings.ShrinkOnly);
+            Assert.IsTrue(settings.Replace);
+            Assert.IsTrue(settings.IgnoreOrientation);
+            Assert.IsTrue(settings.RemoveMetadata);
+            Assert.AreEqual(90, settings.JpegQualityLevel);
+            Assert.IsTrue(settings.KeepDateModified);
+            Assert.AreEqual("test_%2", settings.FileName);
+        }
+
+        [TestMethod]
+        public void Apply_CustomSizeTakesPrecedence_OverSizeIndex()
+        {
+            var options = new CliOptions
+            {
+                Width = 800,
+                Height = 600,
+                SizeIndex = 1, // Should be ignored when Width/Height specified
+            };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            // Custom size should be selected, not preset
+            Assert.AreEqual(settings.Sizes.Count, settings.SelectedSizeIndex);
+            Assert.AreEqual(800.0, settings.CustomSize.Width);
+        }
+
+        [TestMethod]
+        public void Apply_WithOnlyWidth_StillSelectsCustomSize()
+        {
+            var options = new CliOptions { Width = 800 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(settings.Sizes.Count, settings.SelectedSizeIndex);
+            Assert.AreEqual(800.0, settings.CustomSize.Width);
+        }
+
+        [TestMethod]
+        public void Apply_WithOnlyHeight_StillSelectsCustomSize()
+        {
+            var options = new CliOptions { Height = 600 };
+            var settings = CreateDefaultSettings();
+
+            CliSettingsApplier.Apply(options, settings);
+
+            Assert.AreEqual(settings.Sizes.Count, settings.SelectedSizeIndex);
+            Assert.AreEqual(600.0, settings.CustomSize.Height);
+        }
+    }
+}

src/modules/imageresizer/tests/Models/CliOptionsTests.cs

@@ -0,0 +1,268 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Linq;
+using ImageResizer.Cli.Commands;
+using ImageResizer.Models;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace ImageResizer.Tests.Models
+{
+    [TestClass]
+    public class CliOptionsTests
+    {
+        private static readonly string[] _multiFileArgs = new[] { "test1.jpg", "test2.jpg", "test3.jpg" };
+        private static readonly string[] _mixedOptionsArgs = new[] { "--width", "800", "test1.jpg", "--height", "600", "test2.jpg" };
+
+        [TestMethod]
+        public void Parse_WithValidWidth_SetsWidth()
+        {
+            var args = new[] { "--width", "800", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(800.0, options.Width);
+        }
+
+        [TestMethod]
+        public void Parse_WithValidHeight_SetsHeight()
+        {
+            var args = new[] { "--height", "600", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(600.0, options.Height);
+        }
+
+        [TestMethod]
+        public void Parse_WithShortWidthAlias_WorksIdentically()
+        {
+            var longFormArgs = new[] { "--width", "800", "test.jpg" };
+            var shortFormArgs = new[] { "-w", "800", "test.jpg" };
+            var longForm = CliOptions.Parse(longFormArgs);
+            var shortForm = CliOptions.Parse(shortFormArgs);
+
+            Assert.AreEqual(longForm.Width, shortForm.Width);
+        }
+
+        [TestMethod]
+        public void Parse_WithShortHeightAlias_WorksIdentically()
+        {
+            var longFormArgs = new[] { "--height", "600", "test.jpg" };
+            var shortFormArgs = new[] { "-h", "600", "test.jpg" };
+            var longForm = CliOptions.Parse(longFormArgs);
+            var shortForm = CliOptions.Parse(shortFormArgs);
+
+            Assert.AreEqual(longForm.Height, shortForm.Height);
+        }
+
+        [TestMethod]
+        public void Parse_WithValidUnit_SetsUnit()
+        {
+            var args = new[] { "--unit", "Percent", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(ResizeUnit.Percent, options.Unit);
+        }
+
+        [TestMethod]
+        public void Parse_WithValidFit_SetsFit()
+        {
+            var args = new[] { "--fit", "Fill", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(ResizeFit.Fill, options.Fit);
+        }
+
+        [TestMethod]
+        public void Parse_WithSizeIndex_SetsSizeIndex()
+        {
+            var args = new[] { "--size", "2", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(2, options.SizeIndex);
+        }
+
+        [TestMethod]
+        public void Parse_WithShrinkOnly_SetsShrinkOnly()
+        {
+            var args = new[] { "--shrink-only", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(true, options.ShrinkOnly);
+        }
+
+        [TestMethod]
+        public void Parse_WithReplace_SetsReplace()
+        {
+            var args = new[] { "--replace", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(true, options.Replace);
+        }
+
+        [TestMethod]
+        public void Parse_WithIgnoreOrientation_SetsIgnoreOrientation()
+        {
+            var args = new[] { "--ignore-orientation", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(true, options.IgnoreOrientation);
+        }
+
+        [TestMethod]
+        public void Parse_WithRemoveMetadata_SetsRemoveMetadata()
+        {
+            var args = new[] { "--remove-metadata", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(true, options.RemoveMetadata);
+        }
+
+        [TestMethod]
+        public void Parse_WithValidQuality_SetsQuality()
+        {
+            var args = new[] { "--quality", "85", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(85, options.JpegQualityLevel);
+        }
+
+        [TestMethod]
+        public void Parse_WithKeepDateModified_SetsKeepDateModified()
+        {
+            var args = new[] { "--keep-date-modified", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(true, options.KeepDateModified);
+        }
+
+        [TestMethod]
+        public void Parse_WithFileName_SetsFileName()
+        {
+            var args = new[] { "--filename", "%1 (%2)", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual("%1 (%2)", options.FileName);
+        }
+
+        [TestMethod]
+        public void Parse_WithDestination_SetsDestinationDirectory()
+        {
+            var args = new[] { "--destination", "C:\\Output", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual("C:\\Output", options.DestinationDirectory);
+        }
+
+        [TestMethod]
+        public void Parse_WithShortDestinationAlias_WorksIdentically()
+        {
+            var longFormArgs = new[] { "--destination", "C:\\Output", "test.jpg" };
+            var shortFormArgs = new[] { "-d", "C:\\Output", "test.jpg" };
+            var longForm = CliOptions.Parse(longFormArgs);
+            var shortForm = CliOptions.Parse(shortFormArgs);
+
+            Assert.AreEqual(longForm.DestinationDirectory, shortForm.DestinationDirectory);
+        }
+
+        [TestMethod]
+        public void Parse_WithProgressLines_SetsProgressLines()
+        {
+            var args = new[] { "--progress-lines", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(true, options.ProgressLines);
+        }
+
+        [TestMethod]
+        public void Parse_WithAccessibleAlias_SetsProgressLines()
+        {
+            var args = new[] { "--accessible", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(true, options.ProgressLines);
+        }
+
+        [TestMethod]
+        public void Parse_WithMultipleFiles_AddsAllFiles()
+        {
+            var args = _multiFileArgs;
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(3, options.Files.Count);
+            CollectionAssert.Contains(options.Files.ToList(), "test1.jpg");
+            CollectionAssert.Contains(options.Files.ToList(), "test2.jpg");
+            CollectionAssert.Contains(options.Files.ToList(), "test3.jpg");
+        }
+
+        [TestMethod]
+        public void Parse_WithMixedOptionsAndFiles_ParsesCorrectly()
+        {
+            var args = _mixedOptionsArgs;
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(800.0, options.Width);
+            Assert.AreEqual(600.0, options.Height);
+            Assert.AreEqual(2, options.Files.Count);
+        }
+
+        [TestMethod]
+        public void Parse_WithHelp_SetsShowHelp()
+        {
+            var args = new[] { "--help" };
+            var options = CliOptions.Parse(args);
+
+            Assert.IsTrue(options.ShowHelp);
+        }
+
+        [TestMethod]
+        public void Parse_WithShowConfig_SetsShowConfig()
+        {
+            var args = new[] { "--show-config" };
+            var options = CliOptions.Parse(args);
+
+            Assert.IsTrue(options.ShowConfig);
+        }
+
+        [TestMethod]
+        public void Parse_WithNoArguments_ReturnsEmptyOptions()
+        {
+            var args = Array.Empty<string>();
+            var options = CliOptions.Parse(args);
+
+            Assert.IsNotNull(options);
+            Assert.AreEqual(0, options.Files.Count);
+        }
+
+        [TestMethod]
+        public void Parse_WithZeroWidth_AllowsZeroValue()
+        {
+            var args = new[] { "--width", "0", "--height", "600", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(0.0, options.Width);
+            Assert.AreEqual(600.0, options.Height);
+        }
+
+        [TestMethod]
+        public void Parse_WithZeroHeight_AllowsZeroValue()
+        {
+            var args = new[] { "--width", "800", "--height", "0", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(800.0, options.Width);
+            Assert.AreEqual(0.0, options.Height);
+        }
+
+        [TestMethod]
+        public void Parse_CaseInsensitiveEnums_ParsesCorrectly()
+        {
+            var args = new[] { "--unit", "pixel", "--fit", "fit", "test.jpg" };
+            var options = CliOptions.Parse(args);
+
+            Assert.AreEqual(ResizeUnit.Pixel, options.Unit);
+            Assert.AreEqual(ResizeFit.Fit, options.Fit);
+        }
+    }
+}

src/modules/imageresizer/tests/Models/ResizeBatchTests.cs

@@ -25,20 +25,27 @@ namespace ImageResizer.Models
         [TestMethod]
         public void FromCommandLineWorks()
         {
+            // Use actual test files that exist in the test directory
+            var testDir = Path.GetDirectoryName(typeof(ResizeBatchTests).Assembly.Location);
+            var file1 = Path.Combine(testDir, "Test.jpg");
+            var file2 = Path.Combine(testDir, "Test.png");
+            var file3 = Path.Combine(testDir, "Test.gif");
+
             var standardInput =
-                "Image1.jpg" + EOL +
-                "Image2.jpg";
+                file1 + EOL +
+                file2;
             var args = new[]
             {
                 "/d", "OutputDir",
-                "Image3.jpg",
+                file3,
             };
 
             var result = ResizeBatch.FromCommandLine(
                 new StringReader(standardInput),
                 args);
 
-            CollectionAssert.AreEquivalent(new List<string> { "Image1.jpg", "Image2.jpg", "Image3.jpg" }, result.Files.ToArray());
+            var files = result.Files.Select(Path.GetFileName).ToArray();
+            CollectionAssert.AreEquivalent(new List<string> { "Test.jpg", "Test.png", "Test.gif" }, files);
 
             Assert.AreEqual("OutputDir", result.DestinationDirectory);
         }

src/modules/imageresizer/ui/Cli/CliLogger.cs

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using ManagedCommon;
+
+namespace ImageResizer.Cli
+{
+    public static class CliLogger
+    {
+        private static bool _initialized;
+
+        public static void Initialize(string logSubFolder)
+        {
+            if (!_initialized)
+            {
+                Logger.InitializeLogger(logSubFolder);
+                _initialized = true;
+            }
+        }
+
+        public static void Info(string message) => Logger.LogInfo(message);
+
+        public static void Warn(string message) => Logger.LogWarning(message);
+
+        public static void Error(string message) => Logger.LogError(message);
+    }
+}

src/modules/imageresizer/ui/Cli/CliSettingsApplier.cs

@@ -0,0 +1,122 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+
+using ImageResizer.Models;
+using ImageResizer.Properties;
+
+namespace ImageResizer.Cli
+{
+    /// <summary>
+    /// Applies CLI options to Settings object.
+    /// Separated from executor logic for Single Responsibility Principle.
+    /// </summary>
+    public static class CliSettingsApplier
+    {
+        /// <summary>
+        /// Applies CLI options to the settings, overriding default values.
+        /// </summary>
+        /// <param name="cliOptions">The CLI options to apply.</param>
+        /// <param name="settings">The settings to modify.</param>
+        public static void Apply(CliOptions cliOptions, Settings settings)
+        {
+            // Handle complex size options first
+            ApplySizeOptions(cliOptions, settings);
+
+            // Apply simple property mappings
+            ApplySimpleOptions(cliOptions, settings);
+        }
+
+        private static void ApplySizeOptions(CliOptions cliOptions, Settings settings)
+        {
+            if (cliOptions.Width.HasValue || cliOptions.Height.HasValue)
+            {
+                ApplyCustomSizeOptions(cliOptions, settings);
+            }
+            else if (cliOptions.SizeIndex.HasValue)
+            {
+                ApplyPresetSizeOption(cliOptions, settings);
+            }
+        }
+
+        private static void ApplyCustomSizeOptions(CliOptions cliOptions, Settings settings)
+        {
+            // Set dimensions (0 = auto-calculate for aspect ratio preservation)
+            // Implementation: ResizeSize.ConvertToPixels() returns double.PositiveInfinity for 0 in Fit mode,
+            // causing Math.Min(scaleX, scaleY) to preserve aspect ratio by selecting the non-zero scale.
+            // For Fill/Stretch modes, 0 uses the original dimension instead.
+            settings.CustomSize.Width = cliOptions.Width ?? 0;
+            settings.CustomSize.Height = cliOptions.Height ?? 0;
+
+            // Apply optional properties
+            if (cliOptions.Unit.HasValue)
+            {
+                settings.CustomSize.Unit = cliOptions.Unit.Value;
+            }
+
+            if (cliOptions.Fit.HasValue)
+            {
+                settings.CustomSize.Fit = cliOptions.Fit.Value;
+            }
+
+            // Select custom size (index = Sizes.Count)
+            settings.SelectedSizeIndex = settings.Sizes.Count;
+        }
+
+        private static void ApplyPresetSizeOption(CliOptions cliOptions, Settings settings)
+        {
+            var index = cliOptions.SizeIndex.Value;
+
+            if (index >= 0 && index < settings.Sizes.Count)
+            {
+                settings.SelectedSizeIndex = index;
+            }
+            else
+            {
+                Console.Error.WriteLine(string.Format(CultureInfo.InvariantCulture, Resources.CLI_WarningInvalidSizeIndex, index));
+                CliLogger.Warn($"Invalid size index: {index}");
+            }
+        }
+
+        private static void ApplySimpleOptions(CliOptions cliOptions, Settings settings)
+        {
+            if (cliOptions.ShrinkOnly.HasValue)
+            {
+                settings.ShrinkOnly = cliOptions.ShrinkOnly.Value;
+            }
+
+            if (cliOptions.Replace.HasValue)
+            {
+                settings.Replace = cliOptions.Replace.Value;
+            }
+
+            if (cliOptions.IgnoreOrientation.HasValue)
+            {
+                settings.IgnoreOrientation = cliOptions.IgnoreOrientation.Value;
+            }
+
+            if (cliOptions.RemoveMetadata.HasValue)
+            {
+                settings.RemoveMetadata = cliOptions.RemoveMetadata.Value;
+            }
+
+            if (cliOptions.JpegQualityLevel.HasValue)
+            {
+                settings.JpegQualityLevel = cliOptions.JpegQualityLevel.Value;
+            }
+
+            if (cliOptions.KeepDateModified.HasValue)
+            {
+                settings.KeepDateModified = cliOptions.KeepDateModified.Value;
+            }
+
+            if (!string.IsNullOrEmpty(cliOptions.FileName))
+            {
+                settings.FileName = cliOptions.FileName;
+            }
+        }
+    }
+}

src/modules/imageresizer/ui/Cli/Commands/ImageResizerRootCommand.cs

@@ -0,0 +1,90 @@
+// 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.CommandLine;
+
+using ImageResizer.Cli.Options;
+
+namespace ImageResizer.Cli.Commands
+{
+    /// <summary>
+    /// Root command for the ImageResizer CLI.
+    /// </summary>
+    public sealed class ImageResizerRootCommand : RootCommand
+    {
+        public ImageResizerRootCommand()
+            : base("PowerToys Image Resizer - Resize images from command line")
+        {
+            HelpOption = new HelpOption();
+            ShowConfigOption = new ShowConfigOption();
+            DestinationOption = new DestinationOption();
+            WidthOption = new WidthOption();
+            HeightOption = new HeightOption();
+            UnitOption = new UnitOption();
+            FitOption = new FitOption();
+            SizeOption = new SizeOption();
+            ShrinkOnlyOption = new ShrinkOnlyOption();
+            ReplaceOption = new ReplaceOption();
+            IgnoreOrientationOption = new IgnoreOrientationOption();
+            RemoveMetadataOption = new RemoveMetadataOption();
+            QualityOption = new QualityOption();
+            KeepDateModifiedOption = new KeepDateModifiedOption();
+            FileNameOption = new FileNameOption();
+            ProgressLinesOption = new ProgressLinesOption();
+            FilesArgument = new FilesArgument();
+
+            AddOption(HelpOption);
+            AddOption(ShowConfigOption);
+            AddOption(DestinationOption);
+            AddOption(WidthOption);
+            AddOption(HeightOption);
+            AddOption(UnitOption);
+            AddOption(FitOption);
+            AddOption(SizeOption);
+            AddOption(ShrinkOnlyOption);
+            AddOption(ReplaceOption);
+            AddOption(IgnoreOrientationOption);
+            AddOption(RemoveMetadataOption);
+            AddOption(QualityOption);
+            AddOption(KeepDateModifiedOption);
+            AddOption(FileNameOption);
+            AddOption(ProgressLinesOption);
+            AddArgument(FilesArgument);
+        }
+
+        public HelpOption HelpOption { get; }
+
+        public ShowConfigOption ShowConfigOption { get; }
+
+        public DestinationOption DestinationOption { get; }
+
+        public WidthOption WidthOption { get; }
+
+        public HeightOption HeightOption { get; }
+
+        public UnitOption UnitOption { get; }
+
+        public FitOption FitOption { get; }
+
+        public SizeOption SizeOption { get; }
+
+        public ShrinkOnlyOption ShrinkOnlyOption { get; }
+
+        public ReplaceOption ReplaceOption { get; }
+
+        public IgnoreOrientationOption IgnoreOrientationOption { get; }
+
+        public RemoveMetadataOption RemoveMetadataOption { get; }
+
+        public QualityOption QualityOption { get; }
+
+        public KeepDateModifiedOption KeepDateModifiedOption { get; }
+
+        public FileNameOption FileNameOption { get; }
+
+        public ProgressLinesOption ProgressLinesOption { get; }
+
+        public FilesArgument FilesArgument { get; }
+    }
+}

src/modules/imageresizer/ui/Cli/ImageResizerCliExecutor.cs

@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+
+using ImageResizer.Models;
+using ImageResizer.Properties;
+
+namespace ImageResizer.Cli
+{
+    /// <summary>
+    /// Executes Image Resizer CLI operations.
+    /// Instance-based design for better testability and Single Responsibility Principle.
+    /// </summary>
+    public class ImageResizerCliExecutor
+    {
+        /// <summary>
+        /// Runs the CLI executor with the provided command-line arguments.
+        /// </summary>
+        /// <param name="args">Command-line arguments.</param>
+        /// <returns>Exit code.</returns>
+        public int Run(string[] args)
+        {
+            var cliOptions = CliOptions.Parse(args);
+
+            if (cliOptions.ParseErrors.Count > 0)
+            {
+                foreach (var error in cliOptions.ParseErrors)
+                {
+                    Console.Error.WriteLine(error);
+                    CliLogger.Error($"Parse error: {error}");
+                }
+
+                CliOptions.PrintUsage();
+                return 1;
+            }
+
+            if (cliOptions.ShowHelp)
+            {
+                CliOptions.PrintUsage();
+                return 0;
+            }
+
+            if (cliOptions.ShowConfig)
+            {
+                CliOptions.PrintConfig(Settings.Default);
+                return 0;
+            }
+
+            if (cliOptions.Files.Count == 0 && string.IsNullOrEmpty(cliOptions.PipeName))
+            {
+                Console.WriteLine(Resources.CLI_NoInputFiles);
+                CliOptions.PrintUsage();
+                return 1;
+            }
+
+            return RunSilentMode(cliOptions);
+        }
+
+        private int RunSilentMode(CliOptions cliOptions)
+        {
+            var batch = ResizeBatch.FromCliOptions(Console.In, cliOptions);
+            var settings = Settings.Default;
+            CliSettingsApplier.Apply(cliOptions, settings);
+
+            CliLogger.Info($"CLI mode: processing {batch.Files.Count} files");
+
+            // Use accessible line-based progress if requested or detected
+            bool useLineBasedProgress = cliOptions.ProgressLines ?? false;
+            int lastReportedMilestone = -1;
+
+            var errors = batch.Process(
+                (completed, total) =>
+                {
+                    var progress = (int)((completed / total) * 100);
+
+                    if (useLineBasedProgress)
+                    {
+                        // Milestone-based progress (0%, 25%, 50%, 75%, 100%)
+                        int milestone = (progress / 25) * 25;
+                        if (milestone > lastReportedMilestone || completed == (int)total)
+                        {
+                            lastReportedMilestone = milestone;
+                            Console.WriteLine(string.Format(CultureInfo.InvariantCulture, Resources.CLI_ProgressFormat, progress, completed, (int)total));
+                        }
+                    }
+                    else
+                    {
+                        // Traditional carriage return mode
+                        Console.Write(string.Format(CultureInfo.InvariantCulture, "\r{0}", string.Format(CultureInfo.InvariantCulture, Resources.CLI_ProgressFormat, progress, completed, (int)total)));
+                    }
+                },
+                settings,
+                CancellationToken.None);
+
+            if (!useLineBasedProgress)
+            {
+                Console.WriteLine();
+            }
+
+            var errorList = errors.ToList();
+            if (errorList.Count > 0)
+            {
+                Console.Error.WriteLine(string.Format(CultureInfo.InvariantCulture, Resources.CLI_CompletedWithErrors, errorList.Count));
+                CliLogger.Error($"Processing completed with {errorList.Count} error(s)");
+                foreach (var error in errorList)
+                {
+                    Console.Error.WriteLine(string.Format(CultureInfo.InvariantCulture, "  {0}: {1}", error.File, error.Error));
+                    CliLogger.Error($"  {error.File}: {error.Error}");
+                }
+
+                return 1;
+            }
+
+            CliLogger.Info("CLI batch completed successfully");
+            Console.WriteLine(Resources.CLI_AllFilesProcessed);
+            return 0;
+        }
+    }
+}

src/modules/imageresizer/ui/Cli/Options/DestinationOption.cs

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.CommandLine;
+
+namespace ImageResizer.Cli.Options
+{
+    public sealed class DestinationOption : Option<string>
+    {
+        private static readonly string[] _aliases = ["--destination", "-d", "/d"];
+
+        public DestinationOption()
+            : base(_aliases, Properties.Resources.CLI_Option_Destination)
+        {
+        }
+    }
+}