OverrideConfiguration only if it has been specified. remove default null values in implementing ConfigurationProvider.

Author: HHobeck

src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt renamed to src/GitVersion.Core.Tests/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -55,8 +55,6 @@ public static IBranch CreateMockBranch(string name, params ICommit[] commits)
 
     public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, GitVersionConfiguration? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? branch = null)
     {
-        configuration ??= new ConfigurationBuilder().Build();
-
         repository ??= fixture.Repository;
 
         var options = Options.Create(new GitVersionOptions

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

@@ -25,7 +25,7 @@ public ConfigurationProvider(IFileSystem fileSystem, ILog log, IConfigurationFil
         this.repositoryInfo = repositoryInfo.NotNull();
     }
 
-    public GitVersionConfiguration Provide(GitVersionConfiguration? overrideConfiguration = null)
+    public GitVersionConfiguration Provide(GitVersionConfiguration? overrideConfiguration)
     {
         var gitVersionOptions = this.options.Value;
         var workingDirectory = gitVersionOptions.WorkingDirectory;
@@ -35,14 +35,17 @@ public GitVersionConfiguration Provide(GitVersionConfiguration? overrideConfigur
         return Provide(rootDirectory, overrideConfiguration);
     }
 
-    public GitVersionConfiguration Provide(string? workingDirectory, GitVersionConfiguration? overrideConfiguration = null)
+    public GitVersionConfiguration Provide(string? workingDirectory, GitVersionConfiguration? overrideConfiguration)
     {
         var configurationBuilder = new ConfigurationBuilder();
+
         if (workingDirectory != null)
             configurationBuilder = configurationBuilder.Add(this.configFileLocator.ReadConfig(workingDirectory));
-        return configurationBuilder
-            .Add(overrideConfiguration ?? new GitVersionConfiguration())
-            .Build();
+
+        if (overrideConfiguration != null)
+            configurationBuilder.Add(overrideConfiguration);
+
+        return configurationBuilder.Build();
     }
 
     public void Init(string workingDirectory)

src/GitVersion.Core/Configuration/ConfigurationProvider.cs

@@ -231,8 +231,8 @@ GitVersion.Configuration.ConfigurationModule.RegisterTypes(Microsoft.Extensions.
 GitVersion.Configuration.ConfigurationProvider
 GitVersion.Configuration.ConfigurationProvider.ConfigurationProvider(GitVersion.IFileSystem! fileSystem, GitVersion.Logging.ILog! log, GitVersion.Configuration.IConfigurationFileLocator! configFileLocator, Microsoft.Extensions.Options.IOptions<GitVersion.GitVersionOptions!>! options, GitVersion.Configuration.Init.Wizard.IConfigInitWizard! configInitWizard, GitVersion.IGitRepositoryInfo! repositoryInfo) -> void
 GitVersion.Configuration.ConfigurationProvider.Init(string! workingDirectory) -> void
-GitVersion.Configuration.ConfigurationProvider.Provide(GitVersion.Configuration.GitVersionConfiguration? overrideConfiguration = null) -> GitVersion.Configuration.GitVersionConfiguration!
-GitVersion.Configuration.ConfigurationProvider.Provide(string? workingDirectory, GitVersion.Configuration.GitVersionConfiguration? overrideConfiguration = null) -> GitVersion.Configuration.GitVersionConfiguration!
+GitVersion.Configuration.ConfigurationProvider.Provide(GitVersion.Configuration.GitVersionConfiguration? overrideConfiguration) -> GitVersion.Configuration.GitVersionConfiguration!
+GitVersion.Configuration.ConfigurationProvider.Provide(string? workingDirectory, GitVersion.Configuration.GitVersionConfiguration? overrideConfiguration) -> GitVersion.Configuration.GitVersionConfiguration!
 GitVersion.Configuration.ConfigurationSerializer
 GitVersion.Configuration.ConfigurationSerializer.ConfigurationSerializer() -> void
 GitVersion.Configuration.EffectiveBranchConfiguration