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

Merge branch 'release/2.1' into release/2.2

This commit is contained in:
Nate McMaster 2018-11-06 09:23:17 -08:00
parent 4059e28a3b 17cccade43
commit 4f887e5cd4
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,6 @@ parameters:
codeSign: false codeSign: false
variables: {} variables: {}
dependsOn: '' dependsOn: ''
# buildSteps: ''- don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.buildSteps)"
# jobName: '' - use agentOs by default. # jobName: '' - use agentOs by default.
# jobDisplayName: '' - use agentOs by default. # jobDisplayName: '' - use agentOs by default.
# matrix: {} - don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.matrix)" # matrix: {} - don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.matrix)"
@ -59,7 +58,6 @@ parameters:
publish: true publish: true
path: 'artifacts/' path: 'artifacts/'
buildDirectory: '' buildDirectory: ''
buildSteps: []
jobs: jobs:
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }} - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
@ -112,10 +110,10 @@ jobs:
signType: $(_SignType) signType: $(_SignType)
zipSources: false zipSources: false
- ${{ parameters.beforeBuild }} - ${{ parameters.beforeBuild }}
- ${{ if eq(parameters.agentOs, 'Windows')}}: - ${{ if eq(parameters.agentOs, 'Windows') }}:
- script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
displayName: Run build.cmd displayName: Run build.cmd
- ${{ if ne(parameters.agentOs, 'Windows')}}: - ${{ if ne(parameters.agentOs, 'Windows') }}:
- script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
displayName: Run build.sh displayName: Run build.sh
- task: PublishTestResults@2 - task: PublishTestResults@2

2
.azure/pipelines/project-ci.yml
View File

@ -15,6 +15,7 @@
# This build definition is enabled for code signing. (Only applies to Windows) # This build definition is enabled for code signing. (Only applies to Windows)
# buildDirectory: string # buildDirectory: string
# Specifies what directory to run build.sh/cmd # Specifies what directory to run build.sh/cmd
parameters: parameters:
buildArgs: '' buildArgs: ''
beforeBuild: [] beforeBuild: []
@ -27,6 +28,7 @@ parameters:
Debug: Debug:
BuildConfiguration: Debug BuildConfiguration: Debug
buildDirectory: '' buildDirectory: ''
jobs: jobs:
- template: jobs/default-build.yml - template: jobs/default-build.yml
parameters: parameters:

2
src/Installers/Windows/build.ps1
View File

@ -13,6 +13,7 @@ param(
[Alias("x64")] [Alias("x64")]
[string]$Runtime64Zip, [string]$Runtime64Zip,
[string]$BuildNumber = 't000', [string]$BuildNumber = 't000',
[switch]$IsFinalBuild,
[string]$SignType = '', [string]$SignType = '',
[string]$PackageVersionPropsUrl = $null, [string]$PackageVersionPropsUrl = $null,
[string]$AccessTokenSuffix = $null, [string]$AccessTokenSuffix = $null,
@ -89,6 +90,7 @@ try {
"-p:Configuration=$Configuration" ` "-p:Configuration=$Configuration" `
"-p:BuildNumber=$BuildNumber" ` "-p:BuildNumber=$BuildNumber" `
"-p:SignType=$SignType" ` "-p:SignType=$SignType" `
"-p:IsFinalBuild=$IsFinalBuild" `
"-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" ` "-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" `
@msbuildArgs @msbuildArgs
} }