Browse Source

bump rc ver after repo update

Oren Novotny 9 years ago
parent
commit
3df103db0e
3 changed files with 18 additions and 11 deletions
  1. 3 9
      GitVersion.yml
  2. 7 1
      Ix.NET/Source/build-new.ps1
  3. 8 1
      Rx.NET/Source/build-new.ps1

+ 3 - 9
GitVersion.yml

@@ -13,19 +13,13 @@ commit-message-incrementing: Enabled
 branches:
   master:
     mode: ContinuousDeployment
-    tag: rc-
-    increment: Patch
-    prevent-increment-of-merged-branch-version: true
-    track-merge-target: false
-  core-port:
-    mode: ContinuousDeployment
-    tag: rc-
+    tag: rc1
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
   releases?[/-]:
     mode: ContinuousDeployment
-    tag: beta
+    tag: rc
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
@@ -56,7 +50,7 @@ branches:
     track-merge-target: false
   dev(elop)?(ment)?$:
     mode: ContinuousDeployment
-    tag: unstable
+    tag: dev
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true

+ 7 - 1
Ix.NET/Source/build-new.ps1

@@ -20,7 +20,13 @@ $msbuildExe = Join-Path $msbuild.MSBuildToolsPath "msbuild.exe"
 
 $versionObj = .\packages\gitversion.commandline\tools\gitversion.exe | ConvertFrom-Json 
 
-$version = $versionObj.NuGetVersionV2
+$version = $versionObj.MajorMinorPatch
+$tag = $versionObj.PreReleaseLabel
+$preRelNum = $versionObj.CommitsSinceVersionSourcePadded
+
+if($tag -ne ""){
+  $version = "$version-$tag-$preRelNum"
+}
 
 Write-Host "Version: $version"
 

+ 8 - 1
Rx.NET/Source/build-new.ps1

@@ -18,7 +18,14 @@ $msbuildExe = Join-Path $msbuild.MSBuildToolsPath "msbuild.exe"
 
 $versionObj = .\packages\gitversion.commandline\tools\gitversion.exe | ConvertFrom-Json 
 
-$version = $versionObj.NuGetVersionV2
+$version = $versionObj.MajorMinorPatch
+$tag = $versionObj.PreReleaseLabel
+$preRelNum = $versionObj.CommitsSinceVersionSourcePadded
+
+if($tag -ne ""){
+  $version = "$version-$tag-$preRelNum"
+}
+
 
 Write-Host "Version: $version"