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

This reverts commit 0c8acb6.
protocolbuffers · Nov 14, 2019 · f068005 · f068005
1 parent 0c8acb6
commit f068005
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/csharp/install_dotnet_sdk.ps1 b/csharp/install_dotnet_sdk.ps1
@@ -19,6 +19,3 @@ $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
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100"
+    "version": "2.1.504"
   }
 }
diff --git a/kokoro/linux/dockerfile/test/csharp/Dockerfile b/kokoro/linux/dockerfile/test/csharp/Dockerfile
@@ -28,8 +28,7 @@ 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.802 && \
-    ./dotnet-install.sh --version 3.0.100 && \
+    ./dotnet-install.sh --version 2.1.504 && \
     ln -s /root/.dotnet/dotnet /usr/local/bin
 
 RUN wget -q www.nuget.org/NuGet.exe -O /usr/local/bin/nuget.exe