build script update

Author: Oren Novotny

Ix.NET/Source/build-new.ps1

@@ -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"
   }

Rx.NET/Source/build-new.ps1

@@ -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"
   }

appveyor.yml

@@ -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