Skip to content

Commit 1152953

Browse files
author
roeil
committed
refactor: restore VersionFilters in EffectiveConfiguration
1 parent 354790e commit 1152953

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

src/GitVersion.Core/Configuration/EffectiveConfiguration.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using GitVersion.Extensions;
2+
using GitVersion.Git;
23
using GitVersion.VersionCalculation;
34

45
namespace GitVersion.Configuration;
@@ -12,6 +13,8 @@ public record EffectiveConfiguration
1213
public EffectiveConfiguration(
1314
IGitVersionConfiguration configuration,
1415
IBranchConfiguration branchConfiguration,
16+
IGitRepository? repository = null,
17+
Lazy<GitVersionContext>? versionContext = null,
1518
EffectiveConfiguration? fallbackConfiguration = null)
1619
{
1720
configuration.NotNull();
@@ -67,6 +70,7 @@ public EffectiveConfiguration(
6770
PatchVersionBumpMessage = configuration.PatchVersionBumpMessage;
6871
NoBumpMessage = configuration.NoBumpMessage;
6972
CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing.Value;
73+
VersionFilters = versionContext != null && repository != null ? configuration.Ignore.ToFilters(repository, versionContext.Value) : [];
7074
Ignore = configuration.Ignore;
7175
TracksReleaseBranches = branchConfiguration.TracksReleaseBranches ?? false;
7276
IsReleaseBranch = branchConfiguration.IsReleaseBranch ?? false;
@@ -121,6 +125,8 @@ public EffectiveConfiguration(
121125

122126
public CommitMessageIncrementMode CommitMessageIncrementing { get; }
123127

128+
public IEnumerable<IVersionFilter> VersionFilters { get; }
129+
124130
public IIgnoreConfiguration Ignore { get; }
125131

126132
public string? CommitDateFormat { get; }

src/GitVersion.Core/Extensions/ConfigurationExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static EffectiveConfiguration GetEffectiveConfiguration(
2525
{
2626
fallbackConfiguration = parentConfiguration;
2727
}
28-
return new EffectiveConfiguration(configuration, branchConfiguration, fallbackConfiguration);
28+
return new EffectiveConfiguration(configuration, branchConfiguration, fallbackConfiguration: fallbackConfiguration);
2929
}
3030

3131
public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, IBranch branch)

src/GitVersion.Core/PublicAPI.Shipped.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ GitVersion.Configuration.EffectiveConfiguration.AssemblyVersioningScheme.get ->
6565
GitVersion.Configuration.EffectiveConfiguration.CommitDateFormat.get -> string?
6666
GitVersion.Configuration.EffectiveConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode
6767
GitVersion.Configuration.EffectiveConfiguration.DeploymentMode.get -> GitVersion.VersionCalculation.DeploymentMode
68-
GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.Configuration.IBranchConfiguration! branchConfiguration, GitVersion.Configuration.EffectiveConfiguration? fallbackConfiguration = null) -> void
6968
GitVersion.Configuration.EffectiveConfiguration.Ignore.get -> GitVersion.Configuration.IIgnoreConfiguration!
7069
GitVersion.Configuration.EffectiveConfiguration.Increment.get -> GitVersion.IncrementStrategy
7170
GitVersion.Configuration.EffectiveConfiguration.IsMainBranch.get -> bool
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#nullable enable
2+
GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.Configuration.IBranchConfiguration! branchConfiguration, GitVersion.Git.IGitRepository? repository = null, System.Lazy<GitVersion.GitVersionContext!>? versionContext = null, GitVersion.Configuration.EffectiveConfiguration? fallbackConfiguration = null) -> void
3+
GitVersion.Configuration.EffectiveConfiguration.VersionFilters.get -> System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.IVersionFilter!>!
24
GitVersion.Configuration.IIgnoreConfiguration.Paths.get -> System.Collections.Generic.IReadOnlyCollection<string!>!
35
GitVersion.Git.IGitRepository.FindPatchPaths(GitVersion.Git.ICommit! commit, string? tagPrefix) -> System.Collections.Generic.IEnumerable<string!>?

0 commit comments

Comments
 (0)