Rename Config to Configuration and ConfigInfo to ConfigurationContext

Author: HHobeck

src/GitVersion.App/Arguments.cs

@@ -60,9 +60,9 @@ public GitVersionOptions ToOptions()
 
             ConfigInfo =
             {
-                ConfigFile = ConfigFile,
+                ConfigurationFile = ConfigFile,
                 OverrideConfiguration = OverrideConfig,
-                ShowConfig = ShowConfig
+                ShowConfiguration = ShowConfig
             },
 
             RepositoryInfo =

src/GitVersion.App/GitVersionExecutor.cs

@@ -152,7 +152,7 @@ private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int e
             return true;
         }
 
-        if (gitVersionOptions.ConfigInfo.ShowConfig)
+        if (gitVersionOptions.ConfigInfo.ShowConfiguration)
         {
             var configuration = this.configurationProvider.Provide();
             this.console.WriteLine(configuration.ToString());

src/GitVersion.Core.Tests/Configuration/ConfigurationFileLocatorTests.cs

@@ -84,7 +84,7 @@ public class NamedConfigurationFileLocatorTests : TestBase
         [SetUp]
         public void Setup()
         {
-            this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "my-config.yaml" } };
+            this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigurationFile = "my-config.yaml" } };
             this.repoPath = DefaultRepoPath;
             this.workingPath = DefaultWorkingPath;
 
@@ -140,7 +140,7 @@ public void DoNotThrowWhenConfigFileIsInSubDirectoryOfRepoPath()
         {
             this.workingPath = DefaultRepoPath;
 
-            this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "./src/my-config.yaml" } };
+            this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigurationFile = "./src/my-config.yaml" } };
             var sp = GetServiceProvider(this.gitVersionOptions);
             this.configFileLocator = sp.GetRequiredService<IConfigurationFileLocator>();
             this.fileSystem = sp.GetRequiredService<IFileSystem>();
@@ -200,8 +200,8 @@ public void ThrowsExceptionOnCustomYmlFileDoesNotExist()
 
             var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
 
-            var workingPathFileConfig = PathHelper.Combine(this.workingPath, this.gitVersionOptions.ConfigInfo.ConfigFile);
-            var repoPathFileConfig = PathHelper.Combine(this.repoPath, this.gitVersionOptions.ConfigInfo.ConfigFile);
+            var workingPathFileConfig = PathHelper.Combine(this.workingPath, this.gitVersionOptions.ConfigInfo.ConfigurationFile);
+            var repoPathFileConfig = PathHelper.Combine(this.repoPath, this.gitVersionOptions.ConfigInfo.ConfigurationFile);
             var expectedMessage = $"The configuration file was not found at '{workingPathFileConfig}' or '{repoPathFileConfig}'";
             exception.Message.ShouldBe(expectedMessage);
         }

src/GitVersion.Core/ConfigInfo.cs

@@ -12,7 +12,7 @@ public class ConfigurationFileLocator : IConfigurationFileLocator
     public ConfigurationFileLocator(IFileSystem fileSystem, IOptions<GitVersionOptions> options)
     {
         this.fileSystem = fileSystem;
-        var configFile = options.Value.ConfigInfo.ConfigFile;
+        var configFile = options.Value.ConfigInfo.ConfigurationFile;
         FilePath = !configFile.IsNullOrWhiteSpace() ? configFile : DefaultFileName;
     }
 

src/GitVersion.Core/Configuration/ConfigurationFileLocator.cs

@@ -0,0 +1,8 @@
+namespace GitVersion;
+
+public class ConfigurationContext
+{
+    public string? ConfigurationFile;
+    public IReadOnlyDictionary<object, object?>? OverrideConfiguration;
+    public bool ShowConfiguration;
+}

src/GitVersion.Core/ConfigurationContext.cs

@@ -8,7 +8,7 @@ public class GitVersionOptions
 
     public AssemblyInfoData AssemblyInfo { get; } = new();
     public AuthenticationInfo Authentication { get; } = new();
