From a31da5ca28d380f0f418bb490c1f3528735a8c36 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 12 Sep 2018 17:31:20 -0700 Subject: [PATCH] [Package] Remove packaging, building and installation scripts for Ubuntu 17.10 --- build.psm1 | 1 - tools/installpsh-debian.sh | 4 ++-- tools/packaging/packaging.psm1 | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.psm1 b/build.psm1 index 73adb328497..e8e2f6c9ef4 100644 --- a/build.psm1 +++ b/build.psm1 @@ -133,7 +133,6 @@ function Get-EnvironmentInformation $environment += @{'IsUbuntu' = $LinuxInfo.ID -match 'ubuntu'} $environment += @{'IsUbuntu14' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '14.04'} $environment += @{'IsUbuntu16' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'} - $environment += @{'IsUbuntu17' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '17.10'} $environment += @{'IsUbuntu18' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '18.04'} $environment += @{'IsCentOS' = $LinuxInfo.ID -match 'centos' -and $LinuxInfo.VERSION_ID -match '7'} $environment += @{'IsFedora' = $LinuxInfo.ID -match 'fedora' -and $LinuxInfo.VERSION_ID -ge 24} diff --git a/tools/installpsh-debian.sh b/tools/installpsh-debian.sh index dfccc702f53..3c83a9594cb 100755 --- a/tools/installpsh-debian.sh +++ b/tools/installpsh-debian.sh @@ -139,12 +139,12 @@ curl https://packages.microsoft.com/keys/microsoft.asc | $SUDO apt-key add - case $DISTRIB_ID in ubuntu) case $DISTRIB_RELEASE in - 17.10|16.10|16.04|15.10|14.04) + 18.04|16.10|16.04|15.10|14.04) curl https://packages.microsoft.com/config/ubuntu/$DISTRIB_RELEASE/prod.list | $SUDO tee /etc/apt/sources.list.d/microsoft.list ;; *) echo "ERROR: unsupported Ubuntu version ($DISTRIB_RELEASE)." >&2 - echo "Supported versions: 14.04, 15.10, 16.04, 16.10, 17.10." >&2 + echo "Supported versions: 14.04, 15.10, 16.04, 16.10, 18.04." >&2 exit 1 ;; esac diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 664d8b90ff0..4b829bd305c 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -4,7 +4,7 @@ $Environment = Get-EnvironmentInformation $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.psd1" Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force -$DebianDistributions = @("ubuntu.14.04", "ubuntu.16.04", "ubuntu.17.10", "ubuntu.18.04", "debian.8", "debian.9") +$DebianDistributions = @("ubuntu.14.04", "ubuntu.16.04", "ubuntu.18.04", "debian.8", "debian.9") function Start-PSPackage { [CmdletBinding(DefaultParameterSetName='Version',SupportsShouldProcess=$true)] @@ -667,8 +667,6 @@ function New-UnixPackage { $DebDistro = "ubuntu.14.04" } elseif ($Environment.IsUbuntu16) { $DebDistro = "ubuntu.16.04" - } elseif ($Environment.IsUbuntu17) { - $DebDistro = "ubuntu.17.10" } elseif ($Environment.IsUbuntu18) { $DebDistro = "ubuntu.18.04" } elseif ($Environment.IsDebian8) {