From 84e7b6d277e5c3d118e11a45834d420254a758c0 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 10 Aug 2022 13:28:34 -0700
Subject: Prevent crash when Bundle has SWID Tag but child MSI does not

Fixes 6854
---
 src/setup/WixAdditionalTools/WixAdditionalTools.wxs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/setup')

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 @@
     </BootstrapperApplication>
 
     <SetVariable Variable="InstallFolder" Value="[ProgramFilesFolder]WiX Toolset v$(SetupMajorMinorVersion)\" />
-    <!-- TODO: bring back SoftwareTag when #6854 fixed -->
-    <!-- <SoftwareTag Regid="!(loc.Regid)" InstallPath="[InstallFolder]" /> -->
+    <SoftwareTag Regid="!(loc.Regid)" InstallPath="[InstallFolder]" />
 
     <Update Location="!(loc.UpdateUrl)" />
 
-- 
cgit v1.2.3-55-g6feb