@@ -58,21 +58,16 @@ public virtual NextVersion FindVersion()
58
58
{
59
59
var baseVersionBuildMetaData = this . mainlineVersionCalculator . CreateVersionBuildMetaData ( baseVersion . BaseVersionSource ) ;
60
60
61
- if ( baseVersionBuildMetaData . Sha != nextVersion . IncrementedVersion . BuildMetaData . Sha )
62
- {
63
- semver = nextVersion . IncrementedVersion ;
64
- }
65
- else
66
- {
67
- semver = baseVersion . SemanticVersion ;
68
- }
61
+ semver = baseVersionBuildMetaData . Sha != nextVersion . IncrementedVersion . BuildMetaData . Sha
62
+ ? nextVersion . IncrementedVersion
63
+ : baseVersion . SemanticVersion ;
69
64
70
65
semver . BuildMetaData = baseVersionBuildMetaData ;
71
66
72
67
var lastPrefixedSemver = this . repositoryStore
73
68
. GetVersionTagsOnBranch ( Context . CurrentBranch , Context . Configuration . LabelPrefix , Context . Configuration . SemanticVersionFormat )
74
69
. Where ( v => MajorMinorPatchEqual ( v , semver ) && v . PreReleaseTag . HasTag ( ) )
75
- . FirstOrDefault ( v => v . PreReleaseTag . Name ? . IsEquivalentTo ( preReleaseTagName ) == true ) ;
70
+ . FirstOrDefault ( v => v . PreReleaseTag . Name . IsEquivalentTo ( preReleaseTagName ) ) ;
76
71
77
72
if ( lastPrefixedSemver != null )
78
73
{
@@ -198,9 +193,9 @@ private IEnumerable<NextVersion> GetNextVersions(IBranch branch, IGitVersionConf
198
193
if ( branch . Tip == null )
199
194
throw new GitVersionException ( "No commits found on the current branch." ) ;
200
195
201
- return GetNextVersions ( ) ;
196
+ return GetNextVersionsInternal ( ) ;
202
197
203
- IEnumerable < NextVersion > GetNextVersions ( )
198
+ IEnumerable < NextVersion > GetNextVersionsInternal ( )
204
199
{
205
200
var atLeastOneBaseVersionReturned = false ;
206
201
0 commit comments