Skip to content

Commit b82e2cd

Browse files
committed
Fix ShouldFilterVersion unit test
1 parent af4eeea commit b82e2cd

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,11 +477,11 @@ private record TestIgnoreConfig : IgnoreConfiguration
477477
{
478478
private readonly IVersionFilter filter;
479479

480-
public virtual bool IsEmpty => false;
480+
public override bool IsEmpty => false;
481481

482482
public TestIgnoreConfig(IVersionFilter filter) => this.filter = filter;
483483

484-
public virtual IEnumerable<IVersionFilter> ToFilters()
484+
public override IEnumerable<IVersionFilter> ToFilters()
485485
{
486486
yield return this.filter;
487487
}

src/GitVersion.Core/Configuration/IIgnoreConfiguration.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ public interface IIgnoreConfiguration
88

99
IReadOnlyList<string> Shas { get; }
1010

11-
public IEnumerable<IVersionFilter> ToFilters()
12-
{
13-
if (Shas.Any()) yield return new ShaVersionFilter(Shas);
14-
if (Before.HasValue) yield return new MinDateVersionFilter(Before.Value);
15-
}
11+
IEnumerable<IVersionFilter> ToFilters();
1612

17-
public bool IsEmpty => Before == null && !Shas.Any();
13+
bool IsEmpty { get; }
1814
}
1915
}

src/GitVersion.Core/Configuration/IgnoreConfiguration.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
using GitVersion.Attributes;
2+
using GitVersion.VersionCalculation;
23

34
namespace GitVersion.Configuration;
45

6+
57
public record IgnoreConfiguration : IIgnoreConfiguration
68
{
79
[JsonPropertyName("commits-before")]
@@ -15,4 +17,14 @@ public record IgnoreConfiguration : IIgnoreConfiguration
1517
[JsonPropertyName("sha")]
1618
[JsonPropertyDescription("A sequence of SHAs to be excluded from the version calculations.")]
1719
public List<string> Shas { get; init; } = new();
20+
21+
[JsonIgnore]
22+
public virtual bool IsEmpty => Before == null && !Shas.Any();
23+
24+
public virtual IEnumerable<IVersionFilter> ToFilters()
25+
{
26+
if (Shas.Any()) yield return new ShaVersionFilter(Shas);
27+
if (Before.HasValue) yield return new MinDateVersionFilter(Before.Value);
28+
}
29+
1830
}

src/GitVersion.Core/PublicAPI.Unshipped.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,8 @@ virtual GitVersion.Configuration.BranchConfigurationBuilder.WithTrackMergeMessag
12241224
virtual GitVersion.Configuration.BranchConfigurationBuilder.WithTrackMergeTarget(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
12251225
virtual GitVersion.Configuration.BranchConfigurationBuilder.WithTracksReleaseBranches(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
12261226
virtual GitVersion.Configuration.BranchConfigurationBuilder.WithVersioningMode(GitVersion.VersionCalculation.VersioningMode? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
1227+
virtual GitVersion.Configuration.IgnoreConfiguration.IsEmpty.get -> bool
1228+
virtual GitVersion.Configuration.IgnoreConfiguration.ToFilters() -> System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.IVersionFilter!>!
12271229
virtual GitVersion.VersionCalculation.EffectiveBranchConfigurationFinder.GetConfigurations(GitVersion.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.Configuration.EffectiveBranchConfiguration!>!
12281230
virtual GitVersion.VersionCalculation.FallbackVersionStrategy.GetBaseVersions(GitVersion.Configuration.EffectiveBranchConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.BaseVersion!>!
12291231
virtual GitVersion.VersionCalculation.NextVersionCalculator.FindVersion() -> GitVersion.VersionCalculation.NextVersion!

0 commit comments

Comments
 (0)