@@ -48,24 +48,25 @@ public virtual NextVersion FindVersion()
48
48
}
49
49
50
50
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 ) ;
52
53
53
54
SemanticVersion semver ;
54
55
if ( Context . Configuration . VersioningMode == VersioningMode . Mainline )
55
56
{
56
- semver = this . mainlineVersionCalculator . FindMainlineModeVersion ( nextVersion . BaseVersion ) ;
57
+ semver = this . mainlineVersionCalculator . FindMainlineModeVersion ( baseVersion ) ;
57
58
}
58
59
else
59
60
{
60
- var baseVersionBuildMetaData = this . mainlineVersionCalculator . CreateVersionBuildMetaData ( nextVersion . BaseVersion . BaseVersionSource ) ;
61
+ var baseVersionBuildMetaData = this . mainlineVersionCalculator . CreateVersionBuildMetaData ( baseVersion . BaseVersionSource ) ;
61
62
62
63
if ( baseVersionBuildMetaData == null || baseVersionBuildMetaData . Sha != nextVersion . IncrementedVersion . BuildMetaData ? . Sha )
63
64
{
64
65
semver = nextVersion . IncrementedVersion ;
65
66
}
66
67
else
67
68
{
68
- semver = nextVersion . BaseVersion . SemanticVersion ;
69
+ semver = baseVersion . SemanticVersion ;
69
70
}
70
71
71
72
semver . BuildMetaData = baseVersionBuildMetaData ;
@@ -106,7 +107,7 @@ public virtual NextVersion FindVersion()
106
107
semver . PreReleaseTag = new SemanticVersionPreReleaseTag ( preReleaseTagName , number ) ;
107
108
}
108
109
109
- return new ( semver , nextVersion . BaseVersion , new ( nextVersion . Branch , nextVersion . Configuration ) ) ;
110
+ return new ( semver , baseVersion , new ( nextVersion . Branch , nextVersion . Configuration ) ) ;
110
111
}
111
112
112
113
private static void EnsureHeadIsNotDetached ( GitVersionContext context )
0 commit comments