Merge in 'release/6.0.1xx' changes
This commit is contained in:
commit
aa50e0d7a4
1 changed files with 4 additions and 1 deletions
|
@ -390,7 +390,10 @@ stages:
|
||||||
- Source_Build_Create_Tarball
|
- Source_Build_Create_Tarball
|
||||||
publishUsingPipelines: true
|
publishUsingPipelines: true
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
|
name: NetCore1ESPool-Svc-Internal
|
||||||
|
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017
|
||||||
|
|
||||||
|
|
||||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
- template: eng\common\templates\post-build\post-build.yml
|
- template: eng\common\templates\post-build\post-build.yml
|
||||||
|
|
Loading…
Reference in a new issue