diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-12-10 15:41:39 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-12-11 01:38:00 -0800 |
| commit | 29d08b69560b0e001d11dc1d240cda76df11fb05 (patch) | |
| tree | 54f76ea87057f4785547703fca7489b955bc81c5 | |
| parent | 4cc10b59ac01b1f5bb6925a96017882956716c15 (diff) | |
| download | wix-29d08b69560b0e001d11dc1d240cda76df11fb05.tar.gz wix-29d08b69560b0e001d11dc1d240cda76df11fb05.tar.bz2 wix-29d08b69560b0e001d11dc1d240cda76df11fb05.zip | |
Set WiX Additional Tools update URL
Fixes 5367
Fixes 5292
| -rw-r--r-- | src/Directory.wixproj.targets | 4 | ||||
| -rw-r--r-- | src/setup/WixAdditionalTools/WixAdditionalTools.wxl | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ | |||
| 6 | DependsOnTargets="__SetPropertiesFromGit" | 6 | DependsOnTargets="__SetPropertiesFromGit" |
| 7 | AfterTargets="_CreateProjectDefineConstants"> | 7 | AfterTargets="_CreateProjectDefineConstants"> |
| 8 | <PropertyGroup> | 8 | <PropertyGroup> |
| 9 | <PrereleaseSuffix Condition=" '$(GitSemVerDashLabel)'!='' ">-prerelease</PrereleaseSuffix> | ||
| 10 | |||
| 9 | <DefineConstants> | 11 | <DefineConstants> |
| 10 | $(DefineConstants); | 12 | $(DefineConstants); |
| 11 | SetupVersion=$(PackageVersion); | 13 | SetupVersion=$(PackageVersion); |
| 12 | SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor); | 14 | SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor); |
| 15 | SetupDashedMajorMinorVersion=$(GitBaseVersionMajor)-$(GitBaseVersionMinor); | ||
| 16 | SetupDashedPrerelease=$(PrereleaseSuffix) | ||
| 13 | </DefineConstants> | 17 | </DefineConstants> |
| 14 | </PropertyGroup> | 18 | </PropertyGroup> |
| 15 | </Target> | 19 | </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 @@ | |||
| 8 | <String Id="AboutUrl" Overridable="yes" Value="https://wixtoolset.org/" /> | 8 | <String Id="AboutUrl" Overridable="yes" Value="https://wixtoolset.org/" /> |
| 9 | <String Id="LicenseUrl" Overridable="yes" Value="https://wixtoolset.org/about/license/" /> | 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/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> | 12 | </WixLocalization> |