Add PreReleaseNumber variable

Guillaume Rouchon · Guillaume Rouchon · commit 314f05c2aeba · 2016-01-23T09:05:01.000+01:00
diff --git a/docs/more-info/variables.md b/docs/more-info/variables.md
@@ -10,6 +10,7 @@ For the `release/3.0.0` branch of GitVersion it shows:
   "PreReleaseTag":"beta.1",
   "PreReleaseTagWithDash":"-beta.1",
   "PreReleaseLabel":"beta",
+  "PreReleaseNumber":1,
   "BuildMetaData":1,
   "BuildMetaDataPadded": "0001",
   "FullBuildMetaData":"1.Branch.release/3.0.0.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
diff --git a/src/GitVersionCore.Tests/ExecuteCoreTests.cs b/src/GitVersionCore.Tests/ExecuteCoreTests.cs
@@ -29,6 +29,7 @@ public void CacheFileExistsOnDisk()
 PreReleaseTag: test.19
 PreReleaseTagWithDash: -test.19
 PreReleaseLabel: test
+PreReleaseNumber: 19
 BuildMetaData: 
 BuildMetaDataPadded: 
 FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
diff --git a/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt
@@ -5,6 +5,7 @@
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
   "PreReleaseLabel":"unstable",
+  "PreReleaseNumber":4,
   "BuildMetaData":5,
   "BuildMetaDataPadded":"0005",
   "FullBuildMetaData":"5.Branch.feature1.Sha.commitSha",
diff --git a/src/GitVersionCore.Tests/TestableVersionVariables.cs b/src/GitVersionCore.Tests/TestableVersionVariables.cs
@@ -4,7 +4,7 @@
 
     class TestableVersionVariables : VersionVariables
     {
-        public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, preReleaseLabel, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
+        public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
         {
         }
     }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -5,6 +5,7 @@
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
   "PreReleaseLabel":"unstable",
+  "PreReleaseNumber":4,
   "BuildMetaData":5,
   "BuildMetaDataPadded":"0005",
   "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt
@@ -5,6 +5,7 @@
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
   "PreReleaseLabel":"unstable",
+  "PreReleaseNumber":4,
   "BuildMetaData":5,
   "BuildMetaDataPadded":"05",
   "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
@@ -5,6 +5,7 @@
   "PreReleaseTag":"",
   "PreReleaseTagWithDash":"",
   "PreReleaseLabel":"",
+  "PreReleaseNumber":"",
   "BuildMetaData":5,
   "BuildMetaDataPadded":"0005",
   "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -5,6 +5,7 @@
   "PreReleaseTag":"unstable.5",
   "PreReleaseTagWithDash":"-unstable.5",
   "PreReleaseLabel":"unstable",
+  "PreReleaseNumber":5,
   "BuildMetaData":"",
   "BuildMetaDataPadded":"",
   "FullBuildMetaData":"Branch.develop.Sha.commitSha",
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -5,6 +5,7 @@
   "PreReleaseTag":"ci.5",
   "PreReleaseTagWithDash":"-ci.5",
   "PreReleaseLabel":"ci",
+  "PreReleaseNumber":5,
   "BuildMetaData":"",
   "BuildMetaDataPadded":"",
   "FullBuildMetaData":"Branch.develop.Sha.commitSha",
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -5,6 +5,7 @@
   "PreReleaseTag":"",
   "PreReleaseTagWithDash":"",
   "PreReleaseLabel":"",
+  "PreReleaseNumber":"",
   "BuildMetaData":5,
   "BuildMetaDataPadded":"0005",
   "FullBuildMetaData":"5.Sha.commitSha",
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -59,6 +59,7 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                 semverFormatValues.PreReleaseTag,
                 semverFormatValues.PreReleaseTagWithDash,
                 semverFormatValues.PreReleaseLabel,
+                semverFormatValues.PreReleaseNumber,
                 informationalVersion,
                 semverFormatValues.CommitDate,
                 semverFormatValues.NuGetVersion,
