Skip to content

Commit 892d2c2

Browse files
arturcicarturcic
committed
moving some classes in folders in GitVersion.Core
1 parent bd70866 commit 892d2c2

36 files changed

+87
-116
lines changed

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ works out the [Semantic Version][semver] of the commit being built.
88
[![codecov][codecov-badge]][codecov]
99
[![Gitter][gitter-badge]][gitter]
1010

11-
| Artifact | Stable | |
12-
| :------------------------- | :----------------------------------------------------------------- | - |
13-
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] |
14-
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] |
15-
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
16-
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] |
17-
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
18-
| **Homebrew** | [![homebrew][brew-badge]][brew] |
11+
| Artifact | Stable | |
12+
|:---------------------------|:-------------------------------------------------------------------|---------------------------------------------------------|
13+
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] |
14+
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] |
15+
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
16+
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] |
17+
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
18+
| **Homebrew** | [![homebrew][brew-badge]][brew] |
1919
| **Azure Pipeline Task** | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |
20-
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] |
21-
| **Docker** | [![Docker Pulls][dockerhub-badge]][dockerhub] |
20+
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] |
21+
| **Docker** | [![Docker Pulls][dockerhub-badge]][dockerhub] |
2222

2323
## Compatibility
2424

‎build/nuspec/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ works out the [Semantic Version][semver] of the commit being built.
55

66
[![Gitter][gitter-badge]][gitter]
77

8-
| Artifact | Stable | |
9-
| :------------------------- | :----------------------------------------------------------------- | - |
10-
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
11-
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
8+
| Artifact | Stable | |
9+
|:-----------------------|:-----------------------------|---------------------------------------------------------|
10+
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
11+
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
1212

1313
## Compatibility
1414

‎src/GitVersion.App.Tests/HelpWriterTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void AllArgsAreInHelp()
2828
{ nameof(Arguments.IsHelp), "/?" },
2929
{ nameof(Arguments.IsVersion), "/version" },
3030
{ nameof(Arguments.UpdateWixVersionFile), "/updatewixversionfile" },
31-
{ nameof(Arguments.ConfigFile), "/config" },
31+
{ nameof(Arguments.ConfigurationFile), "/config" },
3232
{ nameof(Arguments.Verbosity), "/verbosity" },
3333
{ nameof(Arguments.CommitId), "/c" }
3434
};

