Migrating from UtilPack to NuGetUtils, take two

src/GitVersionTask.Tests/GetVersionTaskTests.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using GitVersion;
 using GitVersionTask;
 using Microsoft.Build.Framework;
@@ -11,9 +11,8 @@ public class GetVersionTaskTests : TestBase
     [Test]
     public void OutputsShouldMatchVariableProvider()
     {
-        var taskProperties = typeof(GetVersion)
+        var taskProperties = typeof(GetVersion.Output)
             .GetProperties()
-            .Where(p => p.GetCustomAttributes(typeof(OutputAttribute), false).Any())
             .Select(p => p.Name);
 
         var variablesProperties = VersionVariables.AvailableVariables;

src/GitVersionTask.Tests/InvalidFileCheckerTests.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using GitVersion;
-using GitVersionTask.Tests.Mocks;
 using Microsoft.Build.Framework;
 using NUnit.Framework;
 
@@ -41,7 +40,7 @@ public void VerifyIgnoreNonAssemblyInfoFile()
 ");
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "SomeOtherFile.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles(new[] { "SomeOtherFile.cs" }, projectFile);
     }
 
     [Test]
@@ -57,7 +56,7 @@ public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileV
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
     }
 
@@ -75,7 +74,7 @@ public void VerifyUnformattedAttributeFoundCSharp([Values("AssemblyVersion", "As
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
     }
 
@@ -92,7 +91,7 @@ public void VerifyCommentWorksCSharp([Values("AssemblyVersion", "AssemblyFileVer
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
     }
 
     [Test]
@@ -111,7 +110,7 @@ public class Temp
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
     }
 
     [Test]
@@ -129,7 +128,7 @@ public class {0}
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
     }
 
     [Test]
@@ -145,7 +144,7 @@ Imports System.Reflection
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
     }
 
@@ -163,7 +162,7 @@ Imports System.Reflection
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
     }
 
@@ -180,7 +179,7 @@ Imports System.Reflection
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
     }
 
     [Test]
@@ -198,7 +197,7 @@ End Class
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
     }
 
     [Test]
@@ -215,6 +214,6 @@ End Class
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
     }
 }

src/GitVersionTask/GenerateGitVersionInformation.cs

@@ -1,42 +1,52 @@
 namespace GitVersionTask
 {
+    using System;
     using System.IO;
     using GitVersion;
     using GitVersion.Helpers;
-    using Microsoft.Build.Framework;
 
-    public class GenerateGitVersionInformation : GitVersionTaskBase
+    public static class GenerateGitVersionInformation
     {
-        [Required]
-        public string ProjectFile { get; set; }
-
-        [Required]
-        public string IntermediateOutputPath { get; set; }
-
-        [Required]
-        public string Language { get; set; }
-
-        [Output]
-        public string GitVersionInformationFilePath { get; set; }
+        // This method is entrypoint for the task declared in .props file
+        public static Output Execute(Input input)
+        {
+            return GitVersionTaskCommonFunctionality.ExecuteGitVersionTask(input, InnerExecute);
+        }
 
-        protected override void InnerExecute()
+        private static Output InnerExecute(Input input, TaskLogger logger)
         {
-            if (GetVersionVariables(out var versionVariables)) return;
+            var execute = GitVersionTaskCommonFunctionality.CreateExecuteCore();
+            if (!execute.TryGetVersion(input.SolutionDirectory, out var versionVariables, input.NoFetch, new Authentication()))
+            {
+                return null;
+            }
 
-            var fileExtension = TaskUtils.GetFileExtension(Language);
-            var fileName = $"GitVersionInformation.g.{fileExtension}";
+            var fileWriteInfo = input.IntermediateOutputPath.GetFileWriteInfo(
+                input.Language,
+                input.ProjectFile,
+                (pf, ext) => $"GitVersionInformation.g.{ext}",
+                (pf, ext) => $"GitVersionInformation_{Path.GetFileNameWithoutExtension(pf)}_{Path.GetRandomFileName()}.g.{ext}"
+                );
 
-            if (IntermediateOutputPath == null)
+            var output = new Output()
             {
-                fileName = $"GitVersionInformation_{Path.GetFileNameWithoutExtension(ProjectFile)}_{Path.GetRandomFileName()}.g.{fileExtension}";
-            }
+                GitVersionInformationFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName)
+            };
+            var generator = new GitVersionInformationGenerator(fileWriteInfo.FileName, fileWriteInfo.WorkingDirectory, versionVariables, new FileSystem());
+            generator.Generate();
 
-            var workingDirectory = IntermediateOutputPath ?? TempFileTracker.TempPath;
+            return output;
+        }
 
-            GitVersionInformationFilePath = Path.Combine(workingDirectory, fileName);
 
-            var generator = new GitVersionInformationGenerator(fileName, workingDirectory, versionVariables, new FileSystem());
-            generator.Generate();
+        public sealed class Input : InputWithCommonAdditionalProperties
+        {
         }
+
+        public sealed class Output
+        {
+            public string GitVersionInformationFilePath { get; set; }
+        }
+
     }
 }