Implement when PreleaseLabel is empty, the PreleaseTag is generated correctly

HHobeck · HHobeck · commit e0f205112745 · 2023-03-28T09:39:21.000+02:00
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
@@ -926,12 +926,12 @@ public void IncreaseVersionWithBumpMessageWhenCommitMessageIncrementIsEnabledAnd
         fixture.MakeACommit();
 
         // ✅ succeeds as expected
-        fixture.AssertFullSemver("0.0.0", configuration);
+        fixture.AssertFullSemver("0.0.0-1", configuration);
 
         fixture.MakeACommit("+semver: minor");
 
         // ✅ succeeds as expected
-        fixture.AssertFullSemver("0.1.0", configuration);
+        fixture.AssertFullSemver("0.1.0-2", configuration);
 
         fixture.ApplyTag("1.0.0");
 
@@ -941,13 +941,13 @@ public void IncreaseVersionWithBumpMessageWhenCommitMessageIncrementIsEnabledAnd
         fixture.MakeACommit("+semver: major");
 
         // ✅ succeeds as expected
-        fixture.AssertFullSemver("2.0.0", configuration);
+        fixture.AssertFullSemver("2.0.0-1", configuration);
 
         fixture.ApplyTag("2.0.0");
         fixture.MakeACommit();
 
         // ✅ succeeds as expected
-        fixture.AssertFullSemver("2.0.0", configuration);
+        fixture.AssertFullSemver("2.0.0-1", configuration);
     }
 
     [Test]
@@ -1027,4 +1027,24 @@ public void ShouldProvideTheCorrectVersionEvenIfPreReleaseLabelExistsInTheGitTag
         // ✅ succeeds as expected
         fixture.AssertFullSemver("5.0.0-beta.5", configuration);
     }
+
+    /// <summary>
+    /// https://github.com/GitTools/GitVersion/issues/2347
+    /// </summary>
+    [Test]
+    public void EnsureThePreReleaseTagIsCorrectlyGeneratedWhenPreReleaseLabelIsEmpty()
+    {
+        var configuration = GitFlowConfigurationBuilder.New
+            .WithBranch("main", _ => _
+                .WithLabel(string.Empty)
+                .WithVersioningMode(VersioningMode.ContinuousDeployment)
+            ).Build();
+
+        using var fixture = new EmptyRepositoryFixture("main");
+        fixture.Repository.MakeCommits(5);
+
+        var variables = fixture.GetVersion(configuration);
+
+        fixture.AssertFullSemver("0.0.1-5", configuration);
+    }
 }
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForMainBranchWithEmptyLabel.approved.txt b/src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForMainBranchWithEmptyLabel.approved.txt
@@ -0,0 +1,27 @@
+{
+  "Major": 1,
+  "Minor": 2,
+  "Patch": 3,
+  "PreReleaseTag": "9",
+  "PreReleaseTagWithDash": "-9",
+  "PreReleaseLabel": "",
+  "PreReleaseLabelWithDash": "",
+  "PreReleaseNumber": 9,
+  "WeightedPreReleaseNumber": 55009,
+  "BuildMetaData": null,
+  "FullBuildMetaData": "Branch.main.Sha.commitSha",
+  "MajorMinorPatch": "1.2.3",
+  "SemVer": "1.2.3-9",
+  "AssemblySemVer": "1.2.3.0",
+  "AssemblySemFileVer": "1.2.3.0",
+  "FullSemVer": "1.2.3-9",
+  "InformationalVersion": "1.2.3-9+Branch.main.Sha.commitSha",
+  "BranchName": "main",
+  "EscapedBranchName": "main",
+  "Sha": "commitSha",
+  "ShortSha": "commitShortSha",
+  "VersionSourceSha": "versionSourceSha",
+  "CommitsSinceVersionSource": 5,
+  "CommitDate": "2014-03-06",
+  "UncommittedChanges": 0
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs
@@ -1,3 +1,4 @@
+using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -250,4 +251,35 @@ public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomA
 
         vars.ToJsonString().ShouldMatchApproved(c => c.SubFolder("Approved"));
     }
