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

Merge pull request #20561 from dotnet-maestro-bot/merge/release/3.1-to-master 

[automated] Merge branch 'release/3.1' => 'master'
This commit is contained in:
John Luo 2020-04-06 17:02:56 -07:00 committed by GitHub
parent 270013880d ea5d9e3a28
commit 6d3ee37ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.azure/pipelines/ci.yml
View File

@ -77,6 +77,9 @@ variables:
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
# used for post-build phases, internal builds only
- group: DotNet-AspNet-SDLValidation-Params
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- name: _BuildArgs - name: _BuildArgs
value: '' value: ''
@ -84,9 +87,6 @@ variables:
value: test value: test
- name: _PublishArgs - name: _PublishArgs
value: '' value: ''
# used for post-build phases, internal builds only
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-AspNet-SDLValidation-Params
stages: stages:
- stage: build - stage: build
@ -799,7 +799,6 @@ stages:
- CodeSign_Xplat_Linux_musl_x64 - CodeSign_Xplat_Linux_musl_x64
- CodeSign_Xplat_Linux_musl_arm64 - CodeSign_Xplat_Linux_musl_arm64
# In addition to the dependencies above, ensure the build was successful overall. # In addition to the dependencies above, ensure the build was successful overall.
- Code_check
- Linux_Test - Linux_Test
- MacOS_Test - MacOS_Test
- Source_Build - Source_Build