@joebigelow / wix / commits / bc52de8b

Fix up WixAdditionalTools metadata

Rob Mensching committed Dec 21, 2022 at 16:31 UTC bc52de8bd03922cac66b9dddabe14c413d599532
3 files changed +4 -2
src/setup/MetadataTask/GenerateMetadata.cs
+2
@@ -59,11 +59,13 @@ namespace WixToolset.Tasks
59
60 var metadata = new Metadata
61 {
62 + Id = "WixToolset.AdditionalTools",
63 Type = MetadataType.Burn,
64 Name = bundleSymbol.Name,
65 Version = bundleSymbol.Version,
66 Publisher = bundleSymbol.Manufacturer,
67 Description = "Installation for " + bundleSymbol.Name,
68 + License = "MS-RL",
69 SupportUrl = bundleSymbol.HelpUrl,
70 BundleCode = bundleSymbol.BundleId,
71 UpgradeCode = bundleSymbol.UpgradeCode,
src/setup/WixAdditionalTools/WixAdditionalTools.wxl
+1 -1
@@ -7,6 +7,6 @@
7 <String Id="Regid" Overridable="yes" Value="wixtoolset.org" />
8 <String Id="AboutUrl" Overridable="yes" Value="https://wixtoolset.org/" />
9 <String Id="LicenseUrl" Overridable="yes" Value="https://wixtoolset.org/about/license/" />
10 - <String Id="SupportUrl" Overridable="yes" Value="https://wixtoolset.org/documentation/" />
10 + <String Id="SupportUrl" Overridable="yes" Value="https://wixtoolset.org/docs/gethelp/" />
11 <String Id="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feeds/wix-additional-tools-$(SetupDashedMajorMinorVersion)$(SetupDashedPrerelease).feed" />
12 </WixLocalization>
src/setup/WixAdditionalTools/WixAdditionalTools.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
4 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 - <Bundle Name="!(loc.Name)" Version="$(SetupVersion)" UpgradeCode="fc48131d-214a-439b-9a31-ef2ea5c69ea5"
5 + <Bundle Name="!(loc.Name)" Manufacturer="WiX Toolset" Version="$(SetupVersion)" UpgradeCode="fc48131d-214a-439b-9a31-ef2ea5c69ea5"
6 AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)">
7 <BootstrapperApplication>
8 <bal:WixStandardBootstrapperApplication