diff --git a/src/GitVersionCore/OutputVariables/VersionVariables.cs b/src/GitVersionCore/OutputVariables/VersionVariables.cs
@@ -28,6 +28,7 @@ public VersionVariables(string major,
                                 string preReleaseTag,
                                 string preReleaseTagWithDash,
                                 string preReleaseLabel,
+                                string preReleaseNumber,
                                 string informationalVersion,
                                 string commitDate,
                                 string nugetVersion,
@@ -52,6 +53,7 @@ public VersionVariables(string major,
             PreReleaseTag = preReleaseTag;
             PreReleaseTagWithDash = preReleaseTagWithDash;
             PreReleaseLabel = preReleaseLabel;
+            PreReleaseNumber = preReleaseNumber;
             InformationalVersion = informationalVersion;
             CommitDate = commitDate;
             NuGetVersion = nugetVersion;
@@ -66,6 +68,7 @@ public VersionVariables(string major,
         public string PreReleaseTag { get; private set; }
         public string PreReleaseTagWithDash { get; private set; }
         public string PreReleaseLabel { get; private set; }
+        public string PreReleaseNumber { get; private set; }
         public string BuildMetaData { get; private set; }
         public string BuildMetaDataPadded { get; private set; }
         public string FullBuildMetaData { get; private set; }
diff --git a/src/GitVersionCore/SemanticVersionFormatValues.cs b/src/GitVersionCore/SemanticVersionFormatValues.cs
@@ -43,6 +43,11 @@ public string PreReleaseLabel
             get { return _semver.PreReleaseTag.HasTag() ? _semver.PreReleaseTag.Name : null; }
         }
 
+        public string PreReleaseNumber
+        {
+            get { return _semver.PreReleaseTag.HasTag() ? _semver.PreReleaseTag.Number.ToString() : null; }
+        }
+
         public string BuildMetaData
         {
             get { return _semver.BuildMetaData; }
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
         public static string PreReleaseLabel = "beta";
+        public static string PreReleaseNumber = "5";
         public static string BuildMetaData = "6";
         public static string BuildMetaDataPadded = "0006";
         public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -27,6 +27,7 @@ namespace Fake
         public static string PreReleaseTag = "unstable.4";
         public static string PreReleaseTagWithDash = "-unstable.4";
         public static string PreReleaseLabel = "unstable";
+        public static string PreReleaseNumber = "4";
         public static string BuildMetaData = "5";
         public static string BuildMetaDataPadded = "0005";
         public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt
@@ -27,6 +27,7 @@ namespace Fake.System
         public static string PreReleaseTag = "unstable.4";
         public static string PreReleaseTagWithDash = "-unstable.4";
         public static string PreReleaseLabel = "unstable";
+        public static string PreReleaseNumber = "4";
         public static string BuildMetaData = "5";
         public static string BuildMetaDataPadded = "0005";
         public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
diff --git a/src/GitVersionTask/GetVersion.cs b/src/GitVersionTask/GetVersion.cs
@@ -39,6 +39,9 @@ public GetVersion()
         [Output]
         public string PreReleaseLabel { get; set; }
 
+        [Output]
+        public string PreReleaseNumber { get; set; }
+
         [Output]
         public string BuildMetaData { get; set; }
 
diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets
@@ -69,6 +69,7 @@
       <Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
       <Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
       <Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
+      <Output TaskParameter="PreReleaseNumber" PropertyName="GitVersion_PreReleaseNumber" />
       <Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
       <Output TaskParameter="CommitDate" PropertyName="GitVersion_CommitDate" />
       <Output TaskParameter="CommitsSinceVersionSource" PropertyName="GitVersion_CommitsSinceVersionSource" />

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class TestableVersionVariables : VersionVariables`
`6`	`6`	`{`
`7`		- public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, preReleaseLabel, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
	`7`	+ public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`	`}`