From 7c5864d59b00921fefe903ebe43095a1ff91c4a9 Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Wed, 10 Nov 2021 17:22:01 -0500
Subject: [PATCH] Update installer to VS2019 C++ runtime.

---
 ReleasePackageInstaller/Product.wxs                     | 4 ++--
 ReleasePackageInstaller/ReleasePackageInstaller.wixproj | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ReleasePackageInstaller/Product.wxs b/ReleasePackageInstaller/Product.wxs
index 9c9f86a..648b202 100644
--- a/ReleasePackageInstaller/Product.wxs
+++ b/ReleasePackageInstaller/Product.wxs
@@ -146,10 +146,10 @@
     <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\TopBanner.bmp"/>
 
     <DirectoryRef Id="TARGETDIR">
-      <Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0" />
+      <Merge Id="VCRedist" SourceFile="$(var.VSInstallDir)\VC\Redist\MSVC\v142\MergeModules\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0" />
     </DirectoryRef>
     
-    <Feature Id="VCRedist" Title="Microsoft Visual C++ 2017 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
+    <Feature Id="VCRedist" Title="Microsoft Visual C++ 2019 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
       <MergeRef Id="VCRedist" />
     </Feature>
 
diff --git a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
index f88e136..7e5bb9c 100644
--- a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
+++ b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
@@ -19,6 +19,10 @@
     <OutputPath>$(SolutionDir)ReleasePkg\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <Cultures>en-us</Cultures>
+    <DefineConstants>DocumentationDataDir=$(SolutionDir)\Documentation;
+HousesDataDir=$(SolutionDir)\Packaged\Houses;
+PackagedDataDir=$(SolutionDir)\Packaged;
+VSInstallDir=$(VsInstallRoot)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
@@ -179,6 +183,7 @@
 DocumentationDataDir=$(SolutionDir)\Documentation;
 HousesDataDir=$(SolutionDir)\Packaged\Houses;
 PackagedDataDir=$(SolutionDir)\Packaged;
+VSInstallDir=$(VsInstallRoot)
 	</DefineConstants>
   </PropertyGroup>
   <Target Name="BeforeBuild">