From 42e9087bd77657f4734fd130f182d4573376428a Mon Sep 17 00:00:00 2001
From: Tristan Labelle <tristan@thebrowser.company>
Date: Fri, 13 Oct 2023 15:11:00 -0400
Subject: [PATCH 1/2] Install the VC++ redistributable

---
 platforms/Windows/bundle/installer.wixproj |  2 ++
 platforms/Windows/bundle/installer.wxs     | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 0e8d95cb..63ac34ef 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -4,6 +4,8 @@
     <DefaultCompressionLevel>$(BundleCompressionLevel)</DefaultCompressionLevel>
     <DefineConstants>
       $(DefineConstants);
+      VCREDIST_INSTALLER=$(VCREDIST_INSTALLER);
+      VCREDIST_VERSION=$(VCREDIST_VERSION);
       INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
       INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
     </DefineConstants>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 95f0a17a..e49d3cd9 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -59,6 +59,25 @@
     -->
 
     <Chain>
+      <?if $(VCREDIST_INSTALLER) != ""?>
+        <ExePackage
+          SourceFile="$(VCREDIST_INSTALLER)"
+          InstallCondition="OptionsInstallRtl"
+          Permanent="yes"
+          InstallArguments="/install /quiet /norestart"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <!--
+            Install only if not already in Add/Remove Programs
+            under the GUID below.
+            TODO: Is this the right GUID for arm64?
+          -->
+          <ArpEntry 
+            Id="9e10fdb5-a50b-4c3b-98a4-aefac04e5970"
+            Version="$(VCREDIST_VERSION)"
+            Win64="yes" />
+        </ExePackage>
+      <?endif?>
+
       <MsiPackage
         SourceFile="!(bindpath.rtl)\rtl.msi"
         InstallCondition="OptionsInstallRtl"

From 81da21fc39d45892e7708d41a271952b69141697 Mon Sep 17 00:00:00 2001
From: Tristan Labelle <tristan@thebrowser.company>
Date: Fri, 13 Oct 2023 17:05:29 -0400
Subject: [PATCH 2/2] Updated to <BundlePackage> and sourcing the download from
 aka.ms

---
 platforms/Windows/bundle/installer.wixproj |  6 ++++--
 platforms/Windows/bundle/installer.wxs     | 19 +++++--------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 63ac34ef..c5a70d9d 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -2,10 +2,12 @@
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
     <DefaultCompressionLevel>$(BundleCompressionLevel)</DefaultCompressionLevel>
+    <VSMajorVersion Condition=" '$(VSVersion)' != '' ">$(VSVersion.Split('.')[0])</VSMajorVersion>
+    <VCRedistDownloadUrl Condition=" '$(VCRedistDownloadUrl)' == '' AND '$(VSMajorVersion)' != '' ">https://aka.ms/vs/$(VSMajorVersion)/release/vc_redist.$(ProductArchitecture).exe</VCRedistDownloadUrl>
     <DefineConstants>
       $(DefineConstants);
-      VCREDIST_INSTALLER=$(VCREDIST_INSTALLER);
-      VCREDIST_VERSION=$(VCREDIST_VERSION);
+      VCRedistInstaller=$(VCRedistInstaller);
+      VCRedistDownloadUrl=$(VCRedistDownloadUrl);
       INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
       INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
     </DefineConstants>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index e49d3cd9..a3ce5e4f 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -59,23 +59,14 @@
     -->
 
     <Chain>
-      <?if $(VCREDIST_INSTALLER) != ""?>
-        <ExePackage
-          SourceFile="$(VCREDIST_INSTALLER)"
+      <?if $(VCRedistInstaller) != ""?>
+        <BundlePackage
+          SourceFile="$(VCRedistInstaller)"
           InstallCondition="OptionsInstallRtl"
           Permanent="yes"
           InstallArguments="/install /quiet /norestart"
-          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-          <!--
-            Install only if not already in Add/Remove Programs
-            under the GUID below.
-            TODO: Is this the right GUID for arm64?
-          -->
-          <ArpEntry 
-            Id="9e10fdb5-a50b-4c3b-98a4-aefac04e5970"
-            Version="$(VCREDIST_VERSION)"
-            Win64="yes" />
-        </ExePackage>
+          DownloadUrl="$(VCRedistDownloadUrl)">
+        </BundlePackage>
       <?endif?>
 
       <MsiPackage