Update installer to VS2019 C++ runtime.

This commit is contained in:
elasota
2021-11-10 17:22:01 -05:00
parent d698ff23db
commit 7c5864d59b
2 changed files with 7 additions and 2 deletions

View File

@@ -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>

View File

@@ -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">