From 454198d92c03bbec95bf354cb2ded54ff25e9abb Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Tue, 25 Feb 2020 13:50:31 +0300
Subject: [PATCH 1/2] add one more workaround

---
 images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 7 ++++++-
 images/linux/scripts/installers/1804/dotnetcore-sdk.sh | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
index 0193708e..46f881c5 100644
--- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
@@ -34,7 +34,12 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do
     echo "Determing if .NET Core ($latest_package) is installed"
     if ! IsInstalled $latest_package; then
         echo "Could not find .NET Core ($latest_package), installing..."
-        apt-get install $latest_package -y
+        #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+        if [ $latest_package != "dotnet-sdk-3.1" ]; then
+            apt-get install $latest_package -y
+        else
+            apt-get install dotnet-sdk-3.1=3.1.101-1 -y
+        fi
     else
         echo ".NET Core ($latest_package) is already installed"
     fi
diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
index 27a922ee..474ad501 100644
--- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
@@ -42,7 +42,12 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do
         sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list'
         apt-get install apt-transport-https
         apt-get update
-        apt-get install $latest_package -y
+        #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+        if [ $latest_package != "dotnet-sdk-3.1" ]; then
+            apt-get install $latest_package -y
+        else
+            apt-get install dotnet-sdk-3.1=3.1.101-1 -y
+        fi
     else
         echo ".NET Core ($latest_package) is already installed"
     fi

From e9bcc3e9f595d033132b9fe4cfc12ffa5faab5e9 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Tue, 25 Feb 2020 14:37:54 +0300
Subject: [PATCH 2/2] remove 3.1.102 from sorted sdk list

---
 .../linux/scripts/installers/1604/dotnetcore-sdk.sh  | 12 +++++-------
 .../linux/scripts/installers/1804/dotnetcore-sdk.sh  | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
index 46f881c5..c0d48dfd 100644
--- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
@@ -55,15 +55,13 @@ for release_url in ${release_urls[@]}; do
     sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version'))
 done
 
-sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
+#temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v 3.1.102 | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
 
 for sdk in $sortedSdks; do
-    #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
-    if [ $sdk != "3.1.102" ]; then
-        url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
-        echo "$url" >> urls
-        echo "Adding $url to list to download later"
-    fi
+    url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
+    echo "$url" >> urls
+    echo "Adding $url to list to download later"
 done
 
 # Download additional SDKs
diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
index 474ad501..b2081510 100644
--- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
@@ -63,15 +63,13 @@ for release_url in ${release_urls[@]}; do
     sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version'))
 done
 
-sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
+#temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v 3.1.102 | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
 
 for sdk in $sortedSdks; do
-    #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
-    if [ $sdk != "3.1.102" ]; then
-        url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
-        echo "$url" >> urls
-        echo "Adding $url to list to download later"
-    fi
+    url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
+    echo "$url" >> urls
+    echo "Adding $url to list to download later"
 done
 
 # Download additional SDKs