Merge in 'release/3.1' changes

This commit is contained in:
dotnet-bot 2020-04-05 03:20:02 +00:00
commit 95e1891b7b
1 changed files with 22 additions and 21 deletions

View File

@ -89,27 +89,28 @@ stages:
displayName: Build displayName: Build
jobs: jobs:
# Code check # Code check
- template: jobs/default-build.yml - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
parameters: - template: jobs/default-build.yml
jobName: Code_check parameters:
jobDisplayName: Code check jobName: Code_check
agentOs: Windows jobDisplayName: Code check
steps: agentOs: Windows
- ${{ if ne(variables['System.TeamProject'], 'public') }}: steps:
- task: PowerShell@2 - ${{ if ne(variables['System.TeamProject'], 'public') }}:
displayName: Setup Private Feeds Credentials - task: PowerShell@2
inputs: displayName: Setup Private Feeds Credentials
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 inputs:
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
env: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
Token: $(dn-bot-dnceng-artifact-feeds-rw) env:
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs) Token: $(dn-bot-dnceng-artifact-feeds-rw)
displayName: Run eng/scripts/CodeCheck.ps1 - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
artifacts: displayName: Run eng/scripts/CodeCheck.ps1
- name: Code_Check_Logs artifacts:
path: artifacts/log/ - name: Code_Check_Logs
publishOnError: true path: artifacts/log/
includeForks: true publishOnError: true
includeForks: true
# Build Windows (x64/x86) # Build Windows (x64/x86)
- template: jobs/default-build.yml - template: jobs/default-build.yml