Skip to content

Commit 2402ea8

Browse files
committed
formatting
1 parent 81ad112 commit 2402ea8

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,16 @@ public virtual NextVersion FindVersion()
5858
{
5959
var baseVersionBuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
6060

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;
6964

7065
semver.BuildMetaData = baseVersionBuildMetaData;
7166

7267
var lastPrefixedSemver = this.repositoryStore
7368
.GetVersionTagsOnBranch(Context.CurrentBranch, Context.Configuration.LabelPrefix, Context.Configuration.SemanticVersionFormat)
7469
.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));
7671

7772
if (lastPrefixedSemver != null)
7873
{
@@ -198,9 +193,9 @@ private IEnumerable<NextVersion> GetNextVersions(IBranch branch, IGitVersionConf
198193
if (branch.Tip == null)
199194
throw new GitVersionException("No commits found on the current branch.");
200195

201-
return GetNextVersions();
196+
return GetNextVersionsInternal();
202197

203-
IEnumerable<NextVersion> GetNextVersions()
198+
IEnumerable<NextVersion> GetNextVersionsInternal()
204199
{
205200
var atLeastOneBaseVersionReturned = false;
206201

0 commit comments

Comments
 (0)