Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix common.lib.ps1 to download latest patched SDKs #1279

Merged
merged 1 commit into from
Sep 26, 2022
Merged

Fix common.lib.ps1 to download latest patched SDKs #1279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions scripts/common.lib.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ $env:TF_SRC_DIR = $TF_SRC_DIR
$env:TF_TEST_DIR = $TF_TEST_DIR
$env:TF_PACKAGES_DIR = $TF_PACKAGES_DIR
$env:TF_TOOLS_DIR = $TF_TOOLS_DIR
$env:DOTNET_CLI_VERSION = "6.0.100-alpha.1.21067.8"
$GlobalJson = Get-Content -Raw -Path (Join-Path $env:TF_ROOT_DIR 'global.json') | ConvertFrom-Json
$env:DOTNET_CLI_VERSION = $GlobalJson.tools.dotnet

if ([String]::IsNullOrWhiteSpace($TestPlatformVersion)) {
$TestPlatformVersion = Get-PackageVersion -PackageName "MicrosoftNETTestSdkVersion"
Expand Down Expand Up @@ -271,18 +272,14 @@ function Install-DotNetCli {
# Not passing -Version 'X.Y.Z' allows to always install the latest patch

& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '2.1' -Architecture x64 -NoPath
$env:DOTNET_ROOT = $dotnetInstallPath
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '2.1' -Architecture x86 -NoPath
${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"

& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '3.1' -Architecture x64 -NoPath
$env:DOTNET_ROOT = $dotnetInstallPath
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '3.1' -Architecture x86 -NoPath
${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"

& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '6.0' -Architecture x64 -NoPath
$env:DOTNET_ROOT = $dotnetInstallPath

& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '2.1' -Architecture x86 -NoPath
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '3.1' -Architecture x86 -NoPath
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '6.0' -Architecture x86 -NoPath

$env:DOTNET_ROOT= $dotnetInstallPath
${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"

$env:DOTNET_MULTILEVEL_LOOKUP = 0
Expand Down