Inlined RecentTagVersionExtractor into only class using it

Author: JakeGinnivan

GitVersionCore/GitFlow/BranchFinders/RecentTagVersionExtractor.cs

@@ -80,7 +80,6 @@
     <Compile Include="Configuration\LegacyConfigNotifier.cs" />
     <Compile Include="Configuration\OldConfigurationException.cs" />
     <Compile Include="EffectiveConfiguration.cs" />
-    <Compile Include="GitFlow\BranchFinders\RecentTagVersionExtractor.cs" />
     <Compile Include="Helpers\FileSystem.cs" />
     <Compile Include="Helpers\IFileSystem.cs" />
     <Compile Include="Helpers\ProcessHelper.cs" />

GitVersionCore/GitVersionCore.csproj

@@ -1,15 +1,32 @@
 namespace GitVersion.VersioningModes
 {
     using System.Collections.Generic;
-
+    using System.Linq;
     using LibGit2Sharp;
 
     public class ContinuousDeliveryMode : VersioningModeBase
     {
         public override SemanticVersionPreReleaseTag GetPreReleaseTag(GitVersionContext context, List<Tag> possibleCommits, int numberOfCommits)
         {
-            return RecentTagVersionExtractor.RetrieveMostRecentOptionalTagVersion(context, possibleCommits) 
-                ?? context.Configuration.Tag + ".1";
+            return RetrieveMostRecentOptionalTagVersion(context, possibleCommits) ?? context.Configuration.Tag + ".1";
+        }
+
+        static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVersionContext context, List<Tag> applicableTagsInDescendingOrder)
+        {
+            if (applicableTagsInDescendingOrder.Any())
+            {
+                var taggedCommit = applicableTagsInDescendingOrder.First().Target;
+                var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name, context.Configuration.GitTagPrefix)).FirstOrDefault();
+                if (preReleaseVersion != null)
+                {
+                    if (taggedCommit != context.CurrentCommit)
+                    {
+                        preReleaseVersion.PreReleaseTag.Number++;
+                    }
+                    return preReleaseVersion.PreReleaseTag;
+                }
+            }
+            return null;
         }
     }
 }