Skip to content

Commit 5bb1773

Browse files
committed
fixed code review recommendations
1 parent 10753d7 commit 5bb1773

File tree

2 files changed

+32
-29
lines changed

2 files changed

+32
-29
lines changed

src/GitVersion.Core/VersionCalculation/VariableProvider.cs

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,35 @@ public GitVersionVariables GetVariablesFor(
3939
"AssemblyVersioningFormat"
4040
);
4141

42-
return new(assemblyFileSemVer,
43-
assemblySemVer,
44-
semverFormatValues.BranchName,
45-
semverFormatValues.BuildMetaData,
46-
semverFormatValues.CommitDate,
47-
semverFormatValues.VersionSourceDistance,
48-
semverFormatValues.EscapedBranchName,
49-
semverFormatValues.FullBuildMetaData,
50-
semverFormatValues.FullSemVer,
51-
informationalVersion,
52-
semverFormatValues.Major,
53-
semverFormatValues.MajorMinorPatch,
54-
semverFormatValues.Minor,
55-
semverFormatValues.Patch,
56-
semverFormatValues.PreReleaseLabel,
57-
semverFormatValues.PreReleaseLabelWithDash,
58-
semverFormatValues.PreReleaseNumber,
59-
semverFormatValues.PreReleaseTag,
60-
semverFormatValues.PreReleaseTagWithDash,
61-
semverFormatValues.SemVer,
62-
semverFormatValues.Sha,
63-
semverFormatValues.ShortSha,
64-
semverFormatValues.UncommittedChanges,
65-
semverFormatValues.VersionSourceDistance,
66-
semverFormatValues.VersionSourceIncrement,
67-
semverFormatValues.VersionSourceSemVer,
68-
semverFormatValues.VersionSourceSha,
69-
semverFormatValues.WeightedPreReleaseNumber);
42+
return new(
43+
AssemblySemFileVer: assemblyFileSemVer,
44+
AssemblySemVer: assemblySemVer,
45+
BranchName: semverFormatValues.BranchName,
46+
BuildMetaData: semverFormatValues.BuildMetaData,
47+
CommitDate: semverFormatValues.CommitDate,
48+
CommitsSinceVersionSource: semverFormatValues.VersionSourceDistance,
49+
EscapedBranchName: semverFormatValues.EscapedBranchName,
50+
FullBuildMetaData: semverFormatValues.FullBuildMetaData,
51+
FullSemVer: semverFormatValues.FullSemVer,
52+
InformationalVersion: informationalVersion,
53+
Major: semverFormatValues.Major,
54+
MajorMinorPatch: semverFormatValues.MajorMinorPatch,
55+
Minor: semverFormatValues.Minor,
56+
Patch: semverFormatValues.Patch,
57+
PreReleaseLabel: semverFormatValues.PreReleaseLabel,
58+
PreReleaseLabelWithDash: semverFormatValues.PreReleaseLabelWithDash,
59+
PreReleaseNumber: semverFormatValues.PreReleaseNumber,
60+
PreReleaseTag: semverFormatValues.PreReleaseTag,
61+
PreReleaseTagWithDash: semverFormatValues.PreReleaseTagWithDash,
62+
SemVer: semverFormatValues.SemVer,
63+
Sha: semverFormatValues.Sha,
64+
ShortSha: semverFormatValues.ShortSha,
65+
UncommittedChanges: semverFormatValues.UncommittedChanges,
66+
VersionSourceDistance: semverFormatValues.VersionSourceDistance,
67+
VersionSourceIncrement: semverFormatValues.VersionSourceIncrement,
68+
VersionSourceSemVer: semverFormatValues.VersionSourceSemVer,
69+
VersionSourceSha: semverFormatValues.VersionSourceSha,
70+
WeightedPreReleaseNumber: semverFormatValues.WeightedPreReleaseNumber);
7071
}
7172

7273
private string? CheckAndFormatString<T>(string? formatString, T source, string? defaultValue, string formatVarName)
@@ -82,7 +83,7 @@ public GitVersionVariables GetVariablesFor(
8283
try
8384
{
8485
formattedString = formatString.FormatWith(source, this.environment)
85-
.RegexReplace(RegexPatterns.Output.SanitizeAssemblyInfoRegexPattern, "-");
86+
.RegexReplace(RegexPatterns.Output.SanitizeAssemblyInfoRegexPattern, "-");
8687
}
8788
catch (ArgumentException exception)
8889
{

src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,9 @@ private List<NextVersion> GetNextVersions(IBranch branch, IGitVersionConfigurati
240240
using (log.IndentLog("Fetching the base versions for version calculation..."))
241241
{
242242
if (branch.Tip == null)
243+
{
243244
throw new GitVersionException("No commits found on the current branch.");
245+
}
244246

245247
return [.. GetNextVersionsInternal()];
246248
}

0 commit comments

Comments
 (0)