Skip to content

Commit 5c278ab

Browse files
HHobeckHHobeck
committed
Fix GitVersion calculates the wrong version after main is merged back to develop.
1 parent 2ad57ea commit 5c278ab

File tree

12 files changed

+187
-67
lines changed

12 files changed

+187
-67
lines changed

‎src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,4 +1218,88 @@ public void EnsurePreventIncrementWhenCurrentCommitTaggedOnReleaseBranchAndIncre
12181218

12191219
fixture.AssertFullSemver(semVersion, configuration);
12201220
}
1221+
1222+
[Test]
1223+
public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrect()
1224+
{
1225+
using EmptyRepositoryFixture fixture = new("main");
1226+
1227+
fixture.MakeATaggedCommit("1.0.0");
1228+
fixture.BranchTo("develop");
1229+
fixture.MakeACommit("A");
1230+
1231+
// ✅ succeeds as expected
1232+
fixture.AssertFullSemver("1.1.0-alpha.1");
1233+
1234+
fixture.Checkout("main");
1235+
fixture.MakeACommit("B");
1236+
fixture.BranchTo("hotfix/just-a-hotfix");
1237+
fixture.MakeACommit("C +semver: major");
1238+
fixture.MergeTo("main", removeBranchAfterMerging: true);
1239+
fixture.Checkout("develop");
1240+
fixture.MakeACommit("D");
1241+
fixture.Checkout("main");
1242+
fixture.MakeACommit("E");
1243+
fixture.ApplyTag("1.0.1");
1244+
1245+
fixture.Checkout("develop");
1246+
fixture.MergeNoFF("main");
1247+
1248+
// ✅ succeeds as expected
1249+
fixture.AssertFullSemver("1.1.0-alpha.3");
1250+
}
1251+
1252+
[TestCase(false, "2.0.0-alpha.3")]
1253+
[TestCase(true, "2.0.0-alpha.1")]
1254+
public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrectForTrunkBased(bool applyTag, string semanticVersion)
1255+
{
1256+
var configuration = GitFlowConfigurationBuilder.New
1257+
.WithVersionStrategy(VersionStrategies.TrunkBased)
1258+
.Build();
1259+
1260+
using EmptyRepositoryFixture fixture = new("main");
1261+
1262+
fixture.MakeACommit("A");
1263+
fixture.ApplyTag("1.0.0");
1264+
fixture.BranchTo("develop");
1265+
fixture.MakeACommit("B +semver: major");
1266+
1267+
// ✅ succeeds as expected
1268+
fixture.AssertFullSemver("2.0.0-alpha.1", configuration);
1269+
1270+
fixture.Checkout("main");
1271+
fixture.MakeACommit("C");
1272+
if (applyTag) fixture.ApplyTag("1.0.1");
1273+
fixture.Checkout("develop");
1274+
fixture.MergeNoFF("main");
1275+
1276+
// ✅ succeeds as expected
1277+
fixture.AssertFullSemver(semanticVersion, configuration);
1278+
}
1279+
1280+
[TestCase(false, "2.0.0-alpha.3")]
1281+
[TestCase(true, "2.0.0-alpha.2")]
1282+
public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrectForGitFlow(bool applyTag, string semanticVersion)
1283+
{
1284+
var configuration = GitFlowConfigurationBuilder.New.Build();
1285+
1286+
using EmptyRepositoryFixture fixture = new("main");
1287+
1288+
fixture.MakeACommit("A");
1289+
fixture.ApplyTag("1.0.0");
1290+
fixture.BranchTo("develop");
1291+
fixture.MakeACommit("B +semver: major");
1292+
1293+
// ✅ succeeds as expected
1294+
fixture.AssertFullSemver("2.0.0-alpha.1", configuration);
1295+
1296+
fixture.Checkout("main");
1297+
fixture.MakeACommit("C");
1298+
if (applyTag) fixture.ApplyTag("1.0.1");
1299+
fixture.Checkout("develop");
1300+
fixture.MergeNoFF("main");
1301+
1302+
// ✅ succeeds as expected
1303+
fixture.AssertFullSemver(semanticVersion, configuration);
1304+
}
12211305
}

‎src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public interface IRepositoryStore
1111

