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

Merge branch 'release/2.2' -> 'master'

This commit is contained in:
Doug Bunting 2019-05-05 11:14:25 -07:00
parent 2d33c32187 f226864cd6
commit ed886c47fe
No known key found for this signature in database
GPG Key ID: 4F7A35FC67E693A9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ jobs:
name: ${{ parameters.poolName }} name: ${{ parameters.poolName }}
${{ 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
${{ if ne(parameters.isTestingJob, true) }}: ${{ if ne(parameters.isTestingJob, true) }}:
# Visual Studio Build Tools # Visual Studio Build Tools
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open 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 # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
queue: BuildPool.Windows.10.Amd64.VS2019.Open queue: BuildPool.Windows.10.Amd64.VS2019.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Int-Pool name: NetCoreInternal-Pool
${{ if ne(parameters.isTestingJob, true) }}: ${{ if ne(parameters.isTestingJob, true) }}:
# Visual Studio Build Tools # Visual Studio Build Tools
queue: BuildPool.Windows.10.Amd64.VS2019.BT queue: BuildPool.Windows.10.Amd64.VS2019.BT
@ -138,6 +138,13 @@ jobs:
displayName: Install Node 10.x displayName: Install Node 10.x
inputs: inputs:
versionSpec: 10.x 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')) }}: - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
- powershell: | - powershell: |
./eng/scripts/InstallJdk.ps1 '11.0.1' ./eng/scripts/InstallJdk.ps1 '11.0.1'