Revert "Revert "C# upgrade dotnet SDK (#6877)" (#6888)" (#6920)

This reverts commit f06800524f.
pull/6948/head
Jan Tattermusch 5 years ago committed by Jie Luo
parent a9f390f44e
commit 96e9ff3863
  1. 3
      csharp/install_dotnet_sdk.ps1
  2. 2
      global.json
  3. 3
      kokoro/linux/dockerfile/test/csharp/Dockerfile

@ -19,3 +19,6 @@ $SDKVersion = $GlobalJson.sdk.version
Write-Host "Downloading install script: $InstallScriptUrl => $InstallScriptPath" Write-Host "Downloading install script: $InstallScriptUrl => $InstallScriptPath"
Invoke-WebRequest -Uri $InstallScriptUrl -OutFile $InstallScriptPath Invoke-WebRequest -Uri $InstallScriptUrl -OutFile $InstallScriptPath
&$InstallScriptPath -Version $SDKVersion &$InstallScriptPath -Version $SDKVersion
# Also install dotnet SDK LTS which is required to run some of the tests
&$InstallScriptPath -Version 2.1.802

@ -1,5 +1,5 @@
{ {
"sdk": { "sdk": {
"version": "2.1.504" "version": "3.0.100"
} }
} }

@ -28,7 +28,8 @@ RUN apt-get update && apt-get install -y libunwind8 libicu57 && apt-get clean
# Install dotnet SDK via install script # Install dotnet SDK via install script
RUN wget -q https://dot.net/v1/dotnet-install.sh && \ RUN wget -q https://dot.net/v1/dotnet-install.sh && \
chmod u+x dotnet-install.sh && \ chmod u+x dotnet-install.sh && \
./dotnet-install.sh --version 2.1.504 && \ ./dotnet-install.sh --version 2.1.802 && \
./dotnet-install.sh --version 3.0.100 && \
ln -s /root/.dotnet/dotnet /usr/local/bin ln -s /root/.dotnet/dotnet /usr/local/bin
RUN wget -q www.nuget.org/NuGet.exe -O /usr/local/bin/nuget.exe RUN wget -q www.nuget.org/NuGet.exe -O /usr/local/bin/nuget.exe

Loading…
Cancel
Save