[Ubuntu] Add .NET SDK 6.0 (#4958)

This commit is contained in:
Nikolay Frolov
2022-01-29 19:28:21 +03:00
committed by GitHub
parent e6c832339c
commit 02547255ff
3 changed files with 15 additions and 7 deletions

View File

@@ -32,12 +32,16 @@ for version in ${DOTNET_VERSIONS[@]}; do
release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json" release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json"
download_with_retries "${release_url}" "." "${version}.json" download_with_retries "${release_url}" "." "${version}.json"
releases=$(cat "./${version}.json") releases=$(cat "./${version}.json")
sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version')) if [[ $version == "6.0" ]]; then
sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version')) sdks=("${sdks[@]}" $(echo "${releases}" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))'))
else
sdks=("${sdks[@]}" $(echo "${releases}" | jq -r '.releases[].sdk.version | select(contains("preview") or contains("rc") | not)'))
sdks=("${sdks[@]}" $(echo "${releases}" | jq -r '.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not)'))
fi
rm ./${version}.json rm ./${version}.json
done done
sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -r | uniq -w 5) sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | sort -r | uniq -w 5)
extract_dotnet_sdk() { extract_dotnet_sdk() {
local ARCHIVE_NAME="$1" local ARCHIVE_NAME="$1"

View File

@@ -247,12 +247,14 @@
"dotnet": { "dotnet": {
"aptPackages": [ "aptPackages": [
"dotnet-sdk-3.1", "dotnet-sdk-3.1",
"dotnet-sdk-5.0" "dotnet-sdk-5.0",
"dotnet-sdk-6.0"
], ],
"versions": [ "versions": [
"2.1", "2.1",
"3.1", "3.1",
"5.0" "5.0",
"6.0"
], ],
"tools": [ "tools": [
{ "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" }

View File

@@ -247,12 +247,14 @@
"dotnet": { "dotnet": {
"aptPackages": [ "aptPackages": [
"dotnet-sdk-3.1", "dotnet-sdk-3.1",
"dotnet-sdk-5.0" "dotnet-sdk-5.0",
"dotnet-sdk-6.0"
], ],
"versions": [ "versions": [
"2.1", "2.1",
"3.1", "3.1",
"5.0" "5.0",
"6.0"
], ],
"tools": [ "tools": [
{ "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" }