1212
ICommit? FindMergeBase(ICommit commit, ICommit mainlineTip);
1313
ICommit? GetCurrentCommit(IBranch currentBranch, string? commitId);
14-
IEnumerable<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit? currentCommit);
1514

1615
IBranch GetTargetBranch(string? targetBranchName);
1716
IBranch? FindBranch(ReferenceName branchName);

‎src/GitVersion.Core/Core/RepositoryStore.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,6 @@ public IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branc
191191
}
192192
}
193193

194-
public IEnumerable<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit? currentCommit)
195-
{
196-
var filter = new CommitFilter { IncludeReachableFrom = currentCommit, ExcludeReachableFrom = baseVersionSource, SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time };
197-
198-
return this.repository.Commits.QueryBy(filter);
199-
}
200-
201194
public bool IsCommitOnBranch(ICommit? baseVersionSource, IBranch branch, ICommit firstMatchingCommit)
202195
{
203196
var filter = new CommitFilter { IncludeReachableFrom = branch, ExcludeReachableFrom = baseVersionSource, FirstParentOnly = true };

‎src/GitVersion.Core/PublicAPI.Unshipped.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ GitVersion.Common.IRepositoryStore.FindCommitBranchesWasBranchedFrom(GitVersion.
9696
GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.IBranch? branch, GitVersion.IBranch? otherBranch) -> GitVersion.ICommit?
9797
GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.ICommit! commit, GitVersion.ICommit! mainlineTip) -> GitVersion.ICommit?
9898
GitVersion.Common.IRepositoryStore.GetBranchesContainingCommit(GitVersion.ICommit! commit, System.Collections.Generic.IEnumerable<GitVersion.IBranch!>? branches = null, bool onlyTrackedBranches = false) -> System.Collections.Generic.IEnumerable<GitVersion.IBranch!>!
99-
GitVersion.Common.IRepositoryStore.GetCommitLog(GitVersion.ICommit? baseVersionSource, GitVersion.ICommit? currentCommit) -> System.Collections.Generic.IEnumerable<GitVersion.ICommit!>!
10099
GitVersion.Common.IRepositoryStore.GetCurrentCommit(GitVersion.IBranch! currentBranch, string? commitId) -> GitVersion.ICommit?
101100
GitVersion.Common.IRepositoryStore.GetNumberOfUncommittedChanges() -> int
102101
GitVersion.Common.IRepositoryStore.GetReleaseBranches(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, GitVersion.Configuration.IBranchConfiguration!>>! releaseBranchConfig) -> System.Collections.Generic.IEnumerable<GitVersion.IBranch!>!
@@ -690,11 +689,12 @@ GitVersion.VersionCalculation.DeploymentMode.ContinuousDelivery = 1 -> GitVersio
690689
GitVersion.VersionCalculation.DeploymentMode.ContinuousDeployment = 2 -> GitVersion.VersionCalculation.DeploymentMode
691690
GitVersion.VersionCalculation.DeploymentMode.ManualDeployment = 0 -> GitVersion.VersionCalculation.DeploymentMode
692691
GitVersion.VersionCalculation.IDeploymentModeCalculator
693-
GitVersion.VersionCalculation.IDeploymentModeCalculator.Calculate(GitVersion.SemanticVersion! semanticVersion, GitVersion.ICommit? baseVersionSource) -> GitVersion.SemanticVersion!
692+
GitVersion.VersionCalculation.IDeploymentModeCalculator.Calculate(GitVersion.SemanticVersion! semanticVersion, GitVersion.ICommit? baseVersionSource, string? label) -> GitVersion.SemanticVersion!
694693
GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder
695694
GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder.GetConfigurations(GitVersion.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.Configuration.EffectiveBranchConfiguration!>!
696695
GitVersion.VersionCalculation.IIncrementStrategyFinder
697696
GitVersion.VersionCalculation.IIncrementStrategyFinder.DetermineIncrementedField(GitVersion.ICommit! currentCommit, GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.Configuration.EffectiveConfiguration! configuration, string? label) -> GitVersion.VersionField
697+
GitVersion.VersionCalculation.IIncrementStrategyFinder.GetCommitHistory(string? tagPrefix, GitVersion.SemanticVersionFormat semanticVersionFormat, GitVersion.ICommit? baseVersionSource, GitVersion.ICommit! currentCommit, string? label) -> System.Collections.Generic.IReadOnlyCollection<GitVersion.ICommit!>!
698698
GitVersion.VersionCalculation.IIncrementStrategyFinder.GetIncrementForcedByCommit(GitVersion.ICommit! commit, GitVersion.Configuration.EffectiveConfiguration! configuration) -> GitVersion.VersionField
699699
GitVersion.VersionCalculation.IIncrementStrategyFinder.GetIncrementForCommits(string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.ICommit![]! commits) -> GitVersion.VersionField?
700700
GitVersion.VersionCalculation.IIncrementStrategyFinder.GetMergedCommits(GitVersion.ICommit! mergeCommit, int index) -> System.Collections.Generic.IEnumerable<GitVersion.ICommit!>!

‎src/GitVersion.Core/VersionCalculation/Abstractions/IDeploymentModeCalculator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ namespace GitVersion.VersionCalculation;
22

33
public interface IDeploymentModeCalculator
44
{
5-
SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource);
5+
SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource, string? label);
66
}

