Introduce a baseVersion variable to shorten the property call

GitTools · Nov 24, 2022 · c718ee0 · c718ee0
1 parent 244ad64
commit c718ee0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
@@ -48,24 +48,25 @@ public virtual NextVersion FindVersion()
         }
 
         var nextVersion = Calculate(Context.CurrentBranch, Context.Configuration);
-        var preReleaseTagName = nextVersion.Configuration.GetBranchSpecificTag(this.log, Context.CurrentBranch.Name.Friendly, nextVersion.BaseVersion.BranchNameOverride);
+        var baseVersion = nextVersion.BaseVersion;
+        var preReleaseTagName = nextVersion.Configuration.GetBranchSpecificTag(this.log, Context.CurrentBranch.Name.Friendly, baseVersion.BranchNameOverride);
 
         SemanticVersion semver;
         if (Context.Configuration.VersioningMode == VersioningMode.Mainline)
         {
-            semver = this.mainlineVersionCalculator.FindMainlineModeVersion(nextVersion.BaseVersion);
+            semver = this.mainlineVersionCalculator.FindMainlineModeVersion(baseVersion);
         }
         else
         {
-            var baseVersionBuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource);
+            var baseVersionBuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
 
             if (baseVersionBuildMetaData == null || baseVersionBuildMetaData.Sha != nextVersion.IncrementedVersion.BuildMetaData?.Sha)
             {
                 semver = nextVersion.IncrementedVersion;
             }
             else
             {
-                semver = nextVersion.BaseVersion.SemanticVersion;
+                semver = baseVersion.SemanticVersion;
             }
 
             semver.BuildMetaData = baseVersionBuildMetaData;
@@ -106,7 +107,7 @@ public virtual NextVersion FindVersion()
             semver.PreReleaseTag = new SemanticVersionPreReleaseTag(preReleaseTagName, number);
         }
 
-        return new(semver, nextVersion.BaseVersion, new(nextVersion.Branch, nextVersion.Configuration));
+        return new(semver, baseVersion, new(nextVersion.Branch, nextVersion.Configuration));
     }
 
     private static void EnsureHeadIsNotDetached(GitVersionContext context)