From 29d08b69560b0e001d11dc1d240cda76df11fb05 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 10 Dec 2022 15:41:39 -0800
Subject: Set WiX Additional Tools update URL

Fixes 5367
Fixes 5292
---
 src/Directory.wixproj.targets                       | 4 ++++
 src/setup/WixAdditionalTools/WixAdditionalTools.wxl | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets
index c9fb4f5c..b509d0a7 100644
--- a/src/Directory.wixproj.targets
+++ b/src/Directory.wixproj.targets
@@ -6,10 +6,14 @@
           DependsOnTargets="__SetPropertiesFromGit"
           AfterTargets="_CreateProjectDefineConstants">
     <PropertyGroup>
+      <PrereleaseSuffix Condition=" '$(GitSemVerDashLabel)'!='' ">-prerelease</PrereleaseSuffix>
+
       <DefineConstants>
         $(DefineConstants);
         SetupVersion=$(PackageVersion);
         SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor);
+        SetupDashedMajorMinorVersion=$(GitBaseVersionMajor)-$(GitBaseVersionMinor);
+        SetupDashedPrerelease=$(PrereleaseSuffix)
       </DefineConstants>
     </PropertyGroup>
   </Target>
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
index 74e1a1e3..89054f19 100644
--- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
@@ -8,5 +8,5 @@
     <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="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feed/v$(SetupMajorMinorVersion)" />
+    <String Id="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feeds/wix-additional-tools-$(SetupDashedMajorMinorVersion)$(SetupDashedPrerelease).feed" />
 </WixLocalization>
-- 
cgit v1.2.3-55-g6feb