From 26ee8564f8b86d54578c8dda17561cfed16758c5 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 25 Jul 2018 19:52:58 -0700
Subject: [PATCH] Include VC redistributable in the bundle

---
 scripts/generate-installers.bat |  5 ++++-
 wix/MoonlightSetup/Bundle.wxs   | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-installers.bat b/scripts/generate-installers.bat
index 20649355..4e669cbe 100644
--- a/scripts/generate-installers.bat
+++ b/scripts/generate-installers.bat
@@ -20,7 +20,9 @@ if "%ARCH%" NEQ "x86" (
     )
 )
 
-call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
+set VS_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community
+
+call "%VS_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
 if !ERRORLEVEL! NEQ 0 goto Error
 
 set BUILD_ROOT=%cd%\build
@@ -67,6 +69,7 @@ copy %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe %DEPLOY_FOLDER%
 if !ERRORLEVEL! NEQ 0 goto Error
 
 echo Building installer
+set VCREDIST_INSTALLER=%VS_PATH%\VC\Redist\MSVC\14.14.26405\vcredist_%ARCH%.exe
 msbuild %SOURCE_ROOT%\wix\Moonlight.sln /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
 if !ERRORLEVEL! NEQ 0 goto Error
 
diff --git a/wix/MoonlightSetup/Bundle.wxs b/wix/MoonlightSetup/Bundle.wxs
index 615bf2bc..ff7d0154 100644
--- a/wix/MoonlightSetup/Bundle.wxs
+++ b/wix/MoonlightSetup/Bundle.wxs
@@ -24,6 +24,16 @@
     </BootstrapperApplicationRef>
 
     <Chain>
+      <ExePackage Cache="no"
+                  PerMachine="yes"
+                  Permanent="yes"
+                  Vital="yes"
+                  Compressed="yes"
+                  SourceFile="$(env.VCREDIST_INSTALLER)"
+                  InstallCommand="/install /quiet /norestart">
+        <!-- Newer version installed is fine -->
+        <ExitCode Value="1638" Behavior="success" />
+      </ExePackage>
       <MsiPackage Id="Moonlight" SourceFile="$(var.Moonlight.TargetPath)" Vital="yes">
         <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
       </MsiPackage>