Fix bundling unwanted files in MSI (#583)

Adding extra testing for both net48 and net6.0 installers
OctopusDeploy · Sep 6, 2023 · 5af1c57 · 5af1c57
1 parent 85a652a
commit 5af1c57
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -49,6 +49,7 @@ tools
 
 _artifacts
 _build
+_test
 
 .DS_Store
 .env
diff --git a/build/Build.Pack.cs b/build/Build.Pack.cs
@@ -158,6 +158,7 @@ void PackWindowsInstallers(MSBuildTargetPlatform platform, AbsolutePath wixNuget
             {
                 var installerDirectory = BuildDirectory / "Installer";
                 FileSystemTasks.EnsureExistingDirectory(installerDirectory);
+                FileSystemTasks.EnsureCleanDirectory(installerDirectory);
 
                 if (framework != NetCore)
                 {

diff --git a/installer/Octopus.Tentacle.Installer/Product.wxs b/installer/Octopus.Tentacle.Installer/Product.wxs
@@ -14,7 +14,7 @@
     - Product/Version      : Change this every major build
     - Product/UpgradeCode  : Never change this
   -->
-  <Product Id="*" Name="Octopus Deploy Tentacle" Language="1033" Version="7.0.201" Manufacturer="Octopus Deploy Pty. Ltd." UpgradeCode="1B32E04F-49C2-4907-8879-A556986F7F16">
+  <Product Id="*" Name="Octopus Deploy Tentacle" Language="1033" Version="7.0.203" Manufacturer="Octopus Deploy Pty. Ltd." UpgradeCode="1B32E04F-49C2-4907-8879-A556986F7F16">
     <Package InstallerVersion="200" Compressed="yes" Description="Octopus Deploy Tentacle" Platform="$(var.Platform)" InstallScope="perMachine" />
     <Media Id="1" Cabinet="Files.cab" EmbedCab="yes" />
     <Property Id="MSIFASTINSTALL" Value="3" />

diff --git a/installer/Octopus.Tentacle.Installer/Tentacle.Generated.wxs b/installer/Octopus.Tentacle.Installer/Tentacle.Generated.wxs
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- NOTE: This file is replaced using the Wix tool Heat during Nuke PackWindowsInstallers-->
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="INSTALLLOCATION">
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,7 @@ tools @@
     _artifacts
     _build
+    _test
     .DS_Store
     .env