diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 0e598d0dc..0544875b4 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -16,7 +16,7 @@ fi if isUbuntu16 || isUbuntu18 ; then LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1") - release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") + release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json") fi mksamples() diff --git a/images/linux/scripts/installers/dotnetcore.sh b/images/linux/scripts/installers/dotnetcore.sh deleted file mode 100644 index a5eae25cf..000000000 --- a/images/linux/scripts/installers/dotnetcore.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -################################################################################ -## File: dotnetcore.sh -## Desc: Installs .NET Core onto the image for running the provisioner -################################################################################ - -source $HELPER_SCRIPTS/apt.sh -source $HELPER_SCRIPTS/document.sh - -DOTNET_PACKAGE=dotnet-dev-1.0.4 - -echo "Determing if .NET Core ($DOTNET_PACKAGE) is installed" -if ! IsInstalled $DOTNET_PACKAGE; then - echo "Could not find .NET Core ($DOTNET_PACKAGE), installing..." - echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 - apt-get update - apt-get install $DOTNET_PACKAGE -y -else - echo ".NET Core ($DOTNET_PACKAGE) is already installed" -fi - -echo "Testing .NET Core ($DOTNET_PACKAGE)" -echo "Pulling down initial dependencies" -dotnet help - -echo "Documenting .NET Core ($DOTNET_PACKAGE)" -DOTNET_VERSION=`dotnet --version` -DocumentInstalledItem ".NET Core $DOTNET_VERSION"