Skip to content

Commit ea95b5b

Browse files
committed
refactors tag prefix configuration
Renames `TagPrefix` to `TagPrefixPattern` for clarity.
1 parent 5b12277 commit ea95b5b

File tree

9 files changed

+21
-17
lines changed

9 files changed

+21
-17
lines changed

src/GitVersion.Core.Tests/MergeMessageTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ public void EmptyTagPrefix(string? prefix)
3535
{
3636
// Arrange
3737
const string message = "Updated some code.";
38-
var configuration = GitHubFlowConfigurationBuilder.New.WithTagPrefixPattern(prefix).Build();
38+
var configurationBuilder = GitHubFlowConfigurationBuilder.New.WithTagPrefixPattern(prefix);
3939

4040
// Act
41-
var sut = new MergeMessage(message, configuration);
41+
var sut = new MergeMessage(message, configurationBuilder.Build());
4242

4343
// Assert
4444
sut.TargetBranch.ShouldBeNull();

src/GitVersion.Core/Configuration/EffectiveConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public EffectiveConfiguration(
5252
AssemblyVersioningFormat = configuration.AssemblyVersioningFormat;
5353
AssemblyFileVersioningFormat = configuration.AssemblyFileVersioningFormat;
5454
DeploymentMode = branchConfiguration.DeploymentMode.Value;
55-
TagPrefix = configuration.TagPrefixPattern;
55+
TagPrefixPattern = configuration.TagPrefixPattern;
5656
VersionInBranchPattern = configuration.VersionInBranchPattern;
5757
Label = branchConfiguration.Label;
5858
NextVersion = configuration.NextVersion;
@@ -90,7 +90,7 @@ public EffectiveConfiguration(
9090
public string? AssemblyVersioningFormat { get; }
9191
public string? AssemblyFileVersioningFormat { get; }
9292

93-
public string? TagPrefix { get; }
93+
public string? TagPrefixPattern { get; }
9494

9595
public string? VersionInBranchPattern { get; }
9696

src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ namespace GitVersion.Configuration;
66

77
public static class ReferenceNameExtensions
88
{
9-
public static bool TryGetSemanticVersion(this ReferenceName source, out (SemanticVersion Value, string? Name) result, EffectiveConfiguration configuration)
10-
=> source.TryGetSemanticVersion(out result, configuration.VersionInBranchPattern, configuration.TagPrefix, configuration.SemanticVersionFormat);
9+
public static bool TryGetSemanticVersion(this ReferenceName source, EffectiveConfiguration configuration, out (SemanticVersion Value, string? Name) result)
10+
=> source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
1111

12-
public static bool TryGetSemanticVersion(this ReferenceName source, out (SemanticVersion Value, string? Name) result, IGitVersionConfiguration configuration)
13-
=> source.TryGetSemanticVersion(out result, configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat);
12+
public static bool TryGetSemanticVersion(this ReferenceName source, IGitVersionConfiguration configuration, out (SemanticVersion Value, string? Name) result)
13+
=> source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
1414

15-
private static bool TryGetSemanticVersion(this ReferenceName referenceName, out (SemanticVersion Value, string? Name) result,
16-
string? versionPatternPattern,
17-
string? tagPrefix,
18-
SemanticVersionFormat format)
15+
private static bool TryGetSemanticVersion(this ReferenceName referenceName,
16+
string? versionPatternPattern,
17+
string? tagPrefix,
18+
SemanticVersionFormat format, out (SemanticVersion Value, string? Name) result)
1919
{
2020
var versionPatternRegex = RegexPatterns.Cache.GetOrAdd(GetVersionInBranchPattern(versionPatternPattern));
2121
result = default;

src/GitVersion.Core/MergeMessage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public MergeMessage(string mergeMessage, IGitVersionConfiguration configuration)
5353
PullRequestNumber = pullNumber;
5454
}
5555

56-
Version = MergedBranch?.TryGetSemanticVersion(out var result, configuration) == true ? result.Value : null;
56+
Version = MergedBranch?.TryGetSemanticVersion(configuration, out var result) == true ? result.Value : null;
5757

5858
break;
5959
}

src/GitVersion.Core/PublicAPI.Unshipped.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#nullable enable
2+
GitVersion.Configuration.EffectiveConfiguration.TagPrefixPattern.get -> string?
23
GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!)
34
GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyFileVersion(GitVersion.Configuration.AssemblyFileVersioningScheme scheme) -> string?
45
GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyVersion(GitVersion.Configuration.AssemblyVersioningScheme scheme) -> string?
@@ -42,6 +43,9 @@ GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(Git
4243
GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
4344
GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
4445
GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(string! format, params object?[]! args) -> void
46+
static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! referenceName, string? versionPatternPattern, string? tagPrefix, GitVersion.SemanticVersionFormat format, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
47+
static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, GitVersion.Configuration.EffectiveConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
48+
static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, GitVersion.Configuration.IGitVersionConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
4549
static GitVersion.Extensions.FileSystemExtensions.FindGitDir(this System.IO.Abstractions.IFileSystem! fileSystem, string? path) -> (string! GitDirectory, string! WorkingTreeDirectory)?
4650
static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
4751
static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, string! format, params object?[]! args) -> void

src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public VersionField DetermineIncrementedField(
7373
}
7474

7575
IEnumerable<ICommit> commits = GetCommitHistory(
76-
tagPrefix: configuration.TagPrefix,
76+
tagPrefix: configuration.TagPrefixPattern,
7777
semanticVersionFormat: configuration.SemanticVersionFormat,
7878
baseVersionSource: baseVersionSource,
7979
currentCommit: currentCommit,

src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public IEnumerable<IBaseVersionIncrement> GetIncrements(
3030
MainlineIteration iteration, MainlineCommit commit, MainlineContext context)
3131
{
3232
var effectiveConfiguration = commit.GetEffectiveConfiguration(context.Configuration);
33-
if (!commit.BranchName.TryGetSemanticVersion(out var element, effectiveConfiguration)) yield break;
33+
if (!commit.BranchName.TryGetSemanticVersion(effectiveConfiguration, out var element)) yield break;
3434
context.AlternativeSemanticVersions.Add(element.Value);
3535
}
3636
}

src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public virtual IEnumerable<IBaseVersionIncrement> GetIncrements(
1717

1818
var effectiveConfiguration = iteration.GetEffectiveConfiguration(context.Configuration);
1919
if (iteration.GetEffectiveConfiguration(context.Configuration).IsReleaseBranch
20-
&& iteration.BranchName.TryGetSemanticVersion(out var element, effectiveConfiguration))
20+
&& iteration.BranchName.TryGetSemanticVersion(effectiveConfiguration, out var element))
2121
{
2222
context.AlternativeSemanticVersions.Add(element.Value);
2323
}

src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public bool TryGetBaseVersion(EffectiveBranchConfiguration configuration, [NotNu
3535

3636
foreach (var branch in new[] { Context.CurrentBranch, configuration.Branch })
3737
{
38-
if (!branch.Name.TryGetSemanticVersion(out var result, configuration.Value)) continue;
38+
if (!branch.Name.TryGetSemanticVersion(configuration.Value, out var result)) continue;
3939
string? branchNameOverride = null;
4040
if (!result.Name.IsNullOrEmpty() && (Context.CurrentBranch.Name.Equals(branch.Name)
4141
|| Context.Configuration.GetBranchConfiguration(Context.CurrentBranch.Name).Label is null))

0 commit comments

Comments
 (0)