Set WiX Additional Tools update URL
Fixes 5367 Fixes 5292
Rob Mensching committed
Dec 10, 2022 at 15:41 UTC
29d08b69560b0e001d11dc1d240cda76df11fb05
2 files changed
+5
-1
src/Directory.wixproj.targets
+4
@@ -6,10 +6,14 @@
6
DependsOnTargets="__SetPropertiesFromGit"
7
AfterTargets="_CreateProjectDefineConstants">
8
<PropertyGroup>
9
+ <PrereleaseSuffix Condition=" '$(GitSemVerDashLabel)'!='' ">-prerelease</PrereleaseSuffix>
10
+
11
<DefineConstants>
12
$(DefineConstants);
13
SetupVersion=$(PackageVersion);
14
SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor);
15
+ SetupDashedMajorMinorVersion=$(GitBaseVersionMajor)-$(GitBaseVersionMinor);
16
+ SetupDashedPrerelease=$(PrereleaseSuffix)
17
</DefineConstants>
18
</PropertyGroup>
19
</Target>
src/setup/WixAdditionalTools/WixAdditionalTools.wxl
+1
-1
@@ -8,5 +8,5 @@
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/" />
11
- <String Id="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feed/v$(SetupMajorMinorVersion)" />
11
+ <String Id="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feeds/wix-additional-tools-$(SetupDashedMajorMinorVersion)$(SetupDashedPrerelease).feed" />
12
</WixLocalization>