Skip to content

Finalizing the configuration of GitFlow and GitHubFlow workflow and align with the Mainline version strategy #4009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HHobeck merged 7 commits into from
May 7, 2024
Merged

Finalizing the configuration of GitFlow and GitHubFlow workflow and align with the Mainline version strategy #4009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3fd592f
Finalizing the configuration of GitFlow and GitHubFlow workflow and a…
HHobeck Apr 17, 2024
1a14a54
Update configuration.md
HHobeck Apr 17, 2024
dca98c4
Refactor unit tests
HHobeck Apr 17, 2024
ec20afc
Move TryGetSemanticVersion to ReferenceNameExtensions class
HHobeck Apr 18, 2024
84c4ab3
Integrate code review remarks of asbjornu.
HHobeck Apr 19, 2024
83203a8
Integrat code review remarks
HHobeck May 6, 2024
4f2fa29
Integrate code review remarks
HHobeck May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move TryGetSemanticVersion to ReferenceNameExtensions class
  • Loading branch information
@HHobeck
HHobeck committed May 6, 2024
commit ec20afc770756b0c778079d41577d20552d4a6bf
15 changes: 15 additions & 0 deletions src/GitVersion.Core/Configuration/ReferenceNameExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using System.Diagnostics.CodeAnalysis;
using GitVersion.Git;

namespace GitVersion.Configuration;

public static class ReferenceNameExtensions
{
public static bool TryGetSemanticVersion(
this ReferenceName source, [NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, IGitVersionConfiguration configuration)
=> source.TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);

public static bool TryGetSemanticVersion(
this ReferenceName source, [NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, EffectiveConfiguration configuration)
=> source.TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);
}
7 changes: 0 additions & 7 deletions src/GitVersion.Core/Git/ReferenceName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.RegularExpressions;
using GitVersion.Configuration;
using GitVersion.Extensions;
using GitVersion.Helpers;

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

public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, IGitVersionConfiguration configuration)
=> TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);

public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value, string? Name) result, EffectiveConfiguration configuration)
=> TryGetSemanticVersion(out result, configuration.VersionInBranchRegex, configuration.TagPrefix, configuration.SemanticVersionFormat);

public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value, string? Name) result,
Regex versionPatternRegex,
string? tagPrefix,
Expand Down
5 changes: 3 additions & 2 deletions src/GitVersion.Core/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ GitVersion.Configuration.IPreventIncrementConfiguration
GitVersion.Configuration.IPreventIncrementConfiguration.OfMergedBranch.get -> bool?
GitVersion.Configuration.IPreventIncrementConfiguration.WhenBranchMerged.get -> bool?
GitVersion.Configuration.IPreventIncrementConfiguration.WhenCurrentCommitTagged.get -> bool?
GitVersion.Configuration.ReferenceNameExtensions
GitVersion.ConfigurationInfo
GitVersion.ConfigurationInfo.ConfigurationFile -> string?
GitVersion.ConfigurationInfo.OverrideConfiguration -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>?
Expand Down Expand Up @@ -285,8 +286,6 @@ GitVersion.Git.ReferenceName.IsPullRequest.get -> bool
GitVersion.Git.ReferenceName.IsRemoteBranch.get -> bool
GitVersion.Git.ReferenceName.IsTag.get -> bool
GitVersion.Git.ReferenceName.ReferenceName(string! canonical) -> void
GitVersion.Git.ReferenceName.TryGetSemanticVersion(out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.EffectiveConfiguration! configuration) -> bool
GitVersion.Git.ReferenceName.TryGetSemanticVersion(out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> bool
GitVersion.Git.ReferenceName.TryGetSemanticVersion(out (GitVersion.SemanticVersion! Value, string? Name) result, System.Text.RegularExpressions.Regex! versionPatternRegex, string? tagPrefix, GitVersion.SemanticVersionFormat format) -> bool
GitVersion.Git.ReferenceName.WithoutOrigin.get -> string!
GitVersion.Git.RefSpecDirection
Expand Down Expand Up @@ -741,6 +740,8 @@ override GitVersion.VersionCalculation.BaseVersionOperator.ToString() -> string!
override GitVersion.VersionCalculation.NextVersion.Equals(object? other) -> bool
override GitVersion.VersionCalculation.NextVersion.GetHashCode() -> int
override GitVersion.VersionCalculation.NextVersion.ToString() -> string!
static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.EffectiveConfiguration! configuration) -> bool
static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> bool
static GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.GetAssemblyFileVersion(this GitVersion.SemanticVersion! sv, GitVersion.Configuration.AssemblyFileVersioningScheme scheme) -> string?
static GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.GetAssemblyVersion(this GitVersion.SemanticVersion! sv, GitVersion.Configuration.AssemblyVersioningScheme scheme) -> string?
static GitVersion.Extensions.CommonExtensions.NotNull<T>(this T? value, string! name = "") -> T!
Expand Down
2 changes: 2 additions & 0 deletions src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/FirstCommitOnRelease.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using GitVersion.Configuration;

namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;

internal sealed class FirstCommitOnRelease : ITrunkBasedIncrementer
Expand Down