migrate to DI IBaseVersionCalculator

arturcic · arturcic · commit 7fbd21a95780 · 2019-10-25T23:45:03.000+03:00
diff --git a/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs b/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs
@@ -26,7 +26,8 @@ public void Setup()
         {
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
             log = new NullLog();
-            variableProvider = new VariableProvider(log, new MetaDataCalculator());
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
         }
 
         [TestCase("cs")]
diff --git a/src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs b/src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs
@@ -23,7 +23,8 @@ public void SetUp()
         {
             environment = new TestEnvironment();
             log = new NullLog();
-            variableProvider = new VariableProvider(log, new MetaDataCalculator());
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
         }
 
         [Test]
diff --git a/src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs b/src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs
@@ -26,7 +26,9 @@ public void SetUp()
             log = new NullLog();
 
             environment = new TestEnvironment();
-            variableProvider = new VariableProvider(log, new MetaDataCalculator());
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+
+            variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
         }
 
         [Test]
diff --git a/src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs b/src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs
@@ -25,7 +25,8 @@ public void SetUp()
         {
             environment = new TestEnvironment();
             log = new NullLog();
-            variableProvider = new VariableProvider(log, new MetaDataCalculator());
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
         }
 
         [Test]
diff --git a/src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs b/src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs
@@ -25,7 +25,8 @@ public void SetUp()
         {
             environment = new TestEnvironment();
             log = new NullLog();
-            variableProvider = new VariableProvider(log, new MetaDataCalculator());
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
         }
 
         [Test]
diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs
@@ -4,7 +4,9 @@
 using GitVersion.Configuration;
 using NUnit.Framework;
 using GitVersion.Logging;
+using GitVersion.OutputVariables;
 using GitVersion.VersionCalculation;
+using GitVersionCore.Tests.VersionCalculation;
 
 namespace GitVersionCore.Tests
 {
@@ -84,12 +86,14 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
             var buildServerResolver = new BuildServerResolver(null, log);
 
             var metaDataCalculator = new MetaDataCalculator();
-            var gitVersionFinder = new GitVersionFinder(log, metaDataCalculator);
+            var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
+            var gitVersionFinder = new GitVersionFinder(log, metaDataCalculator, baseVersionCalculator);
 
             var gitPreparer = new GitPreparer(log, arguments);
             var configurationProvider = new ConfigurationProvider(testFileSystem, log, configFileLocator, gitPreparer);
 
-            var gitVersionCalculator = new GitVersionCalculator(testFileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator, gitPreparer);
+            var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
+            var gitVersionCalculator = new GitVersionCalculator(testFileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider);
 
             var versionVariables = gitVersionCalculator.CalculateVersionVariables(arguments);
 
diff --git a/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
@@ -9,6 +9,7 @@
 using GitVersion.Logging;
 using GitVersion.SemanticVersioning;
 using GitVersion.VersionCalculation;
+using GitVersionCore.Tests.VersionCalculation;
 
 namespace GitVersionCore.Tests
 {
@@ -29,7 +30,8 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
             }
 
             var log = new NullLog();
-            var variableProvider = new VariableProvider(log, new MetaDataCalculator());
+            var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
+            var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
             var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);
             var executeGitVersion = ExecuteGitVersion(gitVersionContext);
             var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
@@ -73,7 +75,9 @@ public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config c
 
         private static SemanticVersion ExecuteGitVersion(GitVersionContext context)
         {
-            var vf = new GitVersionFinder(new NullLog(), new MetaDataCalculator());
+            var log = new NullLog();
+            var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
+            var vf = new GitVersionFinder(log, new MetaDataCalculator(), baseVersionCalculator);
             return vf.FindVersion(context);
         }
 
diff --git a/src/GitVersionCore.Tests/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/GitVersionExecutorTests.cs
@@ -13,6 +13,7 @@
 using GitVersionCore.Tests.Helpers;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;
+using GitVersionCore.Tests.VersionCalculation;
 using Environment = System.Environment;
 
 namespace GitVersionCore.Tests
@@ -40,7 +41,9 @@ public void SetUp()
             buildServerResolver = new BuildServerResolver(null, log);
             gitVersionCache = new GitVersionCache(fileSystem, log);
             metaDataCalculator = new MetaDataCalculator();
-            gitVersionFinder = new GitVersionFinder(log, metaDataCalculator);
+            var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
+
+            gitVersionFinder = new GitVersionFinder(log, metaDataCalculator, baseVersionCalculator);
         }
 
         [Test]
