From 57624a1ef8b267b4788cb2bcd359b87806daa181 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@users.noreply.github.com>
Date: Mon, 25 Nov 2019 20:29:47 +0100
Subject: [PATCH] Revert "Revert "C# upgrade dotnet SDK (#6877)" (#6888)"
 (#6920)

This reverts commit f06800524f0fe0d2e71a2d3696ce7a5278836445.
---
 csharp/install_dotnet_sdk.ps1                  | 3 +++
 global.json                                    | 2 +-
 kokoro/linux/dockerfile/test/csharp/Dockerfile | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/csharp/install_dotnet_sdk.ps1 b/csharp/install_dotnet_sdk.ps1
index b4132ab31fec..9e300eda067b 100644
--- a/csharp/install_dotnet_sdk.ps1
+++ b/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
diff --git a/global.json b/global.json
index 0c7cc9f180ce..1c02f0719ad0 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.504"
+    "version": "3.0.100"
   }
 }
diff --git a/kokoro/linux/dockerfile/test/csharp/Dockerfile b/kokoro/linux/dockerfile/test/csharp/Dockerfile
index 2073057bc0ce..3d54436bacc6 100644
--- a/kokoro/linux/dockerfile/test/csharp/Dockerfile
+++ b/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