File tree Expand file tree Collapse file tree 3 files changed +15
-7
lines changed Expand file tree Collapse file tree 3 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -32,12 +32,16 @@ for version in ${DOTNET_VERSIONS[@]}; do
3232 release_url=" https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version} /releases.json"
3333 download_with_retries " ${release_url} " " ." " ${version} .json"
3434 releases=$( cat " ./${version} .json" )
35- sdks=(" ${sdks[@]} " $( echo " ${releases} " | jq ' .releases[]' | jq ' .sdk.version' ) )
36- sdks=(" ${sdks[@]} " $( echo " ${releases} " | jq ' .releases[]' | jq ' .sdks[]?' | jq ' .version' ) )
35+ if [[ $version == " 6.0" ]]; then
36+ sdks=(" ${sdks[@]} " $( echo " ${releases} " | jq -r ' first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))' ) )
37+ else
38+ sdks=(" ${sdks[@]} " $( echo " ${releases} " | jq -r ' .releases[].sdk.version | select(contains("preview") or contains("rc") | not)' ) )
39+ sdks=(" ${sdks[@]} " $( echo " ${releases} " | jq -r ' .releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not)' ) )
40+ fi
3741 rm ./${version} .json
3842done
3943
40- sortedSdks=$( echo ${sdks[@]} | tr ' ' ' \n' | grep -v preview | grep -v rc | grep -v display | cut -d \" -f2 | sort -r | uniq -w 5)
44+ sortedSdks=$( echo ${sdks[@]} | tr ' ' ' \n' | sort -r | uniq -w 5)
4145
4246extract_dotnet_sdk () {
4347 local ARCHIVE_NAME=" $1 "
Original file line number Diff line number Diff line change 247247 "dotnet" : {
248248 "aptPackages" : [
249249 " dotnet-sdk-3.1" ,
250- " dotnet-sdk-5.0"
250+ " dotnet-sdk-5.0" ,
251+ " dotnet-sdk-6.0"
251252 ],
252253 "versions" : [
253254 " 2.1" ,
254255 " 3.1" ,
255- " 5.0"
256+ " 5.0" ,
257+ " 6.0"
256258 ],
257259 "tools" : [
258260 { "name" : " nbgv" , "test" : " nbgv --version" , "getversion" : " nbgv --version" }
Original file line number Diff line number Diff line change 247247 "dotnet" : {
248248 "aptPackages" : [
249249 " dotnet-sdk-3.1" ,
250- " dotnet-sdk-5.0"
250+ " dotnet-sdk-5.0" ,
251+ " dotnet-sdk-6.0"
251252 ],
252253 "versions" : [
253254 " 2.1" ,
254255 " 3.1" ,
255- " 5.0"
256+ " 5.0" ,
257+ " 6.0"
256258 ],
257259 "tools" : [
258260 { "name" : " nbgv" , "test" : " nbgv --version" , "getversion" : " nbgv --version" }
You can’t perform that action at this time.
0 commit comments