Add PreReleaseLabel variable

Guillaume Rouchon · Guillaume Rouchon · commit e303405d132b · 2016-01-23T08:52:19.000+01:00
diff --git a/docs/more-info/variables.md b/docs/more-info/variables.md
@@ -9,6 +9,7 @@ For the `release/3.0.0` branch of GitVersion it shows:
   "Patch":0,
   "PreReleaseTag":"beta.1",
   "PreReleaseTagWithDash":"-beta.1",
+  "PreReleaseLabel":"beta",
   "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
@@ -28,6 +28,7 @@ public void CacheFileExistsOnDisk()
 Patch: 3
 PreReleaseTag: test.19
 PreReleaseTagWithDash: -test.19
+PreReleaseLabel: test
 BuildMetaData: 
 BuildMetaDataPadded: 
 FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -201,6 +201,12 @@
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
     <Content Include="JsonVersionBuilderTests.Json.approved.txt" />
+    <Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt" />
+    <Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt" />
+    <Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt" />
+    <Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt" />
+    <Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt" />
+    <Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt
@@ -4,6 +4,7 @@
   "Patch":3,
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
+  "PreReleaseLabel":"unstable",
   "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 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, 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 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)
         {
         }
     }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -4,6 +4,7 @@
   "Patch":3,
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
+  "PreReleaseLabel":"unstable",
   "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
@@ -4,6 +4,7 @@
   "Patch":3,
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
+  "PreReleaseLabel":"unstable",
   "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
@@ -4,6 +4,7 @@
   "Patch":3,
   "PreReleaseTag":"",
   "PreReleaseTagWithDash":"",
+  "PreReleaseLabel":"",
   "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
@@ -4,6 +4,7 @@
   "Patch":3,
   "PreReleaseTag":"unstable.5",
   "PreReleaseTagWithDash":"-unstable.5",
+  "PreReleaseLabel":"unstable",
   "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
@@ -4,6 +4,7 @@
   "Patch":3,
   "PreReleaseTag":"ci.5",
   "PreReleaseTagWithDash":"-ci.5",
+  "PreReleaseLabel":"ci",
   "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
@@ -4,6 +4,7 @@
   "Patch":3,
   "PreReleaseTag":"",
   "PreReleaseTagWithDash":"",
+  "PreReleaseLabel":"",
   "BuildMetaData":5,
   "BuildMetaDataPadded":"0005",
   "FullBuildMetaData":"5.Sha.commitSha",
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -58,6 +58,7 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                 semverFormatValues.AssemblySemVer,
                 semverFormatValues.PreReleaseTag,
                 semverFormatValues.PreReleaseTagWithDash,
+                semverFormatValues.PreReleaseLabel,
                 informationalVersion,
                 semverFormatValues.CommitDate,
                 semverFormatValues.NuGetVersion,
diff --git a/src/GitVersionCore/OutputVariables/VersionVariables.cs b/src/GitVersionCore/OutputVariables/VersionVariables.cs
@@ -27,6 +27,7 @@ public VersionVariables(string major,
                                 string assemblySemVer,
                                 string preReleaseTag,
                                 string preReleaseTagWithDash,
+                                string preReleaseLabel,
                                 string informationalVersion,
                                 string commitDate,
                                 string nugetVersion,
@@ -50,6 +51,7 @@ public VersionVariables(string major,
             AssemblySemVer = assemblySemVer;
             PreReleaseTag = preReleaseTag;
             PreReleaseTagWithDash = preReleaseTagWithDash;
+            PreReleaseLabel = preReleaseLabel;
             InformationalVersion = informationalVersion;
             CommitDate = commitDate;
             NuGetVersion = nugetVersion;
@@ -63,6 +65,7 @@ public VersionVariables(string major,
         public string Patch { get; private set; }
         public string PreReleaseTag { get; private set; }
         public string PreReleaseTagWithDash { get; private set; }
+        public string PreReleaseLabel { 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
@@ -38,6 +38,11 @@ public string PreReleaseTagWithDash
             get { return _semver.PreReleaseTag.HasTag() ? "-" + _semver.PreReleaseTag : null; }
         }
 
+        public string PreReleaseLabel
+        {
+            get { return _semver.PreReleaseTag.HasTag() ? _semver.PreReleaseTag.Name : 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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "4";
         public static string PreReleaseTag = "beta.5";
         public static string PreReleaseTagWithDash = "-beta.5";
+        public static string PreReleaseLabel = "beta";
         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
@@ -26,6 +26,7 @@ namespace Fake
         public static string Patch = "3";
         public static string PreReleaseTag = "unstable.4";
         public static string PreReleaseTagWithDash = "-unstable.4";
+        public static string PreReleaseLabel = "unstable";
         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
@@ -26,6 +26,7 @@ namespace Fake.System
         public static string Patch = "3";
         public static string PreReleaseTag = "unstable.4";
         public static string PreReleaseTagWithDash = "-unstable.4";
+        public static string PreReleaseLabel = "unstable";
         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
@@ -36,6 +36,9 @@ public GetVersion()
         [Output]
         public string PreReleaseTagWithDash { get; set; }
 
+        [Output]
+        public string PreReleaseLabel { get; set; }
+
         [Output]
         public string BuildMetaData { get; set; }
 
diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets
@@ -68,6 +68,7 @@
       <Output TaskParameter="NuGetVersion" PropertyName="GitVersion_NuGetVersion" />
       <Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
       <Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
+      <Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
       <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 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, 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 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)
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`	`}`