Merge pull request #1002 from qetza/nugetprereleasetag

JakeGinnivan · web-flow · commit 2ed1ad79332c · 2016-08-13T10:09:14.000+08:00
Add NuGetPreReleaseTag variable
diff --git a/docs/more-info/variables.md b/docs/more-info/variables.md
@@ -25,6 +25,8 @@ For the `release/3.0.0` branch of GitVersion it shows:
   "Sha":"28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
   "NuGetVersionV2":"3.0.0-beta0001",
   "NuGetVersion":"3.0.0-beta0001",
+  "NuGetPreReleaseTagV2":"beta0001",
+  "NuGetPreReleaseTag":"beta0001",
   "CommitsSinceVersionSource":1,
   "CommitsSinceVersionSourcePadded":"0001",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt
@@ -20,6 +20,8 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.0-unstable0004",
   "NuGetVersion":"1.2.0-unstable0004",
+  "NuGetPreReleaseTagV2":"unstable0004",
+  "NuGetPreReleaseTag":"unstable0004",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -20,6 +20,8 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
   "NuGetVersion":"1.2.3-unstable0004",
+  "NuGetPreReleaseTagV2":"unstable0004",
+  "NuGetPreReleaseTag":"unstable0004",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt
@@ -20,6 +20,8 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable00004",
   "NuGetVersion":"1.2.3-unstable00004",
+  "NuGetPreReleaseTagV2":"unstable0004",
+  "NuGetPreReleaseTag":"unstable0004",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
@@ -20,6 +20,8 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
+  "NuGetPreReleaseTagV2":"",
+  "NuGetPreReleaseTag":"",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -20,6 +20,8 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0005",
   "NuGetVersion":"1.2.3-unstable0005",
+  "NuGetPreReleaseTagV2":"unstable0005",
+  "NuGetPreReleaseTag":"unstable0005",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -20,6 +20,8 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-ci0005",
   "NuGetVersion":"1.2.3-ci0005",
+  "NuGetPreReleaseTagV2":"ci0005",
+  "NuGetPreReleaseTag":"ci0005",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -20,6 +20,8 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
+  "NuGetPreReleaseTagV2":"",
+  "NuGetPreReleaseTag":"",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
diff --git a/src/GitVersionCore.Tests/ExecuteCoreTests.cs b/src/GitVersionCore.Tests/ExecuteCoreTests.cs
@@ -62,6 +62,8 @@ public void CacheFileExistsOnDisk()
 Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 NuGetVersionV2: 4.10.3-test0019
 NuGetVersion: 4.10.3-test0019
+NuGetPreReleaseTagV2: test0019
+NuGetPreReleaseTag: test0019
 CommitsSinceVersionSource: 19
 CommitsSinceVersionSourcePadded: 0019
 CommitDate: 2015-11-10
@@ -105,6 +107,8 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
 Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 NuGetVersionV2: 4.10.3-test0019
 NuGetVersion: 4.10.3-test0019
+NuGetPreReleaseTagV2: test0019
+NuGetPreReleaseTag: test0019
 CommitsSinceVersionSource: 19
 CommitsSinceVersionSourcePadded: 0019
 CommitDate: 2015-11-10
@@ -165,6 +169,8 @@ public void ConfigChangeInvalidatesCache()
 Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 NuGetVersionV2: 4.10.3-test0019
 NuGetVersion: 4.10.3-test0019
+NuGetPreReleaseTagV2: test0019
+NuGetPreReleaseTag: test0019
 CommitsSinceVersionSource: 19
 CommitsSinceVersionSourcePadded: 0019
 CommitDate: 2015-11-10
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 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)
+        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 nugetPreReleaseTag = "", string nugetPreReleaseTagV2 = "", 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, nugetPreReleaseTag, nugetPreReleaseTagV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
         {
         }
     }
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -84,6 +84,8 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                 semverFormatValues.CommitDate,
                 semverFormatValues.NuGetVersion,
                 semverFormatValues.NuGetVersionV2,
+                semverFormatValues.NuGetPreReleaseTag,
+                semverFormatValues.NuGetPreReleaseTagV2,
                 semverFormatValues.CommitsSinceVersionSource,
                 semverFormatValues.CommitsSinceVersionSourcePadded);
 
