From 5c35c46a3c9d024b85b7ca81589f0c86ff3924af Mon Sep 17 00:00:00 2001 From: Guillaume Rouchon Date: Thu, 11 Aug 2016 09:16:46 +0200 Subject: [PATCH 1/2] Add NuGetPreReleaseTag variable --- docs/more-info/variables.md | 1 + .../Approved/JsonVersionBuilderTests.Json.approved.txt | 1 + ...riablesInContinuousDeliveryModeForPreRelease.approved.txt | 1 + ...ntinuousDeliveryModeForPreReleaseWithPadding.approved.txt | 1 + ...esVariablesInContinuousDeliveryModeForStable.approved.txt | 1 + ...ablesInContinuousDeploymentModeForPreRelease.approved.txt | 1 + ...VariablesInContinuousDeploymentModeForStable.approved.txt | 1 + ...oymentModeForStableWhenCurrentCommitIsTagged.approved.txt | 1 + src/GitVersionCore.Tests/ExecuteCoreTests.cs | 2 ++ src/GitVersionCore.Tests/TestableVersionVariables.cs | 2 +- src/GitVersionCore/OutputVariables/VariableProvider.cs | 1 + src/GitVersionCore/OutputVariables/VersionVariables.cs | 3 +++ src/GitVersionCore/SemanticVersionFormatValues.cs | 5 +++++ ...InfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt | 1 + ...uilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt | 1 + ...rTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt | 1 + ...sts.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt | 1 + ...Version_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt | 1 + ...blyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt | 1 + ...AssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt | 1 + ...Minor_NugetAssemblyInfoWithMultipleVariables.approved.txt | 1 + ...erifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt | 1 + .../AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt | 1 + ...rTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt | 1 + ...InfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt | 1 + ...uilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt | 1 + ...rTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt | 1 + ...sts.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt | 1 + ...Version_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt | 1 + ...blyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt | 1 + ...AssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt | 1 + ...Minor_NugetAssemblyInfoWithMultipleVariables.approved.txt | 1 + ...erifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt | 1 + .../AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt | 1 + ...rTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt | 1 + src/GitVersionTask/GetVersion.cs | 3 +++ src/GitVersionTask/NugetAssets/GitVersionTask.targets | 1 + 37 files changed, 46 insertions(+), 1 deletion(-) diff --git a/docs/more-info/variables.md b/docs/more-info/variables.md index a49cd86de4..0e0d161032 100644 --- a/docs/more-info/variables.md +++ b/docs/more-info/variables.md @@ -25,6 +25,7 @@ For the `release/3.0.0` branch of GitVersion it shows: "Sha":"28c853159a46b5a87e6cc9c4f6e940c59d6bc68a", "NuGetVersionV2":"3.0.0-beta0001", "NuGetVersion":"3.0.0-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 index 6c167e01b5..920bd5865e 100644 --- a/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt +++ b/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.0-unstable0004", "NuGetVersion":"1.2.0-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 index e55ae83ed7..0544fb5552 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-unstable0004", "NuGetVersion":"1.2.3-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 index c37507e976..1c5702258d 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-unstable00004", "NuGetVersion":"1.2.3-unstable00004", + "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 index c99b3f2fcb..17b20f0e20 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3", "NuGetVersion":"1.2.3", + "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 index 7c9b3b93c8..37676de41d 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-unstable0005", "NuGetVersion":"1.2.3-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 index 4c5d64bc6a..ee1b75b5fb 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-ci0005", "NuGetVersion":"1.2.3-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 index 11732f0890..c347c2b3ce 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3", "NuGetVersion":"1.2.3", + "NuGetPreReleaseTag":"", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", "CommitDate":"2014-03-06" diff --git a/src/GitVersionCore.Tests/ExecuteCoreTests.cs b/src/GitVersionCore.Tests/ExecuteCoreTests.cs index bb4bbfeca1..4b11037258 100644 --- a/src/GitVersionCore.Tests/ExecuteCoreTests.cs +++ b/src/GitVersionCore.Tests/ExecuteCoreTests.cs @@ -62,6 +62,7 @@ public void CacheFileExistsOnDisk() Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f NuGetVersionV2: 4.10.3-test0019 NuGetVersion: 4.10.3-test0019 +NuGetPreReleaseTag: test0019 CommitsSinceVersionSource: 19 CommitsSinceVersionSourcePadded: 0019 CommitDate: 2015-11-10 @@ -165,6 +166,7 @@ public void ConfigChangeInvalidatesCache() Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f NuGetVersionV2: 4.10.3-test0019 NuGetVersion: 4.10.3-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 index 3dd8794638..f8d07e2a6f 100644 --- 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 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, commitsSinceVersionSource, commitsSinceVersionSourcePadded) { } } diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs index 0f893d5b51..6f291a71bd 100644 --- a/src/GitVersionCore/OutputVariables/VariableProvider.cs +++ b/src/GitVersionCore/OutputVariables/VariableProvider.cs @@ -84,6 +84,7 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion, semverFormatValues.CommitDate, semverFormatValues.NuGetVersion, semverFormatValues.NuGetVersionV2, + semverFormatValues.NuGetPreReleaseTag, semverFormatValues.CommitsSinceVersionSource, semverFormatValues.CommitsSinceVersionSourcePadded); diff --git a/src/GitVersionCore/OutputVariables/VersionVariables.cs b/src/GitVersionCore/OutputVariables/VersionVariables.cs index 9a6d9634c5..74603ae965 100644 --- a/src/GitVersionCore/OutputVariables/VersionVariables.cs +++ b/src/GitVersionCore/OutputVariables/VersionVariables.cs @@ -33,6 +33,7 @@ public VersionVariables(string major, string commitDate, string nugetVersion, string nugetVersionV2, + string nugetPreReleaseTag, string commitsSinceVersionSource, string commitsSinceVersionSourcePadded) { @@ -58,6 +59,7 @@ public VersionVariables(string major, CommitDate = commitDate; NuGetVersion = nugetVersion; NuGetVersionV2 = nugetVersionV2; + NuGetPreReleaseTag = nugetPreReleaseTag; CommitsSinceVersionSource = commitsSinceVersionSource; CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded; } @@ -83,6 +85,7 @@ public VersionVariables(string major, public string Sha { get; private set; } public string NuGetVersionV2 { get; private set; } public string NuGetVersion { 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 index 6a727f8178..36ac48c16e 100644 --- a/src/GitVersionCore/SemanticVersionFormatValues.cs +++ b/src/GitVersionCore/SemanticVersionFormatValues.cs @@ -120,6 +120,11 @@ public string NuGetVersion get { return NuGetVersionV2; } } + public string NuGetPreReleaseTag + { + get { return _semver.PreReleaseTag.HasTag() ? _semver.PreReleaseTag.ToString("lp").ToLower() : null; } + } + 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 index 4dbb754a11..7d4d9d077f 100644 --- 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,7 @@ 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 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 index 3765b07ad5..6aacb4da8a 100644 --- 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,7 @@ 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 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 index 4d54699624..842a907b0c 100644 --- 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,7 @@ 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 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 index 8469a8181a..ac1514e7cd 100644 --- 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,7 @@ 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 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 index 84fe3a052f..7034b5d526 100644 --- 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,7 @@ 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 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 index 81e4ecbe48..9c96ffdf6a 100644 --- 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,7 @@ 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 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 index 7c9bfa1201..73744b1ecf 100644 --- 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,7 @@ 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 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 index 9e57181192..00ad354d38 100644 --- 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,7 @@ 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 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 index daf0434818..c603029229 100644 --- 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,7 @@ 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 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 index 27786b2e9a..abc756fe2b 100644 --- a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt +++ b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt @@ -42,6 +42,7 @@ 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 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 index 98dd286428..a951ad1d80 100644 --- 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,7 @@ 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 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 index 4bb7990a02..0d2c520b7d 100644 --- 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,7 @@ 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 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 index fdbb02a420..468198e4aa 100644 --- 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,7 @@ 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 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 index 3a77c60ff3..86ddfba5d6 100644 --- 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,7 @@ 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 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 index 1011e2a649..3252d9858a 100644 --- 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,7 @@ 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 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 index 616d21a823..7286a0c64b 100644 --- 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,7 @@ 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 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 index ae4fd46834..1a4fec63af 100644 --- 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,7 @@ 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 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 index e488bc39b4..e8fda65e2e 100644 --- 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,7 @@ 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 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 index ec53604b0b..b374b6c429 100644 --- 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,7 @@ 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 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 index 58267e15bf..3e277f6c25 100644 --- 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,7 @@ 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 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 index 1ab19f61c9..95600d2aa2 100644 --- a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt +++ b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt @@ -40,6 +40,7 @@ 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 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 index 1ab19f61c9..95600d2aa2 100644 --- a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt +++ b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt @@ -40,6 +40,7 @@ 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 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/GetVersion.cs b/src/GitVersionTask/GetVersion.cs index 646d4a2748..487feaa195 100644 --- a/src/GitVersionTask/GetVersion.cs +++ b/src/GitVersionTask/GetVersion.cs @@ -84,6 +84,9 @@ public GetVersion() [Output] public string NuGetVersion { get; set; } + [Output] + public string NuGetPreReleaseTag { get; set; } + [Output] public string CommitDate { get; set; } diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets index 7f0ae1fe20..a648a33c09 100644 --- a/src/GitVersionTask/NugetAssets/GitVersionTask.targets +++ b/src/GitVersionTask/NugetAssets/GitVersionTask.targets @@ -66,6 +66,7 @@ + From c23a3f0821c4186e9ec50013712a7bb8f3c53de2 Mon Sep 17 00:00:00 2001 From: Guillaume Rouchon Date: Thu, 11 Aug 2016 21:50:27 +0200 Subject: [PATCH 2/2] Add NuGetPreReleaseTagV2 variable --- docs/more-info/variables.md | 1 + .../Approved/JsonVersionBuilderTests.Json.approved.txt | 1 + ...ablesInContinuousDeliveryModeForPreRelease.approved.txt | 1 + ...inuousDeliveryModeForPreReleaseWithPadding.approved.txt | 1 + ...VariablesInContinuousDeliveryModeForStable.approved.txt | 1 + ...lesInContinuousDeploymentModeForPreRelease.approved.txt | 1 + ...riablesInContinuousDeploymentModeForStable.approved.txt | 1 + ...mentModeForStableWhenCurrentCommitIsTagged.approved.txt | 1 + src/GitVersionCore.Tests/ExecuteCoreTests.cs | 4 ++++ src/GitVersionCore.Tests/TestableVersionVariables.cs | 2 +- src/GitVersionCore/OutputVariables/VariableProvider.cs | 1 + src/GitVersionCore/OutputVariables/VersionVariables.cs | 3 +++ src/GitVersionCore/SemanticVersionFormatValues.cs | 7 ++++++- ...foBuilderTests.VerifyAssemblyVersion_Major.approved.txt | 1 + ...lderTests.VerifyAssemblyVersion_MajorMinor.approved.txt | 1 + ...ests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt | 1 + ...s.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt | 1 + ...rsion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt | 1 + ...yVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt | 1 + ...semblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt | 1 + ...nor_NugetAssemblyInfoWithMultipleVariables.approved.txt | 1 + ...ifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt | 1 + ...AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt | 1 + ...ests.VerifyCreatedCode_NoNamespaceConflict.approved.txt | 1 + ...foBuilderTests.VerifyAssemblyVersion_Major.approved.txt | 1 + ...lderTests.VerifyAssemblyVersion_MajorMinor.approved.txt | 1 + ...ests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt | 1 + ...s.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt | 1 + ...rsion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt | 1 + ...yVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt | 1 + ...semblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt | 1 + ...nor_NugetAssemblyInfoWithMultipleVariables.approved.txt | 1 + ...ifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt | 1 + ...AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt | 1 + ...ests.VerifyCreatedCode_NoNamespaceConflict.approved.txt | 1 + src/GitVersionTask/GetVersion.cs | 3 +++ 36 files changed, 48 insertions(+), 2 deletions(-) diff --git a/docs/more-info/variables.md b/docs/more-info/variables.md index 0e0d161032..9ad11cede9 100644 --- a/docs/more-info/variables.md +++ b/docs/more-info/variables.md @@ -25,6 +25,7 @@ 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", diff --git a/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt index 920bd5865e..93fa4d2539 100644 --- a/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt +++ b/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.0-unstable0004", "NuGetVersion":"1.2.0-unstable0004", + "NuGetPreReleaseTagV2":"unstable0004", "NuGetPreReleaseTag":"unstable0004", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt index 0544fb5552..24b9530cec 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-unstable0004", "NuGetVersion":"1.2.3-unstable0004", + "NuGetPreReleaseTagV2":"unstable0004", "NuGetPreReleaseTag":"unstable0004", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt index 1c5702258d..c0a6a2d26b 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-unstable00004", "NuGetVersion":"1.2.3-unstable00004", + "NuGetPreReleaseTagV2":"unstable0004", "NuGetPreReleaseTag":"unstable0004", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt index 17b20f0e20..1f354270ad 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3", "NuGetVersion":"1.2.3", + "NuGetPreReleaseTagV2":"", "NuGetPreReleaseTag":"", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt index 37676de41d..3726dd9ece 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-unstable0005", "NuGetVersion":"1.2.3-unstable0005", + "NuGetPreReleaseTagV2":"unstable0005", "NuGetPreReleaseTag":"unstable0005", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt index ee1b75b5fb..cc5b1bd162 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3-ci0005", "NuGetVersion":"1.2.3-ci0005", + "NuGetPreReleaseTagV2":"ci0005", "NuGetPreReleaseTag":"ci0005", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt index c347c2b3ce..59ad7577f5 100644 --- a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt +++ b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt @@ -20,6 +20,7 @@ "Sha":"commitSha", "NuGetVersionV2":"1.2.3", "NuGetVersion":"1.2.3", + "NuGetPreReleaseTagV2":"", "NuGetPreReleaseTag":"", "CommitsSinceVersionSource":5, "CommitsSinceVersionSourcePadded":"0005", diff --git a/src/GitVersionCore.Tests/ExecuteCoreTests.cs b/src/GitVersionCore.Tests/ExecuteCoreTests.cs index 4b11037258..86b3eaba94 100644 --- a/src/GitVersionCore.Tests/ExecuteCoreTests.cs +++ b/src/GitVersionCore.Tests/ExecuteCoreTests.cs @@ -62,6 +62,7 @@ public void CacheFileExistsOnDisk() Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f NuGetVersionV2: 4.10.3-test0019 NuGetVersion: 4.10.3-test0019 +NuGetPreReleaseTagV2: test0019 NuGetPreReleaseTag: test0019 CommitsSinceVersionSource: 19 CommitsSinceVersionSourcePadded: 0019 @@ -106,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 @@ -166,6 +169,7 @@ public void ConfigChangeInvalidatesCache() Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f NuGetVersionV2: 4.10.3-test0019 NuGetVersion: 4.10.3-test0019 +NuGetPreReleaseTagV2: test0019 NuGetPreReleaseTag: test0019 CommitsSinceVersionSource: 19 CommitsSinceVersionSourcePadded: 0019 diff --git a/src/GitVersionCore.Tests/TestableVersionVariables.cs b/src/GitVersionCore.Tests/TestableVersionVariables.cs index f8d07e2a6f..e09bc7fc62 100644 --- 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 nugetPreReleaseTag = "", 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, 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 index 6f291a71bd..c1613c6ca5 100644 --- a/src/GitVersionCore/OutputVariables/VariableProvider.cs +++ b/src/GitVersionCore/OutputVariables/VariableProvider.cs @@ -85,6 +85,7 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion, 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 index 74603ae965..28719fbf4e 100644 --- a/src/GitVersionCore/OutputVariables/VersionVariables.cs +++ b/src/GitVersionCore/OutputVariables/VersionVariables.cs @@ -34,6 +34,7 @@ public VersionVariables(string major, string nugetVersion, string nugetVersionV2, string nugetPreReleaseTag, + string nugetPreReleaseTagV2, string commitsSinceVersionSource, string commitsSinceVersionSourcePadded) { @@ -60,6 +61,7 @@ public VersionVariables(string major, NuGetVersion = nugetVersion; NuGetVersionV2 = nugetVersionV2; NuGetPreReleaseTag = nugetPreReleaseTag; + NuGetPreReleaseTagV2 = nugetPreReleaseTagV2; CommitsSinceVersionSource = commitsSinceVersionSource; CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded; } @@ -85,6 +87,7 @@ 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 index 36ac48c16e..ec93bc9d86 100644 --- a/src/GitVersionCore/SemanticVersionFormatValues.cs +++ b/src/GitVersionCore/SemanticVersionFormatValues.cs @@ -120,11 +120,16 @@ public string NuGetVersion get { return NuGetVersionV2; } } - public string NuGetPreReleaseTag + 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 index 7d4d9d077f..0e997ea146 100644 --- 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,7 @@ 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"; diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt index 6aacb4da8a..d85691e47e 100644 --- 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,7 @@ 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"; diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt index 842a907b0c..1170939dfa 100644 --- 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,7 @@ 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"; diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt index ac1514e7cd..0aca25785e 100644 --- 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,7 @@ 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"; 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 index 7034b5d526..4d7c513035 100644 --- 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,7 @@ 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"; 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 index 9c96ffdf6a..3422554882 100644 --- 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,7 @@ 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"; 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 index 73744b1ecf..97b0345900 100644 --- 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,7 @@ 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"; 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 index 00ad354d38..5054741b4b 100644 --- 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,7 @@ 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"; 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 index c603029229..bcff3d091a 100644 --- 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,7 @@ 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"; diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt index abc756fe2b..1aa46340a5 100644 --- a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt +++ b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt @@ -42,6 +42,7 @@ 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"; diff --git a/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt b/src/GitVersionTask.Tests/Approved/CSharp/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt index a951ad1d80..d42893d62e 100644 --- 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,7 @@ 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"; diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt index 0d2c520b7d..c2f26580b9 100644 --- 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,7 @@ 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" diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt index 468198e4aa..815846a967 100644 --- 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,7 @@ 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" diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt index 86ddfba5d6..21f242cb88 100644 --- 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,7 @@ 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" diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt index 3252d9858a..6cb1a801bc 100644 --- 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,7 @@ 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" 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 index 7286a0c64b..7954721264 100644 --- 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,7 @@ 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" 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 index 1a4fec63af..d04809c150 100644 --- 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,7 @@ 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" 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 index e8fda65e2e..41649c3346 100644 --- 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,7 @@ 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" 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 index b374b6c429..f43d0c1f00 100644 --- 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,7 @@ 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" 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 index 3e277f6c25..8479e8a3a1 100644 --- 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,7 @@ 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" diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt index 95600d2aa2..5990b11448 100644 --- a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt +++ b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt @@ -40,6 +40,7 @@ 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" diff --git a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt index 95600d2aa2..5990b11448 100644 --- a/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt +++ b/src/GitVersionTask.Tests/Approved/VisualBasic/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt @@ -40,6 +40,7 @@ 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" diff --git a/src/GitVersionTask/GetVersion.cs b/src/GitVersionTask/GetVersion.cs index 487feaa195..9440997f1c 100644 --- a/src/GitVersionTask/GetVersion.cs +++ b/src/GitVersionTask/GetVersion.cs @@ -84,6 +84,9 @@ public GetVersion() [Output] public string NuGetVersion { get; set; } + [Output] + public string NuGetPreReleaseTagV2 { get; set; } + [Output] public string NuGetPreReleaseTag { get; set; }