From 222f3bb86f3d9f64c0832a70469fa45f717c7567 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Tue, 27 Oct 2020 11:05:36 +0300
Subject: [PATCH] use ssh-keyscan from git

---
 images/win/scripts/Installers/Install-Git.ps1     |  2 +-
 images/win/scripts/Installers/Install-OpenSSH.ps1 | 13 -------------
 images/win/windows2016.json                       |  2 --
 images/win/windows2019.json                       |  1 -
 4 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 images/win/scripts/Installers/Install-OpenSSH.ps1

diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1
index 2a5eb546..c7b2c457 100644
--- a/images/win/scripts/Installers/Install-Git.ps1
+++ b/images/win/scripts/Installers/Install-Git.ps1
@@ -37,7 +37,7 @@ Choco-Install -PackageName hub
 [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine)
 
 if (Test-IsWin16) {
-    $env:Path += ";$env:ProgramFiles\OpenSSH-Win64"
+    $env:Path += ";$env:ProgramFiles\Git\usr\bin\"
 }
 
 # Add well-known SSH host keys to ssh_known_hosts
diff --git a/images/win/scripts/Installers/Install-OpenSSH.ps1 b/images/win/scripts/Installers/Install-OpenSSH.ps1
deleted file mode 100644
index b0ea1527..00000000
--- a/images/win/scripts/Installers/Install-OpenSSH.ps1
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-##  File:  Install-OpenSSH.ps1
-##  Desc:  Install OpenSSH-Win64
-################################################################################
-
-Write-Host "Download Latest OpenSSH-Win64 archive"
-$url = 'https://api.github.com/repos/PowerShell/Win32-OpenSSH/releases/latest'
-$name = 'OpenSSH-Win64.zip'
-# Explicitly set type to string since match returns array by default
-[string]$opensshLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match $name
-$opensshArchivePath = Start-DownloadWithRetry -Url $opensshLatest -Name $name
-Write-Host "Expand OpenSSH-Win64 archive"
-Extract-7Zip -Path $opensshArchivePath -DestinationPath $env:ProgramFiles
\ No newline at end of file
diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index 43faaa25..8c1314d6 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -245,7 +245,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Perl.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-OpenSSH.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Git.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PHP.ps1",
@@ -334,7 +333,6 @@
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
-                "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1"
             ],
             "elevated_user": "{{user `install_user`}}",
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index dd717711..a002f77f 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -331,7 +331,6 @@
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
-                "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1"
             ],
             "elevated_user": "{{user `install_user`}}",