WiX: Package the VC runtime dlls directly

* Package the VC runtime dlls directly
* Make VC redist optional for build script backcompat.
* Package VCRuntime using harvesting.

Author: tristanlabelle

platforms/Windows/bundle/installer.wixproj

@@ -6,8 +6,6 @@
     <VCRedistDownloadUrl Condition=" '$(VCRedistDownloadUrl)' == '' AND '$(VSMajorVersion)' != '' ">https://aka.ms/vs/$(VSMajorVersion)/release/vc_redist.$(ProductArchitecture).exe</VCRedistDownloadUrl>
     <DefineConstants>
       $(DefineConstants);
-      VCRedistInstaller=$(VCRedistInstaller);
-      VCRedistDownloadUrl=$(VCRedistDownloadUrl);
       INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
       INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
     </DefineConstants>

platforms/Windows/bundle/installer.wxs

@@ -59,15 +59,6 @@
     -->
 
     <Chain>
-      <?if $(VCRedistInstaller) != ""?>
-        <BundlePackage
-          SourceFile="$(VCRedistInstaller)"
-          Permanent="yes"
-          InstallArguments="/install /quiet /norestart"
-          DownloadUrl="$(VCRedistDownloadUrl)">
-        </BundlePackage>
-      <?endif?>
-
       <MsiPackage
         SourceFile="!(bindpath.rtl)\rtl.msi"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">

platforms/Windows/rtl/msi/rtlmsi.wixproj

@@ -1,6 +1,10 @@
 <Project Sdk="WixToolset.Sdk/4.0.1">
   <PropertyGroup>
     <OutputName>rtl</OutputName>
+    <DefineConstants>
+      $(DefineConstants);
+      VCRedistDir=$(VCRedistDir);
+    </DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
@@ -14,4 +18,19 @@
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
     <ProjectReference Include="..\lib\rtllib.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Heat" Version="4.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <HarvestDirectory Include="$(VCRedistDir)">
+      <ComponentGroupName>VCRuntime_$(ProductArchitecture)</ComponentGroupName>
+      <DirectoryRefId>RUNTIMEDIR_$(ProductArchitecture)</DirectoryRefId>
+      <PreprocessorVariable>var.VCRedistDir</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
 </Project>

platforms/Windows/rtl/msi/rtlmsi.wxs

@@ -22,6 +22,10 @@
       </Component>
     </ComponentGroup>
 
+    <Feature Id="VCRuntime" AllowAbsent="no" Title="!(loc.VCRuntime_ProductName_$(ProductArchitecture))">
+      <ComponentGroupRef Id="VCRuntime_$(ProductArchitecture)" />
+    </Feature>
+
     <Feature Id="SwiftRuntime" AllowAbsent="no" Title="!(loc.Rtl_ProductName_$(ProductArchitecture))">
       <ComponentGroupRef Id="swift_runtime_$(ProductArchitecture)" />
       <ComponentGroupRef Id="EnvironmentVariables" />

platforms/Windows/shared/swift.en-us.wxl

@@ -7,6 +7,9 @@
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="Rtl_ProductName" Value="Swift Windows Utilities" />
+  <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />
+  <String Id="VCRuntime_ProductName_amd64" Value="Visual C++ Runtime (AMD64)" />
+  <String Id="VCRuntime_ProductName_x86" Value="Visual C++ Runtime (X86)" />
   <String Id="Rtl_ProductName_arm64" Value="Swift Windows Utilities (ARM64)" />
   <String Id="Rtl_ProductName_amd64" Value="Swift Windows Utilities (AMD64)" />
   <String Id="Rtl_ProductName_x86" Value="Swift Windows Utilities (X86)" />