Skip to content

Commit

Permalink
change 2.2 to 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nkolev92 committed Jan 22, 2022
1 parent 1e18c76 commit e6bdaea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,11 @@ Function Install-DotnetCLI {
}

# Install the 2.x runtime because our tests target netcoreapp2x
Trace-Log "$DotNetInstall -Runtime dotnet -Channel 2.2 -InstallDir $CLIRoot -NoPath"
Trace-Log "$DotNetInstall -Runtime dotnet -Channel 3.1 -InstallDir $CLIRoot -NoPath"
# dotnet-install might make http requests that fail, but it handles those errors internally
# However, Invoke-BuildStep checks if any error happened, ever. Hence we need to run dotnet-install
# in a different process, to avoid treating their handled errors as build errors.
& powershell $DotNetInstall -Runtime dotnet -Channel 2.2 -InstallDir $CLIRoot -NoPath
& powershell $DotNetInstall -Runtime dotnet -Channel 3.1 -InstallDir $CLIRoot -NoPath
if ($LASTEXITCODE -ne 0)
{
throw "dotnet-install.ps1 exited with non-zero exit code"
Expand Down
2 changes: 1 addition & 1 deletion scripts/funcTests/runFuncTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ curl -o cli/dotnet-install.sh -L https://dot.net/v1/dotnet-install.sh
chmod +x cli/dotnet-install.sh

# Get recommended version for bootstrapping testing version
cli/dotnet-install.sh -i cli -c 2.2 -nopath
cli/dotnet-install.sh -i cli -c 3.1 -nopath

if (( $? )); then
echo "The .NET CLI Install failed!!"
Expand Down

0 comments on commit e6bdaea

Please sign in to comment.