@@ -518,7 +521,9 @@ private void RepositoryScope(ILog _log, Action<EmptyRepositoryFixture, VersionVa
 
             var gitPreparer = new GitPreparer(_log, arguments);
             var configurationProvider = new ConfigurationProvider(fileSystem, _log, configFileLocator, gitPreparer);
-            var gitVersionCalculator = new GitVersionCalculator(fileSystem, _log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator, gitPreparer);
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
+            var gitVersionCalculator = new GitVersionCalculator(fileSystem, _log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider);
 
             fixture.Repository.MakeACommit();
             var vv = gitVersionCalculator.CalculateVersionVariables(arguments);
@@ -533,7 +538,9 @@ private GitVersionCalculator GetGitVersionCalculator(Arguments arguments)
         {
             var gitPreparer = new GitPreparer(log, arguments);
             var configurationProvider = new ConfigurationProvider(fileSystem, log, configFileLocator, gitPreparer);
-            var gitVersionCalculator = new GitVersionCalculator(fileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, metaDataCalculator, gitPreparer);
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
+            var gitVersionCalculator = new GitVersionCalculator(fileSystem, log, configFileLocator, configurationProvider, buildServerResolver, gitVersionCache, gitVersionFinder, gitPreparer, variableProvider);
             return gitVersionCalculator;
         }
     }
diff --git a/src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs b/src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs
@@ -42,7 +42,8 @@ public void ShouldCreateFile(string fileExtension)
                     "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
             };
 
-            var variableProvider = new VariableProvider(new NullLog(), new MetaDataCalculator());
+            var baseVersionCalculator = new BaseVersionCalculator(new NullLog(), null);
+            var variableProvider = new VariableProvider(new NullLog(), new MetaDataCalculator(), baseVersionCalculator);
             var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
             var generator = new GitVersionInformationGenerator(fileName, directory, variables, fileSystem);
 
diff --git a/src/GitVersionCore.Tests/JsonVersionBuilderTests.cs b/src/GitVersionCore.Tests/JsonVersionBuilderTests.cs
@@ -34,7 +34,9 @@ public void Json()
 
             var config = new TestEffectiveConfiguration();
 
-            var variableProvider = new VariableProvider(new NullLog(), new MetaDataCalculator());
+            var log = new NullLog();
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
             var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
             var json = JsonOutputFormatter.ToJson(variables);
             json.ShouldMatchApproved(c => c.SubFolder("Approved"));
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.cs b/src/GitVersionCore.Tests/VariableProviderTests.cs
@@ -20,7 +20,8 @@ public void Setup()
         {
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
             var log = new NullLog();
-            variableProvider = new VariableProvider(log, new MetaDataCalculator());
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
         }
 
         [Test]
diff --git a/src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs b/src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs
@@ -1,4 +1,5 @@
 using GitVersion;
+using GitVersion.Logging;
 using GitVersion.SemanticVersioning;
 using GitVersion.VersionCalculation;
 using GitVersion.VersionCalculation.BaseVersionCalculators;
@@ -24,4 +25,20 @@ public BaseVersion GetBaseVersion(GitVersionContext context)
             return new BaseVersion(context, "Test source", shouldIncrement, semanticVersion, source, null);
         }
     }
-}
+
+    public class TestBaseVersionStrategiesCalculator : BaseVersionCalculator
+    {
+        private static IVersionStrategy[] versionStrategies = new IVersionStrategy[]
+        {
+            new FallbackVersionStrategy(),
+            new ConfigNextVersionVersionStrategy(),
+            new TaggedCommitVersionStrategy(),
+            new MergeMessageVersionStrategy(),
+            new VersionInBranchNameVersionStrategy(),
+            new TrackReleaseBranchesVersionStrategy()
+        };
+        public TestBaseVersionStrategiesCalculator(ILog log) : base(log, versionStrategies)
+        {
+        }
+    }
+}
diff --git a/src/GitVersionCore.Tests/VersionSourceTests.cs b/src/GitVersionCore.Tests/VersionSourceTests.cs
@@ -3,6 +3,7 @@
 using GitVersion.Configuration;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;
+using GitVersionCore.Tests.VersionCalculation;
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
@@ -14,12 +15,14 @@ public class VersionSourceTests : TestBase
     {
         private ILog log;
         private IMetaDataCalculator metaDataCalculator;
+        private IBaseVersionCalculator baseVersionCalculator;
 
         [SetUp]
         public void SetUp()
         {
             log = new NullLog();
             metaDataCalculator = new MetaDataCalculator();
+            baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);
         }
 
         [Test]
@@ -36,7 +39,7 @@ public void VersionSourceSha()
             _ = fixture.Repository.MakeACommit();
 
             var context = new GitVersionContext(fixture.Repository, new NullLog(), fixture.Repository.Head, config);
-            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator);
             var version = nextVersionCalculator.FindVersion(context);
 
             version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
@@ -52,7 +55,7 @@ public void VersionSourceShaOneCommit()
             var initialCommit = fixture.Repository.MakeACommit();
 
             var context = new GitVersionContext(fixture.Repository, new NullLog(), fixture.Repository.Head, config);
