Skip to content

Fixes #2122 - sequence contains no elements when using IgnoreConfig #2318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/GitVersionCore.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
32 changes: 19 additions & 13 deletions src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down