From bdd8f813294f003a4fc26d416bd9622d39123cf2 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Sat, 26 Mar 2022 23:24:26 +0400
Subject: [PATCH] Install llvm version correctly (#5288)

* Install llvm version correctly

* Move llvm installation to script for win22
---
 images/win/scripts/Installers/Install-LLVM.ps1 | 2 +-
 images/win/toolsets/toolset-2022.json          | 4 +++-
 images/win/windows2022.json                    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/images/win/scripts/Installers/Install-LLVM.ps1 b/images/win/scripts/Installers/Install-LLVM.ps1
index 07c7c46e..f039a942 100644
--- a/images/win/scripts/Installers/Install-LLVM.ps1
+++ b/images/win/scripts/Installers/Install-LLVM.ps1
@@ -5,6 +5,6 @@
 
 $llvmVersion = (Get-ToolsetContent).llvm.version
 $latestChocoVersion = Get-LatestChocoPackageVersion -TargetVersion $llvmVersion -PackageName "llvm"
-Choco-Install -PackageName llvm -ArgumentList "--version $latestChocoVersion"
+Choco-Install -PackageName llvm -ArgumentList '--version', $latestChocoVersion
 
 Invoke-PesterTests -TestFile "LLVM"
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index 1bc9df9d..bc02df03 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -306,7 +306,6 @@
             { "name": "Bicep" },
             { "name": "innosetup" },
             { "name": "jq" },
-            { "name": "llvm" },
             { "name": "NuGet.CommandLine" },
             {
                 "name": "openssl.light",
@@ -340,6 +339,9 @@
     "nsis": {
         "version": "3.08"
     },
+    "llvm": {
+        "version": "13"
+    },
     "php": {
         "version": "8.1"
     },
diff --git a/images/win/windows2022.json b/images/win/windows2022.json
index db33e7b0..858a18ff 100644
--- a/images/win/windows2022.json
+++ b/images/win/windows2022.json
@@ -255,7 +255,8 @@
                 "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1",
-                "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
+                "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1"
             ],
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"