diff --git a/src/GitVersionCore/OutputVariables/VersionVariables.cs b/src/GitVersionCore/OutputVariables/VersionVariables.cs
@@ -33,6 +33,8 @@ public VersionVariables(string major,
                                 string commitDate,
                                 string nugetVersion,
                                 string nugetVersionV2,
+                                string nugetPreReleaseTag,
+                                string nugetPreReleaseTagV2,
                                 string commitsSinceVersionSource,
                                 string commitsSinceVersionSourcePadded)
         {
@@ -58,6 +60,8 @@ public VersionVariables(string major,
             CommitDate = commitDate;
             NuGetVersion = nugetVersion;
             NuGetVersionV2 = nugetVersionV2;
+            NuGetPreReleaseTag = nugetPreReleaseTag;
+            NuGetPreReleaseTagV2 = nugetPreReleaseTagV2;
             CommitsSinceVersionSource = commitsSinceVersionSource;
             CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded;
         }
@@ -83,6 +87,8 @@ public VersionVariables(string major,
         public string Sha { get; private set; }
         public string NuGetVersionV2 { get; private set; }
         public string NuGetVersion { get; private set; }
+        public string NuGetPreReleaseTagV2 { get; private set; }
+        public string NuGetPreReleaseTag { get; private set; }
         public string CommitsSinceVersionSource { get; private set; }
         public string CommitsSinceVersionSourcePadded { get; private set; }
 
diff --git a/src/GitVersionCore/SemanticVersionFormatValues.cs b/src/GitVersionCore/SemanticVersionFormatValues.cs
@@ -120,6 +120,16 @@ public string NuGetVersion
             get { return NuGetVersionV2; }
         }
 
+        public string NuGetPreReleaseTagV2
+        {
+            get { return _semver.PreReleaseTag.HasTag() ? _semver.PreReleaseTag.ToString("lp").ToLower() : null; }
+        }
+
+        public string NuGetPreReleaseTag
+        {
+            get { return NuGetPreReleaseTagV2; }
+        }
+
         public string DefaultInformationalVersion
         {
             get { return _semver.ToString("i"); }
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
+        public static string NuGetPreReleaseTagV2 = "beta0005";
+        public static string NuGetPreReleaseTag = "beta0005";
         public static string CommitsSinceVersionSource = "6";
         public static string CommitsSinceVersionSourcePadded = "0006";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -42,6 +42,8 @@ namespace Fake
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "1.2.3-unstable0004";
         public static string NuGetVersion = "1.2.3-unstable0004";
+        public static string NuGetPreReleaseTagV2 = "unstable0004";
+        public static string NuGetPreReleaseTag = "unstable0004";
         public static string CommitsSinceVersionSource = "5";
         public static string CommitsSinceVersionSourcePadded = "0005";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt
@@ -42,6 +42,8 @@ namespace Fake.System
         public static string Sha = "commitSha";
         public static string NuGetVersionV2 = "1.2.3-unstable0004";
         public static string NuGetVersion = "1.2.3-unstable0004";
+        public static string NuGetPreReleaseTagV2 = "unstable0004";
+        public static string NuGetPreReleaseTag = "unstable0004";
         public static string CommitsSinceVersionSource = "5";
         public static string CommitsSinceVersionSourcePadded = "0005";
         public static string CommitDate = "2014-03-06";
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "2.3.4-beta0005"
         Public Shared NuGetVersion As String = "2.3.4-beta0005"
+        Public Shared NuGetPreReleaseTagV2 As String = "beta0005"
+        Public Shared NuGetPreReleaseTag As String = "beta0005"
         Public Shared CommitsSinceVersionSource As String = "6"
         Public Shared CommitsSinceVersionSourcePadded As String = "0006"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -40,6 +40,8 @@ NotInheritable Class GitVersionInformation
         Public Shared Sha As String = "commitSha"
         Public Shared NuGetVersionV2 As String = "1.2.3-unstable0004"
         Public Shared NuGetVersion As String = "1.2.3-unstable0004"
+        Public Shared NuGetPreReleaseTagV2 As String = "unstable0004"
+        Public Shared NuGetPreReleaseTag As String = "unstable0004"
         Public Shared CommitsSinceVersionSource As String = "5"
         Public Shared CommitsSinceVersionSourcePadded As String = "0005"
         Public Shared CommitDate As String = "2014-03-06"
diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt
diff --git a/src/GitVersionTask/GetVersion.cs b/src/GitVersionTask/GetVersion.cs
diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets

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 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)
	`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 nugetPreReleaseTag = "", string nugetPreReleaseTagV2 = "", 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, nugetPreReleaseTag, nugetPreReleaseTagV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`	`}`