cleanup

Author: arturcic

src/Directory.Build.props

@@ -23,6 +23,7 @@
         <PackageVersion_YamlDotNet>8.1.0</PackageVersion_YamlDotNet>
         <PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
         <PackageVersion_MicrosoftExtensions>3.0.0</PackageVersion_MicrosoftExtensions>
+        <PackageVersion_MsBuild>16.5.0</PackageVersion_MsBuild>
 
         <PackageVersion_MicrosoftTestSdk>16.5.0</PackageVersion_MicrosoftTestSdk>
         <PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>

src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs

@@ -45,7 +45,7 @@ public void CacheKeySameAfterReNormalizing()
             var environment = new TestEnvironment();
             environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
 
-            sp = GetServiceProvider(gitVersionOptions, environment:environment);
+            sp = GetServiceProvider(gitVersionOptions, environment: environment);
 
             var preparer = sp.GetService<IGitPreparer>();
 
@@ -95,7 +95,7 @@ public void CacheKeyForWorktree()
 
                 var gitVersionOptions = new GitVersionOptions
                 {
-                    RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = "master"},
+                    RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = "master" },
                     WorkingDirectory = worktreePath
                 };
 

src/GitVersionCore/Core/GitVersionTool.cs

@@ -38,7 +38,7 @@ public GitVersionTool(ILog log, INextVersionCalculator nextVersionCalculator, IV
 
             this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
             this.variableProvider = variableProvider ?? throw new ArgumentNullException(nameof(variableProvider));
-            this.gitPreparer = gitPreparer?? throw new ArgumentNullException(nameof(gitPreparer));
+            this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
 
             this.cacheKeyFactory = cacheKeyFactory ?? throw new ArgumentNullException(nameof(cacheKeyFactory));
             this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));

src/GitVersionCore/Model/Settings.cs

