Skip to content

Commit 4e7380c

Browse files
committed
Introduce a baseVersion variable to shorten the property call
1 parent 6ecbdc6 commit 4e7380c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,25 @@ public virtual NextVersion FindVersion()
4848
}
4949

5050
var nextVersion = Calculate(Context.CurrentBranch, Context.Configuration);
51-
var preReleaseTagName = nextVersion.Configuration.GetBranchSpecificTag(this.log, Context.CurrentBranch.Name.Friendly, nextVersion.BaseVersion.BranchNameOverride);
51+
var baseVersion = nextVersion.BaseVersion;
52+
var preReleaseTagName = nextVersion.Configuration.GetBranchSpecificTag(this.log, Context.CurrentBranch.Name.Friendly, baseVersion.BranchNameOverride);
5253

5354
SemanticVersion semver;
5455
if (Context.Configuration.VersioningMode == VersioningMode.Mainline)
5556
{
56-
semver = this.mainlineVersionCalculator.FindMainlineModeVersion(nextVersion.BaseVersion);
57+
semver = this.mainlineVersionCalculator.FindMainlineModeVersion(baseVersion);
5758
}
5859
else
5960
{
60-
var baseVersionBuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource);
61+
var baseVersionBuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
6162

6263
if (baseVersionBuildMetaData == null || baseVersionBuildMetaData.Sha != nextVersion.IncrementedVersion.BuildMetaData?.Sha)
6364
{
6465
semver = nextVersion.IncrementedVersion;
6566
}
6667
else
6768
{
68-
semver = nextVersion.BaseVersion.SemanticVersion;
69+
semver = baseVersion.SemanticVersion;
6970
}
7071

7172
semver.BuildMetaData = baseVersionBuildMetaData;
@@ -106,7 +107,7 @@ public virtual NextVersion FindVersion()
106107
semver.PreReleaseTag = new SemanticVersionPreReleaseTag(preReleaseTagName, number);
107108
}
108109

109-
return new(semver, nextVersion.BaseVersion, new(nextVersion.Branch, nextVersion.Configuration));
110+
return new(semver, baseVersion, new(nextVersion.Branch, nextVersion.Configuration));
110111
}
111112

112113
private static void EnsureHeadIsNotDetached(GitVersionContext context)

0 commit comments

Comments
 (0)