From e9bcc3e9f595d033132b9fe4cfc12ffa5faab5e9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 25 Feb 2020 14:37:54 +0300 Subject: [PATCH] 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 46f881c59..c0d48dfdd 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 474ad501b..b2081510d 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