‎src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ ICommit[] commits
1515
IEnumerable<ICommit> GetMergedCommits(ICommit mergeCommit, int index);
1616

1717
VersionField GetIncrementForcedByCommit(ICommit commit, EffectiveConfiguration configuration);
18+
19+
IReadOnlyCollection<ICommit> GetCommitHistory(
20+
string? tagPrefix, SemanticVersionFormat semanticVersionFormat, ICommit? baseVersionSource, ICommit currentCommit, string? label);
1821
}

‎src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs‎

Lines changed: 47 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace GitVersion.VersionCalculation;
88

9-
internal class IncrementStrategyFinder : IIncrementStrategyFinder
9+
internal sealed class IncrementStrategyFinder : IIncrementStrategyFinder
1010
{
1111
public const string DefaultMajorPattern = @"\+semver:\s?(breaking|major)";
1212
public const string DefaultMinorPattern = @"\+semver:\s?(feature|minor)";
@@ -28,7 +28,6 @@ internal class IncrementStrategyFinder : IIncrementStrategyFinder
2828

2929
public IncrementStrategyFinder(IGitRepository repository, ITaggedSemanticVersionRepository taggedSemanticVersionRepository)
3030
{
31-
this.repository = repository.NotNull();
3231
this.repository = repository.NotNull();
3332
this.taggedSemanticVersionRepository = taggedSemanticVersionRepository;
3433
}
@@ -81,26 +80,21 @@ public VersionField DetermineIncrementedField(
8180
}
8281

8382
private VersionField? FindCommitMessageIncrement(
84-
EffectiveConfiguration configuration, ICommit? baseCommit, ICommit? currentCommit, string? label)
83+
EffectiveConfiguration configuration, ICommit? baseVersionSource, ICommit currentCommit, string? label)
8584
{
8685
if (configuration.CommitMessageIncrementing == CommitMessageIncrementMode.Disabled)
8786
{
8887
return null;
8988
}
9089

91-
//get tags with valid version - depends on configuration (see #3757)
92-
var targetShas = new Lazy<IReadOnlySet<string>>(() =>
93-
this.taggedSemanticVersionRepository.GetTaggedSemanticVersions(configuration.TagPrefix, configuration.SemanticVersionFormat)
94-
.SelectMany(_ => _).Where(_ => _.Value.IsMatchForBranchSpecificLabel(label)).Select(_ => _.Tag.TargetSha).ToHashSet()
90+
IEnumerable<ICommit> commits = GetCommitHistory(
91+
tagPrefix: configuration.TagPrefix,
92+
semanticVersionFormat: configuration.SemanticVersionFormat,
93+
baseVersionSource: baseVersionSource,
94+
currentCommit: currentCommit,
95+
label: label
9596
);
9697

97-
var commits = GetIntermediateCommits(baseCommit, currentCommit);
98-
// consider commit messages since latest tag only (see #3071)
99-
commits = commits
100-
.Reverse()
101-
.TakeWhile(x => !targetShas.Value.Contains(x.Sha))
102-
.Reverse();
103-
10498
if (configuration.CommitMessageIncrementing == CommitMessageIncrementMode.MergeMessageOnly)
10599
{
106100
commits = commits.Where(c => c.Parents.Count() > 1);
@@ -120,6 +114,41 @@ private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultReg
120114
? defaultRegex
121115
: CompiledRegexCache.GetOrAdd(messageRegex, pattern => new(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase));
122116

117+
public IReadOnlyCollection<ICommit> GetCommitHistory(
118+
string? tagPrefix, SemanticVersionFormat semanticVersionFormat, ICommit? baseVersionSource, ICommit currentCommit, string? label)
119+
{
120+
var targetShas = new Lazy<IReadOnlySet<string>>(() =>
121+
this.taggedSemanticVersionRepository.GetTaggedSemanticVersions(tagPrefix, semanticVersionFormat)
122+
.SelectMany(_ => _).Where(_ => _.Value.IsMatchForBranchSpecificLabel(label)).Select(_ => _.Tag.TargetSha).ToHashSet()
123+
);
124+
125+
var intermediateCommits = GetIntermediateCommits(baseVersionSource, currentCommit).ToArray();
126+
127+
var commitLog = intermediateCommits.ToDictionary(element => element.Id.Sha);
128+
129+
foreach (var item in intermediateCommits.Reverse())
130+
{
131+
if (!commitLog.ContainsKey(item.Sha)) continue;
132+
133+
if (targetShas.Value.Contains(item.Sha))
134+
{
135+
void RemoveCommitFromHistory(ICommit commit)
136+
{
137+
if (!commitLog.ContainsKey(commit.Sha)) return;
138+
139+
commitLog.Remove(commit.Sha);
140+
foreach (var item in commit.Parents)
141+
{
142+
RemoveCommitFromHistory(item);
143+
}
144+
}
145+
RemoveCommitFromHistory(item);
146+
}
147+
}
148+
149+
return commitLog.Values;
150+
}
151+
123152
/// <summary>
124153
/// Get the sequence of commits in a repository between a <paramref name="baseCommit"/> (exclusive)
125154
/// and a particular <paramref name="headCommit"/> (inclusive)
@@ -155,7 +184,7 @@ private Dictionary<string, int> GetHeadCommitsMap(ICommit? headCommit) =>
155184
/// </summary>
156185
private ICommit[] GetHeadCommits(ICommit? headCommit) =>
157186
this.headCommitsCache.GetOrAdd(headCommit?.Sha ?? "NULL", () =>
158-
GetCommitsReacheableFromHead(repository, headCommit).ToArray());
187+
GetCommitsReacheableFromHead(headCommit).ToArray());
159188

160189
private VersionField? GetIncrementFromCommit(ICommit commit, Regex majorRegex, Regex minorRegex, Regex patchRegex, Regex none) =>
161190
this.commitIncrementCache.GetOrAdd(commit.Sha, () =>
@@ -170,19 +199,15 @@ private ICommit[] GetHeadCommits(ICommit? headCommit) =>
170199
return null;
171200
}
172201

173-
/// <summary>
174-
/// Query a <paramref name="repo"/> for the sequence of commits from the beginning to a particular
175-
/// <paramref name="headCommit"/> (inclusive)
176-
/// </summary>
177-
private static IEnumerable<ICommit> GetCommitsReacheableFromHead(IGitRepository repo, ICommit? headCommit)
202+
private IEnumerable<ICommit> GetCommitsReacheableFromHead(ICommit? headCommit)
178203
{
179204
var filter = new CommitFilter
180205
{
181206
IncludeReachableFrom = headCommit,
182207
SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
183208
};
184209

185-
return repo.Commits.QueryBy(filter);
210+
return repository.Commits.QueryBy(filter);
186211
}
187212

188213
public IEnumerable<ICommit> GetMergedCommits(ICommit mergeCommit, int index)
@@ -208,7 +233,7 @@ private static ICommit GetMergedHead(ICommit mergeCommit)
208233
{
209234
var parents = mergeCommit.Parents.Skip(1).ToList();
210235
if (parents.Count > 1)
211-
throw new NotSupportedException("Mainline development does not support more than one merge source in a single commit yet");
236+
throw new NotSupportedException("GitVersion does not support more than one merge source in a single commit yet");
212237
return parents.Single();
213238
}
214239

‎src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeliveryVersionCalculator.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using GitVersion.Common;
21
using GitVersion.Logging;
32

43
namespace GitVersion.VersionCalculation;
54

6-
internal sealed class ContinuousDeliveryVersionCalculator(ILog log, IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext)
7-
: VersionCalculatorBase(log, repositoryStore, versionContext), IDeploymentModeCalculator
5+
internal sealed class ContinuousDeliveryVersionCalculator(
6+
ILog log, IIncrementStrategyFinder incrementStrategyFinder, Lazy<GitVersionContext> versionContext)
7+
: VersionCalculatorBase(log, incrementStrategyFinder, versionContext), IDeploymentModeCalculator
88
{
9-
public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource)
9+
public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource, string? label)
1010
{
1111
using (this.log.IndentLog("Using continuous delivery workflow to calculate the incremented version."))
1212
{
@@ -16,13 +16,13 @@ public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseV
1616
throw new WarningException("Continuous delivery requires a pre-release tag.");
1717
}
1818

19-
return CalculateInternal(semanticVersion, baseVersionSource);
19+
return CalculateInternal(semanticVersion, baseVersionSource, label);
2020
}
2121
}
2222