+
+    [Test]
+    public void ProvidesVariablesInContinuousDeploymentModeForMainBranchWithEmptyLabel()
+    {
+        var semanticVersion = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new(string.Empty, 5),
+            BuildMetaData = new("5.Branch.main")
+            {
+                Branch = "main",
+                VersionSourceSha = "versionSourceSha",
+                Sha = "commitSha",
+                ShortSha = "commitShortSha",
+                CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
+            }
+        };
+
+        var configuration = GitFlowConfigurationBuilder.New
+            .WithBranch("main", _ => _
+                .WithLabel(string.Empty)
+                .WithVersioningMode(VersioningMode.ContinuousDeployment)
+            ).Build().GetEffectiveConfiguration(ReferenceName.FromBranchName("main"));
+
+
+        var variables = this.variableProvider.GetVariablesFor(semanticVersion, configuration, null);
+
+        variables.ToString().ShouldMatchApproved(_ => _.SubFolder("Approved"));
+    }
 }
diff --git a/src/GitVersion.Core/Configuration/ConfigurationExtensions.cs b/src/GitVersion.Core/Configuration/ConfigurationExtensions.cs
@@ -8,7 +8,7 @@ public static class ConfigurationExtensions
     public static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, IBranch branch)
         => GetEffectiveConfiguration(configuration, branch.NotNull().Name);
 
-    private static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
+    public static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
     {
         IBranchConfiguration branchConfiguration = configuration.GetBranchConfiguration(branchName);
         return new EffectiveConfiguration(configuration, branchConfiguration);
diff --git a/src/GitVersion.Core/Extensions/StringExtensions.cs b/src/GitVersion.Core/Extensions/StringExtensions.cs
@@ -104,4 +104,8 @@ public static bool IsEquivalentTo(this string self, string? other) =>
     public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value) => string.IsNullOrWhiteSpace(value);
 
     public static bool IsEmpty([NotNullWhen(false)] this string? value) => string.Empty.Equals(value);
+
+    public static string WithPrefixIfNotNullOrEmpty(this string value, string prefix)
+        => string.IsNullOrEmpty(value) ? value : prefix + value;
+
 }
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -813,7 +813,7 @@ GitVersion.SemanticVersionFormatValues
 GitVersion.SemanticVersionFormatValues.AssemblyFileSemVer.get -> string?
 GitVersion.SemanticVersionFormatValues.AssemblySemVer.get -> string?
 GitVersion.SemanticVersionFormatValues.BranchName.get -> string?
-GitVersion.SemanticVersionFormatValues.BuildMetaData.get -> string?
+GitVersion.SemanticVersionFormatValues.BuildMetaData.get -> string!
 GitVersion.SemanticVersionFormatValues.CommitDate.get -> string?
 GitVersion.SemanticVersionFormatValues.CommitsSinceVersionSource.get -> string?
 GitVersion.SemanticVersionFormatValues.EscapedBranchName.get -> string?
@@ -824,13 +824,13 @@ GitVersion.SemanticVersionFormatValues.Major.get -> string!
 GitVersion.SemanticVersionFormatValues.MajorMinorPatch.get -> string!
 GitVersion.SemanticVersionFormatValues.Minor.get -> string!
 GitVersion.SemanticVersionFormatValues.Patch.get -> string!
-GitVersion.SemanticVersionFormatValues.PreReleaseLabel.get -> string?
-GitVersion.SemanticVersionFormatValues.PreReleaseLabelWithDash.get -> string?
-GitVersion.SemanticVersionFormatValues.PreReleaseNumber.get -> string?
-GitVersion.SemanticVersionFormatValues.PreReleaseTag.get -> string?
-GitVersion.SemanticVersionFormatValues.PreReleaseTagWithDash.get -> string?
-GitVersion.SemanticVersionFormatValues.SemVer.get -> string!
+GitVersion.SemanticVersionFormatValues.PreReleaseLabel.get -> string!
+GitVersion.SemanticVersionFormatValues.PreReleaseLabelWithDash.get -> string!
+GitVersion.SemanticVersionFormatValues.PreReleaseNumber.get -> string!
+GitVersion.SemanticVersionFormatValues.PreReleaseTag.get -> string!
+GitVersion.SemanticVersionFormatValues.PreReleaseTagWithDash.get -> string!
 GitVersion.SemanticVersionFormatValues.SemanticVersionFormatValues(GitVersion.SemanticVersion! semver, GitVersion.Configuration.EffectiveConfiguration! configuration) -> void
