diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-08-10 13:28:34 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-08-10 17:31:40 -0700 |
| commit | 84e7b6d277e5c3d118e11a45834d420254a758c0 (patch) | |
| tree | 7e50655dd077d4db4c99db45bf7ba8d68f378030 /src/setup | |
| parent | 6b7ad550ab4caaa262137539c9e5b0017fba4bd5 (diff) | |
| download | wix-84e7b6d277e5c3d118e11a45834d420254a758c0.tar.gz wix-84e7b6d277e5c3d118e11a45834d420254a758c0.tar.bz2 wix-84e7b6d277e5c3d118e11a45834d420254a758c0.zip | |
Prevent crash when Bundle has SWID Tag but child MSI does not
Fixes 6854
Diffstat (limited to 'src/setup')
| -rw-r--r-- | src/setup/WixAdditionalTools/WixAdditionalTools.wxs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs index a53db9d3..c54f6100 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs | |||
| @@ -13,8 +13,7 @@ | |||
| 13 | </BootstrapperApplication> | 13 | </BootstrapperApplication> |
| 14 | 14 | ||
| 15 | <SetVariable Variable="InstallFolder" Value="[ProgramFilesFolder]WiX Toolset v$(SetupMajorMinorVersion)\" /> | 15 | <SetVariable Variable="InstallFolder" Value="[ProgramFilesFolder]WiX Toolset v$(SetupMajorMinorVersion)\" /> |
| 16 | <!-- TODO: bring back SoftwareTag when #6854 fixed --> | 16 | <SoftwareTag Regid="!(loc.Regid)" InstallPath="[InstallFolder]" /> |
| 17 | <!-- <SoftwareTag Regid="!(loc.Regid)" InstallPath="[InstallFolder]" /> --> | ||
| 18 | 17 | ||
| 19 | <Update Location="!(loc.UpdateUrl)" /> | 18 | <Update Location="!(loc.UpdateUrl)" /> |
| 20 | 19 | ||