From ce3b9c3d3180a3854344d6b306ea2bc48d409e59 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 16 Apr 2022 11:56:07 -0500
Subject: [PATCH] Update Visual C++ Runtime

---
 GS-IPv6-Forwarder     |  2 +-
 mish-setup/Bundle.wxs | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/GS-IPv6-Forwarder b/GS-IPv6-Forwarder
index 98e2ddd..2115224 160000
--- a/GS-IPv6-Forwarder
+++ b/GS-IPv6-Forwarder
@@ -1 +1 @@
-Subproject commit 98e2ddd1e0db4b1702a0aa168be35d5931ced27a
+Subproject commit 21152240cfbf8c6a35c665575b8b25de7ed36b40
diff --git a/mish-setup/Bundle.wxs b/mish-setup/Bundle.wxs
index 4e9a054..79e0820 100644
--- a/mish-setup/Bundle.wxs
+++ b/mish-setup/Bundle.wxs
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?define VCREDIST_VER = "14.29.30133" ?>
-<?define VCREDIST_X86_SIZE = "13782872" ?>
-<?define VCREDIST_X86_SHA1 = "2C1AE47103E7F8D6072DF4A8D9CEB382724AC59B" ?>
-<?define VCREDIST_X86_URL = "https://download.visualstudio.microsoft.com/download/pr/221ed2ae-1269-497b-a962-e113045001fa/1ACD8D5EA1CDC3EB2EB4C87BE3AB28722D0825C15449E5C9CEEF95D897DE52FA/VC_redist.x86.exe" ?>
+<?define VCREDIST_VER = "14.31.31103" ?>
+<?define VCREDIST_X86_SIZE = "13725768" ?>
+<?define VCREDIST_X86_SHA1 = "15fe8e70c3c5582b70df173cd9b580331677735a" ?>
+<?define VCREDIST_X86_URL = "https://download.visualstudio.microsoft.com/download/pr/144a5711-f076-44fa-bf55-f7e0121eb30c/B7AE307237F869E09F7413691A2CD1944357B5CEE28049C0A0D3430B47BB3EDC/VC_redist.x86.exe" ?>
 <?define VCREDIST_X86_UPGRADE_CODE = "65E5BD06-6392-3027-8C26-853107D3CF1A" ?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
@@ -20,13 +20,13 @@
 
     <WixVariable Id="WixUILicenseRtf" Value="" />
 
-    <util:ProductSearch Id="VCREDIST_142_x86"
+    <util:ProductSearch Id="VCREDIST_14_x86"
                         UpgradeCode="$(var.VCREDIST_X86_UPGRADE_CODE)"
                         Result="version"
-                        Variable="VCREDIST_142_x86" />
+                        Variable="VCREDIST_14_x86" />
       
     <Chain>
-      <ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable - x86"
+      <ExePackage Name="Microsoft Visual C++ 2015-2022 Redistributable - x86"
                   Cache="no"
                   Compressed="no"
                   PerMachine="yes"
@@ -34,10 +34,10 @@
                   Vital="yes"
                   InstallCommand="/install /quiet /norestart"
                   DownloadUrl="$(var.VCREDIST_X86_URL)"
-                  DetectCondition="VCREDIST_142_x86 &gt;= v$(var.VCREDIST_VER)">
+                  DetectCondition="VCREDIST_14_x86 &gt;= v$(var.VCREDIST_VER)">
         
-        <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - x86"
-                       ProductName="Microsoft Visual C++ 2015-2019 Redistributable - x86"
+        <RemotePayload Description="Microsoft Visual C++ 2015-2022 Redistributable - x86"
+                       ProductName="Microsoft Visual C++ 2015-2022 Redistributable - x86"
                        Size="$(var.VCREDIST_X86_SIZE)"
                        Version="$(var.VCREDIST_VER).0"
                        Hash="$(var.VCREDIST_X86_SHA1)"/>