+GitVersion.SemanticVersionFormatValues.SemVer.get -> string!
 GitVersion.SemanticVersionFormatValues.Sha.get -> string?
 GitVersion.SemanticVersionFormatValues.ShortSha.get -> string?
 GitVersion.SemanticVersionFormatValues.UncommittedChanges.get -> string!
@@ -844,11 +844,11 @@ GitVersion.SemanticVersionPreReleaseTag.Name.get -> string!
 GitVersion.SemanticVersionPreReleaseTag.Name.init -> void
 GitVersion.SemanticVersionPreReleaseTag.Number.get -> long?
 GitVersion.SemanticVersionPreReleaseTag.Number.init -> void
-GitVersion.SemanticVersionPreReleaseTag.PromotedFromCommits.get -> bool?
-GitVersion.SemanticVersionPreReleaseTag.PromotedFromCommits.init -> void
+GitVersion.SemanticVersionPreReleaseTag.PromoteTagEvenIfNameIsEmpty.get -> bool
+GitVersion.SemanticVersionPreReleaseTag.PromoteTagEvenIfNameIsEmpty.init -> void
 GitVersion.SemanticVersionPreReleaseTag.SemanticVersionPreReleaseTag() -> void
 GitVersion.SemanticVersionPreReleaseTag.SemanticVersionPreReleaseTag(GitVersion.SemanticVersionPreReleaseTag! preReleaseTag) -> void
-GitVersion.SemanticVersionPreReleaseTag.SemanticVersionPreReleaseTag(string! name, long? number) -> void
+GitVersion.SemanticVersionPreReleaseTag.SemanticVersionPreReleaseTag(string! name, long? number, bool promoteTagEvenIfNameIsEmpty = true) -> void
 GitVersion.SemanticVersionPreReleaseTag.ToString(string! format) -> string!
 GitVersion.SemanticVersionPreReleaseTag.ToString(string? format, System.IFormatProvider? formatProvider) -> string!
 GitVersion.SemanticVersionWithTag
