Skip to content

Commit 2e6e34c

Browse files
authored
Use runtime 3.1.27 (#3900)
1 parent cdf55d8 commit 2e6e34c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

scripts/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ function install_cli()
215215
return 1
216216
fi
217217
chmod u+x $install_script
218-
# Get netcoreapp1.1 shared components
218+
# Runtime versions installed usually need to be kept in sync with the ones installed in common.lib.ps1
219219
$install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "2.1" --version "2.1.30"
220-
$install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "3.1" --version "3.1.24"
220+
$install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "3.1" --version "3.1.27"
221221
$install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "5.0" --version "5.0.16"
222222
$install_script --runtime dotnet --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64 --channel "6.0" --version "6.0.4"
223223

scripts/common.lib.ps1

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,15 @@ function Install-DotNetCli
105105
$dotnetInstallPath = Join-Path $env:TP_TOOLS_DIR "dotnet"
106106
New-Item -ItemType directory -Path $dotnetInstallPath -Force | Out-Null
107107

108+
# Runtime versions installed usually need to be kept in sync with the ones installed in build.sh
108109
& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '2.1' -Architecture x64 -NoPath -Version '2.1.30'
109-
& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '3.1' -Architecture x64 -NoPath -Version '3.1.24'
110+
& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '3.1' -Architecture x64 -NoPath -Version '3.1.27'
110111
& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '5.0' -Architecture x64 -NoPath -Version '5.0.16'
111112
& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Channel '6.0' -Architecture x64 -NoPath -Version '6.0.4'
112113
& $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Channel '7.0' -Architecture x64 -NoPath -Version $env:DOTNET_CLI_VERSION
113114

114115
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '2.1' -Architecture x86 -NoPath -Version '2.1.30'
115-
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '3.1' -Architecture x86 -NoPath -Version '3.1.24'
116+
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '3.1' -Architecture x86 -NoPath -Version '3.1.27'
116117
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '5.0' -Architecture x86 -NoPath -Version '5.0.16'
117118
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Channel '6.0' -Architecture x86 -NoPath -Version '6.0.4'
118119
& $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Channel '7.0' -Architecture x86 -NoPath -Version $env:DOTNET_CLI_VERSION
@@ -390,7 +391,7 @@ function Start-InlineProcess {
390391
}
391392

392393
Add-Type -TypeDefinition @"
393-
public static class Hash {
394+
public static class Hash {
394395
public static string GetHash(string value)
395396
{
396397
unchecked
@@ -414,6 +415,6 @@ function Get-Hash {
414415
[string]$Value
415416
)
416417

417-
# PowerShell does not have unchecked keyword, so we can't do unchecked math easily.
418+
# PowerShell does not have unchecked keyword, so we can't do unchecked math easily.
418419
[Hash]::GetHash($Value)
419420
}

0 commit comments

Comments
 (0)