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

Only download the CRT redistributable if it's newer than what is installed

Browse Source
This commit is contained in:
Cameron Gutman 2020-11-29 17:23:48 -06:00
parent e7db5242c9
commit 66b36684ec
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mish-setup/Bundle.wxs
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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">
<Bundle Name="Moonlight Internet Hosting Tool" Manufacturer="Moonlight Game Streaming Project" Version="!(bind.packageVersion.mish)" UpgradeCode="a2ce5056-1114-44b9-b79b-952ef46d3d50"> <Bundle Name="Moonlight Internet Hosting Tool" Manufacturer="Moonlight Game Streaming Project" Version="!(bind.packageVersion.mish)" UpgradeCode="a2ce5056-1114-44b9-b79b-952ef46d3d50">
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense"> <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
<bal:WixStandardBootstrapperApplication <bal:WixStandardBootstrapperApplication
@ -12,6 +13,11 @@
<WixVariable Id="WixUILicenseRtf" Value="" /> <WixVariable Id="WixUILicenseRtf" Value="" />
<util:ProductSearch Id="VCREDIST_142_x86"
UpgradeCode="65E5BD06-6392-3027-8C26-853107D3CF1A"
Result="version"
Variable="VCREDIST_142_x86" />
<Chain> <Chain>
<ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable" <ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable"
Cache="no" Cache="no"
@ -19,6 +25,7 @@
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/14.28.29334/vcredist_x86.exe"> DownloadUrl="https://moonlight-stream.org/downloads/vcredist/14.28.29334/vcredist_x86.exe">
<RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable" <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable"

4
mish-setup/mish-setup.wixproj
View File

@ -26,6 +26,10 @@
<HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
<Name>WixBalExtension</Name> <Name>WixBalExtension</Name>
</WixExtension> </WixExtension>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\GS-IPv6-Forwarder\GSv6FwdSetup\GSv6FwdSetup.wixproj"> <ProjectReference Include="..\GS-IPv6-Forwarder\GSv6FwdSetup\GSv6FwdSetup.wixproj">