diff --git a/.gitignore b/.gitignore index ff701ad53..8268734a6 100644 --- 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 index c1fbe2279..61f0e4e56 100644 --- 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 index e3443fc78..e9a7298eb 100644 --- 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 --> - + diff --git a/installer/Octopus.Tentacle.Installer/Tentacle.Generated.wxs b/installer/Octopus.Tentacle.Installer/Tentacle.Generated.wxs index fc51f0455..3f4e0b87d 100644 --- a/installer/Octopus.Tentacle.Installer/Tentacle.Generated.wxs +++ b/installer/Octopus.Tentacle.Installer/Tentacle.Generated.wxs @@ -1,4 +1,7 @@ + + +