Browse Source

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

This reverts commit 0c8acb6c8d3de17acb09ba2fbd99a9aecd676336.
Jie Luo 5 years ago
parent
commit
f06800524f
3 changed files with 2 additions and 6 deletions
  1. 0 3
      csharp/install_dotnet_sdk.ps1
  2. 1 1
      global.json
  3. 1 2
      kokoro/linux/dockerfile/test/csharp/Dockerfile

+ 0 - 3
csharp/install_dotnet_sdk.ps1

@@ -19,6 +19,3 @@ $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 - 1
global.json

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

+ 1 - 2
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
 # 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.802 && \
-    ./dotnet-install.sh --version 3.0.100 && \
+    ./dotnet-install.sh --version 2.1.504 && \
     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