Skip to content

Commit 72fa337

Browse files
committed
Move TryGetSemanticVersion to ReferenceNameExtensions class
1 parent d88aaa2 commit 72fa337

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System.Diagnostics.CodeAnalysis;
2+
using GitVersion.Git;
3+
4+
namespace GitVersion.Configuration;
5+
6+
public static class ReferenceNameExtensions
7+
{
8+
public static bool TryGetSemanticVersion(
9+
this ReferenceName source, [NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, IGitVersionConfiguration configuration)
10+
=> source.TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);
11+
12+
public static bool TryGetSemanticVersion(
13+
this ReferenceName source, [NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, EffectiveConfiguration configuration)
14+
=> source.TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);
15+
}

src/GitVersion.Core/Git/ReferenceName.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Diagnostics.CodeAnalysis;
22
using System.Text.RegularExpressions;
3-
using GitVersion.Configuration;
43
using GitVersion.Extensions;
54
using GitVersion.Helpers;
65

@@ -78,12 +77,6 @@ public static ReferenceName FromBranchName(string branchName)
7877
public override int GetHashCode() => equalityHelper.GetHashCode(this);
7978
public override string ToString() => Friendly;
8079

81-
public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, IGitVersionConfiguration configuration)
82-
=> TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);
83-
84-
public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, EffectiveConfiguration configuration)
85-
=> TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);
86-
8780
public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value, string? Name) result,
8881
Regex versionPatternRegex,
8982
string? tagPrefix,

src/GitVersion.Core/PublicAPI.Unshipped.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ GitVersion.Configuration.IPreventIncrementConfiguration
146146
GitVersion.Configuration.IPreventIncrementConfiguration.OfMergedBranch.get -> bool?
147147
GitVersion.Configuration.IPreventIncrementConfiguration.WhenBranchMerged.get -> bool?
148148
GitVersion.Configuration.IPreventIncrementConfiguration.WhenCurrentCommitTagged.get -> bool?
149+
GitVersion.Configuration.ReferenceNameExtensions
149150
GitVersion.ConfigurationInfo
150151
GitVersion.ConfigurationInfo.ConfigurationFile -> string?
151152
GitVersion.ConfigurationInfo.OverrideConfiguration -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>?
@@ -285,8 +286,6 @@ GitVersion.Git.ReferenceName.IsPullRequest.get -> bool
285286
GitVersion.Git.ReferenceName.IsRemoteBranch.get -> bool
286287
GitVersion.Git.ReferenceName.IsTag.get -> bool
287288
GitVersion.Git.ReferenceName.ReferenceName(string! canonical) -> void
288-
GitVersion.Git.ReferenceName.TryGetSemanticVersion(out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.EffectiveConfiguration! configuration) -> bool
289-
GitVersion.Git.ReferenceName.TryGetSemanticVersion(out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> bool
290289
GitVersion.Git.ReferenceName.TryGetSemanticVersion(out (GitVersion.SemanticVersion! Value, string? Name) result, System.Text.RegularExpressions.Regex! versionPatternRegex, string? tagPrefix, GitVersion.SemanticVersionFormat format) -> bool
291290
GitVersion.Git.ReferenceName.WithoutOrigin.get -> string!
292291
GitVersion.Git.RefSpecDirection
@@ -741,6 +740,8 @@ override GitVersion.VersionCalculation.BaseVersionOperator.ToString() -> string!
741740
override GitVersion.VersionCalculation.NextVersion.Equals(object? other) -> bool
742741
override GitVersion.VersionCalculation.NextVersion.GetHashCode() -> int
743742
override GitVersion.VersionCalculation.NextVersion.ToString() -> string!
743+
static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.EffectiveConfiguration! configuration) -> bool
744+
static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> bool
744745
static GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.GetAssemblyFileVersion(this GitVersion.SemanticVersion! sv, GitVersion.Configuration.AssemblyFileVersioningScheme scheme) -> string?
745746
static GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.GetAssemblyVersion(this GitVersion.SemanticVersion! sv, GitVersion.Configuration.AssemblyVersioningScheme scheme) -> string?
746747
static GitVersion.Extensions.CommonExtensions.NotNull<T>(this T? value, string! name = "") -> T!

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using GitVersion.Configuration;
2+
13
namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
24

35
internal sealed class FirstCommitOnRelease : ITrunkBasedIncrementer

0 commit comments

Comments
 (0)