Add VC++ redistributable to MSI installer (#3487)

zeroc-ice · Feb 4, 2025 · c91dd1c · c91dd1c
1 parent a215eb0
commit c91dd1c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/packaging/msi/Ice.wixproj b/packaging/msi/Ice.wixproj
@@ -1,4 +1,13 @@
 <Project Sdk="WixToolset.Sdk/5.0.2">
+
+  <PropertyGroup>
+      <!--
+        Suppress warning from the VC++ redistributable merge modules
+        see: https://wixtoolset.org/docs/v3/howtos/redistributables_and_install_checks/install_vcredist/#a-note-about-ice-warnings
+      -->
+      <SuppressIces>ICE03;ICE82</SuppressIces>
+  </PropertyGroup>
+
   <ItemGroup>
       <BindPath Include="$(MBuildThisFileDirectory)..\..\" BindName="SOURCE_ROOT" />
   </ItemGroup>

diff --git a/packaging/msi/Product.wxs b/packaging/msi/Product.wxs
@@ -35,6 +35,13 @@
             <Directory Id="IceStartMenu" Name="Ice 3.8.0"/>
         </StandardDirectory>
 
+         <!-- VC140 C++ runtime merge module -->
+        <StandardDirectory Id="TARGETDIR">
+            <Merge Id="VC140CRT"
+                SourceFile="$(env.CommonProgramFiles(x86))\Merge Modules\Microsoft_VC140_CRT_x64.msm"
+                Language="0"/>
+        </StandardDirectory>
+
         <!-- Define the components that install the require files -->
         <ComponentGroup Id="ProductComponents">
             <!-- Binary files from the x64 Release build -->
@@ -106,6 +113,7 @@
         <Feature Id="MainFeature" Title="Ice" Level="1">
             <ComponentGroupRef Id="ProductComponents" />
             <ComponentGroupRef Id="StartMenuComponents"/>
+            <MergeRef Id="VC140CRT"/>
         </Feature>
     </Package>
 </Wix>