diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 36df3be9d..3093dc457 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -19,35 +19,20 @@ chmod +x ./dotnet-install.sh ARGS_LIST=() echo "Parsing dotnet SDK (except rc and preview versions) from .json..." -# TO-DO: move the list of versions to install to toolset -if is_BigSur; then - DOTNET_CHANNELS=( - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json' - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json' - ) -elif is_Less_Catalina; then - DOTNET_CHANNELS=( - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json' - ) -else - DOTNET_CHANNELS=( - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json' - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.0/releases.json' - 'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json' - ) -fi +DOTNET_VERSIONS=$(get_toolset_value '.dotnet[].versions') -for DOTNET_CHANNEL in "${DOTNET_CHANNELS[@]}"; do +for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do + RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json" # Old Mono versions don't support NuGet versions from .Net sdk >=2.1.6**, exclude them explicitly from Mojave and HS images # https://rider-support.jetbrains.com/hc/en-us/articles/360004180039 if is_Less_Catalina; then ARGS_LIST+=( - $(curl -s "$DOTNET_CHANNEL" | \ + $(curl -s "$RELEASE_URL" | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*') ) else ARGS_LIST+=( - $(curl -s "$DOTNET_CHANNEL" | \ + $(curl -s "$RELEASE_URL" | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*') ) fi diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json index e4834c8b6..c96c723e1 100644 --- a/images/macos/toolsets/toolset-10.13.json +++ b/images/macos/toolsets/toolset-10.13.json @@ -205,5 +205,10 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1" + ] + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 2d0972caf..f66c2f387 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -265,5 +265,10 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1" + ] + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 11a7e0161..828684ab2 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -181,5 +181,13 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1", + "3.0", + "3.1", + "5.0" + ] + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 874dec122..693d9f619 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -106,5 +106,12 @@ "package": "yamllint", "cmd": "yamllint --version" } - ] + ], + "dotnet": { + "versions": [ + "2.1", + "3.1", + "5.0" + ] + } } \ No newline at end of file