From 3b91a7827bd7ecbf2bbe6056523e82f7e91fd1a6 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:32:32 +0100 Subject: [PATCH] [windows-2025] Fix .Net 8 SDK installation (#11564) --- images/windows/scripts/build/Install-DotnetSDK.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index 68c2ff6c3..d51ae531e 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -97,7 +97,7 @@ $installScriptPath = Invoke-DownloadWithRetry -Url "https://dot.net/v1/dotnet-in # Visual Studio 2022 pre-creates sdk-manifests/8.0.100 folder, causing dotnet-install to skip manifests creation # https://github.com/actions/runner-images/issues/11402 -if (Test-IsWin22 -or Test-IsWin25) { +if ((Test-IsWin22) -or (Test-IsWin25)) { $sdkManifestPath = "C:\Program Files\dotnet\sdk-manifests\8.0.100" if (Test-Path $sdkManifestPath) { Move-Item -Path $sdkManifestPath -Destination $env:TEMP_DIR -ErrorAction Stop @@ -117,7 +117,7 @@ foreach ($dotnetVersion in $dotnetToolset.versions) { # Replace manifests inside sdk-manifests/8.0.100 folder with ones from Visual Studio # https://github.com/actions/runner-images/issues/11402 -if (Test-IsWin22 -or Test-IsWin25) { +if ((Test-IsWin22) -or (Test-IsWin25)) { if (Test-Path "${env:TEMP_DIR}\8.0.100") { Get-ChildItem -Path "${env:TEMP_DIR}\8.0.100" | ForEach-Object { Remove-Item -Path "$sdkManifestPath\$($_.BaseName)" -Recurse -Force | Out-Null