From 2706c4349326921109881d20c05175de39123d77 Mon Sep 17 00:00:00 2001
From: Trey Valenta <t@trey.net>
Date: Fri, 30 Jan 2026 04:01:43 -0800
Subject: [PATCH] [Windows] Several fixes for the SSH known_hosts files
 (#13154)

---
 images/windows/scripts/build/Install-Git.ps1 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1
index 6f0118dd1..0e6843d79 100644
--- a/images/windows/scripts/build/Install-Git.ps1
+++ b/images/windows/scripts/build/Install-Git.ps1
@@ -46,7 +46,16 @@ if ($LASTEXITCODE -ne 0) {
 Add-MachinePathItem "C:\Program Files\Git\bin"
 
 # Add well-known SSH host keys to ssh_known_hosts
-ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
-ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
+# Write content to the file used by OpenSSH and the version includes with Git
+# for Windows
+$windowsSSHKnownHosts = "C:\ProgramData\ssh\ssh_known_hosts"
+$gitSSHKnownHosts = "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
+
+$sshKeyScan = "C:\Program Files\Git\usr\bin\ssh-keyscan"
+$githubHostKeys = &$sshKeyScan -t rsa,ecdsa,ed25519 github.com
+$azureHostKeys = &$sshKeyscan -t rsa ssh.dev.azure.com
+
+Set-Content -Encoding ASCII -Path $windowsSSHKnownHosts, $gitSSHKnownHosts -Value $githubHostKeys
+Add-Content -Encoding ASCII -Path $windowsSSHKnownHosts, $gitSSHKnownHosts -Value $azureHostKeys
 
 Invoke-PesterTests -TestFile "Git"