Skip to content

Commit 6af005e

Browse files
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",

0 commit comments

Comments
 (0)