moonlight-stream/Internet-Hosting-Tool
1
0
Fork 0
mirror of https://github.com/moonlight-stream/Internet-Hosting-Tool.git synced 2025-07-01 23:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use preprocessor variables to improve readability

Browse Source
This commit is contained in:
Cameron Gutman 2020-11-29 20:21:37 -06:00
parent 66b36684ec
commit 01a1012e74
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mish-setup/Bundle.wxs
View File

@ -1,4 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?define VCREDIST_VER = "14.28.29334" ?>
<?define VCREDIST_X86_SIZE = "14328440" ?>
<?define VCREDIST_X86_SHA1 = "17674FCC6CF3A2FFDC391BDCDE082AA936E37A89" ?>
<?define VCREDIST_X86_UPGRADE_CODE = "65E5BD06-6392-3027-8C26-853107D3CF1A" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
@ -14,25 +20,25 @@
<WixVariable Id="WixUILicenseRtf" Value="" /> <WixVariable Id="WixUILicenseRtf" Value="" />
<util:ProductSearch Id="VCREDIST_142_x86" <util:ProductSearch Id="VCREDIST_142_x86"
UpgradeCode="65E5BD06-6392-3027-8C26-853107D3CF1A" UpgradeCode="$(var.VCREDIST_X86_UPGRADE_CODE)"
Result="version" Result="version"
Variable="VCREDIST_142_x86" /> Variable="VCREDIST_142_x86" />
<Chain> <Chain>
<ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable" <ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable - x86"
Cache="no" Cache="no"
PerMachine="yes" PerMachine="yes"
Permanent="yes" Permanent="yes"
Vital="yes" Vital="yes"
InstallCommand="/install /quiet /norestart" InstallCommand="/install /quiet /norestart"
DetectCondition="VCREDIST_142_x86 &gt;= v14.28.29334" DownloadUrl="https://moonlight-stream.org/downloads/vcredist/$(var.VCREDIST_VER)/vcredist_x86.exe"
DownloadUrl="https://moonlight-stream.org/downloads/vcredist/14.28.29334/vcredist_x86.exe"> DetectCondition="VCREDIST_142_x86 &gt;= v$(var.VCREDIST_VER)">
<RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable" <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - x86"
ProductName="Microsoft Visual C++ 2015-2019 Redistributable" ProductName="Microsoft Visual C++ 2015-2019 Redistributable - x86"
Size="14328440" Size="$(var.VCREDIST_X86_SIZE)"
Version="14.28.29334.0" Version="$(var.VCREDIST_VER).0"
Hash="17674FCC6CF3A2FFDC391BDCDE082AA936E37A89"/> Hash="$(var.VCREDIST_X86_SHA1)"/>
<!-- Newer version installed is fine --> <!-- Newer version installed is fine -->
<ExitCode Value="1638" Behavior="success" /> <ExitCode Value="1638" Behavior="success" />