From 2a99c0731596f62223ca455926b246c601f9e946 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:10:01 -0500
Subject: [PATCH] Fix subtle bug causing mixmatched files between host watchdog
 and host in installer

---
 .../winget/Tgstation.Server.Host.Service.Wix/Package.wxs     | 4 ++++
 .../Tgstation.Server.Host.Service.Wix.wixproj                | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs b/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs
index 240250b62f4..bde9181f975 100644
--- a/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs
+++ b/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs
@@ -48,6 +48,10 @@
         </DirectorySearch>
       </DirectorySearch>
     </Property>
+    
+    <ComponentGroup Id="ServiceHostWatchdogComponentGroup">
+      <Files Include="../../../../artifacts/Tgstation.Server.Host.Service/**" Directory="ApplicationDirectory" />
+    </ComponentGroup>
 
     <StandardDirectory Id="ProgramFiles6432Folder">
       <Directory Id="ApplicationDirectory" Name="!(bind.Property.ProductName)">
diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj b/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj
index 9ca13531e21..272694a58e5 100644
--- a/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj
+++ b/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj
@@ -18,11 +18,6 @@
       <SuppressRegistry>true</SuppressRegistry>
       <SuppressRootDirectory>true</SuppressRootDirectory>
     </HarvestDirectory>
-    <HarvestDirectory Include="../../../../artifacts/Tgstation.Server.Host.Service">
-      <ComponentGroupName>ServiceHostWatchdogComponentGroup</ComponentGroupName>
-      <DirectoryRefId>ApplicationDirectory</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestDirectory>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Heat" Version="5.0.2" />