Merge branch 'release/2.2' -> 'master'
This commit is contained in:
commit
ed886c47fe
|
|
@ -95,7 +95,7 @@ jobs:
|
|||
name: ${{ parameters.poolName }}
|
||||
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCorePublic-Int-Pool
|
||||
name: NetCorePublic-Pool
|
||||
${{ if ne(parameters.isTestingJob, true) }}:
|
||||
# Visual Studio Build Tools
|
||||
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open
|
||||
|
|
@ -103,7 +103,7 @@ jobs:
|
|||
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
|
||||
queue: BuildPool.Windows.10.Amd64.VS2019.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCoreInternal-Int-Pool
|
||||
name: NetCoreInternal-Pool
|
||||
${{ if ne(parameters.isTestingJob, true) }}:
|
||||
# Visual Studio Build Tools
|
||||
queue: BuildPool.Windows.10.Amd64.VS2019.BT
|
||||
|
|
@ -138,6 +138,13 @@ jobs:
|
|||
displayName: Install Node 10.x
|
||||
inputs:
|
||||
versionSpec: 10.x
|
||||
- ${{ if eq(parameters.agentOs, 'Windows') }}:
|
||||
- task: NuGetCommand@2
|
||||
displayName: 'Clear NuGet caches'
|
||||
condition: succeeded()
|
||||
inputs:
|
||||
command: custom
|
||||
arguments: 'locals all -clear'
|
||||
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
|
||||
- powershell: |
|
||||
./eng/scripts/InstallJdk.ps1 '11.0.1'
|
||||
|
|
|
|||
Loading…
Reference in New Issue