Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/3.1' => 'main' #31592

Merged
merged 3 commits into from
Apr 8, 2021
Merged

[automated] Merge branch 'release/3.1' => 'main' #31592

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48133cc
Update branding to 3.1.15 (#31577)
Apr 7, 2021
24d60f8
Merge branch 'main' into merge/release/3.1-to-main
sebastienros Apr 7, 2021
7cf381d
Update default-build.yml
wtgodbe Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .azure/pipelines/ci.yml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions .azure/pipelines/jobs/default-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ 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
queue: BuildPool.Ubuntu.1604.Amd64.Open
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastienros should work if you undo this change and the change at line 111 (keep line 104)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually nvm I'll do it now

queue: Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Ubuntu.1604.Amd64
queue: Ubuntu.1804.Amd64
${{ if eq(parameters.agentOs, 'Windows') }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
Expand Down
Binary file removed src/Mvc/build/Key.snk
View file
Open in desktop
Binary file not shown.
10 changes: 0 additions & 10 deletions src/Mvc/build/buildpipeline/linux.groovy
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions src/Mvc/build/buildpipeline/osx.groovy
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/Mvc/build/buildpipeline/pipeline.groovy
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/Mvc/build/buildpipeline/windows.groovy
View file
Open in desktop

This file was deleted.