Skip to content

Commit 6af005e

Browse files
JakeGinnivanJakeGinnivan
committed
Merge pull request #753 from qetza/prereleaselabel_prereleasenumber
Create PreReleaseLabel and PreReleaseNumber #742
2 parents 10b799a + 314f05c commit 6af005e

File tree

27 files changed

+73
-1
lines changed

27 files changed

+73
-1
lines changed

‎docs/more-info/variables.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ For the `release/3.0.0` branch of GitVersion it shows:
99
"Patch":0,
1010
"PreReleaseTag":"beta.1",
1111
"PreReleaseTagWithDash":"-beta.1",
12+
"PreReleaseLabel":"beta",
13+
"PreReleaseNumber":1,
1214
"BuildMetaData":1,
1315
"BuildMetaDataPadded": "0001",
1416
"FullBuildMetaData":"1.Branch.release/3.0.0.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",

‎src/GitVersionCore.Tests/ExecuteCoreTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ public void CacheFileExistsOnDisk()
2828
Patch: 3
2929
PreReleaseTag: test.19
3030
PreReleaseTagWithDash: -test.19
31+
PreReleaseLabel: test
32+
PreReleaseNumber: 19
3133
BuildMetaData:
3234
BuildMetaDataPadded:
3335
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,12 @@
201201
<ItemGroup>
202202
<Content Include="FodyWeavers.xml" />
203203
<Content Include="JsonVersionBuilderTests.Json.approved.txt" />
204+
<Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt" />
205+
<Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt" />
206+
<Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt" />
207+
<Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt" />
208+
<Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt" />
209+
<Content Include="VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt" />
204210
</ItemGroup>
205211
<ItemGroup>
206212
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"Patch":3,
55
"PreReleaseTag":"unstable.4",
66
"PreReleaseTagWithDash":"-unstable.4",
7+
"PreReleaseLabel":"unstable",
8+
"PreReleaseNumber":4,
79
"BuildMetaData":5,
810
"BuildMetaDataPadded":"0005",
911
"FullBuildMetaData":"5.Branch.feature1.Sha.commitSha",

‎src/GitVersionCore.Tests/TestableVersionVariables.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class TestableVersionVariables : VersionVariables
66
{
7-
public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
7+
public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string 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)
88
{
99
}
1010
}

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"Patch":3,
55
"PreReleaseTag":"unstable.4",
66
"PreReleaseTagWithDash":"-unstable.4",
7+
"PreReleaseLabel":"unstable",
8+
"PreReleaseNumber":4,
79
"BuildMetaData":5,
810
"BuildMetaDataPadded":"0005",
911
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"Patch":3,
55
"PreReleaseTag":"unstable.4",
66
"PreReleaseTagWithDash":"-unstable.4",
7+
"PreReleaseLabel":"unstable",
8+
"PreReleaseNumber":4,
79
"BuildMetaData":5,
810
"BuildMetaDataPadded":"05",
911
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"Patch":3,
55
"PreReleaseTag":"",
66
"PreReleaseTagWithDash":"",
7+
"PreReleaseLabel":"",
8+
"PreReleaseNumber":"",
79
"BuildMetaData":5,
810
"BuildMetaDataPadded":"0005",
911
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"Patch":3,
55
"PreReleaseTag":"unstable.5",
66
"PreReleaseTagWithDash":"-unstable.5",
7+
"PreReleaseLabel":"unstable",
8+
"PreReleaseNumber":5,
79
"BuildMetaData":"",
810
"BuildMetaDataPadded":"",
911
"FullBuildMetaData":"Branch.develop.Sha.commitSha",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"Patch":3,
55
"PreReleaseTag":"ci.5",
66
"PreReleaseTagWithDash":"-ci.5",
7+
"PreReleaseLabel":"ci",
8+
"PreReleaseNumber":5,
79
"BuildMetaData":"",
810
"BuildMetaDataPadded":"",
911
"FullBuildMetaData":"Branch.develop.Sha.commitSha",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"Patch":3,
55
"PreReleaseTag":"",
66
"PreReleaseTagWithDash":"",
7+
"PreReleaseLabel":"",
8+
"PreReleaseNumber":"",
79
"BuildMetaData":5,
810
"BuildMetaDataPadded":"0005",
911
"FullBuildMetaData":"5.Sha.commitSha",