-            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator);
             var version = nextVersionCalculator.FindVersion(context);
 
             version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
@@ -74,7 +77,7 @@ public void VersionSourceShaUsingTag()
             _ = fixture.Repository.MakeACommit();
 
             var context = new GitVersionContext(fixture.Repository, new NullLog(), fixture.Repository.Head, config);
-            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator);
             var version = nextVersionCalculator.FindVersion(context);
 
             version.BuildMetaData.VersionSourceSha.ShouldBe(secondCommit.Sha);
diff --git a/src/GitVersionCore.Tests/WixFileTests.cs b/src/GitVersionCore.Tests/WixFileTests.cs
@@ -43,15 +43,16 @@ public void UpdateWixVersionFile()
 
             var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
 
-            var variableProvider = new VariableProvider(new NullLog(), new MetaDataCalculator());
-            var vars = variableProvider.GetVariablesFor(semVer, config, false);
-
             var stringBuilder = new StringBuilder();
             void Action(string s) => stringBuilder.AppendLine(s);
 
             var logAppender = new TestLogAppender(Action);
             var log = new Log(logAppender);
 
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);
+            var vars = variableProvider.GetVariablesFor(semVer, config, false);
+
             using var wixVersionFileUpdater = new WixVersionFileUpdater(workingDir, vars, fileSystem, log);
             wixVersionFileUpdater.Update();
             fileSystem.ReadAllText(wixVersionFileUpdater.WixVersionFile).
diff --git a/src/GitVersionCore/GitVersionCalculator.cs b/src/GitVersionCore/GitVersionCalculator.cs
@@ -3,7 +3,6 @@
 using GitVersion.OutputVariables;
 using GitVersion.Cache;
 using GitVersion.Logging;
-using GitVersion.VersionCalculation;
 
 namespace GitVersion
 {
@@ -16,13 +15,13 @@ public class GitVersionCalculator : IGitVersionCalculator
         private readonly IBuildServerResolver buildServerResolver;
         private readonly IGitVersionCache gitVersionCache;
         private readonly IGitVersionFinder gitVersionFinder;
-        private readonly IMetaDataCalculator metaDataCalculator;
         private readonly IGitPreparer gitPreparer;
+        private readonly IVariableProvider variableProvider;
 
         public GitVersionCalculator(IFileSystem fileSystem, ILog log, IConfigFileLocator configFileLocator,
             IConfigurationProvider configurationProvider,
             IBuildServerResolver buildServerResolver, IGitVersionCache gitVersionCache,
-            IGitVersionFinder gitVersionFinder, IMetaDataCalculator metaDataCalculator, IGitPreparer gitPreparer)
+            IGitVersionFinder gitVersionFinder, IGitPreparer gitPreparer, IVariableProvider variableProvider)
         {
             this.fileSystem = fileSystem;
             this.log = log;
@@ -31,8 +30,8 @@ public GitVersionCalculator(IFileSystem fileSystem, ILog log, IConfigFileLocator
             this.buildServerResolver = buildServerResolver;
             this.gitVersionCache = gitVersionCache;
             this.gitVersionFinder = gitVersionFinder;
-            this.metaDataCalculator = metaDataCalculator;
             this.gitPreparer = gitPreparer;
+            this.variableProvider = variableProvider;
         }
 
         public VersionVariables CalculateVersionVariables(Arguments arguments)
@@ -58,7 +57,7 @@ public VersionVariables CalculateVersionVariables(Arguments arguments)
                 throw new Exception($"Failed to prepare or find the .git directory in path '{arguments.TargetPath}'.");
             }
 
-            return GetCachedGitVersionInfo(arguments.TargetBranch, arguments.CommitId, arguments.OverrideConfig, arguments.NoCache, gitPreparer);
+            return GetCachedGitVersionInfo(arguments.TargetBranch, arguments.CommitId, arguments.OverrideConfig, arguments.NoCache);
         }
 
         public bool TryCalculateVersionVariables(Arguments arguments, out VersionVariables versionVariables)
@@ -89,13 +88,13 @@ private string ResolveCurrentBranch(IBuildServer buildServer, string targetBranc
             return currentBranch;
         }
 