-    public ConfigInfo ConfigInfo { get; } = new();
+    public ConfigurationContext ConfigInfo { get; } = new();
     public RepositoryInfo RepositoryInfo { get; } = new();
     public WixInfo WixInfo { get; } = new();
     public Settings Settings { get; } = new();

src/GitVersion.Core/GitVersionOptions.cs

@@ -79,11 +79,6 @@ GitVersion.Common.IRepositoryStore.GetTargetBranch(string? targetBranchName) ->
 GitVersion.Common.IRepositoryStore.GetValidVersionTags(string? tagPrefixRegex, GitVersion.SemanticVersionFormat versionFormat, System.DateTimeOffset? olderThan = null) -> System.Collections.Generic.IEnumerable<(GitVersion.ITag! Tag, GitVersion.SemanticVersion! Semver, GitVersion.ICommit! Commit)>!
 GitVersion.Common.IRepositoryStore.GetVersionTagsOnBranch(GitVersion.IBranch! branch, string? tagPrefixRegex, GitVersion.SemanticVersionFormat versionFormat) -> System.Collections.Generic.IEnumerable<GitVersion.SemanticVersion!>!
 GitVersion.Common.IRepositoryStore.IsCommitOnBranch(GitVersion.ICommit? baseVersionSource, GitVersion.IBranch! branch, GitVersion.ICommit! firstMatchingCommit) -> bool
-GitVersion.ConfigInfo
-GitVersion.ConfigInfo.ConfigFile -> string?
-GitVersion.ConfigInfo.ConfigInfo() -> void
-GitVersion.ConfigInfo.OverrideConfiguration -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>?
-GitVersion.ConfigInfo.ShowConfig -> bool
 GitVersion.Configuration.BranchConfiguration
 GitVersion.Configuration.BranchConfiguration.BranchConfiguration() -> void
 GitVersion.Configuration.BranchConfiguration.BranchConfiguration(GitVersion.Configuration.BranchConfiguration! branchConfiguration) -> void
@@ -288,6 +283,11 @@ GitVersion.Configuration.Init.Wizard.PickBranchingStrategy3Step
 GitVersion.Configuration.Init.Wizard.PickBranchingStrategy3Step.PickBranchingStrategy3Step(GitVersion.Logging.IConsole! console, GitVersion.IFileSystem! fileSystem, GitVersion.Logging.ILog! log, GitVersion.Configuration.Init.Wizard.IConfigInitStepFactory! stepFactory) -> void
 GitVersion.Configuration.Init.Wizard.PickBranchingStrategyStep
 GitVersion.Configuration.Init.Wizard.PickBranchingStrategyStep.PickBranchingStrategyStep(GitVersion.Logging.IConsole! console, GitVersion.IFileSystem! fileSystem, GitVersion.Logging.ILog! log, GitVersion.Configuration.Init.Wizard.IConfigInitStepFactory! stepFactory) -> void
+GitVersion.ConfigurationContext
+GitVersion.ConfigurationContext.ConfigurationContext() -> void
+GitVersion.ConfigurationContext.ConfigurationFile -> string?
+GitVersion.ConfigurationContext.OverrideConfiguration -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>?
+GitVersion.ConfigurationContext.ShowConfiguration -> bool
 GitVersion.Environment
 GitVersion.Environment.Environment() -> void
 GitVersion.Environment.GetEnvironmentVariable(string! variableName) -> string?
@@ -370,7 +370,7 @@ GitVersion.GitVersionModule.GitVersionModule() -> void
 GitVersion.GitVersionOptions
 GitVersion.GitVersionOptions.AssemblyInfo.get -> GitVersion.AssemblyInfoData!
 GitVersion.GitVersionOptions.Authentication.get -> GitVersion.AuthenticationInfo!
-GitVersion.GitVersionOptions.ConfigInfo.get -> GitVersion.ConfigInfo!
+GitVersion.GitVersionOptions.ConfigInfo.get -> GitVersion.ConfigurationContext!
 GitVersion.GitVersionOptions.Diag -> bool
 GitVersion.GitVersionOptions.GitVersionOptions() -> void
 GitVersion.GitVersionOptions.Init -> bool