Skip to content

Commit 31caa79

Browse files
author
Yihao
authored
Bump dotnet sdk version (#55)
* Bump dotnet sdk version
1 parent 10d4cf3 commit 31caa79

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

ubuntu.18.04/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG Aws_Iam_Authenticator_Version=0.5.3
55
ARG Aws_Powershell_Version=4.1.2
66
ARG Azure_Cli_Version=2.14.0\*
77
ARG Azure_Powershell_Version=4.5.0
8-
ARG Dotnet_Sdk_Version=3.1.401-1
8+
ARG Dotnet_Sdk_Version=6.0
99
ARG Ecs_Cli_Version=1.20.0
1010
ARG Eks_Cli_Version=0.25.0
1111
ARG Google_Cloud_Cli_Version=339.0.0-0
@@ -56,13 +56,13 @@ RUN pwsh -c 'Install-Module -Force -Name Az -AllowClobber -Scope AllUsers -Maxim
5656
# Get Helm3
5757
RUN wget --quiet -O - https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash -s -- -v ${Helm_Version}
5858

59-
# Get .NET SDK 3.1
59+
# Get .NET SDK 6.0
6060
# https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1804
6161
RUN DOTNET_CLI_TELEMETRY_OPTOUT=1 && \
6262
echo "export DOTNET_CLI_TELEMETRY_OPTOUT=1" > /etc/profile.d/set-dotnet-env-vars.sh && \
6363
apt-get install -y apt-transport-https && \
6464
apt-get update && \
65-
apt-get install -y dotnet-sdk-3.1
65+
apt-get install -y dotnet-sdk-${Dotnet_Sdk_Version}
6666

6767
# Get JDK
6868
# https://www.digitalocean.com/community/tutorials/how-to-install-java-with-apt-on-ubuntu-18-04

ubuntu.18.04/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Ubuntu WorkerTools
22

3+
> Please note that we update this document periodically to match the latest version on DockerHub which is publicly available.
4+
> This does not necessarily match the content of Dockerfiles in this repository, as they may contain changes that are not released yet.
5+
36
## Image Name
47
`octopusdeploy/worker-tools`
58

ubuntu.18.04/spec/ubuntu.18.04.tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Describe 'installed dependencies' {
1313
}
1414

1515
It 'has dotnet installed' {
16-
dotnet --version | Should -match '3.1.\d+'
16+
dotnet --version | Should -match '6.0.\d+'
1717
$LASTEXITCODE | Should -be 0
1818
}
1919

windows.ltsc2019/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN $ProgressPreference = 'SilentlyContinue'; `
3131
# Install dotnet 3.1+
3232
RUN Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -outFile 'dotnet-install.ps1'; `
3333
[Environment]::SetEnvironmentVariable('DOTNET_CLI_TELEMETRY_OPTOUT', '1', 'Machine'); `
34-
.\dotnet-install.ps1 -Channel '3.1'; `
34+
.\dotnet-install.ps1 -Channel '6.0'; `
3535
rm dotnet-install.ps1
3636

3737
# Install JDK

windows.ltsc2019/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Windows WorkerTools
22

3+
> Please note that we update this document periodically to match the latest version on DockerHub which is publicly available.
4+
> This does not necessarily match the content of Dockerfiles in this repository, as they may contain changes that are not released yet.
5+
36
## Image Name
47
`octopusdeploy/worker-tools`
58

windows.ltsc2019/spec/windows.ltsc2019.tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Describe 'installed dependencies' {
1717
}
1818

1919
It 'has dotnet installed' {
20-
dotnet --version | Should -Match '3.1.\d+'
20+
dotnet --version | Should -Match '6.0.\d+'
2121
$LASTEXITCODE | Should -be 0
2222
}
2323

0 commit comments

Comments
 (0)