Skip to content

Commit af4eeea

Browse files
HHobeckHHobeck
committed
Change the usage of GitVersionConfiguration to IGitVersionConfiguration where possible.
1 parent 95075cb commit af4eeea

27 files changed

+122
-116
lines changed

‎src/GitVersion.Core.Tests/Configuration/ConfigurationProviderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void CanWriteOutEffectiveConfiguration()
164164
{
165165
var configuration = this.configurationProvider.ProvideForDirectory(this.repoPath);
166166

167-
configuration.ToString().ShouldMatchApproved();
167+
configuration.ToString()!.ShouldMatchApproved();
168168
}
169169

170170
[Test]

‎src/GitVersion.Core.Tests/Configuration/IgnoreConfigurationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void WhenBadDateFormatShouldFail()
7373
[Test]
7474
public void NewInstanceShouldBeEmpty()
7575
{
76-
var ignoreConfig = new IgnoreConfiguration();
76+
IIgnoreConfiguration ignoreConfig = new IgnoreConfiguration();
7777

7878
ignoreConfig.IsEmpty.ShouldBeTrue();
7979
}

‎src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,14 @@ public static IBranch FindBranch(this IGitRepository repository, string branchNa
4949
=> repository.Branches.FirstOrDefault(branch => branch.Name.WithoutOrigin == branchName)
5050
?? throw new GitVersionException($"Branch {branchName} not found");
5151

52-
public static void DumpGraph(this IGitRepository repository, Action<string>? writer = null, int? maxCommits = null) => GitExtensions.DumpGraph(repository.Path, writer, maxCommits);
52+
public static void DumpGraph(this IGitRepository repository, Action<string>? writer = null, int? maxCommits = null)
53+
=> GitExtensions.DumpGraph(repository.Path, writer, maxCommits);
5354

54-
public static void DumpGraph(this IRepository repository, Action<string>? writer = null, int? maxCommits = null) => GitExtensions.DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);
55+
public static void DumpGraph(this IRepository repository, Action<string>? writer = null, int? maxCommits = null)
56+
=> GitExtensions.DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);
5557

