Merge branch 'master' into patch-1

Author: asbjornu

.github/stale.yml

@@ -6,6 +6,7 @@ daysUntilClose: 30
 exemptLabels:
   - pinned
   - security
+  - bug
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
@@ -14,4 +15,4 @@ markComment: >
   recent activity. After 30 days from now, it will be closed if no further
   activity occurs. Thank you for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false

build/pack.cake

@@ -141,12 +141,14 @@ Task("Pack-Nuget")
         MSBuildSettings = parameters.MSBuildSettings
     };
 
-    // GitVersionTask, & global tool
+    // GitVersionTask, global tool & core
     settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
     DotNetCorePack("./src/GitVersionExe/GitVersionExe.csproj", settings);
 
     settings.ArgumentCustomization = null;
     DotNetCorePack("./src/GitVersionTask", settings);
+
+    DotNetCorePack("./src/GitVersionCore", settings);
 });
 
 Task("Pack-Chocolatey")

build/utils/parameters.cake

@@ -124,7 +124,7 @@ public class BuildParameters
         Packages = BuildPackages.GetPackages(
             Paths.Directories.NugetRoot,
             Version,
-            new [] { "GitVersion.CommandLine", "GitVersionTask", "GitVersion.Tool" },
+            new [] { "GitVersion.CommandLine", "GitVersion.Core", "GitVersionTask", "GitVersion.Tool" },
             new [] { "GitVersion.Portable" });
 
         var files = Paths.Files;

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

@@ -8,6 +8,7 @@
 using GitVersion.Logging;
 using Microsoft.Extensions.Options;
 using GitVersion.Extensions;
+using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -29,10 +30,10 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
 
             var log = sp.GetService<ILog>();
             var variableProvider = sp.GetService<IVariableProvider>();
-            var versionFinder = sp.GetService<IGitVersionFinder>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
 
             var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, onlyTrackedBranches, commitId);
-            var executeGitVersion = versionFinder.FindVersion(gitVersionContext);
+            var executeGitVersion = nextVersionCalculator.FindVersion(gitVersionContext);
             var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
 
             try

src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -4,7 +4,6 @@
 using GitVersion;
 using GitVersion.Configuration;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.VersionFilters;
 using GitVersionCore.Tests.Mocks;
 using LibGit2Sharp;

src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

@@ -28,11 +28,12 @@ public void ShouldIncrementVersionBasedOnConfig()
                 services.AddSingleton<IMetaDataCalculator>(new TestMetaDataCalculator(semanticVersionBuildMetaData));
             });
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
+            nextVersionCalculator.ShouldNotBeNull();
 
             var context = new GitVersionContextBuilder().WithConfig(new Config()).Build();
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersionInternal(context);
 
             version.ToString().ShouldBe("1.0.1");
         }
@@ -47,11 +48,12 @@ public void DoesNotIncrementWhenBaseVersionSaysNotTo()
                 services.AddSingleton<IMetaDataCalculator>(new TestMetaDataCalculator(semanticVersionBuildMetaData));
             });
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
 
+            nextVersionCalculator.ShouldNotBeNull();
             var context = new GitVersionContextBuilder().WithConfig(new Config()).Build();
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersionInternal(context);
 
             version.ToString().ShouldBe("1.0.0");
         }
@@ -67,13 +69,14 @@ public void AppliesBranchPreReleaseTag()
                 services.AddSingleton<IMetaDataCalculator>(new TestMetaDataCalculator(semanticVersionBuildMetaData));
             });
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
+            nextVersionCalculator.ShouldNotBeNull();
 
             var context = new GitVersionContextBuilder()
                 .WithDevelopBranch()
                 .Build();
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersionInternal(context);
 
             version.ToString("f").ShouldBe("1.0.0-alpha.1+2");
         }

src/GitVersionCore.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using GitVersion.Configuration;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersionCore.Tests.Helpers;
 using NUnit.Framework;
 using Shouldly;

src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using GitVersion.Configuration;
 using GitVersion.Logging;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
+using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
 using GitVersionCore.Tests.Mocks;
 using LibGit2Sharp;

src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs

@@ -5,7 +5,6 @@
 using GitVersion.Configuration;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersionCore.Tests.Helpers;
 using LibGit2Sharp;
 using NUnit.Framework;

src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs

@@ -1,6 +1,5 @@
 using GitVersion;
 using GitVersion.VersionCalculation;
-using GitVersion.VersionCalculation.BaseVersionCalculators;
 using LibGit2Sharp;
 
 namespace GitVersionCore.Tests.VersionCalculation