@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion
 {
     public class Settings
     {

src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj

@@ -5,10 +5,10 @@
         <LangVersion>8.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
-   
+
     <ItemGroup>
         <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Runtime.Loader" Version="4.3.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.Build.Framework" Version="16.5.0" />
+        <PackageReference Include="Microsoft.Build.Framework" Version="$(PackageVersion_MsBuild)" />
     </ItemGroup>
 
     <ItemGroup>

src/GitVersionTask.Tests/GenerateGitVersionInformationTest.cs

@@ -11,13 +11,7 @@ public class GenerateGitVersionInformationTest : TestTaskBase
         [Test]
         public void GenerateGitVersionInformationTaskShouldCreateFile()
         {
-            using var fixture = CreateLocalRepositoryFixture();
-
-            var task = new GenerateGitVersionInformation
-            {
-                SolutionDirectory = fixture.RepositoryPath,
-                ProjectFile = fixture.RepositoryPath,
-            };
+            var task = new GenerateGitVersionInformation();
 
             var result = ExecuteMsBuildTask(task);
 
@@ -30,15 +24,9 @@ public void GenerateGitVersionInformationTaskShouldCreateFile()
         }
 
         [Test]
-        public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunningInBuildServer()
+        public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()
         {
-            using var fixture = CreateRemoteRepositoryFixture();
-
-            var task = new GenerateGitVersionInformation
-            {
-                SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath,
-                ProjectFile = fixture.LocalRepositoryFixture.RepositoryPath,
-            };
+            var task = new GenerateGitVersionInformation();
 
             var result = ExecuteMsBuildTaskInBuildServer(task);
 

src/GitVersionTask.Tests/GetVersionTaskTests.cs

@@ -26,34 +26,32 @@ public void OutputsShouldMatchVariableProvider()
         [Test]
         public void GetVersionTaskShouldReturnVersionOutputVariables()
         {
-            using var fixture = CreateLocalRepositoryFixture();
-
-            var task = new GetVersion
-            {
-                SolutionDirectory = fixture.RepositoryPath,
-            };
+            var task = new GetVersion();
 
             var result = ExecuteMsBuildTask(task);
 
             result.Success.ShouldBe(true);
             result.Errors.ShouldBe(0);
+            result.Task.Major.ShouldBe("1");
+            result.Task.Minor.ShouldBe("2");
+            result.Task.Patch.ShouldBe("4");
+            result.Task.MajorMinorPatch.ShouldBe("1.2.4");
             result.Task.FullSemVer.ShouldBe("1.2.4+1");
         }
 
         [Test]
         public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
         {
-            using var fixture = CreateRemoteRepositoryFixture();
-
-            var task = new GetVersion
-            {
-                SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath,
-            };
+            var task = new GetVersion();
 
             var result = ExecuteMsBuildTaskInBuildServer(task);
 
             result.Success.ShouldBe(true);
             result.Errors.ShouldBe(0);
+            result.Task.Major.ShouldBe("1");
+            result.Task.Minor.ShouldBe("0");
+            result.Task.Patch.ShouldBe("1");
+            result.Task.MajorMinorPatch.ShouldBe("1.0.1");
             result.Task.FullSemVer.ShouldBe("1.0.1+1");
         }
     }

src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

@@ -7,6 +7,7 @@
     <Import Project="..\test.props" />
     <ItemGroup>
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
+        <PackageReference Include="Microsoft.Build" Version="$(PackageVersion_MsBuild)" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
     </ItemGroup>
     <ItemGroup>

src/GitVersionTask.Tests/TestTaskBase.cs

@@ -5,21 +5,45 @@
 using GitVersionCore.Tests.Helpers;
 using GitVersionTask.Tests.Helpers;
 using LibGit2Sharp;
-using Microsoft.Build.Framework;
 
 namespace GitVersion.MSBuildTask.Tests
 {
     public class TestTaskBase : TestBase
     {
-        protected static EmptyRepositoryFixture CreateLocalRepositoryFixture()
+        private static IDictionary<string, string> env = new Dictionary<string, string>
+        {
+            { AzurePipelines.EnvironmentVariableName, "true" },
+            { "BUILD_SOURCEBRANCH", null }
+        };
+
+        protected static MsBuildExecutionResult<T> ExecuteMsBuildTask<T>(T task) where T : GitVersionTaskBase
+        {
+            using var fixture = CreateLocalRepositoryFixture();
+            task.SolutionDirectory = fixture.RepositoryPath;
+
+            var msbuildFixture = new MsBuildFixture();
+            return msbuildFixture.Execute(task);
+        }
+
+        protected static MsBuildExecutionResult<T> ExecuteMsBuildTaskInBuildServer<T>(T task) where T : GitVersionTaskBase
+        {
+            using var fixture = CreateRemoteRepositoryFixture();
+            task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
+
+            var msbuildFixture = new MsBuildFixture();
+            msbuildFixture.WithEnv(env.ToArray());
+            return msbuildFixture.Execute(task);
+        }
+
+        private static EmptyRepositoryFixture CreateLocalRepositoryFixture()
         {
             var fixture = new EmptyRepositoryFixture();
             fixture.MakeATaggedCommit("1.2.3");
             fixture.MakeACommit();
             return fixture;
         }
 
-        protected static RemoteRepositoryFixture CreateRemoteRepositoryFixture()
+        private static RemoteRepositoryFixture CreateRemoteRepositoryFixture()
         {
             var fixture = new RemoteRepositoryFixture();
             fixture.Repository.MakeACommit();
@@ -33,24 +57,5 @@ protected static RemoteRepositoryFixture CreateRemoteRepositoryFixture()
             fixture.InitializeRepo();
             return fixture;
         }
-
-        protected static MsBuildExecutionResult<T> ExecuteMsBuildTask<T>(T task) where T : ITask
-        {
-            var msbuildFixture = new MsBuildFixture();
-            return msbuildFixture.Execute(task);
-        }
-
-        protected static MsBuildExecutionResult<T> ExecuteMsBuildTaskInBuildServer<T>(T task) where T : ITask
-        {
-            var env = new Dictionary<string, string>
-            {
-                { AzurePipelines.EnvironmentVariableName, "true" },
-                { "BUILD_SOURCEBRANCH", null }
-            };
-
-            var msbuildFixture = new MsBuildFixture();
-            msbuildFixture.WithEnv(env.ToArray());
-            return msbuildFixture.Execute(task);
-        }
     }
 }

src/GitVersionTask.Tests/UpdateAssemblyInfoTaskTest.cs

@@ -11,13 +11,7 @@ public class UpdateAssemblyInfoTaskTest : TestTaskBase
         [Test]
         public void UpdateAssemblyInfoTaskShouldCreateFile()
         {
-            using var fixture = CreateLocalRepositoryFixture();
-
-            var task = new UpdateAssemblyInfo
-            {
-                SolutionDirectory = fixture.RepositoryPath,
-                ProjectFile = fixture.RepositoryPath,
-            };
+            var task = new UpdateAssemblyInfo();
 
             var result = ExecuteMsBuildTask(task);
 
@@ -30,15 +24,9 @@ public void UpdateAssemblyInfoTaskShouldCreateFile()
         }
 
         [Test]
-        public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunningInBuildServer()
+        public void UpdateAssemblyInfoTaskShouldCreateFileInBuildServer()
         {
-            using var fixture = CreateRemoteRepositoryFixture();
-
-            var task = new UpdateAssemblyInfo
-            {
-                SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath,
-                ProjectFile = fixture.LocalRepositoryFixture.RepositoryPath,
-            };
+            var task = new UpdateAssemblyInfo();
 
             var result = ExecuteMsBuildTaskInBuildServer(task);