Update installer build to pass VCRedistDir

Author: tristanlabelle

.azure/vs2022.yml

@@ -2168,8 +2168,7 @@ stages:
                 -p:ProductVersion=${{ parameters.ProductVersion }}${{ parameters.BuildTag }}
                 -p:CERTIFICATE=$(certificate.secureFilePath)
                 -p:PASSPHRASE=$(CERTIFICATE_PASSWORD)
-                -p:VCRedistInstaller="$(env.VCToolsRedistDir)\vc_redist.$(env.VSCMD_ARG_TGT_ARCH).exe"
-                -p:VSVersion=$(env.VSCMD_VER)
+                -p:VCRedistDir="${env:VCToolsRedistDir}\${env:VSCMD_ARG_TGT_ARCH}\Microsoft.VC143.CRT\"
                 -p:INCLUDE_AMD64_SDK=true
                 -p:INCLUDE_X86_SDK=true
                 -p:INCLUDE_ARM64_SDK=true

.github/workflows/swift-toolchain.yml

@@ -2015,8 +2015,7 @@ jobs:
               -p:CERTIFICATE=${env:CERTIFICATE} `
               -p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
               -p:BundleFlavor=offline `
-              -p:VCRedistInstaller="${env:VCToolsRedistDir}\vc_redist.${env:VSCMD_ARG_TGT_ARCH}.exe" `
-              -p:VSVersion=${env:VSCMD_VER} `
+              -p:VCRedistDir="${env:VCToolsRedistDir}\${env:VSCMD_ARG_TGT_ARCH}\Microsoft.VC143.CRT\" `
               -p:INCLUDE_AMD64_SDK=true `
               -p:INCLUDE_X86_SDK=true `
               -p:INCLUDE_ARM64_SDK=true `

build.ps1

@@ -234,6 +234,13 @@ $SDKArchs = @($SDKs | ForEach-Object {
 })
 
 # Build functions
+function Invoke-BuildStep([string]$Name) {
+  & $Name @Args
+  if ($Name.Replace("Build-", "") -eq $BuildTo) {
+    exit 0
+  }
+}
+
 function Get-ProjectBinaryCache($Arch, $ID) {
   return "$BinaryCache\" + ($Arch.BuildID + $ID)
 }
@@ -1564,10 +1571,9 @@ function Build-Installer() {
 
   Isolate-EnvVars {
     Invoke-VsDevShell $HostArch
-    $VCRedistInstallerPath = "${env:VCToolsRedistDir}\vc_redist.$($HostArch.ShortName).exe"
-    if (Test-Path $VCRedistInstallerPath) {
-      $Properties["VCRedistInstaller"] = $VCRedistInstallerPath
-      $Properties["VSVersion"] = $env:VSCMD_VER
+    $VCRedistDir = (Get-ChildItem "${env:VCToolsRedistDir}\$($HostArch.ShortName)" -Filter "Microsoft.VC*.CRT").FullName
+    if ($VCRedistDir) {
+      $Properties["VCRedistDir"] = "$VCRedistDir\"
     }
   }