Fix up WixAdditionalTools metadata

3 files changed, 4 insertions, 2 deletions

diff --git a/src/setup/MetadataTask/GenerateMetadata.cs b/src/setup/MetadataTask/GenerateMetadata.cs
index a5b45102..efe4ee39 100644
--- a/src/setup/MetadataTask/GenerateMetadata.cs
+++ b/src/setup/MetadataTask/GenerateMetadata.cs
@@ -59,11 +59,13 @@ namespace WixToolset.Tasks
 
             var metadata = new Metadata
             {
+                Id = "WixToolset.AdditionalTools",
                 Type = MetadataType.Burn,
                 Name = bundleSymbol.Name,
                 Version = bundleSymbol.Version,
                 Publisher = bundleSymbol.Manufacturer,
                 Description = "Installation for " + bundleSymbol.Name,
+                License = "MS-RL",
                 SupportUrl = bundleSymbol.HelpUrl,
                 BundleCode = bundleSymbol.BundleId,
                 UpgradeCode = bundleSymbol.UpgradeCode,
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
index 89054f19..5085b5dd 100644
--- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
@@ -7,6 +7,6 @@
     <String Id="Regid" Overridable="yes" Value="wixtoolset.org" />
     <String Id="AboutUrl" Overridable="yes" Value="https://wixtoolset.org/" />
     <String Id="LicenseUrl" Overridable="yes" Value="https://wixtoolset.org/about/license/" />
-    <String Id="SupportUrl" Overridable="yes" Value="https://wixtoolset.org/documentation/" />
+    <String Id="SupportUrl" Overridable="yes" Value="https://wixtoolset.org/docs/gethelp/" />
     <String Id="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feeds/wix-additional-tools-$(SetupDashedMajorMinorVersion)$(SetupDashedPrerelease).feed" />
 </WixLocalization>
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
index c54f6100..6a9f945f 100644
--- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="!(loc.Name)" Version="$(SetupVersion)" UpgradeCode="fc48131d-214a-439b-9a31-ef2ea5c69ea5"
+  <Bundle Name="!(loc.Name)" Manufacturer="WiX Toolset" Version="$(SetupVersion)" UpgradeCode="fc48131d-214a-439b-9a31-ef2ea5c69ea5"
           AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)">
     <BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication