cleanup

Author: arturcic

src/GitVersionCore/Core/GitVersionTool.cs

@@ -28,22 +28,25 @@ public class GitVersionTool : IGitVersionTool
 
         private readonly IBuildServer buildServer;
 
-        public GitVersionTool(ILog log, IGitVersionCache gitVersionCache, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider,
-            IGitVersionCacheKeyFactory cacheKeyFactory, IBuildServerResolver buildServerResolver,
+        public GitVersionTool(ILog log, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider,
+            IGitVersionCache gitVersionCache, IGitVersionCacheKeyFactory cacheKeyFactory, IBuildServerResolver buildServerResolver,
             IWixVersionFileUpdater wixVersionFileUpdater, IGitVersionInformationGenerator gitVersionInformationGenerator, IAssemblyInfoFileUpdater assemblyInfoFileUpdater,
             IOptions<Arguments> options, IOptions<GitVersionContext> versionContext)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
+
             this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
             this.variableProvider = variableProvider ?? throw new ArgumentNullException(nameof(variableProvider));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
+
             this.cacheKeyFactory = cacheKeyFactory ?? throw new ArgumentNullException(nameof(cacheKeyFactory));
+            this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
 
             this.wixVersionFileUpdater = wixVersionFileUpdater ?? throw new ArgumentNullException(nameof(wixVersionFileUpdater));
             this.gitVersionInformationGenerator = gitVersionInformationGenerator ?? throw new ArgumentNullException(nameof(gitVersionInformationGenerator));
             this.assemblyInfoFileUpdater = assemblyInfoFileUpdater ?? throw new ArgumentNullException(nameof(gitVersionInformationGenerator));
 
+            this.options = options ?? throw new ArgumentNullException(nameof(options));
+
             context = versionContext.Value;
             buildServer = buildServerResolver.Resolve();
         }

src/GitVersionCore/Extensions/GitVersionInformationResources/GitVersionInformationGenerator.cs

@@ -5,11 +5,6 @@
 
 namespace GitVersion.Extensions.GitVersionInformationResources
 {
-    public interface IGitVersionInformationGenerator
-    {
-        void Generate(VersionVariables variables, FileWriteInfo writeInfo);
-    }
-
     public class GitVersionInformationGenerator : IGitVersionInformationGenerator
     {
         private readonly IFileSystem fileSystem;

src/GitVersionCore/Extensions/GitVersionInformationResources/IGitVersionInformationGenerator.cs

@@ -0,0 +1,9 @@
+using GitVersion.OutputVariables;
+
+namespace GitVersion.Extensions.GitVersionInformationResources
+{
+    public interface IGitVersionInformationGenerator
+    {
+        void Generate(VersionVariables variables, FileWriteInfo writeInfo);
+    }
+}

src/GitVersionCore/Extensions/IWixVersionFileUpdater.cs

@@ -0,0 +1,10 @@
+using System;
+using GitVersion.OutputVariables;
+
+namespace GitVersion.Extensions
+{
+    public interface IWixVersionFileUpdater : IDisposable
+    {
+        string Update(VersionVariables variables, string workingDirectory);
+    }
+}

src/GitVersionCore/Extensions/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs

@@ -8,12 +8,6 @@
 
 namespace GitVersion.Extensions.VersionAssemblyInfoResources
 {
-    public interface IAssemblyInfoFileUpdater : IDisposable
-    {
-        void Update(VersionVariables variables, bool ensureAssemblyInfo, string workingDirectory, params string[] assemblyInfo);
-        void CommitChanges();
-    }
-
     public class AssemblyInfoFileUpdater : IAssemblyInfoFileUpdater
     {
         private readonly List<Action> restoreBackupTasks = new List<Action>();

src/GitVersionCore/Extensions/VersionAssemblyInfoResources/IAssemblyInfoFileUpdater.cs

@@ -0,0 +1,11 @@
+using System;
+using GitVersion.OutputVariables;
+
+namespace GitVersion.Extensions.VersionAssemblyInfoResources
+{
+    public interface IAssemblyInfoFileUpdater : IDisposable
+    {
+        void Update(VersionVariables variables, bool ensureAssemblyInfo, string workingDirectory, params string[] assemblyInfo);
+        void CommitChanges();
+    }
+}

src/GitVersionCore/Extensions/WixVersionFileUpdater.cs

@@ -7,11 +7,6 @@
 
 namespace GitVersion.Extensions
 {
-    public interface IWixVersionFileUpdater : IDisposable
-    {
-        string Update(VersionVariables variables, string workingDirectory);
-    }
-
     public class WixVersionFileUpdater : IWixVersionFileUpdater
     {
         private readonly IFileSystem fileSystem;

src/GitVersionCore/Model/FileWriteInfo.cs

@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion
 {
     public sealed class FileWriteInfo
     {

src/GitVersionExe.Tests/ArgumentParserTests.cs

@@ -2,21 +2,26 @@
 using GitVersion.Logging;
 using GitVersion.Model;
 using GitVersionCore.Tests.Helpers;
+using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Shouldly;
 using Environment = System.Environment;
 
 namespace GitVersionExe.Tests
 {
     [TestFixture]
-    public class ArgumentParserTests
+    public class ArgumentParserTests : TestBase
     {
         private IArgumentParser argumentParser;
 
         [SetUp]
         public void SetUp()
         {
-            argumentParser = new ArgumentParser(new TestEnvironment());
+            var sp = ConfigureServices(services =>
+            {
+                services.AddSingleton<IArgumentParser, ArgumentParser>();
+            });
+            argumentParser = sp.GetService<IArgumentParser>();
         }
 
         [Test]

src/GitVersionExe.Tests/ExecutionResults.cs

@@ -14,9 +14,9 @@ public ExecutionResults(int exitCode, string output, string logContents)
             Log = logContents;
         }
 
-        public int ExitCode { get; private set; }
-        public string Output { get; private set; }
-        public string Log { get; private set; }
+        public int ExitCode { get; }
+        public string Output { get; }
+        public string Log { get; }
 
         public virtual VersionVariables OutputVariables
         {