浏览代码

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

This reverts commit f06800524f0fe0d2e71a2d3696ce7a5278836445.
Jan Tattermusch 5 年之前
父节点
当前提交
96e9ff3863
共有 3 个文件被更改,包括 6 次插入2 次删除
  1. 3 0
      csharp/install_dotnet_sdk.ps1
  2. 1 1
      global.json
  3. 2 1
      kokoro/linux/dockerfile/test/csharp/Dockerfile

+ 3 - 0
csharp/install_dotnet_sdk.ps1

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

+ 1 - 1
global.json

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

+ 2 - 1
kokoro/linux/dockerfile/test/csharp/Dockerfile

@@ -28,7 +28,8 @@ RUN apt-get update && apt-get install -y libunwind8 libicu57 && apt-get clean
 # Install dotnet SDK via install script
 RUN wget -q https://dot.net/v1/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
 
 RUN wget -q www.nuget.org/NuGet.exe -O /usr/local/bin/nuget.exe