huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.1' into release/2.2

This commit is contained in:
Doug Bunting 2019-05-04 22:43:55 -07:00
parent 8db56e56c7 6a6a119c9a
commit 8cb331f8e1
No known key found for this signature in database
GPG Key ID: 4F7A35FC67E693A9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.azure/pipelines/jobs/default-build.yml
View File

@ -78,10 +78,10 @@ jobs:
vmImage: ubuntu-16.04 vmImage: ubuntu-16.04
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Int-Pool name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2017.Open queue: BuildPool.Windows.10.Amd64.VS2017.Open
${{ if ne(variables['System.TeamProject'], 'public') }}: ${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Int-Pool name: NetCoreInternal-Pool
queue: BuildPool.Windows.10.Amd64.VS2017 queue: BuildPool.Windows.10.Amd64.VS2017
variables: variables:
AgentOsName: ${{ parameters.agentOs }} AgentOsName: ${{ parameters.agentOs }}
@ -111,6 +111,12 @@ jobs:
- ${{ if eq(parameters.agentOs, 'Windows') }}: - ${{ if eq(parameters.agentOs, 'Windows') }}:
- powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1' - powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1'
displayName: Install JDK 11 displayName: Install JDK 11
- task: NuGetCommand@2
displayName: 'Clear NuGet caches'
condition: succeeded()
inputs:
command: custom
arguments: 'locals all -clear'
- ${{ if eq(parameters.agentOs, 'Linux') }}: - ${{ if eq(parameters.agentOs, 'Linux') }}:
- script: ./eng/scripts/InstallJdk.sh '10.0.2' - script: ./eng/scripts/InstallJdk.sh '10.0.2'
displayName: Install JDK 10 displayName: Install JDK 10