Revert "Merge pull request #1591 from asbjornu/feature/tfs-merge-messages"

This reverts commit a0a6cc4, reversing
changes made to 371a896.

# Conflicts:
#	src/GitVersionCore/MergeMessage.cs

Author: Kieranties

src/GitVersionCore.Tests/MergeMessageTests.cs

@@ -209,63 +209,6 @@ public void ParsesRemoteTrackingMergeMessage(
             sut.Version.ShouldBe(expectedVersion);
         }
 
-        private static readonly object[] ParsesTfsEnglishUSMergeMessages =
-        {
-            new object[] { "Merge feature/one to master", "feature/one", "master", null },
-            new object[] { "Merge v://10.10.10.10 to master", "v://10.10.10.10", "master", null },
-            new object[] { "Merge feature/one to v://10.10.10.10", "feature/one", "v://10.10.10.10", null },
-            new object[] { "Merge V4.0.0 to master", "V4.0.0", "master", new SemanticVersion(4) },
-            new object[] { "Merge feature/4.1/one to master", "feature/4.1/one", "master", new SemanticVersion(4, 1) }
-         };
-
-        [TestCaseSource(nameof(ParsesTfsEnglishUSMergeMessages))]
-        public void ParsesTfsEnglishUSMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion)
-        {
-            // Act
-            var sut = new MergeMessage(message, _config);
-
-            // Assert
-            sut.MatchDefinition.ShouldBe("TfsMergeMessageEnglishUS");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        private static readonly object[] ParsesTfsGermanDEMergeMessages =
-        {
-            new object[] { "Zusammengeführter PR \"1234\": feature/one mit master mergen", "feature/one", "master", null, 1234 },
-            new object[] { "Zusammengeführter PR \"1234\": v://10.10.10.10 mit master mergen", "v://10.10.10.10", "master", null, 1234 },
-            new object[] { "Zusammengeführter PR \"1234\": feature/one mit v://10.10.10.10 mergen", "feature/one", "v://10.10.10.10", null, 1234 },
-            new object[] { "Zusammengeführter PR \"1234\": V4.0.0 mit master mergen", "V4.0.0", "master", new SemanticVersion(4), 1234 },
-            new object[] { "Zusammengeführter PR \"1234\": feature/4.1/one mit master mergen", "feature/4.1/one", "master", new SemanticVersion(4, 1), 1234 }
-        };
-
-        [TestCaseSource(nameof(ParsesTfsGermanDEMergeMessages))]
-        public void ParseTfsGermanDEMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion,
-            int? expectedPullRequestNumber)
-        {
-            // Act
-            var sut = new MergeMessage(message, _config);
-
-            // Assert
-            sut.MatchDefinition.ShouldBe("TfsMergeMessageGermanDE");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeTrue();
-            sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
         private static readonly object[] InvalidMergeMessages =
         {
             new object[] { "Merge pull request # from feature/one", "", null, null, null },

src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -47,8 +47,6 @@ public void ShouldNotAllowIncrementOfVersion()
         [TestCase("Merge branch 'Release-v2.2'", true, "2.2.0")]
         [TestCase("Merge remote-tracking branch 'origin/release/0.8.0' into develop/master", true, "0.8.0")]
         [TestCase("Merge remote-tracking branch 'refs/remotes/origin/release/2.0.0'", true, "2.0.0")]
-        [TestCase("Merge release/5.1.0 to master", true, "5.1.0")] // Team Foundation Server 2017 default merge message (en-US)
-        [TestCase("Zusammengeführter PR \"9\": release/5.1.0 mit master mergen", true, "5.1.0")] // Team Foundation Server 2017 default merge message (de-DE)
         public void TakesVersionFromMergeOfReleaseBranch(string message, bool isMergeCommit, string expectedVersion)
         {
             var parents = GetParents(isMergeCommit);

src/GitVersionCore/MergeMessage.cs

@@ -13,9 +13,7 @@ public class MergeMessage
             Pattern("SmartGit",  @"^Finish (?<SourceBranch>[^\s]*)(?: into (?<TargetBranch>[^\s]*))*"),
             Pattern("BitBucketPull", @"^Merge pull request #(?<PullRequestNumber>\d+) (from|in) (?<Source>.*) from (?<SourceBranch>[^\s]*) to (?<TargetBranch>[^\s]*)"),
             Pattern("GitHubPull", @"^Merge pull request #(?<PullRequestNumber>\d+) (from|in) (?:(?<SourceBranch>[^\s]*))(?: into (?<TargetBranch>[^\s]*))*"),
-            Pattern("RemoteTracking", @"^Merge remote-tracking branch '(?<SourceBranch>[^\s]*)'(?: into (?<TargetBranch>[^\s]*))*"),
-            Pattern("TfsMergeMessageEnglishUS", @"^Merge (?<SourceBranch>[^\s]*) to (?<TargetBranch>[^\s]*)"),
-            Pattern("TfsMergeMessageGermanDE",@"^Zusammengeführter PR ""(?<PullRequestNumber>\d+)""\: (?<SourceBranch>.*) mit (?<TargetBranch>.*) mergen")
+            Pattern("RemoteTracking", @"^Merge remote-tracking branch '(?<SourceBranch>[^\s]*)'(?: into (?<TargetBranch>[^\s]*))*")
         };
 
         public MergeMessage(string mergeMessage, Config config)