-        private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache, IGitPreparer gitPreparer)
+        private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache)
         {
             var cacheKey = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, configFileLocator, overrideConfig);
             var versionVariables = noCache ? default : gitVersionCache.LoadVersionVariablesFromDiskCache(gitPreparer, cacheKey);
             if (versionVariables == null)
             {
-                versionVariables = ExecuteInternal(targetBranch, commitId, gitPreparer, overrideConfig);
+                versionVariables = ExecuteInternal(targetBranch, commitId, overrideConfig);
 
                 if (!noCache)
                 {
@@ -113,7 +112,7 @@ private VersionVariables GetCachedGitVersionInfo(string targetBranch, string com
             return versionVariables;
         }
 
-        private VersionVariables ExecuteInternal(string targetBranch, string commitId, IGitPreparer gitPreparer, Config overrideConfig)
+        private VersionVariables ExecuteInternal(string targetBranch, string commitId, Config overrideConfig)
         {
             var configuration = configurationProvider.Provide(overrideConfig: overrideConfig);
 
@@ -122,7 +121,6 @@ private VersionVariables ExecuteInternal(string targetBranch, string commitId, I
                 var gitVersionContext = new GitVersionContext(repo, log, targetBranch, configuration, commitId: commitId);
                 var semanticVersion = gitVersionFinder.FindVersion(gitVersionContext);
 
-                var variableProvider = new VariableProvider(log, metaDataCalculator);
                 return variableProvider.GetVariablesFor(semanticVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
             });
         }
diff --git a/src/GitVersionCore/GitVersionCoreModule.cs b/src/GitVersionCore/GitVersionCoreModule.cs
@@ -20,6 +20,8 @@ public void RegisterTypes(IServiceCollection services)
             services.AddSingleton<ILog, Log>();
             services.AddSingleton<IGitVersionCache, GitVersionCache>();
 
+            services.AddSingleton<IBaseVersionCalculator, BaseVersionCalculator>();
+
             services.AddSingleton<IGitVersionCalculator, GitVersionCalculator>();
             services.AddSingleton<IMetaDataCalculator, MetaDataCalculator>();
             services.AddSingleton<IVariableProvider, VariableProvider>();
diff --git a/src/GitVersionCore/GitVersionFinder.cs b/src/GitVersionCore/GitVersionFinder.cs
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
diff --git a/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs b/src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs
diff --git a/src/GitVersionTask/GitVersionTasks.cs b/src/GitVersionTask/GitVersionTasks.cs

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ public void Setup()`
`26`	`26`	`{`
`27`	`27`	`ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();`
`28`	`28`	`log = new NullLog();`
`29`		`- variableProvider = new VariableProvider(log, new MetaDataCalculator());`
	`29`	`+ var baseVersionCalculator = new BaseVersionCalculator(log, null);`
	`30`	`+ variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`[TestCase("cs")]`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ public void SetUp()`
`23`	`23`	`{`
`24`	`24`	`environment = new TestEnvironment();`
`25`	`25`	`log = new NullLog();`
`26`		`- variableProvider = new VariableProvider(log, new MetaDataCalculator());`
	`26`	`+ var baseVersionCalculator = new BaseVersionCalculator(log, null);`
	`27`	`+ variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ public void SetUp()`
`26`	`26`	`log = new NullLog();`
`27`	`27`
`28`	`28`	`environment = new TestEnvironment();`
`29`		`- variableProvider = new VariableProvider(log, new MetaDataCalculator());`
	`29`	`+ var baseVersionCalculator = new BaseVersionCalculator(log, null);`
	`30`	`+`
	`31`	`+ variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ public void SetUp()`
`25`	`25`	`{`
`26`	`26`	`environment = new TestEnvironment();`
`27`	`27`	`log = new NullLog();`
`28`		`- variableProvider = new VariableProvider(log, new MetaDataCalculator());`
	`28`	`+ var baseVersionCalculator = new BaseVersionCalculator(log, null);`
	`29`	`+ variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using GitVersion.Logging;`
`10`	`10`	`using GitVersion.SemanticVersioning;`
`11`	`11`	`using GitVersion.VersionCalculation;`
	`12`	`+using GitVersionCore.Tests.VersionCalculation;`
`12`	`13`
`13`	`14`	`namespace GitVersionCore.Tests`
`14`	`15`	`{`
`@@ -29,7 +30,8 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`var log = new NullLog();`
`32`		`- var variableProvider = new VariableProvider(log, new MetaDataCalculator());`
	`33`	`+ var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);`
	`34`	`+ var variableProvider = new VariableProvider(log, new MetaDataCalculator(), baseVersionCalculator);`
`33`	`35`	`var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);`
`34`	`36`	`var executeGitVersion = ExecuteGitVersion(gitVersionContext);`
`35`	`37`	`var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);`
`@@ -73,7 +75,9 @@ public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config c`
`73`	`75`
`74`	`76`	`private static SemanticVersion ExecuteGitVersion(GitVersionContext context)`
`75`	`77`	`{`
`76`		`- var vf = new GitVersionFinder(new NullLog(), new MetaDataCalculator());`
	`78`	`+ var log = new NullLog();`
	`79`	`+ var baseVersionCalculator = new TestBaseVersionStrategiesCalculator(log);`
	`80`	`+ var vf = new GitVersionFinder(log, new MetaDataCalculator(), baseVersionCalculator);`
`77`	`81`	`return vf.FindVersion(context);`
`78`	`82`	`}`
`79`	`83`