‎src/GitVersionCore/OutputVariables/VariableProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
5858
semverFormatValues.AssemblySemVer,
5959
semverFormatValues.PreReleaseTag,
6060
semverFormatValues.PreReleaseTagWithDash,
61+
semverFormatValues.PreReleaseLabel,
62+
semverFormatValues.PreReleaseNumber,
6163
informationalVersion,
6264
semverFormatValues.CommitDate,
6365
semverFormatValues.NuGetVersion,

‎src/GitVersionCore/OutputVariables/VersionVariables.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public VersionVariables(string major,
2727
string assemblySemVer,
2828
string preReleaseTag,
2929
string preReleaseTagWithDash,
30+
string preReleaseLabel,
31+
string preReleaseNumber,
3032
string informationalVersion,
3133
string commitDate,
3234
string nugetVersion,
@@ -50,6 +52,8 @@ public VersionVariables(string major,
5052
AssemblySemVer = assemblySemVer;
5153
PreReleaseTag = preReleaseTag;
5254
PreReleaseTagWithDash = preReleaseTagWithDash;
55+
PreReleaseLabel = preReleaseLabel;
56+
PreReleaseNumber = preReleaseNumber;
5357
InformationalVersion = informationalVersion;
5458
CommitDate = commitDate;
5559
NuGetVersion = nugetVersion;
@@ -63,6 +67,8 @@ public VersionVariables(string major,
6367
public string Patch { get; private set; }
6468
public string PreReleaseTag { get; private set; }
6569
public string PreReleaseTagWithDash { get; private set; }
70+
public string PreReleaseLabel { get; private set; }
71+
public string PreReleaseNumber { get; private set; }
6672
public string BuildMetaData { get; private set; }
6773
public string BuildMetaDataPadded { get; private set; }
6874
public string FullBuildMetaData { get; private set; }

‎src/GitVersionCore/SemanticVersionFormatValues.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ public string PreReleaseTagWithDash
3838
get { return _semver.PreReleaseTag.HasTag() ? "-" + _semver.PreReleaseTag : null; }
3939
}
4040

41+
public string PreReleaseLabel
42+
{
43+
get { return _semver.PreReleaseTag.HasTag() ? _semver.PreReleaseTag.Name : null; }
44+
}
45+
46+
public string PreReleaseNumber
47+
{
48+
get { return _semver.PreReleaseTag.HasTag() ? _semver.PreReleaseTag.Number.ToString() : null; }
49+
}
50+
4151
public string BuildMetaData
4252
{
4353
get { return _semver.BuildMetaData; }

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "4";
2727
public static string PreReleaseTag = "beta.5";
2828
public static string PreReleaseTagWithDash = "-beta.5";
29+
public static string PreReleaseLabel = "beta";
30+
public static string PreReleaseNumber = "5";
2931
public static string BuildMetaData = "6";
3032
public static string BuildMetaDataPadded = "0006";
3133
public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake
2626
public static string Patch = "3";
2727
public static string PreReleaseTag = "unstable.4";
2828
public static string PreReleaseTagWithDash = "-unstable.4";
29+
public static string PreReleaseLabel = "unstable";
30+
public static string PreReleaseNumber = "4";
2931
public static string BuildMetaData = "5";
3032
public static string BuildMetaDataPadded = "0005";
3133
public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace Fake.System
2626
public static string Patch = "3";
2727
public static string PreReleaseTag = "unstable.4";
2828
public static string PreReleaseTagWithDash = "-unstable.4";
29+
public static string PreReleaseLabel = "unstable";
30+
public static string PreReleaseNumber = "4";
2931
public static string BuildMetaData = "5";
3032
public static string BuildMetaDataPadded = "0005";
3133
public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";

‎src/GitVersionTask/GetVersion.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ public GetVersion()
3636
[Output]
3737
public string PreReleaseTagWithDash { get; set; }
3838

39+
[Output]
40+
public string PreReleaseLabel { get; set; }
41+
42+
[Output]
43+
public string PreReleaseNumber { get; set; }
44+
3945
[Output]
4046
public string BuildMetaData { get; set; }
4147

‎src/GitVersionTask/NugetAssets/GitVersionTask.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
<Output TaskParameter="NuGetVersion" PropertyName="GitVersion_NuGetVersion" />
6969
<Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
7070
<Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
71+
<Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
72+
<Output TaskParameter="PreReleaseNumber" PropertyName="GitVersion_PreReleaseNumber" />
7173
<Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
7274
<Output TaskParameter="CommitDate" PropertyName="GitVersion_CommitDate" />
7375
<Output TaskParameter="CommitsSinceVersionSource" PropertyName="GitVersion_CommitsSinceVersionSource" />

0 commit comments

Comments
 (0)