From fbf6920678606a33bb70ee4a16221253a983e290 Mon Sep 17 00:00:00 2001
From: Franz Busch <f.busch@apple.com>
Date: Wed, 28 Oct 2026 14:36:21 +0100
Subject: [PATCH] Install the Visual C++ Redistributable before the Swift
 toolchain on Windows

On a hosted Windows runner, a nightly toolchain installed successfully and then `swift.exe` would not start: "The application has failed to start because its side-by-side configuration is incorrect". That error means a Visual C++ runtime the program was built against is missing, and the runner image can carry an older one than a current toolchain needs. It fails the same way in `swift_package_test.yml` and `package_test.yml`, since both install through `Install-Swift`.

`Install-Swift` now installs the latest Visual C++ Redistributable for the machine's architecture first. The link follows the latest release, so there is no hash to check, and the installer must instead carry a valid Microsoft signature. A newer runtime already being present, or a pending restart, is not an error.
---
 .../scripts/windows/swift/install-swift.ps1   | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scripts/windows/swift/install-swift.ps1 b/.github/workflows/scripts/windows/swift/install-swift.ps1
index 51cdf80f..bd009bbc 100644
--- a/.github/workflows/scripts/windows/swift/install-swift.ps1
+++ b/.github/workflows/scripts/windows/swift/install-swift.ps1
@@ -134,6 +134,48 @@ function Remove-FileWithRetry {
     return $false
 }
 
+# A toolchain's tools are built against a recent Microsoft Visual C++ runtime, which the
+# runner image can predate. Without it swift.exe fails to start, with "the side-by-side
+# configuration is incorrect". The link follows the latest release, so there is no fixed
+# hash to check; the installer must instead carry a valid Microsoft signature.
+function Install-VisualCppRedistributable {
+    $architecture = if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq "Arm64") { "arm64" } else { "x64" }
+    $url = "https://aka.ms/vs/17/release/vc_redist.$architecture.exe"
+    $installerPath = Join-Path $env:TEMP "vc_redist.$architecture.exe"
+
+    Write-Host "Installing the Visual C++ Redistributable ($architecture)..."
+    try {
+        Invoke-WebRequestWithRetry -Uri $url -OutFile $installerPath
+    }
+    catch {
+        Write-Host "FAILED: $($_.Exception.Message)"
+        Remove-FileWithRetry -Path $installerPath
+        exit 1
+    }
+
+    $signature = Get-AuthenticodeSignature $installerPath
+    if ($signature.Status -ne "Valid" -or $signature.SignerCertificate.Subject -notlike "*O=Microsoft Corporation*") {
+        Write-Host "FAILED: $installerPath is not signed by Microsoft (status $($signature.Status))"
+        Remove-FileWithRetry -Path $installerPath
+        exit 1
+    }
+
+    $process = Start-Process $installerPath -Wait -PassThru -NoNewWindow -ArgumentList @(
+        '/install',
+        '/quiet',
+        '/norestart'
+    )
+    Remove-FileWithRetry -Path $installerPath
+
+    # 0 is installed, 1638 is a newer version already installed, and 3010 is installed with
+    # a restart pending, which the toolchain does not need.
+    if ($process.ExitCode -notin @(0, 1638, 3010)) {
+        Write-Host "FAILED ($($process.ExitCode))"
+        exit 1
+    }
+    Write-Host "SUCCESS"
+}
+
 function Install-Swift {
     param (
         [string]$Url,
@@ -141,7 +183,9 @@ function Install-Swift {
     )
     Set-Variable ErrorActionPreference Stop
     Set-Variable ProgressPreference SilentlyContinue
-    
+
+    Install-VisualCppRedistributable
+
     Write-Host "Downloading $Url ... "
     
     try {
@@ -229,4 +273,4 @@ function GitHubActions-ExportVariable {
         Add-Content -Path "$FilePath" -Value "$Name=$Value`r`n"
     }
     Set-Content env:\$Name $Value
-}
+}
\ No newline at end of file