From 34b6b3172fd0df92534a35723efd7489aa44682a Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Thu, 28 Dec 2023 11:18:57 +0100
Subject: [PATCH] [windows] pin pwsh in toolset (#9072)

---
 .../windows/scripts/build/Install-PowershellCore.ps1  | 11 +++++++++--
 images/windows/toolsets/toolset-2019.json             |  3 +++
 images/windows/toolsets/toolset-2022.json             |  3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/images/windows/scripts/build/Install-PowershellCore.ps1 b/images/windows/scripts/build/Install-PowershellCore.ps1
index d14d0e30..68a3bc80 100644
--- a/images/windows/scripts/build/Install-PowershellCore.ps1
+++ b/images/windows/scripts/build/Install-PowershellCore.ps1
@@ -13,8 +13,15 @@ try {
     [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
 
     $metadata = Invoke-RestMethod https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json
-    $release = $metadata.LTSReleaseTag[0] -replace '^v'
-    $downloadUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/PowerShell-${release}-win-x64.msi"
+    $pwshMajorMinor = (Get-ToolsetContent).pwsh.version
+
+    $releases = $metadata.LTSReleaseTag -replace '^v'
+    foreach ($release in $releases) {
+        if ($release -like "${pwshMajorMinor}*") {
+            $downloadUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/PowerShell-${release}-win-x64.msi"
+            break
+        }
+    }
 
     $installerName = Split-Path $downloadUrl -Leaf
     $externalHash = Get-ChecksumFromUrl -Type "SHA256" `
diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
index 5f3dcbdc..66696190 100644
--- a/images/windows/toolsets/toolset-2019.json
+++ b/images/windows/toolsets/toolset-2019.json
@@ -491,5 +491,8 @@
     },
     "openssl": {
         "version": "1.1.1"
+    },
+    "pwsh": {
+        "version": "7.2"
     }
 }
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index 0312de3a..200bc3c6 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -431,5 +431,8 @@
     },
     "openssl": {
         "version": "1.1.1"
+    },
+    "pwsh": {
+        "version": "7.2"
     }
 }