Merge branch 'develop'

jweber · Oct 8, 2014 · 02e8c56 · 02e8c56
2 parents 0dfeda0 + e730e7c
commit 02e8c56
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/rakefile.rb b/rakefile.rb
@@ -115,10 +115,16 @@
 task :versioning do
   ver = SemVer.find
   revision = (ENV['BUILD_NUMBER'] || ver.patch).to_i
-  var = SemVer.new(ver.major, ver.minor, revision, ver.special)
+  #ver = SemVer.new(ver.major, ver.minor, revision, ver.special)
+
+  if ver.special != ''
+    ENV['BUILD_VERSION'] = BUILD_VERSION = ver.format("%M.%m.%p.%s") + ".#{commit_data()[0]}"
+    ENV['NUGET_VERSION'] = NUGET_VERSION = ver.format("%M.%m.%p-%s")
+  else
+    ENV['BUILD_VERSION'] = BUILD_VERSION = ver.format("%M.%m.%p") + ".#{commit_data()[0]}"
+    ENV['NUGET_VERSION'] = NUGET_VERSION = ver.format("%M.%m.%p")  
+  end
 
-  ENV['BUILD_VERSION'] = BUILD_VERSION = ver.format("%M.%m.%p.%s") + ".#{commit_data()[0]}"
-  ENV['NUGET_VERSION'] = NUGET_VERSION = ver.format("%M.%m.%p-%s")
   ENV['FORMAL_VERSION'] = FORMAL_VERSION = "#{ SemVer.new(ver.major, ver.minor, revision).format "%M.%m.%p"}"
   puts "##teamcity[buildNumber '#{BUILD_VERSION}']"  
 end