Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bundling unwanted files in MSI #583

Merged
merged 4 commits into from
Sep 6, 2023
Merged

Fix bundling unwanted files in MSI #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c618541
Adding extra testing for both net48 and net6.0 installers
sburmanoctopus Sep 6, 2023
b8ce427
Typos...
sburmanoctopus Sep 6, 2023
aa1a15d
Clearing out the installer directory so that files from previous inst…
sburmanoctopus Sep 6, 2023
c2d9792
Merge remote-tracking branch 'origin/main' into sast/FixBundlingUnwan…
sburmanoctopus Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ tools

_artifacts
_build
_test
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When tests clean up after themselves, we don't need this. But when they don't, it's a Git mess


.DS_Store
.env
1 change: 1 addition & 0 deletions build/Build.Pack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ void PackWindowsInstallers(MSBuildTargetPlatform platform, AbsolutePath wixNuget
{
var installerDirectory = BuildDirectory / "Installer";
FileSystemTasks.EnsureExistingDirectory(installerDirectory);
FileSystemTasks.EnsureCleanDirectory(installerDirectory);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot


if (framework != NetCore)
{
Expand Down
2 changes: 1 addition & 1 deletion installer/Octopus.Tentacle.Installer/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 3 additions & 0 deletions installer/Octopus.Tentacle.Installer/Tentacle.Generated.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down