Skip to content

Commit c9de783

Browse files
committed
Config -> Configuration
1 parent 892d2c2 commit c9de783

File tree

9 files changed

+19
-17
lines changed

9 files changed

+19
-17
lines changed

src/GitVersion.App.Tests/ArgumentParserTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ public void UpdateAssemblyInfoWithRelativeFilename()
365365
public void OverrideconfigWithNoOptions()
366366
{
367367
var arguments = this.argumentParser.ParseArguments("/overrideconfig");
368-
arguments.OverrideConfig.ShouldBeNull();
368+
arguments.OverrideConfiguration.ShouldBeNull();
369369
}
370370

371371
[TestCaseSource(nameof(OverrideconfigWithInvalidOptionTestData))]
@@ -393,7 +393,7 @@ public void OverrideConfigWithSingleOptions(string options, GitVersionConfigurat
393393
{
394394
var arguments = this.argumentParser.ParseArguments($"/overrideconfig {options}");
395395

396-
ConfigurationHelper configurationHelper = new(arguments.OverrideConfig);
396+
ConfigurationHelper configurationHelper = new(arguments.OverrideConfiguration);
397397
configurationHelper.Configuration.ShouldBeEquivalentTo(expected);
398398
}
399399

@@ -531,7 +531,7 @@ private static IEnumerable<TestCaseData> OverrideConfigWithSingleOptionTestData(
531531
public void OverrideConfigWithMultipleOptions(string options, GitVersionConfiguration expected)
532532
{
533533
var arguments = this.argumentParser.ParseArguments(options);
534-
ConfigurationHelper configruationHelper = new(arguments.OverrideConfig);
534+
ConfigurationHelper configruationHelper = new(arguments.OverrideConfiguration);
535535
configruationHelper.Configuration.ShouldBeEquivalentTo(expected);
536536
}
537537

src/GitVersion.App.Tests/HelpWriterTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public void AllArgsAreInHelp()
3030
{ nameof(Arguments.UpdateWixVersionFile), "/updatewixversionfile" },
3131
{ nameof(Arguments.ConfigurationFile), "/config" },
3232
{ nameof(Arguments.Verbosity), "/verbosity" },
33-
{ nameof(Arguments.CommitId), "/c" }
33+
{ nameof(Arguments.CommitId), "/c" },
34+
{ nameof(Arguments.ShowConfiguration), "/showconfig" },
35+
{ nameof(Arguments.OverrideConfiguration), "/overrideconfig" }
3436
};
3537
string helpText = string.Empty;
3638

src/GitVersion.App/ArgumentParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private static bool ParseConfigArguments(Arguments arguments, string? name, IRea
300300
if (!name.IsSwitch("showConfig"))
301301
return false;
302302

303-
arguments.ShowConfig = value.IsTrue() || !value.IsFalse();
303+
arguments.ShowConfiguration = value.IsTrue() || !value.IsFalse();
304304
return true;
305305

306306
}
@@ -437,7 +437,7 @@ private static void ParseOverrideConfig(Arguments arguments, IReadOnlyCollection
437437
}
438438
parser.SetValue(optionKey, keyAndValue[1]);
439439
}
440-
arguments.OverrideConfig = parser.GetOverrideConfiguration();
440+
arguments.OverrideConfiguration = parser.GetOverrideConfiguration();
441441
}
442442

443443
private static void ParseUpdateAssemblyInfo(Arguments arguments, string? value, IReadOnlyCollection<string>? values)

src/GitVersion.App/Arguments.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ public class Arguments
77
public AuthenticationInfo Authentication = new();
88

99
public string? ConfigurationFile;
10-
public IReadOnlyDictionary<object, object?> OverrideConfig;
11-
public bool ShowConfig;
10+
public IReadOnlyDictionary<object, object?> OverrideConfiguration;
11+
public bool ShowConfiguration;
1212

1313
public string? TargetPath;
1414

@@ -61,8 +61,8 @@ public GitVersionOptions ToOptions()
6161
ConfigurationInfo =
6262
{
6363
ConfigurationFile = ConfigurationFile,
64-
OverrideConfiguration = OverrideConfig,
65-
ShowConfiguration = ShowConfig
64+
OverrideConfiguration = OverrideConfiguration,
65+
ShowConfiguration = ShowConfiguration
6666
},
6767

6868
RepositoryInfo =
@@ -82,7 +82,7 @@ public GitVersionOptions ToOptions()
8282

8383
WixInfo =
8484
{
85-
ShouldUpdate = UpdateWixVersionFile
85+
UpdateWixVersionFile = UpdateWixVersionFile
8686
},
8787

8888
Init = Init,

src/GitVersion.App/PublicAPI.Unshipped.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ GitVersion.Arguments.NoFetch -> bool
2020
GitVersion.Arguments.NoNormalize -> bool
2121
GitVersion.Arguments.Output -> System.Collections.Generic.ISet<GitVersion.OutputType>!
2222
GitVersion.Arguments.OutputFile -> string?
23-
GitVersion.Arguments.OverrideConfig -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>!
24-
GitVersion.Arguments.ShowConfig -> bool
23+
GitVersion.Arguments.OverrideConfiguration -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>!
24+
GitVersion.Arguments.ShowConfiguration -> bool
2525
GitVersion.Arguments.ShowVariable -> string?
2626
GitVersion.Arguments.TargetBranch -> string?
2727
GitVersion.Arguments.TargetPath -> string?

src/GitVersion.Core/Options/WixInfo.cs

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

33
public class WixInfo
44
{
5-
public bool ShouldUpdate;
5+
public bool UpdateWixVersionFile;
66
}

src/GitVersion.Core/PublicAPI.Unshipped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ GitVersion.VersionField.Patch = 1 -> GitVersion.VersionField
929929
GitVersion.WarningException
930930
GitVersion.WarningException.WarningException(string! message) -> void
931931
GitVersion.WixInfo
932-
GitVersion.WixInfo.ShouldUpdate -> bool
932+
GitVersion.WixInfo.UpdateWixVersionFile -> bool
933933
GitVersion.WixInfo.WixInfo() -> void
934934
abstract GitVersion.Agents.BuildAgentBase.EnvironmentVariable.get -> string!
935935
abstract GitVersion.Agents.BuildAgentBase.GenerateSetParameterMessage(string! name, string! value) -> string![]!

src/GitVersion.MsBuild/GitVersionTaskExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
4949
task.AssemblyInfoTempFilePath = PathHelper.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
5050

5151
var gitVersionOptions = this.options.Value;
52+
gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
5253
gitVersionOptions.AssemblySettingsInfo.UpdateAssemblyInfo = true;
5354
gitVersionOptions.AssemblySettingsInfo.EnsureAssemblyInfo = true;
54-
gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
5555
gitVersionOptions.AssemblySettingsInfo.Files.Add(fileWriteInfo.FileName);
5656

5757
gitVersionOutputTool.UpdateAssemblyInfo(versionVariables);

src/GitVersion.Output/GitVersionOutputTool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void UpdateAssemblyInfo(VersionVariables variables)
6262

6363
public void UpdateWixVersionFile(VersionVariables variables)
6464
{
65-
if (gitVersionOptions.WixInfo.ShouldUpdate)
65+
if (gitVersionOptions.WixInfo.UpdateWixVersionFile)
6666
{
6767
using (this.wixVersionFileUpdater)
6868
{

0 commit comments

Comments
 (0)