From 9dc028cf996e04d702c14543f1b73c4ecacf0551 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 19 Apr 2019 02:41:49 -0400 Subject: [PATCH] chore: Use Xenial image for Travis .Net install started to fail on 14.04 Pipelines is already using this version --- .travis.yml | 1 + azure-pipelines.yml | 2 +- preproduction-azure-pipelines.yml | 2 +- scripts/install-dotnet.sh | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2b4b38975d7..8a6a9bfa6f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial language: node_js node_js: - '10' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 17c93f53b932..3d909d6df8f6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,7 +73,7 @@ jobs: vmImage: 'Ubuntu 16.04' steps: - script: 'scripts/install-dotnet.sh' - displayName: 'Insall .Net' + displayName: 'Install .Net' - task: Npm@1 displayName: 'npm install' inputs: diff --git a/preproduction-azure-pipelines.yml b/preproduction-azure-pipelines.yml index 8d4200a7f8a1..16be310b131e 100644 --- a/preproduction-azure-pipelines.yml +++ b/preproduction-azure-pipelines.yml @@ -76,7 +76,7 @@ jobs: vmImage: 'Ubuntu 16.04' steps: - script: 'scripts/install-dotnet.sh' - displayName: 'Insall .Net' + displayName: 'Install .Net' - task: Npm@1 displayName: 'npm install' inputs: diff --git a/scripts/install-dotnet.sh b/scripts/install-dotnet.sh index 6d8d31fe1c1e..4b0b8dbca56f 100755 --- a/scripts/install-dotnet.sh +++ b/scripts/install-dotnet.sh @@ -1,8 +1,8 @@ #!/bin/sh -# From https://www.microsoft.com/net/download/linux-package-manager/ubuntu14-04/sdk-2.0.0 +# From https://www.microsoft.com/net/download/linux-package-manager/ubuntu16-04/sdk-2.0.0 -wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb +wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb sudo dpkg -i packages-microsoft-prod.deb sudo apt-get install apt-transport-https -y sudo apt-get update