From 7546c7f36a0e19195c36a69a9be3a42ac079e551 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Mon, 6 Sep 2021 09:45:16 +0300 Subject: [PATCH] [Windows] Change .NET SDK pre-installation policy (#4007) --- images/win/scripts/Installers/Install-DotnetSDK.ps1 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 0add58f50..b5cd09732 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -28,14 +28,9 @@ function Get-SDKVersionsToInstall ( $sdks += $release.'sdks' } - $sortedSdkVersions = $sdks.version | Sort-Object { [Version] $_ } -Unique - - if (Test-IsWin22) - { - return $sortedSdkVersions | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } | Foreach-Object { $_.Group[-1] } - } - - return $sortedSdkVersions + return $sdks.version | Sort-Object { [Version] $_ } -Unique ` + | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } ` + | Foreach-Object { $_.Group[-1] } } function Invoke-Warmup (