Feature/di2

src/GitVersionCore.Tests/AssemblyFileVersionTests.cs

@@ -1,7 +1,7 @@
-using GitVersion;
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.Extensions;
+using GitVersion;
 
 namespace GitVersionCore.Tests
 {
@@ -26,4 +26,4 @@ public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme asse
             assemblyFileVersion.ShouldBe(versionString);
         }
     }
-}
+}

src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using GitVersion;
 using NSubstitute;
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.OutputVariables;
 using GitVersion.Extensions;
 using GitVersion.Extensions.VersionAssemblyInfoResources;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
+using GitVersion.VersionCalculation;
 
 namespace GitVersionCore.Tests
 {
@@ -25,7 +25,11 @@ public void Setup()
         {
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
             log = new NullLog();
-            variableProvider = new VariableProvider(log);
+            var metaDataCalculator = new MetaDataCalculator();
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator);
         }
 
         [TestCase("cs")]
@@ -398,7 +402,7 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
         [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>\r\n' comment\r\n")]
         [Category("NoMono")]
         [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
-        public void Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
+        public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
         {
             var workingDir = Path.GetTempPath();
             var assemblyInfoFile = "AssemblyInfo." + fileExtension;

src/GitVersionCore.Tests/BuildServers/AzurePipelinesBuildNumberTests.cs

@@ -1,16 +1,16 @@
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests.BuildServers
 {
     [TestFixture]
     public class AzurePipelinesBuildNumberTests : TestBase
     {
-        private string key = "BUILD_BUILDNUMBER";
-        private string logPrefix = "##vso[build.updatebuildnumber]";
+        private readonly string key = "BUILD_BUILDNUMBER";
+        private readonly string logPrefix = "##vso[build.updatebuildnumber]";
         private AzurePipelines versionBuilder;
 
         private IEnvironment environment;

src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs

@@ -1,15 +1,15 @@
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests.BuildServers
 {
     [TestFixture]
     public class AzurePipelinesTests : TestBase
     {
-        private string key = "BUILD_BUILDNUMBER";
+        private readonly string key = "BUILD_BUILDNUMBER";
 
         private IEnvironment environment;
         private ILog log;
@@ -29,7 +29,7 @@ public void ClearEnvironmentVariableForTest()
         }
 
         [Test]
-        public void Develop_branch()
+        public void DevelopBranch()
         {
             var versionBuilder = new AzurePipelines(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");

src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using GitVersion;
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.OutputVariables;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
+using GitVersion.VersionCalculation;
 
 namespace GitVersionCore.Tests.BuildServers
 {
@@ -22,7 +22,11 @@ public void SetUp()
         {
             environment = new TestEnvironment();
             log = new NullLog();
-            variableProvider = new VariableProvider(log);
+            var metaDataCalculator = new MetaDataCalculator();
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator);
         }
 
         [Test]

src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs

@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using GitVersion;
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.OutputVariables;
 using GitVersion.Logging;
+using GitVersion.VersionCalculation;
 
 namespace GitVersionCore.Tests.BuildServers
 {
@@ -25,7 +25,11 @@ public void SetUp()
             log = new NullLog();
 
             environment = new TestEnvironment();
-            variableProvider = new VariableProvider(log);
+            var metaDataCalculator = new MetaDataCalculator();
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator);
         }
 
         [Test]

src/GitVersionCore.Tests/BuildServers/ContinuaCiTests.cs

@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests.BuildServers

src/GitVersionCore.Tests/BuildServers/DroneTests.cs

@@ -1,5 +1,5 @@
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
 using NUnit.Framework;
 using Shouldly;
@@ -27,7 +27,7 @@ public void TearDown()
         }
 
         [Test]
-        public void CanApplyToCurrentContext_ShouldBeTrue_WhenEnvironmentVariableIsSet()
+        public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
         {
             // Arrange
             var buildServer = new Drone(environment, log);
@@ -40,7 +40,7 @@ public void CanApplyToCurrentContext_ShouldBeTrue_WhenEnvironmentVariableIsSet()
         }
 
         [Test]
-        public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotSet()
+        public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
         {
             // Arrange
             environment.SetEnvironmentVariable("DRONE", "");
@@ -54,7 +54,7 @@ public void CanApplyToCurrentContext_ShouldBeFalse_WhenEnvironmentVariableIsNotS
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
+        public void GetCurrentBranchShouldDroneBranchInCaseOfPush()
         {
             // Arrange
             const string droneBranch = "droneBranch";
@@ -72,7 +72,7 @@ public void GetCurrentBranch_ShouldDroneBranch_InCaseOfPush()
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNonEmptyDroneSourceBranch()
+        public void GetCurrentBranchShouldUseDroneSourceBranchInCaseOfPullRequestAndNonEmptyDroneSourceBranch()
         {
             // Arrange
             const string droneSourceBranch = "droneSourceBranch";
@@ -89,13 +89,13 @@ public void GetCurrentBranch_ShouldUseDroneSourceBranch_InCaseOfPullRequestAndNo
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPullRequestAndEmptyDroneSourceBranch()
+        public void GetCurrentBranchShouldUseSourceBranchFromCiCommitRefSpecInCaseOfPullRequestAndEmptyDroneSourceBranch()
         {
             // Arrange
             const string droneSourceBranch = "droneSourceBranch";
             const string droneDestinationBranch = "droneDestinationBranch";
 
-            string ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
+            var ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
 
             environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
             environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
@@ -111,7 +111,7 @@ public void GetCurrentBranch_ShouldUseSourceBranchFromCiCommitRefSpec_InCaseOfPu
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
+        public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
         {
             // Arrange
             const string droneBranch = "droneBranch";
@@ -131,14 +131,14 @@ public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDro
         }
 
         [Test]
-        public void GetCurrentBranch_ShouldUseDroneBranch_InCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
+        public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
         {
             // Arrange
             const string droneBranch = "droneBranch";
             const string droneSourceBranch = "droneSourceBranch";
             const string droneDestinationBranch = "droneDestinationBranch";
 
-            string ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
+            var ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
 
             environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
             environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");

src/GitVersionCore.Tests/BuildServers/EnvRunTests.cs

@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests.BuildServers
@@ -36,25 +36,25 @@ public void ClearEnvironmentVariableForTest()
         [Test]
         public void CanApplyToCurrentContext()
         {
-            EnvRun envrun = new EnvRun(environment, log);
-            bool applys = envrun.CanApplyToCurrentContext();
+            var envrun = new EnvRun(environment, log);
+            var applys = envrun.CanApplyToCurrentContext();
             applys.ShouldBeTrue();
         }
 
         [Test]
-        public void CanApplyToCurrentContext_EnvironmentVariableNotSet()
+        public void CanApplyToCurrentContextEnvironmentVariableNotSet()
         {
             environment.SetEnvironmentVariable(EnvVarName, null);
-            EnvRun envrun = new EnvRun(environment, log);
-            bool applys = envrun.CanApplyToCurrentContext();
+            var envrun = new EnvRun(environment, log);
+            var applys = envrun.CanApplyToCurrentContext();
             applys.ShouldBeFalse();
         }
 
         [TestCase("1.2.3")]
         [TestCase("1.2.3-rc4")]
         public void GenerateSetVersionMessage(string fullSemVer)
         {
-            EnvRun envrun = new EnvRun(environment, log);
+            var envrun = new EnvRun(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: fullSemVer);
             var version = envrun.GenerateSetVersionMessage(vars);
             version.ShouldBe(fullSemVer);
@@ -64,7 +64,7 @@ public void GenerateSetVersionMessage(string fullSemVer)
         [TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
         public void GenerateSetParameterMessage(string name, string value, string expected)
         {
-            EnvRun envrun = new EnvRun(environment, log);
+            var envrun = new EnvRun(environment, log);
             var output = envrun.GenerateSetParameterMessage(name, value);
             output.ShouldHaveSingleItem();
             output[0].ShouldBe(expected);

src/GitVersionCore.Tests/BuildServers/EnvironmentVariableJenkinsTests.cs

@@ -1,18 +1,18 @@
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
 
 namespace GitVersionCore.Tests.BuildServers
 {
     [TestFixture]
     public class EnvironmentVariableJenkinsTests : TestBase
     {
-        private string key = "JENKINS_URL";
-        private string branch = "GIT_BRANCH";
-        private string localBranch = "GIT_LOCAL_BRANCH";
-        private string pipelineBranch = "BRANCH_NAME";
+        private readonly string key = "JENKINS_URL";
+        private readonly string branch = "GIT_BRANCH";
+        private readonly string localBranch = "GIT_LOCAL_BRANCH";
+        private readonly string pipelineBranch = "BRANCH_NAME";
         private IEnvironment environment;
         private ILog log;
 
@@ -54,8 +54,8 @@ public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
         public void JenkinsTakesLocalBranchNameNotRemoteName()
         {
             // Save original values so they can be restored
-            string branchOrig = environment.GetEnvironmentVariable(branch);
-            string localBranchOrig = environment.GetEnvironmentVariable(localBranch);
+            var branchOrig = environment.GetEnvironmentVariable(branch);
+            var localBranchOrig = environment.GetEnvironmentVariable(localBranch);
 
             // Set GIT_BRANCH for testing
             environment.SetEnvironmentVariable(branch, "origin/master");
@@ -79,9 +79,9 @@ public void JenkinsTakesLocalBranchNameNotRemoteName()
         public void JenkinsTakesBranchNameInPipelineAsCode()
         {
             // Save original values so they can be restored
-            string branchOrig = environment.GetEnvironmentVariable(branch);
-            string localBranchOrig = environment.GetEnvironmentVariable(localBranch);
-            string pipelineBranchOrig = environment.GetEnvironmentVariable(pipelineBranch);
+            var branchOrig = environment.GetEnvironmentVariable(branch);
+            var localBranchOrig = environment.GetEnvironmentVariable(localBranch);
+            var pipelineBranchOrig = environment.GetEnvironmentVariable(pipelineBranch);
 
             // Set BRANCH_NAME in pipeline mode
             environment.SetEnvironmentVariable(pipelineBranch, "master");

src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs

@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using GitVersion;
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.BuildServers;
-using GitVersion.Common;
+using GitVersion;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
+using GitVersion.VersionCalculation;
 
 namespace GitVersionCore.Tests.BuildServers
 {
@@ -24,11 +24,15 @@ public void SetUp()
         {
             environment = new TestEnvironment();
             log = new NullLog();
-            variableProvider = new VariableProvider(log);
+            var metaDataCalculator = new MetaDataCalculator();
+            var baseVersionCalculator = new BaseVersionCalculator(log, null);
+            var mainlineVersionCalculator = new MainlineVersionCalculator(log, metaDataCalculator);
+            var nextVersionCalculator = new NextVersionCalculator(log, metaDataCalculator, baseVersionCalculator, mainlineVersionCalculator);
+            variableProvider = new VariableProvider(nextVersionCalculator);
         }
 
         [Test]
-        public void GenerateSetVersionMessageReturnsVersionAsIs_AlthoughThisIsNotUsedByJenkins()
+        public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
         {
             var j = new GitLabCi(environment, log);
             var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");