Config -> Configuration

Author: arturcic

src/GitVersion.App.Tests/ArgumentParserTests.cs

@@ -365,7 +365,7 @@ public void UpdateAssemblyInfoWithRelativeFilename()
     public void OverrideconfigWithNoOptions()
     {
         var arguments = this.argumentParser.ParseArguments("/overrideconfig");
-        arguments.OverrideConfig.ShouldBeNull();
+        arguments.OverrideConfiguration.ShouldBeNull();
     }
 
     [TestCaseSource(nameof(OverrideconfigWithInvalidOptionTestData))]
@@ -393,7 +393,7 @@ public void OverrideConfigWithSingleOptions(string options, GitVersionConfigurat
     {
         var arguments = this.argumentParser.ParseArguments($"/overrideconfig {options}");
 
-        ConfigurationHelper configurationHelper = new(arguments.OverrideConfig);
+        ConfigurationHelper configurationHelper = new(arguments.OverrideConfiguration);
         configurationHelper.Configuration.ShouldBeEquivalentTo(expected);
     }
 
@@ -531,7 +531,7 @@ private static IEnumerable<TestCaseData> OverrideConfigWithSingleOptionTestData(
     public void OverrideConfigWithMultipleOptions(string options, GitVersionConfiguration expected)
     {
         var arguments = this.argumentParser.ParseArguments(options);
-        ConfigurationHelper configruationHelper = new(arguments.OverrideConfig);
+        ConfigurationHelper configruationHelper = new(arguments.OverrideConfiguration);
         configruationHelper.Configuration.ShouldBeEquivalentTo(expected);
     }
 

src/GitVersion.App.Tests/HelpWriterTests.cs

@@ -30,7 +30,9 @@ public void AllArgsAreInHelp()
             { nameof(Arguments.UpdateWixVersionFile), "/updatewixversionfile" },
             { nameof(Arguments.ConfigurationFile), "/config" },
             { nameof(Arguments.Verbosity), "/verbosity" },
-            { nameof(Arguments.CommitId), "/c" }
+            { nameof(Arguments.CommitId), "/c" },
+            { nameof(Arguments.ShowConfiguration), "/showconfig" },
+            { nameof(Arguments.OverrideConfiguration), "/overrideconfig" }
         };
         string helpText = string.Empty;
 

src/GitVersion.App/ArgumentParser.cs

@@ -300,7 +300,7 @@ private static bool ParseConfigArguments(Arguments arguments, string? name, IRea
         if (!name.IsSwitch("showConfig"))
             return false;
 
-        arguments.ShowConfig = value.IsTrue() || !value.IsFalse();
+        arguments.ShowConfiguration = value.IsTrue() || !value.IsFalse();
         return true;
 
     }
@@ -437,7 +437,7 @@ private static void ParseOverrideConfig(Arguments arguments, IReadOnlyCollection
             }
             parser.SetValue(optionKey, keyAndValue[1]);
         }
-        arguments.OverrideConfig = parser.GetOverrideConfiguration();
+        arguments.OverrideConfiguration = parser.GetOverrideConfiguration();
     }
 
     private static void ParseUpdateAssemblyInfo(Arguments arguments, string? value, IReadOnlyCollection<string>? values)

src/GitVersion.App/Arguments.cs

@@ -7,8 +7,8 @@ public class Arguments
     public AuthenticationInfo Authentication = new();
 
     public string? ConfigurationFile;
-    public IReadOnlyDictionary<object, object?> OverrideConfig;
-    public bool ShowConfig;
+    public IReadOnlyDictionary<object, object?> OverrideConfiguration;
+    public bool ShowConfiguration;
 
     public string? TargetPath;
 
@@ -61,8 +61,8 @@ public GitVersionOptions ToOptions()
             ConfigurationInfo =
             {
                 ConfigurationFile = ConfigurationFile,
-                OverrideConfiguration = OverrideConfig,
-                ShowConfiguration = ShowConfig
+                OverrideConfiguration = OverrideConfiguration,
+                ShowConfiguration = ShowConfiguration
             },
 
             RepositoryInfo =
@@ -82,7 +82,7 @@ public GitVersionOptions ToOptions()
 
             WixInfo =
             {
-                ShouldUpdate = UpdateWixVersionFile
+                UpdateWixVersionFile = UpdateWixVersionFile
             },
 
             Init = Init,

src/GitVersion.App/PublicAPI.Unshipped.txt

@@ -20,8 +20,8 @@ GitVersion.Arguments.NoFetch -> bool
 GitVersion.Arguments.NoNormalize -> bool
 GitVersion.Arguments.Output -> System.Collections.Generic.ISet<GitVersion.OutputType>!
 GitVersion.Arguments.OutputFile -> string?
-GitVersion.Arguments.OverrideConfig -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>!
-GitVersion.Arguments.ShowConfig -> bool
+GitVersion.Arguments.OverrideConfiguration -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>!
+GitVersion.Arguments.ShowConfiguration -> bool
 GitVersion.Arguments.ShowVariable -> string?
 GitVersion.Arguments.TargetBranch -> string?
 GitVersion.Arguments.TargetPath -> string?

src/GitVersion.Core/Options/WixInfo.cs

@@ -2,5 +2,5 @@ namespace GitVersion;
 
 public class WixInfo
 {
-    public bool ShouldUpdate;
+    public bool UpdateWixVersionFile;
 }

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -929,7 +929,7 @@ GitVersion.VersionField.Patch = 1 -> GitVersion.VersionField
 GitVersion.WarningException
 GitVersion.WarningException.WarningException(string! message) -> void
 GitVersion.WixInfo
-GitVersion.WixInfo.ShouldUpdate -> bool
+GitVersion.WixInfo.UpdateWixVersionFile -> bool
 GitVersion.WixInfo.WixInfo() -> void
 abstract GitVersion.Agents.BuildAgentBase.EnvironmentVariable.get -> string!
 abstract GitVersion.Agents.BuildAgentBase.GenerateSetParameterMessage(string! name, string! value) -> string![]!

src/GitVersion.MsBuild/GitVersionTaskExecutor.cs

@@ -49,9 +49,9 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
         task.AssemblyInfoTempFilePath = PathHelper.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
 
         var gitVersionOptions = this.options.Value;
+        gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
         gitVersionOptions.AssemblySettingsInfo.UpdateAssemblyInfo = true;
         gitVersionOptions.AssemblySettingsInfo.EnsureAssemblyInfo = true;
-        gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
         gitVersionOptions.AssemblySettingsInfo.Files.Add(fileWriteInfo.FileName);
 
         gitVersionOutputTool.UpdateAssemblyInfo(versionVariables);

src/GitVersion.Output/GitVersionOutputTool.cs

@@ -62,7 +62,7 @@ public void UpdateAssemblyInfo(VersionVariables variables)
 
     public void UpdateWixVersionFile(VersionVariables variables)
     {
-        if (gitVersionOptions.WixInfo.ShouldUpdate)
+        if (gitVersionOptions.WixInfo.UpdateWixVersionFile)
         {
             using (this.wixVersionFileUpdater)
             {