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-10-16 14:59:03 -07:00
parent 6366deb193 bf43721efb
commit eb9061103e
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/GenerateTags.ps1
View File

@ -60,9 +60,9 @@ function New-GitTag {
function Get-PackageVersion([string]$repoRoot) { function Get-PackageVersion([string]$repoRoot) {
$buildScript = if (-not $IsCoreCLR -or $IsWindows) { 'build.ps1' } else { 'build.sh' } $buildScript = if (-not $IsCoreCLR -or $IsWindows) { 'build.ps1' } else { 'build.sh' }
$inspectTarget = "/p:CustomAfterKoreBuildTargets=$PSScriptRoot/GetPackageVersion.targets" $inspectTarget = "/p:CustomAfterKoreBuildTargets=$PSScriptRoot/GetPackageVersion.targets"
Write-Verbose "Running `"$repoRoot/$buildScript`" $inspectTarget /v:m /p:IsFinalBuild=true /t:Noop /t:GetPackageVersion" Write-Verbose "Running `"$repoRoot/$buildScript`" $inspectTarget /v:m /p:IsFinalBuild=true /t:Noop /t:GetPackageVersion /p:BuildNumber=t000"
# Add the /t:Noop target which may be used by the bootstrapper to skip unimportant initialization # Add the /t:Noop target which may be used by the bootstrapper to skip unimportant initialization
$output = & "$repoRoot/$buildScript" $inspectTarget /v:m /p:IsFinalBuild=true /t:Noop /t:GetPackageVersion $output = & "$repoRoot/$buildScript" $inspectTarget /v:m /p:IsFinalBuild=true /t:Noop /t:GetPackageVersion /p:BuildNumber=t000
$output | out-string | Write-Verbose $output | out-string | Write-Verbose
if (-not $? -or $LASTEXITCODE -ne 0) { if (-not $? -or $LASTEXITCODE -ne 0) {
throw "$buildScript failed on $repoRoot. Exit code $LASTEXITCODE" throw "$buildScript failed on $repoRoot. Exit code $LASTEXITCODE"
@ -70,6 +70,7 @@ function Get-PackageVersion([string]$repoRoot) {
$packageVersion = $output | where-object { $_ -like '*PackageVersion=*' } | select-object -first 1 $packageVersion = $output | where-object { $_ -like '*PackageVersion=*' } | select-object -first 1
$packageVersion = $packageVersion -replace 'PackageVersion=', '' $packageVersion = $packageVersion -replace 'PackageVersion=', ''
$packageVersion = $packageVersion -replace '-final', '' $packageVersion = $packageVersion -replace '-final', ''
$packageVersion = $packageVersion -replace '-t000', ''
if ($packageVersion) { $packageVersion = $packageVersion.Trim() } if ($packageVersion) { $packageVersion = $packageVersion.Trim() }
if (-not $packageVersion) { if (-not $packageVersion) {
throw "Could not determine final package version for $repoRoot" throw "Could not determine final package version for $repoRoot"