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

Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2019-04-20 01:25:16 +00:00
parent d5d91ad3a9 e96a53f9e7
commit d1a4528160
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: pool:
vmImage: vs2017-win2016 vmImage: vs2017-win2016
strategy: strategy:
maxParallel: 4 maxParallel: 8
matrix: matrix:
Portable_Node8: Portable_Node8:
Test.RuntimeIdentifier: none Test.RuntimeIdentifier: none
@ -87,7 +87,7 @@ jobs:
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-16.04
strategy: strategy:
maxParallel: 4 maxParallel: 8
matrix: matrix:
Portable_Node8: Portable_Node8:
Test.RuntimeIdentifier: none Test.RuntimeIdentifier: none

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

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