From 02e87f8e78aef49800ca92bc1c8448f0ce16e51f Mon Sep 17 00:00:00 2001
From: Jaylyn Barbee <51131738+Jaylyn-Barbee@users.noreply.github.com>
Date: Mon, 22 Sep 2025 14:55:31 -0400
Subject: [PATCH] Installer updates

---
 .../PowerToysSetupCustomActionsVNext.vcxproj    |  1 +
 installer/PowerToysSetupVNext/LightSwitch.wxs   | 17 +++--------------
 .../PowerToysInstallerVNext.wixproj             |  2 ++
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
index db6f6e6392..7cd49be6ea 100644
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -65,6 +65,7 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\LightSwitch.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\LightSwitch.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs.bk""""
diff --git a/installer/PowerToysSetupVNext/LightSwitch.wxs b/installer/PowerToysSetupVNext/LightSwitch.wxs
index bae53d9e97..962945944e 100644
--- a/installer/PowerToysSetupVNext/LightSwitch.wxs
+++ b/installer/PowerToysSetupVNext/LightSwitch.wxs
@@ -3,7 +3,7 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define LightSwitchFiles=PowerToys.LightSwitchService.exePowerToys.LightSwitchService.exePowerToys.LightSwitchService.exe?>
+  <?define LightSwitchFiles=?>
   <?define LightSwitchFilesPath=$(var.BinDir)\LightSwitchService\?>
 
   <Fragment>
@@ -16,14 +16,8 @@
 
     <!-- File components generated by generateAllFileComponents.ps1 -->
     <DirectoryRef Id="LightSwitchServiceFolder" FileSource="$(var.LightSwitchFilesPath)">
-
-            <Component Id="LightSwitchFiles_Component" Guid="70654D33-B978-4ABE-B95D-DFBD77B08233">
-              <RegistryKey Root="HKLM" Key="Software\Classes\powertoys\components">
-                <RegistryValue Type="string" Name="LightSwitchFiles_Component" Value="" KeyPath="yes"/>
-              </RegistryKey>
-              <File Id="LightSwitchFiles_File_PowerToys.LightSwitchService.exe" Source="$(var.LightSwitchFilesPath)\PowerToys.LightSwitchService.exe" />
-            </Component>
-
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!-- LightSwitchFiles_Component_Def -->
     </DirectoryRef>
 
     <!-- Group to include the service + cleanup on uninstall -->
@@ -36,11 +30,6 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderLightSwitchServiceFolder" Directory="LightSwitchServiceFolder" On="uninstall" />
       </Component>
-
-            <ComponentRef Id="LightSwitchFiles_Component" />
-            <ComponentRef Id="LightSwitchFiles_Component" />
-            <ComponentRef Id="LightSwitchFiles_Component" />
     </ComponentGroup>
-
   </Fragment>
 </Wix>
diff --git a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
index 0cb9118b91..c70c3d9622 100644
--- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
@@ -39,6 +39,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
       call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
       call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
+      call move /Y ..\..\..\LightSwitch.wxs.bk ..\..\..\LightSwitch.wxs
       call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
       call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
       call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
@@ -112,6 +113,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="FileLocksmith.wxs" />
     <Compile Include="Hosts.wxs" />
     <Compile Include="ImageResizer.wxs" />
+    <Compile Include="LightSwitch.wxs" />
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />