Merge pull request #2356 from FISHMANPET/mainline1.0.0

Add support for next-version in mainline mode

Author: asbjornu

src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

@@ -117,6 +117,42 @@ public void PreReleaseTagCanUseBranchName()
             fixture.AssertFullSemver("1.0.0-foo.1+2", config);
         }
 
+        [Test]
+        public void PreReleaseVersionMainline()
+        {
+            var config = new Config
+            {
+                VersioningMode = VersioningMode.Mainline,
+                NextVersion = "1.0.0"
+            };
+
+            using var fixture = new EmptyRepositoryFixture();
+            fixture.MakeACommit();
+            fixture.BranchTo("foo");
+            fixture.MakeACommit();
+
+            fixture.AssertFullSemver("1.0.0-foo.1", config);
+        }
+
+        [Test]
+        public void MergeIntoMainline()
+        {
+            var config = new Config
+            {
+                VersioningMode = VersioningMode.Mainline,
+                NextVersion = "1.0.0"
+            };
+
+            using var fixture = new EmptyRepositoryFixture();
+            fixture.MakeACommit();
+            fixture.BranchTo("foo");
+            fixture.MakeACommit();
+            fixture.Checkout("master");
+            fixture.MergeNoFF("foo");
+
+            fixture.AssertFullSemver("1.0.0", config);
+        }
+
         [Test]
         public void PreReleaseTagCanUseBranchNameVariable()
         {

src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs

@@ -54,22 +54,25 @@ public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
                 var mainlineCommitLog = repositoryMetadataProvider.GetMainlineCommitLog(baseVersion.BaseVersionSource, mainlineTip);
                 var directCommits = new List<Commit>(mainlineCommitLog.Count);
 
-                // Scans commit log in reverse, aggregating merge commits
-                foreach (var commit in mainlineCommitLog)
+                if (string.IsNullOrEmpty(context.Configuration.NextVersion))
                 {
-                    directCommits.Add(commit);
-                    if (commit.Parents.Count() > 1)
+                    // Scans commit log in reverse, aggregating merge commits
+                    foreach (var commit in mainlineCommitLog)
                     {
-                        mainlineVersion = AggregateMergeCommitIncrement(commit, directCommits, mainlineVersion, mainline);
+                        directCommits.Add(commit);
+                        if (commit.Parents.Count() > 1)
+                        {
+                            mainlineVersion = AggregateMergeCommitIncrement(commit, directCommits, mainlineVersion, mainline);
+                        }
                     }
-                }
 
-                // This will increment for any direct commits on mainline
-                mainlineVersion = IncrementForEachCommit(directCommits, mainlineVersion, mainline);
+                    // This will increment for any direct commits on mainline
+                    mainlineVersion = IncrementForEachCommit(directCommits, mainlineVersion, mainline);
+                }
                 mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);
 
                 // branches other than master always get a bump for the act of branching
-                if (!context.CurrentBranch.IsSameBranch(mainline))
+                if ((!context.CurrentBranch.IsSameBranch(mainline)) && (string.IsNullOrEmpty(context.Configuration.NextVersion)))
                 {
                     var branchIncrement = FindMessageIncrement(null, context.CurrentCommit, mergeBase, mainlineCommitLog);
                     log.Info($"Performing {branchIncrement} increment for current branch ");