Remove the hardcoded string to detect a base version calculated using a MergeMessageBaseVersionStrategy

Ruh Ullah Shah · Ruh Ullah Shah · commit dcd9215b2328 · 2019-03-12T10:30:18.000+01:00
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs
@@ -104,7 +104,8 @@ private void FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMerg
             {
                 foreach (var baseVersion in baseVersions)
                 {
-                    if (baseVersion.Version.Source.Contains("Merge message")
+                    if (baseVersion.Version.Source.Contains(
+                        MergeMessageBaseVersionStrategy.MergeMessageStrategyPrefix)
                         && baseVersion.Version.Source.Contains("Merge branch")
                         && baseVersion.Version.Source.Contains("release"))
                     {
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs
@@ -26,14 +26,16 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
                         var shouldIncrement = !context.Configuration.PreventIncrementForMergedBranchVersion;
                         return new[]
                         {
-                            new BaseVersion(context, $"Merge message '{c.Message.Trim()}'", shouldIncrement, mergeMessage.Version, c, null)
+                            new BaseVersion(context, $"{MergeMessageStrategyPrefix} '{c.Message.Trim()}'", shouldIncrement, mergeMessage.Version, c, null)
                         };
                     }
                     return Enumerable.Empty<BaseVersion>();
                 }).ToList();
             return baseVersions;
         }
 
+        public static readonly string MergeMessageStrategyPrefix = "Merge message";
+
         static bool TryParse(Commit mergeCommit, GitVersionContext context, out MergeMessage mergeMessage)
         {
             mergeMessage = Inner(mergeCommit, context);

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ private void FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMerg`
`104`	`104`	`{`
`105`	`105`	`foreach (var baseVersion in baseVersions)`
`106`	`106`	`{`
`107`		`- if (baseVersion.Version.Source.Contains("Merge message")`
	`107`	`+ if (baseVersion.Version.Source.Contains(`
	`108`	`+ MergeMessageBaseVersionStrategy.MergeMessageStrategyPrefix)`
`108`	`109`	`&& baseVersion.Version.Source.Contains("Merge branch")`
`109`	`110`	`&& baseVersion.Version.Source.Contains("release"))`
`110`	`111`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,16 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)`
`26`	`26`	`var shouldIncrement = !context.Configuration.PreventIncrementForMergedBranchVersion;`
`27`	`27`	`return new[]`
`28`	`28`	`{`
`29`		`- new BaseVersion(context, $"Merge message '{c.Message.Trim()}'", shouldIncrement, mergeMessage.Version, c, null)`
	`29`	`+ new BaseVersion(context, $"{MergeMessageStrategyPrefix} '{c.Message.Trim()}'", shouldIncrement, mergeMessage.Version, c, null)`
`30`	`30`	`};`
`31`	`31`	`}`
`32`	`32`	`return Enumerable.Empty<BaseVersion>();`
`33`	`33`	`}).ToList();`
`34`	`34`	`return baseVersions;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ public static readonly string MergeMessageStrategyPrefix = "Merge message";`
	`38`	`+`
`37`	`39`	`static bool TryParse(Commit mergeCommit, GitVersionContext context, out MergeMessage mergeMessage)`
`38`	`40`	`{`
`39`	`41`	`mergeMessage = Inner(mergeCommit, context);`