From 88dd87f830fe775017388ff42c4c75669f0bc32e Mon Sep 17 00:00:00 2001
From: Noraa Junker <noraa.junker@outlook.com>
Date: Tue, 17 Feb 2026 01:39:03 +0100
Subject: [PATCH] Fix installer now?

---
 installer/PowerToysSetupVNext/Core.wxs         |  6 +++---
 installer/PowerToysSetupVNext/PowerDisplay.wxs | 16 +++++++++++++---
 installer/PowerToysSetupVNext/PowerToys.wxs    |  6 +++---
 installer/PowerToysSetupVNext/Product.wxs      |  2 +-
 src/Runner/RunnerV2.csproj                     |  3 +++
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/installer/PowerToysSetupVNext/Core.wxs b/installer/PowerToysSetupVNext/Core.wxs
index aaf9bb5550..c456a36974 100644
--- a/installer/PowerToysSetupVNext/Core.wxs
+++ b/installer/PowerToysSetupVNext/Core.wxs
@@ -66,9 +66,9 @@
           <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
             <RegistryValue Type="string" Name="svgs_icons" Value="" KeyPath="yes" />
           </RegistryKey>
-          <File Id="icon.ico" Source="$(var.BinDir)svgs\icon.ico" />
-          <File Id="PowerToysWhite.ico" Source="$(var.BinDir)svgs\PowerToysWhite.ico" />
-          <File Id="PowerToysDark.ico" Source="$(var.BinDir)svgs\PowerToysDark.ico" />
+          <File Id="icon.ico" Source="$(var.BinDir)icon.ico" />
+          <File Id="PowerToysLight.ico" Source="$(var.BinDir)Assets\Runner\PowerToysLight.ico" />
+          <File Id="PowerToysDark.ico" Source="$(var.BinDir)Assets\Runner\PowerToysDark.ico" />
         </Component>
       </Directory>
     </DirectoryRef>
diff --git a/installer/PowerToysSetupVNext/PowerDisplay.wxs b/installer/PowerToysSetupVNext/PowerDisplay.wxs
index 5cfe23661c..1bb38fa658 100644
--- a/installer/PowerToysSetupVNext/PowerDisplay.wxs
+++ b/installer/PowerToysSetupVNext/PowerDisplay.wxs
@@ -3,7 +3,7 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PowerDisplayAssetsFiles=?>
+  <?define PowerDisplayAssetsFiles=PowerDisplay.icoPowerDisplay.icoPowerDisplay.ico?>
   <?define PowerDisplayAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerDisplay?>
 
   <Fragment>
@@ -13,7 +13,14 @@
     </DirectoryRef>
     <DirectoryRef Id="PowerDisplayAssetsInstallFolder" FileSource="$(var.PowerDisplayAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerDisplayAssetsFiles_Component_Def-->
+
+            <Component Id="PowerDisplayAssetsFiles_Component" Guid="">
+              <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+                <RegistryValue Type="string" Name="PowerDisplayAssetsFiles_Component" Value="" KeyPath="yes"/>
+              </RegistryKey>
+              <File Id="PowerDisplayAssetsFiles_File_PowerDisplay.ico" Source="$(var.PowerDisplayAssetsFilesPath)\PowerDisplay.ico" />
+            </Component>
+
     </DirectoryRef>
 
     <ComponentGroup Id="PowerDisplayComponentGroup">
@@ -23,7 +30,10 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderPowerDisplayAssetsFolder" Directory="PowerDisplayAssetsInstallFolder" On="uninstall"/>
       </Component>
+            <ComponentRef Id="PowerDisplayAssetsFiles_Component" />
+            <ComponentRef Id="PowerDisplayAssetsFiles_Component" />
+            <ComponentRef Id="PowerDisplayAssetsFiles_Component" />
     </ComponentGroup>
 
   </Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/installer/PowerToysSetupVNext/PowerToys.wxs b/installer/PowerToysSetupVNext/PowerToys.wxs
index 64f6f35c5e..4d74b02284 100644
--- a/installer/PowerToysSetupVNext/PowerToys.wxs
+++ b/installer/PowerToysSetupVNext/PowerToys.wxs
@@ -4,16 +4,16 @@
 
     <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-    <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)" Version="$(var.Version)" Manufacturer="Microsoft Corporation" IconSourceFile="$(var.BinDir)svgs\icon.ico" UpgradeCode="$(var.UpgradeCode)">
+    <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)" Version="$(var.Version)" Manufacturer="Microsoft Corporation" IconSourceFile="$(var.BinDir)icon.ico" UpgradeCode="$(var.UpgradeCode)">
         <BootstrapperApplication>
             <bal:WixStandardBootstrapperApplication 
                 LicenseFile="$(var.RepoDir)\installer\License.rtf" 
-                LogoFile="$(var.RepoDir)\installer\PowerToysSetupVNext\Images\logo44.png" 
+                LogoFile="$(var.RepoDir)\installer\PowerToysSetupVNext\Images\logo44.png"   
                 SuppressOptionsUI="no" 
                 SuppressRepair="yes" 
                 Theme="rtfLicense" 
                 ThemeFile="$(var.RepoDir)\installer\PowerToysSetupVNext\RtfTheme.xml"/>
-            <Payload Name="icon.ico" SourceFile="$(var.BinDir)svgs\icon.ico" Compressed="yes" />
+            <Payload Name="icon.ico" SourceFile="$(var.BinDir)icon.ico" Compressed="yes" />
             <Payload Name="SilentFilesInUseBAFunction.dll" SourceFile="$(var.RepoDir)installer\$(var.PowerToysPlatform)\Release\SilentFilesInUseBAFunction.dll" Compressed="yes" bal:BAFunctions="yes" />
         </BootstrapperApplication>
 
diff --git a/installer/PowerToysSetupVNext/Product.wxs b/installer/PowerToysSetupVNext/Product.wxs
index 1a5f8010f7..f6d093ddb4 100644
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -35,7 +35,7 @@
     </Property>
     <Launch Condition="(WINDOWSBUILDNUMBER &gt;= 19041)" Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher." />
 
-    <Icon Id="powertoys.exe" SourceFile="$(var.BinDir)svgs\icon.ico" />
+    <Icon Id="powertoys.exe" SourceFile="$(var.BinDir)icon.ico" />
 
     <Property Id="ARPPRODUCTICON" Value="powertoys.exe" />
 
diff --git a/src/Runner/RunnerV2.csproj b/src/Runner/RunnerV2.csproj
index 9fc600c6a2..de5d75ba6f 100644
--- a/src/Runner/RunnerV2.csproj
+++ b/src/Runner/RunnerV2.csproj
@@ -38,6 +38,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="icon.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Assets\Runner\PowerToysDark.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>