diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index f6678b2a84b8..13da1c1429c7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -266,7 +266,7 @@ stages: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - + - script: ./build.cmd -ci -arch arm64 @@ -296,7 +296,7 @@ stages: $(_InternalRuntimeDownloadArgs) /bl:artifacts/log/Release/Build.Installers.Arm64.binlog displayName: Build Arm64 Installers - + # A few files must also go to the VS package feed. - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetCommand@2 @@ -661,7 +661,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 buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs) @@ -699,7 +699,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 302f36d3e159..e939243a85f6 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -91,7 +91,7 @@ jobs: ${{ if eq(parameters.agentOs, 'macOS') }}: vmImage: macOS-10.14 ${{ if eq(parameters.agentOs, 'Linux') }}: - vmImage: ubuntu-16.04 + vmImage: ubuntu-18.04 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool diff --git a/eng/Versions.props b/eng/Versions.props index 8fd3dcd294e7..55e7f9af4d90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,8 +8,8 @@ 3 1 - 14 - true + 15 + false 0 3 2 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' - } -}