Fix subtle bug causing mixmatched files between host watchdog and hos…

…t in installer
tgstation · Nov 18, 2024 · 2a99c07 · 2a99c07
1 parent d2b58ad
commit 2a99c07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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/...ackage/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj b/...ackage/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" />