@@ -1102,6 +1102,7 @@ static GitVersion.Configuration.ConfigurationExtensions.GetBranchConfiguration(t
 static GitVersion.Configuration.ConfigurationExtensions.GetBranchSpecificLabel(this GitVersion.Configuration.EffectiveConfiguration! configuration, GitVersion.ReferenceName! branchName, string? branchNameOverride) -> string?
 static GitVersion.Configuration.ConfigurationExtensions.GetBranchSpecificLabel(this GitVersion.Configuration.EffectiveConfiguration! configuration, string? branchName, string? branchNameOverride) -> string?
 static GitVersion.Configuration.ConfigurationExtensions.GetEffectiveConfiguration(this GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.IBranch! branch) -> GitVersion.Configuration.EffectiveConfiguration!
+static GitVersion.Configuration.ConfigurationExtensions.GetEffectiveConfiguration(this GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.ReferenceName! branchName) -> GitVersion.Configuration.EffectiveConfiguration!
 static GitVersion.Configuration.ConfigurationExtensions.GetFallbackBranchConfiguration(this GitVersion.Configuration.IGitVersionConfiguration! configuration) -> GitVersion.Configuration.IBranchConfiguration!
 static GitVersion.Configuration.ConfigurationExtensions.GetReleaseBranchConfiguration(this GitVersion.Configuration.IGitVersionConfiguration! configuration) -> System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<string!, GitVersion.Configuration.IBranchConfiguration!>>!
 static GitVersion.Configuration.ConfigurationExtensions.IsReleaseBranch(this GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.IBranch! branch) -> bool
@@ -1144,6 +1145,7 @@ static GitVersion.Extensions.StringExtensions.IsSwitchArgument(this string? valu
 static GitVersion.Extensions.StringExtensions.IsTrue(this string? value) -> bool
 static GitVersion.Extensions.StringExtensions.IsValidPath(this string? path) -> bool
 static GitVersion.Extensions.StringExtensions.RegexReplace(this string! input, string! pattern, string! replace, System.Text.RegularExpressions.RegexOptions options = System.Text.RegularExpressions.RegexOptions.None) -> string!
+static GitVersion.Extensions.StringExtensions.WithPrefixIfNotNullOrEmpty(this string! value, string! prefix) -> string!
 static GitVersion.GitVersionModule.FindAllDerivedTypes<T>(System.Reflection.Assembly? assembly) -> System.Collections.Generic.IEnumerable<System.Type!>!
 static GitVersion.Helpers.EncodingHelper.DetectEncoding(System.Collections.Generic.IList<byte>! bytes) -> System.Text.Encoding?
 static GitVersion.Helpers.EncodingHelper.DetectEncoding(string? filename) -> System.Text.Encoding?
diff --git a/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
@@ -83,7 +83,10 @@ public SemanticVersion FindMainlineModeVersion(NextVersion nextVersion)
 
             return new SemanticVersion(mainlineVersion)
             {
-                PreReleaseTag = new SemanticVersionPreReleaseTag(nextVersion.IncrementedVersion.PreReleaseTag),
+                PreReleaseTag = new SemanticVersionPreReleaseTag(nextVersion.IncrementedVersion.PreReleaseTag)
+                {
+                    PromoteTagEvenIfNameIsEmpty = false
+                },
                 BuildMetaData = baseVersionBuildMetaData
             };
         }
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
@@ -21,19 +21,19 @@ public SemanticVersionFormatValues(SemanticVersion semver, EffectiveConfiguratio
 
     public string Patch => this.semver.Patch.ToString();
 
-    public string? PreReleaseTag => this.semver.PreReleaseTag;
+    public string PreReleaseTag => this.semver.PreReleaseTag.ToString();
 
-    public string? PreReleaseTagWithDash => this.semver.PreReleaseTag.HasTag() ? "-" + this.semver.PreReleaseTag : null;
+    public string PreReleaseTagWithDash => this.PreReleaseTag.WithPrefixIfNotNullOrEmpty("-");
 
-    public string? PreReleaseLabel => this.semver.PreReleaseTag.HasTag() ? this.semver.PreReleaseTag.Name : null;
+    public string PreReleaseLabel => this.semver.PreReleaseTag.Name;
 
-    public string? PreReleaseLabelWithDash => this.semver.PreReleaseTag.HasTag() ? "-" + this.semver.PreReleaseTag.Name : null;
+    public string PreReleaseLabelWithDash => this.PreReleaseLabel.WithPrefixIfNotNullOrEmpty("-");
 
-    public string? PreReleaseNumber => this.semver.PreReleaseTag.HasTag() ? this.semver.PreReleaseTag.Number.ToString() : null;
+    public string PreReleaseNumber => this.semver.PreReleaseTag.Number?.ToString() ?? string.Empty;
 
     public string WeightedPreReleaseNumber => GetWeightedPreReleaseNumber();
 
-    public string? BuildMetaData => this.semver.BuildMetaData;
+    public string BuildMetaData => this.semver.BuildMetaData.ToString();
 
     public string FullBuildMetaData => this.semver.BuildMetaData.ToString("f");
 
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -21,14 +21,15 @@ public sealed class SemanticVersionPreReleaseTag :
 
     public long? Number { get; init; }
 
-    public bool? PromotedFromCommits { get; init; }
+    public bool PromoteTagEvenIfNameIsEmpty { get; init; }
 
     public SemanticVersionPreReleaseTag() => Name = string.Empty;
 
-    public SemanticVersionPreReleaseTag(string name, long? number)
+    public SemanticVersionPreReleaseTag(string name, long? number, bool promoteTagEvenIfNameIsEmpty = true)
     {
         Name = name.NotNull();
         Number = number;
+        PromoteTagEvenIfNameIsEmpty = promoteTagEvenIfNameIsEmpty;
     }
 
     public SemanticVersionPreReleaseTag(SemanticVersionPreReleaseTag preReleaseTag)
@@ -37,7 +38,7 @@ public SemanticVersionPreReleaseTag(SemanticVersionPreReleaseTag preReleaseTag)
 
         Name = preReleaseTag.Name;
         Number = preReleaseTag.Number;
-        PromotedFromCommits = preReleaseTag.PromotedFromCommits;
+        PromoteTagEvenIfNameIsEmpty = preReleaseTag.PromoteTagEvenIfNameIsEmpty;
     }
 
     public override bool Equals(object? obj) => Equals(obj as SemanticVersionPreReleaseTag);
@@ -130,6 +131,5 @@ public string ToString(string? format, IFormatProvider? formatProvider)
         };
     }
 
