Merge branch 'master' into feature/put-vbnet-code_in-global-namespace

Author: asbjornu

src/GitVersionCore.Tests/IntegrationTests/IgnoreBeforeScenarios.cs

@@ -0,0 +1,31 @@
+using GitTools.Testing;
+using GitVersion.Configuration;
+using GitVersion.Extensions;
+using GitVersion.Model.Configuration;
+using GitVersionCore.Tests.Helpers;
+using NUnit.Framework;
+
+namespace GitVersionCore.Tests.IntegrationTests
+{
+    [TestFixture]
+    public class IgnoreBeforeScenarios : TestBase
+    {
+        [Test]
+        public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+            var commit = fixture.Repository.MakeACommit();
+
+            var config = new ConfigurationBuilder()
+                .Add(new Config
+                {
+                    Ignore = new IgnoreConfig
+                    {
+                        Before = commit.When().AddMinutes(1)
+                    }
+                }).Build();
+
+            fixture.AssertFullSemver("0.1.0+0", config);
+        }
+    }
+}

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -28,23 +28,29 @@ public BaseVersion GetBaseVersion()
             using (log.IndentLog("Calculating base versions"))
             {
                 var baseVersions = strategies
-                    .SelectMany(s => s.GetVersions())
-                    .Where(v =>
+                    .SelectMany(s =>
                     {
-                        if (v == null) return false;
+                        if (s is FallbackVersionStrategy)
+                            return s.GetVersions();
 
-                        log.Info(v.ToString());
-
-                        foreach (var filter in context.Configuration.VersionFilters)
-                        {
-                            if (filter.Exclude(v, out var reason))
+                        return s.GetVersions()
+                            .Where(v =>
                             {
-                                log.Info(reason);
-                                return false;
-                            }
-                        }
+                                if (v == null) return false;
+
+                                log.Info(v.ToString());
+
+                                foreach (var filter in context.Configuration.VersionFilters)
+                                {
+                                    if (filter.Exclude(v, out var reason))
+                                    {
+                                        log.Info(reason);
+                                        return false;
+                                    }
+                                }
 
-                        return true;
+                                return true;
+                            });
                     })
                     .Select(v => new Versions
                     {