From 4b7bca622fe79204620b12727a4108ae1fbbe31a Mon Sep 17 00:00:00 2001 From: George Pollard Date: Wed, 22 Feb 2023 00:53:46 +0000 Subject: [PATCH] Two-digit version numbers are Channels, not Versions --- src/runtime-tools/linux/setup.sh | 2 +- src/runtime-tools/win64/onefuzz.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime-tools/linux/setup.sh b/src/runtime-tools/linux/setup.sh index 34b24234c1..f6859003b4 100755 --- a/src/runtime-tools/linux/setup.sh +++ b/src/runtime-tools/linux/setup.sh @@ -146,7 +146,7 @@ if type apt > /dev/null 2> /dev/null; then for version in "${DOTNET_VERSIONS[@]}"; do logger "running dotnet install $version" - /bin/bash ./dotnet-install.sh --version "$version" --install-dir "$DOTNET_ROOT" 2>&1 | logger -s -i -t 'onefuzz-dotnet-setup' + /bin/bash ./dotnet-install.sh --channel "$version" --install-dir "$DOTNET_ROOT" 2>&1 | logger -s -i -t 'onefuzz-dotnet-setup' done rm dotnet-install.sh diff --git a/src/runtime-tools/win64/onefuzz.ps1 b/src/runtime-tools/win64/onefuzz.ps1 index e406ac86cd..bbaa81c0b9 100644 --- a/src/runtime-tools/win64/onefuzz.ps1 +++ b/src/runtime-tools/win64/onefuzz.ps1 @@ -180,7 +180,7 @@ function Install-Dotnet([string]$Versions, [string]$InstallDir, [string]$ToolsDi $Version = $_ log "Installing dotnet ${Version} to ${InstallDir}" Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' - ./dotnet-install.ps1 -Version $Version -InstallDir $InstallDir + ./dotnet-install.ps1 -Channel $Version -InstallDir $InstallDir Remove-Item ./dotnet-install.ps1 log "Installing dotnet ${Version}: done" }