23-
private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource)
23+
private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource, string? label)
2424
{
25-
var buildMetaData = CreateVersionBuildMetaData(baseVersionSource);
25+
var buildMetaData = CreateVersionBuildMetaData(baseVersionSource, label);
2626

2727
return new SemanticVersion(semanticVersion)
2828
{

‎src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeploymentVersionCalculator.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
using GitVersion.Common;
21
using GitVersion.Logging;
32

43
namespace GitVersion.VersionCalculation;
54

6-
internal sealed class ContinuousDeploymentVersionCalculator(ILog log, IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext)
7-
: VersionCalculatorBase(log, repositoryStore, versionContext), IDeploymentModeCalculator
5+
internal sealed class ContinuousDeploymentVersionCalculator(
6+
ILog log, IIncrementStrategyFinder incrementStrategyFinder, Lazy<GitVersionContext> versionContext)
7+
: VersionCalculatorBase(log, incrementStrategyFinder, versionContext), IDeploymentModeCalculator
88
{
9-
public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource)
9+
public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource, string? label)
1010
{
1111
using (this.log.IndentLog("Using continuous deployment workflow to calculate the incremented version."))
1212
{
13-
return CalculateInternal(semanticVersion, baseVersionSource);
13+
return CalculateInternal(semanticVersion, baseVersionSource, label);
1414
}
1515
}
1616

17-
private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource)
17+
private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource, string? label)
1818
{
19-
var buildMetaData = CreateVersionBuildMetaData(baseVersionSource);
19+
var buildMetaData = CreateVersionBuildMetaData(baseVersionSource, label);
2020

2121
return new SemanticVersion(semanticVersion)
2222
{

‎src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
using GitVersion.Common;
21
using GitVersion.Logging;
32

43
namespace GitVersion.VersionCalculation;
54

6-
internal sealed class ManualDeploymentVersionCalculator(ILog log, IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext)
7-
: VersionCalculatorBase(log, repositoryStore, versionContext), IDeploymentModeCalculator
5+
internal sealed class ManualDeploymentVersionCalculator(
6+
ILog log, IIncrementStrategyFinder incrementStrategyFinder, Lazy<GitVersionContext> versionContext)
7+
: VersionCalculatorBase(log, incrementStrategyFinder, versionContext), IDeploymentModeCalculator
88
{
9-
public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource)
9+
public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseVersionSource, string? label)
1010
{
1111
using (this.log.IndentLog("Using manual deployment workflow to calculate the incremented version."))
1212
{
13-
return CalculateInternal(semanticVersion, baseVersionSource);
13+
return CalculateInternal(semanticVersion, baseVersionSource, label);
1414
}
1515
}
1616

17-
private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource)
17+
private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource, string? label)
1818
{
19-
var buildMetaData = CreateVersionBuildMetaData(baseVersionSource);
19+
var buildMetaData = CreateVersionBuildMetaData(baseVersionSource, label);
2020

2121
return new SemanticVersion(semanticVersion)
2222
{

0 commit comments

Comments
 (0)