add to installer and sign

2026-02-23 19:49:43 +01:00 · 2025-10-13 18:14:41 +08:00
parent bcaa461b62
commit cc2d89a3ba
16 changed files with 358 additions and 38 deletions
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -235,7 +235,9 @@
            "*Microsoft.CmdPal.UI_*.msix",

            "PowerToys.DSC.dll",
-            "PowerToys.DSC.exe"
+            "PowerToys.DSC.exe",
+
+            "PowerToysSparse.msix"
          ],
            "SigningInfo": {
                "Operations": [
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -61,7 +61,8 @@
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
-  <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
    <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -3016,7 +3016,6 @@ Global
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{B25AC7A5-FB9F-4789-B392-D5C85E948670} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
@@ -594,6 +594,216 @@ LExit:
    return WcaFinalize(er);
 }

+UINT __stdcall InstallPackageIdentityMSIXCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    LPWSTR customActionData = nullptr;
+    std::wstring installFolderPath;
+    std::wstring installScope;
+    std::wstring msixPath;
+    std::wstring data;
+    size_t delimiterPos;
+    bool isMachineLevel = false;
+    
+    hr = WcaInitialize(hInstall, "InstallPackageIdentityMSIXCA");
+    ExitOnFailure(hr, "Failed to initialize");
+
+    hr = WcaGetProperty(L"CustomActionData", &customActionData);
+    ExitOnFailure(hr, "Failed to get CustomActionData property");
+    
+    // Parse CustomActionData: "[INSTALLFOLDER];[InstallScope]"
+    data = customActionData;
+    delimiterPos = data.find(L';');
+    installFolderPath = data.substr(0, delimiterPos);
+    installScope = data.substr(delimiterPos + 1);
+    
+    // Check if this is a machine-level installation
+    if (installScope == L"perMachine")
+    {
+        isMachineLevel = true;
+    }
+    
+    Logger::info(L"Installing PackageIdentity MSIX - perUser: {}", !isMachineLevel);
+
+    // Construct path to PackageIdentity MSIX
+    msixPath = installFolderPath;
+    msixPath += L"PowerToysSparse.msix";
+
+    if (std::filesystem::exists(msixPath))
+    {
+        using namespace winrt::Windows::Management::Deployment;
+        using namespace winrt::Windows::Foundation;
+
+        try
+        {
+            
+            std::wstring externalLocation = installFolderPath; // External content location (PowerToys install folder)
+            Uri externalUri{ externalLocation };               // External location URI for sparse package content
+            Uri packageUri{ msixPath };                        // The MSIX file URI
+            
+            PackageManager packageManager;
+            
+            if (isMachineLevel)
+            {
+                // Machine-level installation
+                
+                StagePackageOptions stageOptions;
+                stageOptions.ExternalLocationUri(externalUri);
+                
+                auto stageResult = packageManager.StagePackageByUriAsync(packageUri, stageOptions).get();
+                
+                uint32_t stageErrorCode = static_cast<uint32_t>(stageResult.ExtendedErrorCode());
+                if (stageErrorCode == 0)
+                {
+                    std::wstring packageFamilyName = L"Microsoft.PowerToys.SparseApp_8wekyb3d8bbwe";
+                    
+                    try
+                    {
+                        auto provisionResult = packageManager.ProvisionPackageForAllUsersAsync(packageFamilyName).get();
+                        uint32_t provisionErrorCode = static_cast<uint32_t>(provisionResult.ExtendedErrorCode());
+                        
+                        if (provisionErrorCode != 0)
+                        {
+                            Logger::error(L"Machine-level provisioning failed: 0x{:08X}", provisionErrorCode);
+                        }
+                    }
+                    catch (const winrt::hresult_error& ex)
+                    {
+                        Logger::error(L"Provisioning exception: HRESULT 0x{:08X}", static_cast<uint32_t>(ex.code()));
+                    }
+                }
+                else
+                {
+                    Logger::error(L"Package staging failed: 0x{:08X}", stageErrorCode);
+                }
+            }
+            else
+            {
+                AddPackageOptions addOptions;
+                addOptions.ExternalLocationUri(externalUri);
+                
+                auto addResult = packageManager.AddPackageByUriAsync(packageUri, addOptions).get();
+                
+                if (!addResult.IsRegistered())
+                {
+                    uint32_t errorCode = static_cast<uint32_t>(addResult.ExtendedErrorCode());
+                    Logger::error(L"Per-user installation failed: 0x{:08X}", errorCode);
+                }
+            }
+        }
+        catch (const std::exception& ex)
+        {
+            Logger::error(L"PackageIdentity MSIX installation failed - Exception: {}", 
+                         winrt::to_hstring(ex.what()).c_str());
+        }
+    }
+    else
+    {
+        Logger::error(L"PackageIdentity MSIX not found: " + msixPath);
+    }
+
+LExit:
+    ReleaseStr(customActionData);
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
+UINT __stdcall UninstallPackageIdentityMSIXCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    using namespace winrt::Windows::Management::Deployment; 
+    using namespace winrt::Windows::Foundation;
+    
+    LPWSTR installScope = nullptr;
+    bool isMachineLevel = false;
+    
+    PackageManager pm;
+
+    hr = WcaInitialize(hInstall, "UninstallPackageIdentityMSIXCA");
+    ExitOnFailure(hr, "Failed to initialize");
+    
+    // Check if this was a machine-level installation
+    hr = WcaGetProperty(L"InstallScope", &installScope);
+    if (SUCCEEDED(hr) && installScope && wcscmp(installScope, L"perMachine") == 0)
+    {
+        isMachineLevel = true;
+    }
+    
+    Logger::info(L"Uninstalling PackageIdentity MSIX - perUser: {}", !isMachineLevel);
+
+    try
+    {
+        std::wstring packageFamilyName = L"Microsoft.PowerToys.SparseApp_8wekyb3d8bbwe";
+        
+        if (isMachineLevel)
+        {
+            // Machine-level uninstallation: deprovision + remove for all users
+            
+            // First deprovision the package
+            try
+            {
+                auto deprovisionResult = pm.DeprovisionPackageForAllUsersAsync(packageFamilyName).get();
+                if (deprovisionResult.IsRegistered())
+                {
+                    Logger::warn(L"Machine-level deprovisioning completed with warnings");
+                }
+            }
+            catch (const winrt::hresult_error& ex)
+            {
+                Logger::warn(L"Machine-level deprovisioning failed: HRESULT 0x{:08X}", static_cast<uint32_t>(ex.code()));
+            }
+            
+            // Then remove packages for all users
+            auto packages = pm.FindPackagesForUserWithPackageTypes({}, packageFamilyName, PackageTypes::Main);
+            for (const auto& package : packages)
+            {
+                try
+                {
+                    auto machineResult = pm.RemovePackageAsync(package.Id().FullName(), RemovalOptions::RemoveForAllUsers).get();
+                    if (machineResult.IsRegistered())
+                    {
+                        uint32_t errorCode = static_cast<uint32_t>(machineResult.ExtendedErrorCode());
+                        Logger::error(L"Machine-level removal failed: 0x{:08X} - {}", errorCode, machineResult.ErrorText());
+                    }
+                }
+                catch (const winrt::hresult_error& ex)
+                {
+                    Logger::error(L"Machine-level removal exception: HRESULT 0x{:08X}", static_cast<uint32_t>(ex.code()));
+                }
+            }
+        }
+        else
+        {
+            // Per-user uninstallation: standard removal
+            
+            auto packages = pm.FindPackagesForUserWithPackageTypes({}, packageFamilyName, PackageTypes::Main);
+            for (const auto& package : packages)
+            {
+                auto userResult = pm.RemovePackageAsync(package.Id().FullName()).get();
+                if (userResult.IsRegistered())
+                {
+                    uint32_t errorCode = static_cast<uint32_t>(userResult.ExtendedErrorCode());
+                    Logger::error(L"Per-user removal failed: 0x{:08X} - {}", errorCode, userResult.ErrorText());
+                }
+            }
+        }
+    }
+    catch (const std::exception& ex)
+    {
+        std::string errorMsg = "Failed to uninstall PackageIdentity MSIX: " + std::string(ex.what());
+        Logger::error(errorMsg);
+        // Don't fail the entire uninstallation if PackageIdentity fails
+        Logger::warn(L"Continuing uninstallation despite PackageIdentity MSIX error");
+    }
+
+LExit:
+    ReleaseStr(installScope);
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
 UINT __stdcall RemoveWindowsServiceByName(std::wstring serviceName)
 {
    SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.def
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.def
@@ -33,3 +33,5 @@ EXPORTS
 	CleanPowerRenameRuntimeRegistryCA
 	CleanNewPlusRuntimeRegistryCA
 	SetBundleInstallLocationCA
+	InstallPackageIdentityMSIXCA
+	UninstallPackageIdentityMSIXCA
--- a/installer/PowerToysSetupVNext/Core.wxs
+++ b/installer/PowerToysSetupVNext/Core.wxs
@@ -73,6 +73,16 @@
      </Component>
    </DirectoryRef>

+    <!-- PackageIdentity MSIX file in root install folder -->
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="PackageIdentityMSIX" Guid="A5D5E12A-3C7F-4B5D-9E1F-8F2A3B4C5D6E" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="PackageIdentityMSIX" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="PowerToysSparse.msix" Name="PowerToysSparse.msix" Source="$(var.BinDir)PowerToysSparse.msix" />
+      </Component>
+    </DirectoryRef>
+
    <?if $(var.PerUser) = "true" ?>
    <!-- DSC module files for PerUser handled in InstallDSCModule custom action. -->
    <?else?>
@@ -134,6 +144,7 @@
  <ComponentRef Id="powertoys_env_path_machine" />
  <?endif?>
      <ComponentRef Id="powertoys_toast_clsid" />
+      <ComponentRef Id="PackageIdentityMSIX" />
      <ComponentRef Id="License_rtf" />
      <ComponentRef Id="Notice_md" />
      <ComponentRef Id="DesktopShortcut" />
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -112,6 +112,7 @@
      <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
      <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
      <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
+      <Custom Action="SetInstallPackageIdentityMSIXParam" Before="InstallPackageIdentityMSIX" />

      <?if $(var.PerUser) = "true" ?>
      <Custom Action="SetInstallDSCModuleParam" Before="InstallDSCModule" />
@@ -123,6 +124,7 @@
      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed" />
      <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
      <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
+      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed" />
      <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
      <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
      <!-- TODO: Use to activate embedded MSIX -->
@@ -144,6 +146,7 @@
      <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
      <Custom Action="UninstallCommandNotFound" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
      <Custom Action="UpgradeCommandNotFound" After="InstallFiles" Condition="WIX_UPGRADE_DETECTED" />
+      <Custom Action="UninstallPackageIdentityMSIX" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
      <Custom Action="UninstallServicesTask" After="InstallFinalize" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
        <!-- TODO: Use to activate embedded MSIX -->
      <!--<Custom Action="UninstallEmbeddedMSIXTask" After="InstallFinalize">
@@ -199,6 +202,12 @@

    <CustomAction Id="UninstallEmbeddedMSIXTask" Return="ignore" Impersonate="yes" DllEntry="UninstallEmbeddedMSIXCA" BinaryRef="PTCustomActions" />

+    <CustomAction Id="SetInstallPackageIdentityMSIXParam" Property="InstallPackageIdentityMSIX" Value="[INSTALLFOLDER];[InstallScope]" />
+
+    <CustomAction Id="InstallPackageIdentityMSIX" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallPackageIdentityMSIXCA" BinaryRef="PTCustomActions" />
+
+    <CustomAction Id="UninstallPackageIdentityMSIX" Return="ignore" Impersonate="yes" DllEntry="UninstallPackageIdentityMSIXCA" BinaryRef="PTCustomActions" />
+
    <CustomAction Id="InstallDSCModule" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallDSCModuleCA" BinaryRef="PTCustomActions" />

    <CustomAction Id="UninstallDSCModule" Return="ignore" Impersonate="yes" DllEntry="UninstallDSCModuleCA" BinaryRef="PTCustomActions" />
--- a/src/PackageIdentity/BuildSparsePackage.ps1
+++ b/src/PackageIdentity/BuildSparsePackage.ps1
@@ -81,7 +81,7 @@ function Write-BuildLog {
    param([string]$Message, [string]$Level = "Info")
    
    $colors = @{ Error = "Red"; Warning = "Yellow"; Success = "Green"; Info = "Cyan" }
-    $color = $colors[$Level] ?? "White"
+    $color = if ($colors.ContainsKey($Level)) { $colors[$Level] } else { "White" }
    
    Write-Host "[$(Get-Date -f 'HH:mm:ss')] $Message" -ForegroundColor $color
 }
@@ -197,19 +197,14 @@ if ($needNewCert) {
        -Password (ConvertTo-SecureString -String $plainPwd -AsPlainText -Force) | Out-Null
 }

-# Build (restore + compile). This assumes msbuild is on PATH (VS Developer Prompt) or dev shell.
-Write-BuildLog "(Info) Build step skipped: integrate real project build here if needed (Platform=$Platform Configuration=$Configuration)." -Level Info
-#msbuild /restore /p:Platform=$Platform /p:Configuration=$Configuration "$ProjectRoot\PowerOCR.csproj"
-#msbuild /p:Platform=$Platform /p:Configuration=$Configuration "$ProjectRoot\PowerOCR.csproj"
+# Determine output directory - using PowerToys standard structure
+# Navigate to PowerToys root (two levels up from src/PackageIdentity)
+$PowerToysRoot = Split-Path (Split-Path $ProjectRoot -Parent) -Parent
+$outDir = Join-Path $PowerToysRoot "$Platform\$Configuration"

-# Determine output directory (adjust if TFM changes)
-#$tfmFolder = 'net8.0-windows10.0.22621.0'
-#$outDir = Join-Path $ProjectRoot "bin/$Platform/$Configuration/$tfmFolder"
-
-$outDir = Join-Path $ProjectRoot "bin/"
 if (-not (Test-Path $outDir)) {
    Write-BuildLog "Creating output directory: $outDir" -Level Info
-    New-Item -ItemType Directory -Path $outDir | Out-Null
+    New-Item -ItemType Directory -Path $outDir -Force | Out-Null
 }

 # PackageIdentity folder (this script location) containing the sparse manifest and assets
--- a/src/PackageIdentity/PackageIdentity.vcxproj
+++ b/src/PackageIdentity/PackageIdentity.vcxproj
@@ -20,6 +20,25 @@
          WorkingDirectory="$(MSBuildThisFileDirectory)" />
  </Target>

+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
  <PropertyGroup Label="Globals">
    <VCProjectVersion>15.0</VCProjectVersion>
    <Keyword>Win32Proj</Keyword>
@@ -30,11 +49,32 @@

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Label="Configuration">
+  <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>
+
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <ImportGroup Label="ExtensionSettings">
--- a/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj
+++ b/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj
@@ -32,6 +32,7 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(CIBuild)'=='true'">CIBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp
+++ b/src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp
@@ -122,7 +122,7 @@ private:

        SHELLEXECUTEINFOW sei{ sizeof(sei) };
        sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
-        sei.lpFile = L"shell:AppsFolder\\Microsoft.PowerToys.SparseApp_djwsxzxb4ksa8!PowerToys.OCR";;
+        sei.lpFile = L"PowerToys.PowerOCR.exe";
        sei.nShow = SW_SHOWNORMAL;
        sei.lpParameters = executable_args.data();
        if (ShellExecuteExW(&sei))
--- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
+++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
@@ -41,6 +41,7 @@
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;IMAGERESIZERCONTEXTMENU_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(CIBuild)'=='true'">CIBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>..\ImageResizerLib;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
@@ -62,6 +63,7 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv</Comm
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;IMAGERESIZERCONTEXTMENU_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(CIBuild)'=='true'">CIBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>..\ImageResizerLib;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp
+++ b/src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp
@@ -245,8 +245,18 @@ private:
        }
        create_pipe_thread = std::thread(&ImageResizerContextMenuCommand::StartNamedPipeServerAndSendData, this, pipe_name);

+        // Select Package Family Name based on build configuration
+        std::wstring packageFamilyName;
+#if !defined(CIBUILD)
+        // Non-CI Release build
+        packageFamilyName = L"djwsxzxb4ksa8";
+#else
+        // Debug build or CI build
+        packageFamilyName = L"8wekyb3d8bbwe";
+#endif
+
        std::wstring aumidTarget =
-            L"shell:AppsFolder\\Microsoft.PowerToys.SparseApp_djwsxzxb4ksa8!PowerToys.ImageResizerUI"; // PFN!AppId
+            L"shell:AppsFolder\\Microsoft.PowerToys.SparseApp_" + packageFamilyName + L"!PowerToys.ImageResizerUI"; // PFN!AppId
        std::wstring args = L"--pipe \"" + pipe_name + L"\"";

        // Use ShellExecuteEx so you get a process handle:
@@ -263,9 +273,17 @@ private:
        }
        else
        {
-            Logger::error(L"Failed to start ImageResizer (sparse). {}", get_last_error_or_default(GetLastError()));
+            Logger::warn(L"Failed to start ImageResizer (sparse). {}. Trying fallback to exe.", get_last_error_or_default(GetLastError()));
+            // Fallback to traditional exe if MSIX launch fails
+            if (RunNonElevatedEx(path.c_str(), pipe_name, get_module_folderpath(g_hInst)))
+            {
+                Logger::trace(L"Started ImageResizer (exe) with pipe {} as fallback", pipe_name);
+            }
+            else
+            {
+                Logger::error(L"Failed to start ImageResizer (exe) fallback. {}", get_last_error_or_default(GetLastError()));
+            }
        }
