Skip to content

Commit 941aef6

Browse files
committed
Fix versioning scheme.
* Remove redundant number following revision. * Fix incorrect version in nightly packages in CI. * Fix nightly package publish failure in CI.
1 parent 74f98f0 commit 941aef6

File tree

4 files changed

+27
-16
lines changed

4 files changed

+27
-16
lines changed

appveyor-debug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ init:
1313
assembly_info:
1414
patch: true
1515
file: '**\*AssemblyInfo.cs'
16-
assembly_version: $(AssemblyBaseVersion).0.0
17-
assembly_file_version: $(PackageVersion).{build}
16+
assembly_version: $(AssemblyBaseVersion).0
17+
assembly_file_version: $(AssemblyBaseVersion).{build}
1818
assembly_informational_version: $(PackageVersion)
1919
environment:
2020
ANDROID_HOME: C:\android-sdk-windows

appveyor-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ init:
1515
assembly_info:
1616
patch: true
1717
file: '**\*AssemblyInfo.cs'
18-
assembly_version: $(AssemblyBaseVersion).0.0
19-
assembly_file_version: $(PackageVersion).{build}
18+
assembly_version: $(AssemblyBaseVersion).0
19+
assembly_file_version: $(AssemblyBaseVersion).{build}
2020
assembly_informational_version: $(PackageVersion)
2121
environment:
2222
ANDROID_HOME: C:\android-sdk-windows

build/Build.ps1

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,22 +195,16 @@ if ( $LastExitCode -ne 0 )
195195

196196
if ( $buildConfig -eq 'Release' )
197197
{
198-
$packageVersion = $env:PackageVersion
199-
if ($env:APPVEYOR_REPO_TAG -ne "True")
200-
{
201-
$packageVersion += $env:APPVEYOR_BUILD_VERSION
202-
}
203-
[string]$zipVersion = $packageVersion
204-
& $nuget pack ../MsgPack.nuspec -Symbols -Version $packageVersion -OutputDirectory ../dist
198+
& $nuget pack ../MsgPack.nuspec -Symbols -Version $env:PackageVersion -OutputDirectory ../dist
205199

206200
Copy-Item ../bin/ ./MsgPack-CLI/ -Recurse -Exclude @("*.vshost.*")
207201
Copy-Item ../tools/mpu/bin/ ./MsgPack-CLI/mpu/ -Recurse -Exclude @("*.vshost.*")
208202
[Reflection.Assembly]::LoadWithPartialName( "System.IO.Compression.FileSystem" ) | Out-Null
209203
# 'latest' should be rewritten with semver manually.
210-
if ( ( Test-Path "../dist/MsgPack.Cli.${zipVersion}.zip" ) )
204+
if ( ( Test-Path "../dist/MsgPack.Cli.${env:PackageVersion}.zip" ) )
211205
{
212-
Remove-Item ../dist/MsgPack.Cli.${zipVersion}.zip
206+
Remove-Item ../dist/MsgPack.Cli.${env:PackageVersion}.zip
213207
}
214-
[IO.Compression.ZipFile]::CreateFromDirectory( ( Convert-Path './MsgPack-CLI' ), ( Convert-Path '../dist/' ) + "MsgPack.Cli.${zipVersion}.zip" )
208+
[IO.Compression.ZipFile]::CreateFromDirectory( ( Convert-Path './MsgPack-CLI' ), ( Convert-Path '../dist/' ) + "MsgPack.Cli.${env:PackageVersion}.zip" )
215209
Remove-Item ./MsgPack-CLI -Recurse -Force
216210
}

build/SetBuildEnv.ps1

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
11
# Set versions for AssemblyInfo.cs
2-
$env:PackageVersion = ( Get-Content .\Version.txt );
3-
$env:AssemblyBaseVersion = $env:PackageVersion | foreach{ if( $_ -match "^\d+\.\d+" ){ $matches[0] } }
2+
$version = ( Get-Content .\Version.txt );
3+
$env:AssemblyBaseVersion = $version | foreach{ if( $_ -match "^\d+\.\d+" ){ $matches[0] } }
4+
if ( $env:APPVEYOR_REPO_TAG -ne "True" )
5+
{
6+
if ( ${env:APPVEYOR_BUILD_NUMBER} -eq $null )
7+
{
8+
$now = [DateTime]::UtcNow
9+
$daysSpan = $now - ( New-Object DateTime( $now.Year, 1, 1 ) )
10+
$env:PackageVersion = "${version}-{0:yy}{1:000}" -f @( $now, $daysSpan.Days )
11+
}
12+
else
13+
{
14+
$env:PackageVersion = "${version}-${env:APPVEYOR_BUILD_NUMBER}"
15+
}
16+
}
17+
else
18+
{
19+
$env:PackageVersion = $version
20+
}

0 commit comments

Comments
 (0)