Skip to content

Commit c7f6267

Browse files
committed
cleanup
1 parent c4461fb commit c7f6267

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

src/GitVersion.App/GitVersionExecutor.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,6 @@ private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int e
143143
this.log.Info("Working directory: " + workingDirectory);
144144
}
145145

146-
if (gitVersionOptions.RepositoryInfo.TargetUrl.IsNullOrWhiteSpace())
147-
{
148-
this.configurationFileLocator.Verify(workingDirectory, this.repositoryInfo.ProjectRootDirectory);
149-
}
150-
151146
if (gitVersionOptions.Init)
152147
{
153148
this.configurationProvider.Init(workingDirectory);
@@ -157,8 +152,12 @@ private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int e
157152

158153
if (gitVersionOptions.ConfigurationInfo.ShowConfiguration)
159154
{
155+
if (gitVersionOptions.RepositoryInfo.TargetUrl.IsNullOrWhiteSpace())
156+
{
157+
this.configurationFileLocator.Verify(workingDirectory, this.repositoryInfo.ProjectRootDirectory);
158+
}
160159
var configuration = this.configurationProvider.Provide();
161-
this.console.WriteLine(configuration.ToString());
160+
this.console.WriteLine(configuration.ToJsonString());
162161
exitCode = 0;
163162
return true;
164163
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void CanWriteOutEffectiveConfiguration()
170170
{
171171
var configuration = this.configurationProvider.ProvideForDirectory(this.repoPath);
172172

173-
configuration.ToString()!.ShouldMatchApproved();
173+
configuration.ToJsonString().ShouldMatchApproved();
174174
}
175175

176176
[Test]

src/GitVersion.Core/Configuration/GitVersionConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ IReadOnlyDictionary<string, IBranchConfiguration> IGitVersionConfiguration.Branc
123123

124124
public override IBranchConfiguration Inherit(IBranchConfiguration configuration) => throw new NotSupportedException();
125125

126-
public override string ToString()
126+
public string ToJsonString()
127127
{
128128
var stringBuilder = new StringBuilder();
129129
using var stream = new StringWriter(stringBuilder);

src/GitVersion.Core/Configuration/IGitVersionConfiguration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,6 @@ public interface IGitVersionConfiguration : IBranchConfiguration
4646
IReadOnlyDictionary<string, IBranchConfiguration> Branches { get; }
4747

4848
IIgnoreConfiguration Ignore { get; }
49+
50+
string ToJsonString();
4951
}

src/GitVersion.Core/PublicAPI.Unshipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ GitVersion.Configuration.IGitVersionConfiguration.NextVersion.get -> string?
180180
GitVersion.Configuration.IGitVersionConfiguration.NoBumpMessage.get -> string?
181181
GitVersion.Configuration.IGitVersionConfiguration.PatchVersionBumpMessage.get -> string?
182182
GitVersion.Configuration.IGitVersionConfiguration.SemanticVersionFormat.get -> GitVersion.SemanticVersionFormat
183+
GitVersion.Configuration.IGitVersionConfiguration.ToJsonString() -> string!
183184
GitVersion.Configuration.IGitVersionConfiguration.UpdateBuildNumber.get -> bool
184185
GitVersion.Configuration.IGitVersionConfiguration.VersionInBranchPattern.get -> string?
185186
GitVersion.Configuration.IGitVersionConfiguration.VersionInBranchRegex.get -> System.Text.RegularExpressions.Regex!

0 commit comments

Comments
 (0)