-    public bool HasTag() =>
-        !Name.IsNullOrEmpty() || (Number.HasValue && PromotedFromCommits != true);
+    public bool HasTag() => !Name.IsNullOrEmpty() || Number.HasValue && PromoteTagEvenIfNameIsEmpty;
 }
diff --git a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs
@@ -109,7 +109,6 @@ public GitVersionVariables GetVariablesFor(
     private static SemanticVersion PromoteNumberOfCommitsToTagNumber(SemanticVersion semanticVersion, string preReleaseTagName)
     {
         var preReleaseTagNumber = semanticVersion.PreReleaseTag.Number;
-        var preReleaseTagPromotedFromCommits = semanticVersion.PreReleaseTag.PromotedFromCommits;
         long buildMetaDataCommitsSinceVersionSource;
         var buildMetaDataCommitsSinceTag = semanticVersion.BuildMetaData.CommitsSinceTag;
 
@@ -129,7 +128,6 @@ private static SemanticVersion PromoteNumberOfCommitsToTagNumber(SemanticVersion
             else
             {
                 preReleaseTagNumber = semanticVersion.BuildMetaData.CommitsSinceTag;
-                preReleaseTagPromotedFromCommits = true;
             }
             buildMetaDataCommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag.Value;
             buildMetaDataCommitsSinceTag = null; // why is this set to null ?
@@ -140,8 +138,7 @@ private static SemanticVersion PromoteNumberOfCommitsToTagNumber(SemanticVersion
             PreReleaseTag = new(semanticVersion.PreReleaseTag)
             {
                 Name = preReleaseTagName,
-                Number = preReleaseTagNumber,
-                PromotedFromCommits = preReleaseTagPromotedFromCommits
+                Number = preReleaseTagNumber
             },
             BuildMetaData = new(semanticVersion.BuildMetaData)
             {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public static class ConfigurationExtensions`
`8`	`8`	`public static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, IBranch branch)`
`9`	`9`	`=> GetEffectiveConfiguration(configuration, branch.NotNull().Name);`
`10`	`10`
`11`		`- private static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)`
	`11`	`+ public static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)`
`12`	`12`	`{`
`13`	`13`	`IBranchConfiguration branchConfiguration = configuration.GetBranchConfiguration(branchName);`
`14`	`14`	`return new EffectiveConfiguration(configuration, branchConfiguration);`
Original file line number	Diff line number	Diff line change
`@@ -104,4 +104,8 @@ public static bool IsEquivalentTo(this string self, string? other) =>`
`104`	`104`	`public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value) => string.IsNullOrWhiteSpace(value);`
`105`	`105`
`106`	`106`	`public static bool IsEmpty([NotNullWhen(false)] this string? value) => string.Empty.Equals(value);`
	`107`	`+`
	`108`	`+ public static string WithPrefixIfNotNullOrEmpty(this string value, string prefix)`
	`109`	`+ => string.IsNullOrEmpty(value) ? value : prefix + value;`
	`110`	`+`
`107`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,10 @@ public SemanticVersion FindMainlineModeVersion(NextVersion nextVersion)`
`83`	`83`
`84`	`84`	`return new SemanticVersion(mainlineVersion)`
`85`	`85`	`{`
`86`		`- PreReleaseTag = new SemanticVersionPreReleaseTag(nextVersion.IncrementedVersion.PreReleaseTag),`
	`86`	`+ PreReleaseTag = new SemanticVersionPreReleaseTag(nextVersion.IncrementedVersion.PreReleaseTag)`
	`87`	`+ {`
	`88`	`+ PromoteTagEvenIfNameIsEmpty = false`
	`89`	`+ },`
`87`	`90`	`BuildMetaData = baseVersionBuildMetaData`
`88`	`91`	`};`
`89`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,15 @@ public sealed class SemanticVersionPreReleaseTag :`
`21`	`21`
`22`	`22`	`public long? Number { get; init; }`
`23`	`23`
`24`		`- public bool? PromotedFromCommits { get; init; }`
	`24`	`+ public bool PromoteTagEvenIfNameIsEmpty { get; init; }`
`25`	`25`
`26`	`26`	`public SemanticVersionPreReleaseTag() => Name = string.Empty;`
`27`	`27`
`28`		`- public SemanticVersionPreReleaseTag(string name, long? number)`
	`28`	`+ public SemanticVersionPreReleaseTag(string name, long? number, bool promoteTagEvenIfNameIsEmpty = true)`
`29`	`29`	`{`
`30`	`30`	`Name = name.NotNull();`
`31`	`31`	`Number = number;`
	`32`	`+ PromoteTagEvenIfNameIsEmpty = promoteTagEvenIfNameIsEmpty;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`public SemanticVersionPreReleaseTag(SemanticVersionPreReleaseTag preReleaseTag)`
`@@ -37,7 +38,7 @@ public SemanticVersionPreReleaseTag(SemanticVersionPreReleaseTag preReleaseTag)`
`37`	`38`
`38`	`39`	`Name = preReleaseTag.Name;`
`39`	`40`	`Number = preReleaseTag.Number;`
`40`		`- PromotedFromCommits = preReleaseTag.PromotedFromCommits;`
	`41`	`+ PromoteTagEvenIfNameIsEmpty = preReleaseTag.PromoteTagEvenIfNameIsEmpty;`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`public override bool Equals(object? obj) => Equals(obj as SemanticVersionPreReleaseTag);`
`@@ -130,6 +131,5 @@ public string ToString(string? format, IFormatProvider? formatProvider)`
`130`	`131`	`};`
`131`	`132`	`}`
`132`	`133`
`133`		`- public bool HasTag() =>`
`134`		`- !Name.IsNullOrEmpty() \|\| (Number.HasValue && PromotedFromCommits != true);`
	`134`	`+ public bool HasTag() => !Name.IsNullOrEmpty() \|\| Number.HasValue && PromoteTagEvenIfNameIsEmpty;`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ public GitVersionVariables GetVariablesFor(`
`109`	`109`	`private static SemanticVersion PromoteNumberOfCommitsToTagNumber(SemanticVersion semanticVersion, string preReleaseTagName)`
`110`	`110`	`{`
`111`	`111`	`var preReleaseTagNumber = semanticVersion.PreReleaseTag.Number;`
`112`		`- var preReleaseTagPromotedFromCommits = semanticVersion.PreReleaseTag.PromotedFromCommits;`
`113`	`112`	`long buildMetaDataCommitsSinceVersionSource;`
`114`	`113`	`var buildMetaDataCommitsSinceTag = semanticVersion.BuildMetaData.CommitsSinceTag;`
`115`	`114`
`@@ -129,7 +128,6 @@ private static SemanticVersion PromoteNumberOfCommitsToTagNumber(SemanticVersion`
`129`	`128`	`else`
`130`	`129`	`{`
`131`	`130`	`preReleaseTagNumber = semanticVersion.BuildMetaData.CommitsSinceTag;`
`132`		`- preReleaseTagPromotedFromCommits = true;`
`133`	`131`	`}`
`134`	`132`	`buildMetaDataCommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag.Value;`
`135`	`133`	`buildMetaDataCommitsSinceTag = null; // why is this set to null ?`
`@@ -140,8 +138,7 @@ private static SemanticVersion PromoteNumberOfCommitsToTagNumber(SemanticVersion`
`140`	`138`	`PreReleaseTag = new(semanticVersion.PreReleaseTag)`
`141`	`139`	`{`
`142`	`140`	`Name = preReleaseTagName,`
`143`		`- Number = preReleaseTagNumber,`
`144`		`- PromotedFromCommits = preReleaseTagPromotedFromCommits`
	`141`	`+ Number = preReleaseTagNumber`
`145`	`142`	`},`
`146`	`143`	`BuildMetaData = new(semanticVersion.BuildMetaData)`
`147`	`144`	`{`