bad tag should be skipped when finding last major

Author: SimonCropp

GitVersionCore.Tests/GitFlowFeatureBranchTests.cs

@@ -0,0 +1,38 @@
+using System;
+using GitVersion;
+using NUnit.Framework;
+
+[TestFixture]
+public class LastMinorVersionFinderTests
+{
+    [Test]
+    public void Should_get_last_minor_release()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            var commit0 = fixture.Repository.MakeACommit(new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero));
+            fixture.Repository.Tags.Add("1.0.0", commit0);
+            var commit1 = fixture.Repository.MakeACommit(new DateTimeOffset(2001, 1, 1, 1, 1, 1, TimeSpan.Zero));
+            fixture.Repository.Tags.Add("1.1.0", commit1);
+            var commit2 = fixture.Repository.MakeACommit(new DateTimeOffset(2002, 1, 1, 1, 1, 1, TimeSpan.Zero));
+            fixture.Repository.Tags.Add("1.1.1", commit2);
+           
+            var dateTimeOffset = LastMinorVersionFinder.Execute(fixture.Repository, new Config(), fixture.Repository.Head.Tip);
+            Assert.AreEqual(2001, dateTimeOffset.Year);
+        }
+    }    
+    [Test]
+    public void Should_ignore_invalid_tag()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            var commit1 = fixture.Repository.MakeACommit(new DateTimeOffset(2001, 1, 1, 1, 1, 1, TimeSpan.Zero));
+            fixture.Repository.Tags.Add("1.1.0", commit1);
+            var commit2 = fixture.Repository.MakeACommit(new DateTimeOffset(2002, 1, 1, 1, 1, 1, TimeSpan.Zero));
+            fixture.Repository.Tags.Add("BadTag", commit2);
+           
+            var dateTimeOffset = LastMinorVersionFinder.Execute(fixture.Repository, new Config(), fixture.Repository.Head.Tip);
+            Assert.AreEqual(2001, dateTimeOffset.Year);
+        }
+    }    
+}

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -76,6 +76,7 @@
     <Compile Include="Fixtures\RemoteRepositoryFixture.cs" />
     <Compile Include="GitDirFinderTests.cs" />
     <Compile Include="Fixtures\BaseGitFlowRepositoryFixture.cs" />
+    <Compile Include="GitFlowFeatureBranchTests.cs" />
     <Compile Include="IntegrationTests\RemoteRepositoryTests.cs" />
     <Compile Include="IntegrationTests\GitFlow\DevelopScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\GitFlowFeatureBranchTests.cs" />

GitVersionCore/LastMinorVersionFinder.cs

@@ -19,7 +19,7 @@ public static DateTimeOffset Execute(IRepository repo, Config configuration, Com
                 )
             {
                 var fromTag = GetTimeStampFromTag(repo, configuration, commit);
-                
+
                 if (fromTag != DateTimeOffset.MinValue)
                 {
                     return fromTag;
@@ -28,11 +28,18 @@ public static DateTimeOffset Execute(IRepository repo, Config configuration, Com
             return commit.When();
         }
 
-
         static DateTimeOffset GetTimeStampFromTag(IRepository repository, Config configuration, Commit targetCommit)
         {
             var allMajorMinorTags = repository.Tags
-                .Where(x => SemanticVersion.Parse(x.Name, configuration.TagPrefix).Patch == 0)
+                .Where(x =>
+                {
+                    SemanticVersion version;
+                    if (!SemanticVersion.TryParse(x.Name, configuration.TagPrefix, out version))
+                    {
+                        return false;
+                    }
+                    return version.Patch == 0;
+                })
                 .ToDictionary(x => x.PeeledTarget(), x => x);
             var olderThan = targetCommit.When();
             foreach (var commit in repository.Head.Commits.Where(x => x.When() <= olderThan))