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

Merge in 'release/5.0' changes

This commit is contained in:
dotnet-bot 2021-04-08 22:26:52 +00:00
parent 9e2892d353 8269463d9c
commit c7d102bd78
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.azure/pipelines/ci.yml
View File

@ -566,7 +566,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM64" jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux agentOs: Linux
useHostedUbuntu: false useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-20210311173921-b2c2436
buildScript: ./build.sh buildScript: ./build.sh
buildArgs: buildArgs:
--arch arm64 --arch arm64
@ -680,7 +680,7 @@ stages:
parameters: parameters:
condition: ne(variables['SkipTests'], 'true') condition: ne(variables['SkipTests'], 'true')
jobName: Linux_Test jobName: Linux_Test
jobDisplayName: "Test: Ubuntu 16.04 x64" jobDisplayName: "Test: Ubuntu 18.04 x64"
agentOs: Linux agentOs: Linux
isTestingJob: true isTestingJob: true
useHostedUbuntu: false useHostedUbuntu: false
@ -734,12 +734,15 @@ stages:
displayName: 'Test: Linux Source Build' displayName: 'Test: Linux Source Build'
container: centos:7 container: centos:7
pool: pool:
vmImage: 'ubuntu-16.04' vmImage: 'ubuntu-18.04'
variables: variables:
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
# This isn't needed in the path because build does not need to _use_ global tools. # This isn't needed in the path because build does not need to _use_ global tools.
DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory) DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
LC_ALL: 'en_US.UTF-8'
LANG: 'en_US.UTF-8'
LANGUAGE: 'en_US.UTF-8'
steps: steps:
- script: | - script: |
source eng/common/native/common-library.sh source eng/common/native/common-library.sh

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

@ -95,7 +95,7 @@ jobs:
vmImage: macOS-10.14 vmImage: macOS-10.14
${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.agentOs, 'Linux') }}:
${{ if eq(parameters.useHostedUbuntu, true) }}: ${{ if eq(parameters.useHostedUbuntu, true) }}:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
${{ if eq(parameters.useHostedUbuntu, false) }}: ${{ if eq(parameters.useHostedUbuntu, false) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool name: NetCorePublic-Pool
@ -139,6 +139,9 @@ jobs:
- _SignType: real - _SignType: real
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- _SignType: test - _SignType: test
- LC_ALL: 'en_US.UTF-8'
- LANG: 'en_US.UTF-8'
- LANGUAGE: 'en_US.UTF-8'
steps: steps:
- ${{ if ne(parameters.agentOs, 'Windows') }}: - ${{ if ne(parameters.agentOs, 'Windows') }}:
- script: df -h - script: df -h