Merge in 'release/2.2' changes
This commit is contained in:
commit
9ee1a878fc
|
|
@ -78,10 +78,10 @@ jobs:
|
|||
vmImage: ubuntu-16.04
|
||||
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCorePublic-Int-Pool
|
||||
name: NetCorePublic-Pool
|
||||
queue: BuildPool.Windows.10.Amd64.VS2017.Open
|
||||
${{ if ne(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCoreInternal-Int-Pool
|
||||
name: NetCoreInternal-Pool
|
||||
queue: BuildPool.Windows.10.Amd64.VS2017
|
||||
variables:
|
||||
AgentOsName: ${{ parameters.agentOs }}
|
||||
|
|
@ -111,6 +111,12 @@ jobs:
|
|||
- ${{ if eq(parameters.agentOs, 'Windows') }}:
|
||||
- powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1'
|
||||
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') }}:
|
||||
- script: ./eng/scripts/InstallJdk.sh '10.0.2'
|
||||
displayName: Install JDK 10
|
||||
|
|
|
|||
Loading…
Reference in New Issue