Fix bundling unwanted files in MSI #583
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…allers do not make their way into subsequent installers
…tedFilesInMsi # Conflicts: # installer/Octopus.Tentacle.Installer/Product.wxs
sburmanoctopus
commented
Sep 6, 2023
| @@ -49,6 +49,7 @@ tools | |||
|
|
|||
| _artifacts | |||
| _build | |||
| _test | |||
There was a problem hiding this comment.
When tests clean up after themselves, we don't need this. But when they don't, it's a Git mess
|
This pull request has been linked to Shortcut Story #59022: Ensure net6.0 only installs required files. |
sburmanoctopus
changed the title
| @@ -158,6 +158,7 @@ void PackWindowsInstallers(MSBuildTargetPlatform platform, AbsolutePath wixNuget | |||
| { | |||
| var installerDirectory = BuildDirectory / "Installer"; | |||
| FileSystemTasks.EnsureExistingDirectory(installerDirectory); | |||
| FileSystemTasks.EnsureCleanDirectory(installerDirectory); | |||
nathanwoctopusdeploy
approved these changes
Sep 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[sc-59022]
Background
We found that the Tentacle Manager was being shipped in the net6.0 MSI, when is shouldn't be.
Results
Related to #584
Before
We generate the files to include in Wix using Heat.exe. This exe then overrides the
Tentacle.Generated.wxsfile with what should be installed.Before we run Heat.exe, we copy all the files we need for the MSI being built into the
_build\Installerfolder, and then tell Heat.exe to include everything in there.But we don't clear that folder between MSI builds. So any file from a previous MSI build will be included in the next MSI (unless it's overridden, which most of them are).
After
We now clear the
_build\Installerfolder so that the Tentacle Manager files from the previous MSI build are not included in the net6.0 MSIs anymore.Below is output from a test installation. Note we order by type, and that there is no
Octopus.Manager.Tentacle.exeAlso, note the file size changes before and after.
Before
After
How to review this PR
Quality ✔️
Pre-requisites