56-
public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, GitVersionConfiguration? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
58+
public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, IGitVersionConfiguration? configuration = null,
59+
IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
5760
{
5861
repository ??= fixture.Repository;
5962
configuration ??= GitFlowConfigurationBuilder.New.Build();
@@ -106,7 +109,8 @@ public static void WriteVersionVariables(this RepositoryFixtureBase fixture, str
106109
writer.Write(versionInfo.ToString());
107110
}
108111

109-
public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, GitVersionConfiguration? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
112+
public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver,
113+
IGitVersionConfiguration? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
110114
{
111115
repository ??= fixture.Repository;
112116

‎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 override bool IsEmpty => false;
480+
public virtual bool IsEmpty => false;
481481

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

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

‎src/GitVersion.Core/Configuration/Abstractions/IConfigurationProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ namespace GitVersion.Configuration;
22

33
public interface IConfigurationProvider
44
{
5-
GitVersionConfiguration Provide(IReadOnlyDictionary<object, object?>? overrideConfiguration = null);
5+
IGitVersionConfiguration Provide(IReadOnlyDictionary<object, object?>? overrideConfiguration = null);
66
void Init(string workingDirectory);
77
}

‎src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public virtual TConfigurationBuilder WithSemanticVersionFormat(SemanticVersionFo
191191
return (TConfigurationBuilder)this;
192192
}
193193

194-
public virtual TConfigurationBuilder WithMergeMessageFormats(Dictionary<string, string> value)
194+
public virtual TConfigurationBuilder WithMergeMessageFormats(IReadOnlyDictionary<string, string> value)
195195
{
196196
this.mergeMessageFormats = new(value);
197197
return (TConfigurationBuilder)this;

‎src/GitVersion.Core/Configuration/ConfigurationExtensions.cs

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

77
public static class ConfigurationExtensions
88
{
9-
public static EffectiveConfiguration GetEffectiveConfiguration(this GitVersionConfiguration configuration, IBranch branch)
9+
public static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, IBranch branch)
1010
=> GetEffectiveConfiguration(configuration, branch.NotNull().Name);
1111

12-
private static EffectiveConfiguration GetEffectiveConfiguration(this GitVersionConfiguration configuration, ReferenceName branchName)
12+
private static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
1313
{
1414
IBranchConfiguration branchConfiguration = configuration.GetBranchConfiguration(branchName);
1515
return new EffectiveConfiguration(configuration, branchConfiguration);
1616
}
1717

18-
public static IBranchConfiguration GetBranchConfiguration(this GitVersionConfiguration configuration, IBranch branch)
18+
public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, IBranch branch)
1919
=> GetBranchConfiguration(configuration, branch.NotNull().Name);
2020

21-
public static IBranchConfiguration GetBranchConfiguration(this GitVersionConfiguration configuration, ReferenceName branchName)
21+
public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
2222
{
2323
var branchConfiguration = GetBranchConfigurations(configuration, branchName.WithoutOrigin).FirstOrDefault();
2424
branchConfiguration ??= new BranchConfiguration()
@@ -30,7 +30,7 @@ public static IBranchConfiguration GetBranchConfiguration(this GitVersionConfigu
3030
return branchConfiguration;
3131
}
3232

33-
private static IEnumerable<IBranchConfiguration> GetBranchConfigurations(GitVersionConfiguration configuration, string branchName)
33+
private static IEnumerable<IBranchConfiguration> GetBranchConfigurations(IGitVersionConfiguration configuration, string branchName)
3434
{
3535
IBranchConfiguration? unknownBranchConfiguration = null;
3636
foreach ((string key, IBranchConfiguration branchConfiguration) in configuration.Branches)
@@ -51,12 +51,12 @@ private static IEnumerable<IBranchConfiguration> GetBranchConfigurations(GitVers
5151
if (unknownBranchConfiguration != null) yield return unknownBranchConfiguration;
5252
}
5353

54-
public static BranchConfiguration GetFallbackBranchConfiguration(this GitVersionConfiguration configuration) => configuration;
54+
public static IBranchConfiguration GetFallbackBranchConfiguration(this IGitVersionConfiguration configuration) => configuration;
5555

56-
public static bool IsReleaseBranch(this GitVersionConfiguration configuration, IBranch branch)
56+
public static bool IsReleaseBranch(this IGitVersionConfiguration configuration, IBranch branch)
5757
=> IsReleaseBranch(configuration, branch.NotNull().Name);
5858

59-
public static bool IsReleaseBranch(this GitVersionConfiguration configuration, ReferenceName branchName)
59+
public static bool IsReleaseBranch(this IGitVersionConfiguration configuration, ReferenceName branchName)
6060
=> configuration.GetBranchConfiguration(branchName).IsReleaseBranch ?? false;
6161

6262
public static string GetBranchSpecificTag(this EffectiveConfiguration configuration, ILog log, string? branchFriendlyName,
@@ -129,6 +129,6 @@ public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(thi
129129
return null;
130130
}
131131

132-
public static List<KeyValuePair<string, IBranchConfiguration>> GetReleaseBranchConfiguration(this GitVersionConfiguration configuration) =>
133-
((IGitVersionConfiguration)configuration).Branches.Where(b => b.Value.IsReleaseBranch == true).ToList();
132+
public static List<KeyValuePair<string, IBranchConfiguration>> GetReleaseBranchConfiguration(this IGitVersionConfiguration configuration) =>
133+
configuration.Branches.Where(b => b.Value.IsReleaseBranch == true).ToList();
134134
}

‎src/GitVersion.Core/Configuration/ConfigurationFileLocator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ bool HasConfigurationFileAt(string fileName, out string? configFile)
7070
|| HasConfigurationFileAt(DefaultAlternativeFileName, out path);
7171
}
7272

73-
private static void VerifyReadConfig(GitVersionConfiguration configuration)
73+
private static void VerifyReadConfig(IGitVersionConfiguration configuration)
7474
{
7575
// Verify no branches are set to mainline mode
7676
if (configuration.Branches.Any(b => b.Value.VersioningMode == VersioningMode.Mainline))

‎src/GitVersion.Core/Configuration/ConfigurationHelper.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace GitVersion.Configuration;
55
internal class ConfigurationHelper
66
{
77
private string Yaml => this._yaml ??= this._dictionary == null
8-
? ConfigurationSerializer.Serialize(this._configuration!)
8+
? ConfigurationSerializer.Serialize(this.configuration!)
99
: ConfigurationSerializer.Serialize(this._dictionary);
1010
private string? _yaml;
1111

@@ -15,22 +15,22 @@ internal class ConfigurationHelper
1515
{
1616
if (this._dictionary == null)
1717
{
18-
this._yaml ??= ConfigurationSerializer.Serialize(this._configuration!);
18+
this._yaml ??= ConfigurationSerializer.Serialize(this.configuration!);
1919
this._dictionary = ConfigurationSerializer.Deserialize<Dictionary<object, object?>>(this._yaml!);
2020
}
2121
return this._dictionary;
2222
}
2323
}
2424
private IReadOnlyDictionary<object, object?>? _dictionary;
2525

26-
public GitVersionConfiguration Configuration => this._configuration ??= ConfigurationSerializer.Deserialize<GitVersionConfiguration>(Yaml);
27-
private GitVersionConfiguration? _configuration;
26+
public GitVersionConfiguration Configuration => this.configuration ??= ConfigurationSerializer.Deserialize<GitVersionConfiguration>(Yaml);
27+
private GitVersionConfiguration? configuration;
2828

2929
internal ConfigurationHelper(string yaml) => this._yaml = yaml.NotNull();
3030

3131
internal ConfigurationHelper(IReadOnlyDictionary<object, object?> dictionary) => this._dictionary = dictionary.NotNull();
3232

33-
public ConfigurationHelper(GitVersionConfiguration configuration) => this._configuration = configuration.NotNull();
33+
public ConfigurationHelper(GitVersionConfiguration configuration) => this.configuration = configuration.NotNull();
3434

3535
public void Override(IReadOnlyDictionary<object, object?> value)
3636
{
@@ -42,7 +42,7 @@ public void Override(IReadOnlyDictionary<object, object?> value)
4242
Merge(dictionary, value);
4343
this._dictionary = dictionary;
4444
this._yaml = null;
45-
this._configuration = null;
45+
this.configuration = null;
4646
}
4747
}
4848

‎src/GitVersion.Core/Configuration/ConfigurationProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public ConfigurationProvider(IFileSystem fileSystem, ILog log, IConfigurationFil
2626
this.configInitWizard = configInitWizard.NotNull();
2727
}
2828

29-
public GitVersionConfiguration Provide(IReadOnlyDictionary<object, object?>? overrideConfiguration)
29+
public IGitVersionConfiguration Provide(IReadOnlyDictionary<object, object?>? overrideConfiguration)
3030
{
3131
var gitVersionOptions = this.options.Value;
3232
var workingDirectory = gitVersionOptions.WorkingDirectory;
@@ -54,14 +54,14 @@ public void Init(string workingDirectory)
5454
stream.Flush();
5555
}
5656

57-
internal GitVersionConfiguration ProvideForDirectory(string? workingDirectory,
57+
internal IGitVersionConfiguration ProvideForDirectory(string? workingDirectory,
5858
IReadOnlyDictionary<object, object?>? overrideConfiguration = null)
5959
{
6060
this.configFileLocator.TryGetConfigurationFile(workingDirectory, null, out var configFilePath);
6161
return ProvideConfiguration(configFilePath, overrideConfiguration);
6262
}
6363

64-
private GitVersionConfiguration ProvideConfiguration(string? configFile,
64+
private IGitVersionConfiguration ProvideConfiguration(string? configFile,
6565
IReadOnlyDictionary<object, object?>? overrideConfiguration = null)
6666
{
6767
var overrideConfigurationFromFile = this.configFileLocator.ReadOverrideConfiguration(configFile);

0 commit comments

Comments
 (0)