‎src/GitVersion.App/ArgumentParser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ private static bool ParseConfigArguments(Arguments arguments, string? name, IRea
287287
if (name.IsSwitch("config"))
288288
{
289289
EnsureArgumentValueCount(values);
290-
arguments.ConfigFile = value;
290+
arguments.ConfigurationFile = value;
291291
return true;
292292
}
293293

‎src/GitVersion.App/Arguments.cs‎

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

9-
public string? ConfigFile;
9+
public string? ConfigurationFile;
1010
public IReadOnlyDictionary<object, object?> OverrideConfig;
1111
public bool ShowConfig;
1212

@@ -43,24 +43,24 @@ public GitVersionOptions ToOptions()
4343
{
4444
var gitVersionOptions = new GitVersionOptions
4545
{
46-
AssemblyInfo =
46+
AssemblySettingsInfo =
4747
{
4848
UpdateProjectFiles = UpdateProjectFiles,
4949
UpdateAssemblyInfo = UpdateAssemblyInfo,
5050
EnsureAssemblyInfo = EnsureAssemblyInfo,
5151
Files = UpdateAssemblyInfoFileName
5252
},
5353

54-
Authentication =
54+
AuthenticationInfo =
5555
{
5656
Username = this.Authentication.Username,
5757
Password = this.Authentication.Password,
5858
Token = this.Authentication.Token
5959
},
6060

61-
ConfigInfo =
61+
ConfigurationInfo =
6262
{
63-
ConfigurationFile = ConfigFile,
63+
ConfigurationFile = ConfigurationFile,
6464
OverrideConfiguration = OverrideConfig,
6565
ShowConfiguration = ShowConfig
6666
},

‎src/GitVersion.App/GitVersionExecutor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private int RunGitVersionTool(GitVersionOptions gitVersionOptions)
6464

6565
var variables = this.gitVersionCalculateTool.CalculateVersionVariables();
6666

67-
var configuration = this.configurationProvider.Provide(gitVersionOptions.ConfigInfo.OverrideConfiguration);
67+
var configuration = this.configurationProvider.Provide(gitVersionOptions.ConfigurationInfo.OverrideConfiguration);
6868

6969
this.gitVersionOutputTool.OutputVariables(variables, configuration.UpdateBuildNumber);
7070
this.gitVersionOutputTool.UpdateAssemblyInfo(variables);
@@ -152,7 +152,7 @@ private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int e
152152
return true;
153153
}
154154

155-
if (gitVersionOptions.ConfigInfo.ShowConfiguration)
155+
if (gitVersionOptions.ConfigurationInfo.ShowConfiguration)
156156
{
157157
var configuration = this.configurationProvider.Provide();
158158
this.console.WriteLine(configuration.ToString());

‎src/GitVersion.App/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ GitVersion.Arguments.Arguments() -> void
88
GitVersion.Arguments.Authentication -> GitVersion.AuthenticationInfo!
99
GitVersion.Arguments.ClonePath -> string?
1010
GitVersion.Arguments.CommitId -> string?
11-
GitVersion.Arguments.ConfigFile -> string?
11+
GitVersion.Arguments.ConfigurationFile -> string?
1212
GitVersion.Arguments.Diag -> bool
1313
GitVersion.Arguments.EnsureAssemblyInfo -> bool
1414
GitVersion.Arguments.Init -> bool

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public class NamedConfigurationFileLocatorTests : TestBase
8484
[SetUp]
8585
public void Setup()
8686
{
87-
this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigurationFile = "my-config.yaml" } };
87+
this.gitVersionOptions = new GitVersionOptions { ConfigurationInfo = { ConfigurationFile = "my-config.yaml" } };
8888
this.repoPath = DefaultRepoPath;
8989
this.workingPath = DefaultWorkingPath;
9090

@@ -140,7 +140,7 @@ public void DoNotThrowWhenConfigFileIsInSubDirectoryOfRepoPath()
140140
{
141141
this.workingPath = DefaultRepoPath;
142142

143-
this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigurationFile = "./src/my-config.yaml" } };
143+
this.gitVersionOptions = new GitVersionOptions { ConfigurationInfo = { ConfigurationFile = "./src/my-config.yaml" } };
144144
var sp = GetServiceProvider(this.gitVersionOptions);
145145
this.configFileLocator = sp.GetRequiredService<IConfigurationFileLocator>();
146146
this.fileSystem = sp.GetRequiredService<IFileSystem>();
@@ -200,8 +200,8 @@ public void ThrowsExceptionOnCustomYmlFileDoesNotExist()
200200

201201
var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
202202

203-
var workingPathFileConfig = PathHelper.Combine(this.workingPath, this.gitVersionOptions.ConfigInfo.ConfigurationFile);
204-
var repoPathFileConfig = PathHelper.Combine(this.repoPath, this.gitVersionOptions.ConfigInfo.ConfigurationFile);
203+
var workingPathFileConfig = PathHelper.Combine(this.workingPath, this.gitVersionOptions.ConfigurationInfo.ConfigurationFile);
204+
var repoPathFileConfig = PathHelper.Combine(this.repoPath, this.gitVersionOptions.ConfigurationInfo.ConfigurationFile);
205205
var expectedMessage = $"The configuration file was not found at '{workingPathFileConfig}' or '{repoPathFileConfig}'";
206206
exception.Message.ShouldBe(expectedMessage);
207207
}

‎src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
207207
gitVersionOptions = new GitVersionOptions
208208
{
209209
WorkingDirectory = fixture.RepositoryPath,
210-
ConfigInfo = { OverrideConfiguration = overrideConfiguration }
210+
ConfigurationInfo = { OverrideConfiguration = overrideConfiguration }
211211
};
212212

213213
gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Gi
6161
var options = Options.Create(new GitVersionOptions
6262
{
6363
WorkingDirectory = repository.Info.WorkingDirectory,
64-
ConfigInfo = { OverrideConfiguration = overrideConfiguration },
64+
ConfigurationInfo = { OverrideConfiguration = overrideConfiguration },
6565
RepositoryInfo =
6666
{
6767
TargetBranch = targetBranch,

0 commit comments

Comments
 (0)