We're now outputting a NuGet compliant version string as a TC build

parameter

Author: andreasohlund

CommonAssemblyInfo.cs

@@ -3,6 +3,6 @@
 
 [assembly: AssemblyTitle("GitFlowVersion")]
 [assembly: AssemblyProduct("GitFlowVersion")]
-[assembly: AssemblyVersion("0.1.23")]
-[assembly: AssemblyFileVersion("0.1.23")]
+[assembly: AssemblyVersion("0.1.24")]
+[assembly: AssemblyFileVersion("0.1.24")]
 [assembly: InternalsVisibleTo("Tests")]

GitFlowVersion/TeamCity.cs

@@ -6,35 +6,47 @@
 public class TeamCity
 {
     public static string GenerateBuildVersion(VersionAndBranch versionAndBranch)
+    {
+        var versionString = CreateVersionString(versionAndBranch);
+
+        return string.Format("##teamcity[buildNumber '{0}']", versionString);
+    }
+
+    static string CreateVersionString(VersionAndBranch versionAndBranch,bool padPreReleaseNumber = false)
     {
         var prereleaseString = "";
 
         if (versionAndBranch.Version.Stability != Stability.Final)
         {
-            switch (versionAndBranch.BranchType )
+            var preReleaseNumber = versionAndBranch.Version.PreReleaseNumber.ToString();
+
+            if (padPreReleaseNumber)
+            {
+                preReleaseNumber = versionAndBranch.Version.PreReleaseNumber.Value.ToString("D4");
+            }
+
+            switch (versionAndBranch.BranchType)
             {
-             case BranchType.Develop:
-                    prereleaseString = "-" + versionAndBranch.Version.Stability + versionAndBranch.Version.PreReleaseNumber;
+                case BranchType.Develop:
+                    prereleaseString = "-" + versionAndBranch.Version.Stability + preReleaseNumber;
                     break;
 
-             case BranchType.Release:
-                    prereleaseString = "-" + versionAndBranch.Version.Stability + versionAndBranch.Version.PreReleaseNumber;
+                case BranchType.Release:
+                    prereleaseString = "-" + versionAndBranch.Version.Stability + preReleaseNumber;
                     break;
 
-             case BranchType.Hotfix:
-                    prereleaseString = "-" + versionAndBranch.Version.Stability + versionAndBranch.Version.PreReleaseNumber;
+                case BranchType.Hotfix:
+                    prereleaseString = "-" + versionAndBranch.Version.Stability + preReleaseNumber;
                     break;
-             case BranchType.PullRequest:
+                case BranchType.PullRequest:
                     prereleaseString = "-PullRequest-" + versionAndBranch.Version.Suffix;
                     break;
-             case BranchType.Feature:
+                case BranchType.Feature:
                     prereleaseString = "-Feature-" + versionAndBranch.BranchName + "-" + versionAndBranch.Sha;
                     break;
             }
-
         }
-
-        return string.Format("##teamcity[buildNumber '{0}.{1}.{2}{3}']", versionAndBranch.Version.Major, versionAndBranch.Version.Minor, versionAndBranch.Version.Patch, prereleaseString);
+        return string.Format("{0}.{1}.{2}{3}",versionAndBranch.Version.Major, versionAndBranch.Version.Minor, versionAndBranch.Version.Patch, prereleaseString);
     }
 
 
@@ -71,14 +83,21 @@ public static int CurrentPullRequestNo()
 
     public static IEnumerable<string> GenerateBuildLogOutput(VersionAndBranch versionAndBranch)
     {
-        yield return GenerateBuildVersion(versionAndBranch);
         var semanticVersion = versionAndBranch.Version;
+        
+        yield return GenerateBuildVersion(versionAndBranch);
         yield return GenerateBuildParameter("Major", semanticVersion.Major.ToString());
         yield return GenerateBuildParameter("Minor", semanticVersion.Minor.ToString());
         yield return GenerateBuildParameter("Patch", semanticVersion.Patch.ToString());
         yield return GenerateBuildParameter("Stability", semanticVersion.Stability.ToString());
         yield return GenerateBuildParameter("PreReleaseNumber", semanticVersion.PreReleaseNumber.ToString());
+        yield return GenerateBuildParameter("Version", CreateVersionString(versionAndBranch)); 
+        yield return GenerateBuildParameter("NugetVersion", GenerateNugetVersion(versionAndBranch));
+    }
 
+    public static string GenerateNugetVersion(VersionAndBranch versionAndBranch)
+    {
+        return CreateVersionString(versionAndBranch, true);
     }
 
     static string GenerateBuildParameter(string name, string value)

Tests/TeamcityVersionNumberTests.cs

@@ -106,6 +106,49 @@ public void Master_branch()
     }
 
 
+    [Test]
+    public void NuGet_version_should_be_padded_to_workaround_stupid_nuget_issue_with_sorting()
+    {
+        Assert.True(TeamCity.GenerateNugetVersion(new VersionAndBranch
+                {
+                    BranchType = BranchType.Develop,
+                    Version = new SemanticVersion
+                    {
+                        PreReleaseNumber = 4
+                    }
+                }).Contains("0.0.0-Unstable0004"));
+
+
+        Assert.True(TeamCity.GenerateNugetVersion(new VersionAndBranch
+        {
+            BranchType = BranchType.Develop,
+            Version = new SemanticVersion
+            {
+                PreReleaseNumber = 40
+            }
+        }).Contains("0.0.0-Unstable0040"));
+
+        Assert.True(TeamCity.GenerateNugetVersion(new VersionAndBranch
+        {
+            BranchType = BranchType.Develop,
+            Version = new SemanticVersion
+            {
+                PreReleaseNumber = 400
+            }
+        }).Contains("0.0.0-Unstable0400"));
+
+        Assert.True(TeamCity.GenerateNugetVersion(new VersionAndBranch
+        {
+            BranchType = BranchType.Develop,
+            Version = new SemanticVersion
+            {
+                PreReleaseNumber = 4000
+            }
+        }).Contains("0.0.0-Unstable4000"));
+
+    }
+
+
     void VerifyOutput(string versionString, VersionAndBranch version)
     {
         var tcVersion = TeamCity.GenerateBuildVersion(version);