Skip to content

Add NuGetPreReleaseTag variable #1002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/more-info/variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"Sha":"commitSha",
"NuGetVersionV2":"1.2.3",
"NuGetVersion":"1.2.3",
"NuGetPreReleaseTagV2":"",
"NuGetPreReleaseTag":"",
"CommitsSinceVersionSource":5,
"CommitsSinceVersionSourcePadded":"0005",
"CommitDate":"2014-03-06"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"Sha":"commitSha",
"NuGetVersionV2":"1.2.3",
"NuGetVersion":"1.2.3",
"NuGetPreReleaseTagV2":"",
"NuGetPreReleaseTag":"",
"CommitsSinceVersionSource":5,
"CommitsSinceVersionSourcePadded":"0005",
"CommitDate":"2014-03-06"
Expand Down
6 changes: 6 additions & 0 deletions src/GitVersionCore.Tests/ExecuteCoreTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/TestableVersionVariables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/GitVersionCore/OutputVariables/VariableProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
semverFormatValues.CommitDate,
semverFormatValues.NuGetVersion,
semverFormatValues.NuGetVersionV2,
semverFormatValues.NuGetPreReleaseTag,
semverFormatValues.NuGetPreReleaseTagV2,
semverFormatValues.CommitsSinceVersionSource,
semverFormatValues.CommitsSinceVersionSourcePadded);

Expand Down
6 changes: 6 additions & 0 deletions src/GitVersionCore/OutputVariables/VersionVariables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public VersionVariables(string major,
string commitDate,
string nugetVersion,
string nugetVersionV2,
string nugetPreReleaseTag,
string nugetPreReleaseTagV2,
string commitsSinceVersionSource,
string commitsSinceVersionSourcePadded)
{
Expand All @@ -58,6 +60,8 @@ public VersionVariables(string major,
CommitDate = commitDate;
NuGetVersion = nugetVersion;
NuGetVersionV2 = nugetVersionV2;
NuGetPreReleaseTag = nugetPreReleaseTag;
NuGetPreReleaseTagV2 = nugetPreReleaseTagV2;
CommitsSinceVersionSource = commitsSinceVersionSource;
CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded;
}
Expand All @@ -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; }

Expand Down
10 changes: 10 additions & 0 deletions src/GitVersionCore/SemanticVersionFormatValues.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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"); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading