Skip to content

Commit 89e81c0

Browse files
authored
Merge pull request #31592 from dotnet-maestro-bot/merge/release/3.1-to-main
[automated] Merge branch 'release/3.1' => 'main'
2 parents 3a3aea8 + 7cf381d commit 89e81c0

File tree

7 files changed

+3
-53
lines changed

7 files changed

+3
-53
lines changed

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ stages:
716716
parameters:
717717
condition: ne(variables['SkipTests'], 'true')
718718
jobName: Linux_Test
719-
jobDisplayName: "Test: Ubuntu 16.04 x64"
719+
jobDisplayName: "Test: Ubuntu 18.04 x64"
720720
agentOs: Linux
721721
isTestingJob: true
722722
useHostedUbuntu: false
@@ -770,7 +770,7 @@ stages:
770770
displayName: 'Test: Linux Source Build'
771771
container: centos:7
772772
pool:
773-
vmImage: 'ubuntu-16.04'
773+
vmImage: 'ubuntu-18.04'
774774
variables:
775775
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
776776
# This isn't needed in the path because build does not need to _use_ global tools.

.azure/pipelines/jobs/default-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
vmImage: macOS-10.15
102102
${{ if eq(parameters.agentOs, 'Linux') }}:
103103
${{ if eq(parameters.useHostedUbuntu, true) }}:
104-
vmImage: ubuntu-16.04
104+
vmImage: ubuntu-18.04
105105
${{ if eq(parameters.useHostedUbuntu, false) }}:
106106
${{ if eq(variables['System.TeamProject'], 'public') }}:
107107
name: NetCorePublic-Pool

src/Mvc/build/Key.snk

-596 Bytes
Binary file not shown.

src/Mvc/build/buildpipeline/linux.groovy

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Mvc/build/buildpipeline/osx.groovy

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Mvc/build/buildpipeline/pipeline.groovy

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/Mvc/build/buildpipeline/windows.groovy

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)