Skip to content

Commit

Permalink
Merge pull request #31592 from dotnet-maestro-bot/merge/release/3.1-t…
Browse files Browse the repository at this point in the history
…o-main

[automated] Merge branch 'release/3.1' => 'main'
  • Loading branch information
sebastienros authored Apr 8, 2021
2 parents 3a3aea8 + 7cf381d commit 89e81c0
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 53 deletions.
4 changes: 2 additions & 2 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .azure/pipelines/jobs/default-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file removed src/Mvc/build/Key.snk
Binary file not shown.
10 changes: 0 additions & 10 deletions src/Mvc/build/buildpipeline/linux.groovy

This file was deleted.

10 changes: 0 additions & 10 deletions src/Mvc/build/buildpipeline/osx.groovy

This file was deleted.

18 changes: 0 additions & 18 deletions src/Mvc/build/buildpipeline/pipeline.groovy

This file was deleted.

12 changes: 0 additions & 12 deletions src/Mvc/build/buildpipeline/windows.groovy

This file was deleted.

0 comments on commit 89e81c0

Please sign in to comment.