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

Merge branch 'release/2.1' => 'release/2.2' (#9590)

This commit is contained in:
Doug Bunting 2019-04-21 20:53:48 -07:00 committed by GitHub
parent e22a7d1b97 2e94885ecd
commit 8db56e56c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.azure/pipelines/e2e-tests.yml
View File

@ -5,7 +5,7 @@ jobs:
pool:
vmImage: vs2017-win2016
strategy:
maxParallel: 4
maxParallel: 8
matrix:
Portable_Node8:
Test.RuntimeIdentifier: none
@ -97,7 +97,7 @@ jobs:
pool:
vmImage: ubuntu-16.04
strategy:
maxParallel: 4
maxParallel: 8
matrix:
Portable_Node8:
Test.RuntimeIdentifier: none

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

@ -6,7 +6,7 @@
# jobDisplayName: string
# The friendly job name to display in the UI. Defaults to the name of the OS.
# poolName: string
# The name of the VSTS agent queue to use.
# The name of the Azure DevOps agent pool to use.
# agentOs: string
# Used in templates to define variables which are OS specific. Typically from the set { Windows, Linux, macOS }
# buildArgs: string
@ -77,10 +77,10 @@ jobs:
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
vmImage: ubuntu-16.04
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Int-Pool
queue: BuildPool.Windows.10.Amd64.VS2017.Open
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Int-Pool
queue: BuildPool.Windows.10.Amd64.VS2017
variables:
@ -95,9 +95,9 @@ jobs:
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
${{ if eq(parameters.agentOs, 'Linux') }}:
JAVA_HOME: $(Agent.BuildDirectory)/.tools/jdk
${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}:
${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'PullRequest')) }}:
_SignType:
${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }}:
${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}:
TeamName: AspNetCore
_SignType: real
${{ insert }}: ${{ parameters.variables }}