-        // RunNonElevatedEx(path.c_str(), pipe_name, get_module_folderpath(g_hInst));

        create_pipe_thread.join();

--- a/src/modules/imageresizer/dll/ContextMenuHandler.cpp
+++ b/src/modules/imageresizer/dll/ContextMenuHandler.cpp
@@ -289,28 +289,56 @@ HRESULT CContextMenuHandler::ResizePictures(CMINVOKECOMMANDINFO* pici, IShellIte

    PROCESS_INFORMATION processInformation;

-    // Start the resizer
-    CreateProcess(
-        NULL,
-        lpszCommandLine,
-        NULL,
-        NULL,
-        TRUE,
-        0,
-        NULL,
-        NULL,
-        &startupInfo,
-        &processInformation);
-    delete[] lpszCommandLine;
-    if (!CloseHandle(processInformation.hProcess))
+    // Try MSIX sparse package first
+    std::wstring packageFamilyName;
+#if !defined(CIBUILD)
+        // Non-CI Release build
+        packageFamilyName = L"djwsxzxb4ksa8";
+#else
+        // Debug build or CI build
+        packageFamilyName = L"8wekyb3d8bbwe";
+#endif
+    std::wstring aumidTarget = L"shell:AppsFolder\\Microsoft.PowerToys.SparseApp_" + packageFamilyName + L"!PowerToys.ImageResizerUI";
+    
+    SHELLEXECUTEINFOW sei{ sizeof(sei) };
+    sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI;
+    sei.lpVerb = L"open";
+    sei.lpFile = aumidTarget.c_str();
+    sei.lpParameters = lpszCommandLine + wcslen(lpApplicationName) + 3; // Skip the exe path and quotes
+    sei.nShow = pici ? static_cast<WORD>(pici->nShow) : SW_SHOWNORMAL;
+
+    if (ShellExecuteExW(&sei) && reinterpret_cast<INT_PTR>(sei.hInstApp) > 32)
    {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        return hr;
+        // MSIX launch succeeded, use existing pipe communication
+        // (no changes to the rest of the function)
+        delete[] lpszCommandLine;
    }
-    if (!CloseHandle(processInformation.hThread))
+    else
    {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        return hr;
+        // Fallback to traditional exe
+        // Start the resizer
+        CreateProcess(
+            NULL,
+            lpszCommandLine,
+            NULL,
+            NULL,
+            TRUE,
+            0,
+            NULL,
+            NULL,
+            &startupInfo,
+            &processInformation);
+        delete[] lpszCommandLine;
+        if (!CloseHandle(processInformation.hProcess))
+        {
+            hr = HRESULT_FROM_WIN32(GetLastError());
+            return hr;
+        }
+        if (!CloseHandle(processInformation.hThread))
+        {
+            hr = HRESULT_FROM_WIN32(GetLastError());
+            return hr;
+        }
    }

    // psiItemArray is NULL if called from InvokeCommand. This part is used for the MSI installer. It is not NULL if it is called from Invoke (MSIX).
--- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
+++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
@@ -32,6 +32,7 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(CIBuild)'=='true'">CIBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\ImageResizerLib;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/src/modules/imageresizer/tests/ImageResizer.UnitTests.csproj
+++ b/src/modules/imageresizer/tests/ImageResizer.UnitTests.csproj
@@ -48,6 +48,7 @@
    </Content>
  </ItemGroup>
  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK.Runtime" />
    <PackageReference Include="Moq" />
    <PackageReference Include="MSTest" />
    <PackageReference Include="System.IO.Abstractions" />