Merge pull request #164 from MichaelSimons/dotnet-3.1

Update linux images to include .NET Core 3.1
This commit is contained in:
Alejandro Pauly
2020-01-30 07:27:19 -05:00
committed by GitHub
2 changed files with 32 additions and 28 deletions

View File

@@ -7,7 +7,7 @@
source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/apt.sh
source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/document.sh
LATEST_DOTNET_PACKAGE=dotnet-sdk-3.0 LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1")
LSB_RELEASE=$(lsb_release -rs) LSB_RELEASE=$(lsb_release -rs)
@@ -30,21 +30,23 @@ mksamples()
set -e set -e
echo "Determing if .NET Core ($LATEST_DOTNET_PACKAGE) is installed" for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do
if ! IsInstalled $LATEST_DOTNET_PACKAGE; then echo "Determing if .NET Core ($latest_package) is installed"
echo "Could not find .NET Core ($LATEST_DOTNET_PACKAGE), installing..." if ! IsInstalled $latest_package; then
wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb echo "Could not find .NET Core ($latest_package), installing..."
dpkg -i packages-microsoft-prod.deb curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
apt-get update mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list'
apt-get install apt-transport-https apt-get install apt-transport-https
apt-get update apt-get update
apt-get install $LATEST_DOTNET_PACKAGE apt-get install $latest_package -y
else else
echo ".NET Core ($LATEST_DOTNET_PACKAGE) is already installed" echo ".NET Core ($latest_package) is already installed"
fi fi
done
# Get list of all released SDKs from channels which are not end-of-life or preview # Get list of all released SDKs from channels which are not end-of-life or preview
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/2.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/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")
sdks=() sdks=()
for release_url in ${release_urls[@]}; do for release_url in ${release_urls[@]}; do
echo "${release_url}" echo "${release_url}"

View File

@@ -7,7 +7,7 @@
source $HELPER_SCRIPTS/apt.sh source $HELPER_SCRIPTS/apt.sh
source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/document.sh
LATEST_DOTNET_PACKAGE=dotnet-sdk-3.0 LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1")
LSB_RELEASE=$(lsb_release -rs) LSB_RELEASE=$(lsb_release -rs)
@@ -30,21 +30,23 @@ mksamples()
set -e set -e
echo "Determing if .NET Core ($LATEST_DOTNET_PACKAGE) is installed" for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do
if ! IsInstalled $LATEST_DOTNET_PACKAGE; then echo "Determing if .NET Core ($latest_package) is installed"
echo "Could not find .NET Core ($LATEST_DOTNET_PACKAGE), installing..." if ! IsInstalled $latest_package; then
echo "Could not find .NET Core ($latest_package), installing..."
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list'
apt-get install apt-transport-https apt-get install apt-transport-https
apt-get update apt-get update
apt-get install $LATEST_DOTNET_PACKAGE -y apt-get install $latest_package -y
else else
echo ".NET Core ($LATEST_DOTNET_PACKAGE) is already installed" echo ".NET Core ($latest_package) is already installed"
fi fi
done
# Get list of all released SDKs from channels which are not end-of-life or preview # Get list of all released SDKs from channels which are not end-of-life or preview
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") 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")
sdks=() sdks=()
for release_url in ${release_urls[@]}; do for release_url in ${release_urls[@]}; do
echo "${release_url}" echo "${release_url}"