Merge pull request #377 from anobleperson/release/3.0.0

Fixes #375 - Made known merge branch version number extraction case insensitive

Author: JakeGinnivan

GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -35,8 +35,12 @@ public void ShouldNotAllowIncrementOfVersion()
         [TestCase("Merge branch 'release-10.10.50'", true, "10.10.50")]
         [TestCase("Merge branch 's'", true, null)] // Must start with a number
         [TestCase("Merge branch 'release-0.2.0'", true, "0.2.0")]
+        [TestCase("Merge branch 'Release-0.2.0'", true, "0.2.0")]
+        [TestCase("Merge branch 'Release/0.2.0'", true, "0.2.0")]
         [TestCase("Merge branch 'hotfix-4.6.6' into support-4.6", true, "4.6.6")]
         [TestCase("Merge branch 'hotfix-10.10.50'", true, "10.10.50")]
+        [TestCase("Merge branch 'Hotfix-10.10.50'", true, "10.10.50")]
+        [TestCase("Merge branch 'Hotfix/10.10.50'", true, "10.10.50")]
         [TestCase("Merge branch 'hotfix-0.1.5'", true, "0.1.5")]
         [TestCase("Merge branch 'hotfix-4.2.2' into support-4.2", true, "4.2.2")]
         [TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]

GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

@@ -50,31 +50,17 @@ static bool Inner(Commit mergeCommit, out string versionPart)
 
             var message = mergeCommit.Message.TrimToFirstLine();
 
+            var knownMergePrefixes = new[] { "Merge branch 'hotfix-", "Merge branch 'hotfix/", "Merge branch 'release-", "Merge branch 'release/" };
 
-            if (message.StartsWith("Merge branch 'hotfix-"))
+            foreach (var prefix in knownMergePrefixes)
             {
-                var suffix = message.Replace("Merge branch 'hotfix-", "");
-                return TryGetPrefix(suffix, out versionPart, "'");
-            }
-
-            if (message.StartsWith("Merge branch 'hotfix/"))
-            {
-                var suffix = message.Replace("Merge branch 'hotfix/", "");
-                return TryGetPrefix(suffix, out versionPart, "'");
-            }
-
-            if (message.StartsWith("Merge branch 'release-"))
-            {
-                var suffix = message.Replace("Merge branch 'release-", "");
-                return TryGetPrefix(suffix, out versionPart, "'");
-            }
-
-            if (message.StartsWith("Merge branch 'release/"))
-            {
-                var suffix = message.Replace("Merge branch 'release/", "");
-                return TryGetPrefix(suffix, out versionPart, "'");
+                if (message.StartsWith(prefix))
+                {
+                    var suffix = message.Substring(prefix.Length);
+                    return TryGetPrefix(suffix, out versionPart, "'");
+                }
             }
-
+            
             if (message.StartsWith("Merge branch '"))
             {
                 var suffix = message.Replace("Merge branch '", "");