Permalink
Browse files

build script update

  • Loading branch information...
1 parent 58b8495 commit 16a664a4f5712046b6917c45a101b80ced52178a @onovotny onovotny committed Nov 3, 2016
Showing with 8 additions and 1 deletion.
  1. +4 −0 Ix.NET/Source/build-new.ps1
  2. +4 −0 Rx.NET/Source/build-new.ps1
  3. +0 −1 appveyor.yml
@@ -42,11 +42,15 @@ $versionObj = .\packages\gitversion.commandline\tools\gitversion.exe | ConvertFr
$version = $versionObj.MajorMinorPatch
$tag = $versionObj.PreReleaseLabel
$preRelNum = $versionObj.CommitsSinceVersionSourcePadded
+$preRelNum2 = $versionObj.PreReleaseNumber
if($tag -ne ""){
if($preRelNum -ne "00000") {
$version = "$version-$tag-$preRelNum"
}
+ else if ($preRelNum2 -ne "0") {
+ $version = "$version-$tag$preRelNum2"
+ }
else {
$version = "$version-$tag"
}
@@ -42,11 +42,15 @@ $versionObj = .\packages\gitversion.commandline\tools\gitversion.exe | ConvertFr
$version = $versionObj.MajorMinorPatch
$tag = $versionObj.PreReleaseLabel
$preRelNum = $versionObj.CommitsSinceVersionSourcePadded
+$preRelNum2 = $versionObj.PreReleaseNumber
if($tag -ne ""){
if($preRelNum -ne "00000") {
$version = "$version-$tag-$preRelNum"
}
+ else if ($preRelNum2 -ne "0") {
+ $version = "$version-$tag$preRelNum2"
+ }
else {
$version = "$version-$tag"
}
View
@@ -28,7 +28,6 @@ deploy:
provider: NuGet
server: https://dotnet.myget.org/F/rx/api/v2/package
on:
- branch: master
appveyor_repo_tag: true
api_key:
secure: 5qZfZf9XVtN+h/UHwocrEBZjaZCajJg9fZbLDPigoew1NG7PzWQxMv1kLQJW6eWE

0 comments on commit 16a664a

Please sign in to comment.