diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-09-26 16:19:42 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-09-26 23:22:49 +0000 |
| commit | 0a45d13652cd0f34a9cabfbc6dbbdc8faaaf3554 (patch) | |
| tree | 8ea295368eec5939aa975f87de921a8a69ec35bb /packaging | |
| parent | b725d6c9acc403dba30c72d20cf7103e4f490334 (diff) | |
WiX: Try to fix development upgrades.
Try enabling the MajorUpgrade:AllowSameVersionUpgrades attribute. This
should keep the .msi packages from installing side by side when only
the micro version differs.
Change-Id: I37e8971d965ec1909c6baacb55d6a8062b13ff70
Reviewed-on: https://code.wireshark.org/review/17945
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/wix/Wireshark.wxs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs index a2fbcd37db..16ce53882c 100644 --- a/packaging/wix/Wireshark.wxs +++ b/packaging/wix/Wireshark.wxs @@ -24,7 +24,17 @@ <Property Id="WIRESHARK_LEGACY_QUICK_LAUNCH_ICON" Value="1" Secure="yes" /> <Property Id="WIRESHARK_FILE_EXTENSIONS" Value="0"/> - <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.WiresharkName) is already installed." /> + <!-- We set AllowSameVersionUpgrade so that automated builds (which + only differ by micro version numbers) won't get installed side + by side. The WiX documentation seems to warn against this, so we + might want to find a better fix. + --> + <MajorUpgrade + DowngradeErrorMessage="A newer version of $(var.WiresharkName) is already installed." + AllowSameVersionUpgrades="yes" + /> + + <MediaTemplate EmbedCab="yes" CompressionLevel="high" /> <!-- Include the prerequisites, by referencing the placeholder property --> |