diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index f4cb66affec1..26f8f50b24c1 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -716,7 +716,7 @@ stages: parameters: condition: ne(variables['SkipTests'], 'true') jobName: Linux_Test - jobDisplayName: "Test: Ubuntu 16.04 x64" + jobDisplayName: "Test: Ubuntu 18.04 x64" agentOs: Linux isTestingJob: true useHostedUbuntu: false @@ -770,7 +770,7 @@ stages: displayName: 'Test: Linux Source Build' container: centos:7 pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-18.04' variables: DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet # This isn't needed in the path because build does not need to _use_ global tools. diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 45a0f46cb836..b73ff473c067 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -101,7 +101,7 @@ jobs: vmImage: macOS-10.15 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: - vmImage: ubuntu-16.04 + vmImage: ubuntu-18.04 ${{ if eq(parameters.useHostedUbuntu, false) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool diff --git a/src/Mvc/build/Key.snk b/src/Mvc/build/Key.snk deleted file mode 100644 index e10e4889c125..000000000000 Binary files a/src/Mvc/build/Key.snk and /dev/null differ diff --git a/src/Mvc/build/buildpipeline/linux.groovy b/src/Mvc/build/buildpipeline/linux.groovy deleted file mode 100644 index 903f218bb817..000000000000 --- a/src/Mvc/build/buildpipeline/linux.groovy +++ /dev/null @@ -1,10 +0,0 @@ -@Library('dotnet-ci') _ - -simpleNode('Ubuntu16.04', 'latest-or-auto-docker') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - sh './build.sh --ci' - } -} diff --git a/src/Mvc/build/buildpipeline/osx.groovy b/src/Mvc/build/buildpipeline/osx.groovy deleted file mode 100644 index aaac63686b53..000000000000 --- a/src/Mvc/build/buildpipeline/osx.groovy +++ /dev/null @@ -1,10 +0,0 @@ -@Library('dotnet-ci') _ - -simpleNode('OSX10.12','latest') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - sh './build.sh --ci' - } -} diff --git a/src/Mvc/build/buildpipeline/pipeline.groovy b/src/Mvc/build/buildpipeline/pipeline.groovy deleted file mode 100644 index e915cadae124..000000000000 --- a/src/Mvc/build/buildpipeline/pipeline.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import org.dotnet.ci.pipelines.Pipeline - -def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') -def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.groovy') -def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy') -String configuration = 'Release' -def parameters = [ - 'Configuration': configuration -] - -windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters) -windowsPipeline.triggerPipelineOnGithubPush(parameters) - -linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters) -linuxPipeline.triggerPipelineOnGithubPush(parameters) - -osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters) -osxPipeline.triggerPipelineOnGithubPush(parameters) diff --git a/src/Mvc/build/buildpipeline/windows.groovy b/src/Mvc/build/buildpipeline/windows.groovy deleted file mode 100644 index 8d26f313d497..000000000000 --- a/src/Mvc/build/buildpipeline/windows.groovy +++ /dev/null @@ -1,12 +0,0 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows_NT','latest') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - bat '.\\run.cmd -CI default-build' - } -}