diff --git a/src/GitVersionTask.Tests/GetVersionTaskTests.cs b/src/GitVersionTask.Tests/GetVersionTaskTests.cs
index a3f6d5c7d1..bf2d995164 100644
--- a/src/GitVersionTask.Tests/GetVersionTaskTests.cs
+++ b/src/GitVersionTask.Tests/GetVersionTaskTests.cs
@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Linq;
 using GitVersion;
 using GitVersionTask;
-using Microsoft.Build.Framework;
 using NUnit.Framework;
 using Shouldly;
 
@@ -11,13 +10,12 @@ 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);
+            .Select( p => p.Name );
 
         var variablesProperties = VersionVariables.AvailableVariables;
 
-        taskProperties.ShouldBe(variablesProperties, ignoreOrder: true);
+        taskProperties.ShouldBe( variablesProperties, ignoreOrder: true );
     }
 }
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
index 3c18824740..7a1a43f9d4 100644
--- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
+++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -17,7 +17,6 @@
     <PackageReference Include="NUnit" Version="3.11.0"></PackageReference>
     <packagereference Include="NUnit3TestAdapter" Version="3.13.0"></packagereference>
     <PackageReference Include="Shouldly" Version="3.0.2"></PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Approved\**\*.txt" />
diff --git a/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs b/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
index e8877d2f94..6531d1b34a 100644
--- a/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
+++ b/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.IO;
 using GitVersion;
-using GitVersionTask.Tests.Mocks;
-using Microsoft.Build.Framework;
 using NUnit.Framework;
 
 [TestFixture]
@@ -14,93 +12,93 @@ public class InvalidFileCheckerTests : TestBase
     [SetUp]
     public void CreateTemporaryProject()
     {
-        projectDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-        projectFile = Path.Combine(projectDirectory, "Fake.csproj");
+        projectDirectory = Path.Combine( Path.GetTempPath(), Guid.NewGuid().ToString() );
+        projectFile = Path.Combine( projectDirectory, "Fake.csproj" );
 
-        Directory.CreateDirectory(projectDirectory);
+        Directory.CreateDirectory( projectDirectory );
 
-        File.Create(projectFile).Close();
+        File.Create( projectFile ).Close();
     }
 
     [TearDown]
     public void Cleanup()
     {
-        Directory.Delete(projectDirectory, true);
+        Directory.Delete( projectDirectory, true );
     }
 
     [Test]
     public void VerifyIgnoreNonAssemblyInfoFile()
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "SomeOtherFile.cs")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "SomeOtherFile.cs" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 using System;
 using System.Reflection;
 
 [assembly: AssemblyVersion(""1.0.0.0"")]
-");
+" );
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "SomeOtherFile.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles( new[] { "SomeOtherFile.cs" }, projectFile );
     }
 
     [Test]
-    public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion")]string attribute)
+    public void VerifyAttributeFoundCSharp( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.cs")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.cs" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 using System;
 using System.Reflection;
 
 [assembly:{0}(""1.0.0.0"")]
-", attribute);
+", attribute );
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "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"));
+        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" ) );
     }
 
     [Test]
-    public void VerifyUnformattedAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion")]string attribute)
+    public void VerifyUnformattedAttributeFoundCSharp( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.cs")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.cs" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 using System;
 using System.Reflection;
 
 [  assembly   :
 {0}     ( ""1.0.0.0"")]
-", attribute);
+", attribute );
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "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"));
+        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" ) );
     }
 
     [Test]
-    public void VerifyCommentWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")]string attribute)
+    public void VerifyCommentWorksCSharp( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.cs")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.cs" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 using System;
 using System.Reflection;
 
 //[assembly: {0}(""1.0.0.0"")]
-", attribute);
+", attribute );
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles( new[] { "AssemblyInfo.cs" }, projectFile );
     }
 
     [Test]
-    public void VerifyStringWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")]string attribute)
+    public void VerifyStringWorksCSharp( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.cs")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.cs" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 using System;
 using System.Reflection;
 
@@ -108,113 +106,113 @@ public class Temp
 {{
     static const string Foo = ""[assembly: {0}(""""1.0.0.0"""")]"";
 }}
-", attribute);
+", attribute );
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles( new[] { "AssemblyInfo.cs" }, projectFile );
     }
 
     [Test]
-    public void VerifyIdentifierWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")]string attribute)
+    public void VerifyIdentifierWorksCSharp( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.cs")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.cs" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 using System;
 using System.Reflection;
 
 public class {0}
 {{
 }}
-", attribute);
+", attribute );
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles( new[] { "AssemblyInfo.cs" }, projectFile );
     }
 
     [Test]
-    public void VerifyAttributeFoundVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion")]string attribute)
+    public void VerifyAttributeFoundVisualBasic( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.vb")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.vb" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 Imports System
 Imports System.Reflection
 
 <Assembly:{0}(""1.0.0.0"")>
-", attribute);
+", attribute );
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "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"));
+        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" ) );
     }
 
     [Test]
-    public void VerifyUnformattedAttributeFoundVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion")]string attribute)
+    public void VerifyUnformattedAttributeFoundVisualBasic( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.vb")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.vb" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 Imports System
 Imports System.Reflection
 
 <  Assembly   :
 {0}     ( ""1.0.0.0"")>
-", attribute);
+", attribute );
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "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"));
+        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" ) );
     }
 
     [Test]
-    public void VerifyCommentWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")]string attribute)
+    public void VerifyCommentWorksVisualBasic( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.vb")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.vb" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 Imports System
 Imports System.Reflection
 
 '<Assembly: {0}(""1.0.0.0"")>
-", attribute);
+", attribute );
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles( new[] { "AssemblyInfo.vb" }, projectFile );
     }
 
     [Test]
-    public void VerifyStringWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")]string attribute)
+    public void VerifyStringWorksVisualBasic( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.vb")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.vb" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 Imports System
 Imports System.Reflection
 
 Public Class Temp
     static const string Foo = ""<Assembly: {0}(""""1.0.0.0"""")>"";
 End Class
-", attribute);
+", attribute );
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles( new[] { "AssemblyInfo.vb" }, projectFile );
     }
 
     [Test]
-    public void VerifyIdentifierWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")]string attribute)
+    public void VerifyIdentifierWorksVisualBasic( [Values( "AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion" )]string attribute )
     {
-        using (var writer = File.CreateText(Path.Combine(projectDirectory, "AssemblyInfo.vb")))
+        using ( var writer = File.CreateText( Path.Combine( projectDirectory, "AssemblyInfo.vb" ) ) )
         {
-            writer.Write(@"
+            writer.Write( @"
 Imports System
 Imports System.Reflection
 
 Public Class {0}
 End Class
-", attribute);
+", attribute );
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, projectFile);
+        InvalidFileChecker.CheckForInvalidFiles( new[] { "AssemblyInfo.vb" }, projectFile );
     }
 }
diff --git a/src/GitVersionTask.Tests/Mocks/MockBuildEngine.cs b/src/GitVersionTask.Tests/Mocks/MockBuildEngine.cs
deleted file mode 100644
index 710462eff5..0000000000
--- a/src/GitVersionTask.Tests/Mocks/MockBuildEngine.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections;
-using Microsoft.Build.Framework;
-
-class MockBuildEngine : IBuildEngine
-{
-    public void LogErrorEvent(BuildErrorEventArgs e)
-    { }
-
-    public void LogWarningEvent(BuildWarningEventArgs e)
-    { }
-
-    public void LogMessageEvent(BuildMessageEventArgs e)
-    { }
-
-    public void LogCustomEvent(CustomBuildEventArgs e)
-    {
-        throw new NotImplementedException();
-    }
-
-    public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs)
-    {
-        throw new NotImplementedException();
-    }
-
-    public bool ContinueOnError
-    {
-        get { throw new NotImplementedException(); }
-    }
-
-    public int LineNumberOfTaskNode
-    {
-        get { throw new NotImplementedException(); }
-    }
-
-    public int ColumnNumberOfTaskNode
-    {
-        get { throw new NotImplementedException(); }
-    }
-
-    public string ProjectFileOfTaskNode
-    {
-        get { throw new NotImplementedException(); }
-    }
-}
\ No newline at end of file
diff --git a/src/GitVersionTask.Tests/Mocks/MockTaskItem.cs b/src/GitVersionTask.Tests/Mocks/MockTaskItem.cs
deleted file mode 100644
index 45a98850b9..0000000000
--- a/src/GitVersionTask.Tests/Mocks/MockTaskItem.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections;
-using Microsoft.Build.Framework;
-
-namespace GitVersionTask.Tests.Mocks
-{
-    class MockTaskItem : ITaskItem
-    {
-        public string ItemSpec { get; set; }
-
-        public int MetadataCount { get; private set; }
-
-        public ICollection MetadataNames { get; private set; }
-
-        public IDictionary CloneCustomMetadata()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void CopyMetadataTo(ITaskItem destinationItem)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetMetadata(string metadataName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void RemoveMetadata(string metadataName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetMetadata(string metadataName, string metadataValue)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/GitVersionTask/BuildLogger.cs b/src/GitVersionTask/BuildLogger.cs
deleted file mode 100644
index 9c9ec461cf..0000000000
--- a/src/GitVersionTask/BuildLogger.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-public static class BuildLogger
-{
-    public static void LogDebug(this Task task, string message)
-    {
-        task.BuildEngine.LogMessageEvent(new BuildMessageEventArgs(message, string.Empty, "GitVersionTask", MessageImportance.Low));
-    }
-
-    public static void LogInfo(this Task task, string message)
-    {
-        task.BuildEngine.LogMessageEvent(new BuildMessageEventArgs(message, string.Empty, "GitVersionTask", MessageImportance.Normal));
-    }
-
-    public static void LogWarning(this Task task, string message)
-    {
-        task.BuildEngine.LogWarningEvent(new BuildWarningEventArgs(string.Empty, string.Empty, null, 0, 0, 0, 0, message, string.Empty, "GitVersionTask"));
-    }
-
-    public static void LogError(this Task task, string message, string file = null)
-    {
-        task.BuildEngine.LogErrorEvent(new BuildErrorEventArgs(string.Empty, string.Empty, file, 0, 0, 0, 0, message, string.Empty, "GitVersionTask"));
-    }
-}
\ No newline at end of file
diff --git a/src/GitVersionTask/GenerateGitVersionInformation.cs b/src/GitVersionTask/GenerateGitVersionInformation.cs
index d91a7898dc..c002731c5a 100644
--- a/src/GitVersionTask/GenerateGitVersionInformation.cs
+++ b/src/GitVersionTask/GenerateGitVersionInformation.cs
@@ -4,98 +4,96 @@ namespace GitVersionTask
     using System.IO;
     using GitVersion;
     using GitVersion.Helpers;
-    using Microsoft.Build.Framework;
 
-    public class GenerateGitVersionInformation : GitVersionTaskBase
+    public static class GenerateGitVersionInformation
     {
-        TaskLogger logger;
-
-        public GenerateGitVersionInformation()
+        public static Output Execute(
+            Input input
+            )
         {
-            logger = new TaskLogger(this);
-            Logger.SetLoggers(this.LogDebug, this.LogInfo, this.LogWarning, s => this.LogError(s));
-        }
-
-        [Required]
-        public string SolutionDirectory { get; set; }
-
-        [Required]
-        public string ProjectFile { get; set; }
-
-        [Required]
-        public string IntermediateOutputPath { get; set; }
-
-        [Required]
-        public string Language { get; set; }
-
-        [Output]
-        public string GitVersionInformationFilePath { get; set; }
+            if ( !input.ValidateInput() )
+            {
+                throw new Exception( "Invalid input." );
+            }
 
-        public bool NoFetch { get; set; }
+            var logger = new TaskLogger();
+            Logger.SetLoggers( logger.LogInfo, logger.LogInfo, logger.LogWarning, s => logger.LogError( s ) );
+            
 
-        public override bool Execute()
-        {
+            Output output = null;
             try
             {
-                InnerExecute();
-                return true;
+                output = InnerExecute(input );
             }
             catch (WarningException errorException)
             {
                 logger.LogWarning(errorException.Message);
-                return true;
+                output = new Output();
             }
             catch (Exception exception)
             {
                 logger.LogError("Error occurred: " + exception);
-                return false;
+                throw;
             }
             finally
             {
                 Logger.Reset();
             }
+
+            return output;
         }
 
-        void InnerExecute()
+        private static Output InnerExecute( Input input )
         {
-            VersionVariables versionVariables;
-            if (!ExecuteCore.TryGetVersion(SolutionDirectory, out versionVariables, NoFetch, new Authentication()))
+            var execute = GitVersionTaskBase.CreateExecuteCore();
+            if (!execute.TryGetVersion(input.SolutionDirectory, out var versionVariables, input.NoFetch, new Authentication()))
             {
-                return;
+                return null;
             }
 
-            var fileExtension = GetFileExtension();
-            var fileName = $"GitVersionInformation.g.{fileExtension}";
+            var fileWriteInfo = input.IntermediateOutputPath.GetWorkingDirectoryAndFileNameAndExtension(
+                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}";
-            }
-
-            var workingDirectory = IntermediateOutputPath ?? TempFileTracker.TempPath;
-
-            GitVersionInformationFilePath = Path.Combine(workingDirectory, fileName);
-
-            var generator = new GitVersionInformationGenerator(fileName, workingDirectory, versionVariables, new FileSystem());
+                GitVersionInformationFilePath = Path.Combine( fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName )
+            };
+            var generator = new GitVersionInformationGenerator( fileWriteInfo.FileName, fileWriteInfo.WorkingDirectory, versionVariables, new FileSystem());
             generator.Generate();
+
+            return output;
         }
 
-        string GetFileExtension()
+        public sealed class Input
         {
-            switch (Language)
-            {
-                case "C#":
-                    return "cs";
+            public string SolutionDirectory { get; set; }
 
-                case "F#":
-                    return "fs";
+            public string ProjectFile { get; set; }
 
-                case "VB":
-                    return "vb";
+            public string IntermediateOutputPath { get; set; }
 
-                default:
-                    throw new Exception($"Unknown language detected: '{Language}'");
-            }
+            public string Language { get; set; }
+
+            public bool NoFetch { get; set; }
+        }
+
+        private static Boolean ValidateInput( this Input input )
+        {
+            return input != null
+                && !String.IsNullOrEmpty( input.SolutionDirectory )
+                && !String.IsNullOrEmpty(input.ProjectFile)
+                // && !String.IsNullOrEmpty(input.IntermediateOutputPath) // This was marked as [Required] but it InnerExecute still seems to allow it to be null... ?
+                && !String.IsNullOrEmpty(input.Language)
+                ;
+        }
+
+        public sealed class Output
+        {
+            public string GitVersionInformationFilePath { get; set; }
         }
     }
 }
diff --git a/src/GitVersionTask/GetVersion.cs b/src/GitVersionTask/GetVersion.cs
index f041a77120..4891093fe6 100644
--- a/src/GitVersionTask/GetVersion.cs
+++ b/src/GitVersionTask/GetVersion.cs
@@ -3,143 +3,126 @@ namespace GitVersionTask
     using System;
     using GitVersion;
 
-    using Microsoft.Build.Framework;
-
-    public class GetVersion : GitVersionTaskBase
+    public static class GetVersion
     {
-        TaskLogger logger;
-
-        public GetVersion()
+        public static Output Execute(
+            Input input
+            )
         {
-            logger = new TaskLogger(this);
-            Logger.SetLoggers(this.LogDebug, this.LogInfo, this.LogWarning, s => this.LogError(s));
-        }
+            if (!input.ValidateInput())
+            {
+                throw new Exception( "Invalid input." );
+            }
 
-        [Required]
-        public string SolutionDirectory { get; set; }
+            var logger = new TaskLogger();
+            Logger.SetLoggers( logger.LogInfo, logger.LogInfo, logger.LogWarning, s => logger.LogError( s ) );
+            var execute = GitVersionTaskBase.CreateExecuteCore();
 
-        public bool NoFetch { get; set; }
+            Output output = null;
+            try
+            {
+                if ( execute.TryGetVersion(input.SolutionDirectory, out var variables, input.NoFetch, new Authentication()))
+                {
+                    var outputType = typeof( Output );
+                    output = new Output();
+                    foreach (var variable in variables)
+                    {
+                        outputType.GetProperty(variable.Key).SetValue( output, variable.Value, null);
+                    }
+                }
+            }
+            catch (WarningException errorException)
+            {
+                logger.LogWarning(errorException.Message);
+                output = new Output();
+            }
+            catch (Exception exception)
+            {
+                logger.LogError("Error occurred: " + exception);
+                throw;
+            }
+            finally
+            {
+                Logger.Reset();
+            }
+            return output;
+        }
 
-        [Output]
-        public string Major { get; set; }
+        private static Boolean ValidateInput(this Input input)
+        {
+            return !String.IsNullOrEmpty( input?.SolutionDirectory );
+        }
 
-        [Output]
-        public string Minor { get; set; }
+        public sealed class Input
+        {
+            public string SolutionDirectory { get; set; }
 
-        [Output]
-        public string Patch { get; set; }
+            public bool NoFetch { get; set; }
+        }
 
-        [Output]
-        public string PreReleaseTag { get; set; }
+        public sealed class Output
+        {
+            public string Major { get; set; }
 
-        [Output]
-        public string PreReleaseTagWithDash { get; set; }
+            public string Minor { get; set; }
 
-        [Output]
-        public string PreReleaseLabel { get; set; }
+            public string Patch { get; set; }
 
-        [Output]
-        public string PreReleaseNumber { get; set; }
+            public string PreReleaseTag { get; set; }
 
-        [Output]
-        public string WeightedPreReleaseNumber { get; set; }
+            public string PreReleaseTagWithDash { get; set; }
 
-        [Output]
-        public string BuildMetaData { get; set; }
+            public string PreReleaseLabel { get; set; }
 
-        [Output]
-        public string BuildMetaDataPadded { get; set; }
+            public string PreReleaseNumber { get; set; }
 
-        [Output]
-        public string FullBuildMetaData { get; set; }
+            public string WeightedPreReleaseNumber { get; set; }
 
-        [Output]
-        public string MajorMinorPatch { get; set; }
+            public string BuildMetaData { get; set; }
 
-        [Output]
-        public string SemVer { get; set; }
+            public string BuildMetaDataPadded { get; set; }
 
-        [Output]
-        public string LegacySemVer { get; set; }
+            public string FullBuildMetaData { get; set; }
 
-        [Output]
-        public string LegacySemVerPadded { get; set; }
+            public string MajorMinorPatch { get; set; }
 
-        [Output]
-        public string AssemblySemVer { get; set; }
+            public string SemVer { get; set; }
 
-        [Output]
-        public string AssemblySemFileVer { get; set; }
+            public string LegacySemVer { get; set; }
 
-        [Output]
-        public string FullSemVer { get; set; }
+            public string LegacySemVerPadded { get; set; }
 
-        [Output]
-        public string InformationalVersion { get; set; }
+            public string AssemblySemVer { get; set; }
 
-        [Output]
-        public string BranchName { get; set; }
+            public string AssemblySemFileVer { get; set; }
 
-        [Output]
-        public string Sha { get; set; }
+            public string FullSemVer { get; set; }
 
-        [Output]
-        public string ShortSha { get; set; }
+            public string InformationalVersion { get; set; }
 
-        [Output]
-        public string NuGetVersionV2 { get; set; }
+            public string BranchName { get; set; }
 
-        [Output]
-        public string NuGetVersion { get; set; }
+            public string Sha { get; set; }
 
-        [Output]
-        public string NuGetPreReleaseTagV2 { get; set; }
+            public string ShortSha { get; set; }
 
-        [Output]
-        public string NuGetPreReleaseTag { get; set; }
+            public string NuGetVersionV2 { get; set; }
 
-        [Output]
-        public string CommitDate { get; set; }
+            public string NuGetVersion { get; set; }
+    
+            public string VersionSourceSha { get; set; }
 
-        [Output]
-        public string VersionSourceSha { get; set; }
+            public string NuGetPreReleaseTagV2 { get; set; }
 
-        [Output]
-        public string CommitsSinceVersionSource { get; set; }
+            public string NuGetPreReleaseTag { get; set; }
 
-        [Output]
-        public string CommitsSinceVersionSourcePadded { get; set; }
+            public string CommitDate { get; set; }
 
-        public override bool Execute()
-        {
-            try
-            {
-                VersionVariables variables;
+            public string CommitsSinceVersionSource { get; set; }
 
-                if (ExecuteCore.TryGetVersion(SolutionDirectory, out variables, NoFetch, new Authentication()))
-                {
-                    var thisType = typeof(GetVersion);
-                    foreach (var variable in variables)
-                    {
-                        thisType.GetProperty(variable.Key).SetValue(this, variable.Value, null);
-                    }
-                }
-                return true;
-            }
-            catch (WarningException errorException)
-            {
-                logger.LogWarning(errorException.Message);
-                return true;
-            }
-            catch (Exception exception)
-            {
-                logger.LogError("Error occurred: " + exception);
-                return false;
-            }
-            finally
-            {
-                Logger.Reset();
-            }
+            public string CommitsSinceVersionSourcePadded { get; set; }
         }
     }
+
+    
 }
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
index 39f6ddf96e..e94e7d4d97 100644
--- a/src/GitVersionTask/GitVersionTask.csproj
+++ b/src/GitVersionTask/GitVersionTask.csproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(MSBuildThisFileDirectory)\UtilPack.Version.props" Condition="exists('$(MSBuildThisFileDirectory)\UtilPack.Version.props')" />
+  <Import Project="$(MSBuildThisFileDirectory)\NuGetUtils.MSBuild.Exec.Version.props" Condition="exists('$(MSBuildThisFileDirectory)\NuGetUtils.MSBuild.Exec.Version.props')" />
 
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
@@ -17,16 +17,17 @@
 
     <NuspecFile>NugetAssets\GitVersionTask.nuspec</NuspecFile>
     <PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
-    <NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);utilpackversion=$(PackageVersion_UtilPackNuGetMSBuild);libgit2sharpversion=$(PackageVersion_LibGit2Sharp);yamldotnetversion=$(PackageVersion_YamlDotNet)</NuspecProperties>
+    <NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);utilpackversion=$(PackageVersion_NuGetUtilsMSBuildExec);libgit2sharpversion=$(PackageVersion_LibGit2Sharp);yamldotnetversion=$(PackageVersion_YamlDotNet)</NuspecProperties>
 
     <Product>$(AssemblyName)</Product>
+    <LangVersion>latest</LangVersion>
 
   </PropertyGroup>
   <ItemGroup>
-    <None Remove="UtilPack.Version.props" />
+    <None Remove="NuGetUtils.MSBuild.Exec.Version.props" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="UtilPack.Version.props">
+    <Content Include="NuGetUtils.MSBuild.Exec.Version.props">
       <PackagePath>build\</PackagePath>
     </Content>
   </ItemGroup>
@@ -37,9 +38,7 @@
     <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)">
         <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <!--See https://github.com/Microsoft/msbuild/issues/3671 for reason for the ExcludeAssets against msbuild packagerefernces -->
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" ExcludeAssets="runtime" />
-    <PackageReference Include="UtilPack.NuGet.MSBuild" Version="$(PackageVersion_UtilPackNuGetMSBuild)">
+    <PackageReference Include="NuGetUtils.MSBuild.Exec" Version="$(PackageVersion_NuGetUtilsMSBuildExec)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/GitVersionTask/GitVersionTaskBase.cs b/src/GitVersionTask/GitVersionTaskBase.cs
index 3337ad8fb6..cd68978b34 100644
--- a/src/GitVersionTask/GitVersionTaskBase.cs
+++ b/src/GitVersionTask/GitVersionTaskBase.cs
@@ -1,23 +1,72 @@
-namespace GitVersionTask
+namespace GitVersionTask
 {
     using GitVersion;
     using GitVersion.Helpers;
+    using System;
+    using System.IO;
 
-    using Microsoft.Build.Utilities;
-
-    public abstract class GitVersionTaskBase : Task
+    public static class GitVersionTaskBase
     {
-        readonly ExecuteCore executeCore;
+        public static ExecuteCore CreateExecuteCore()
+            => new ExecuteCore( new FileSystem() );
+
+        private static string GetFileExtension( this String language )
+        {
+            switch ( language )
+            {
+                case "C#":
+                    return "cs";
+
+                case "F#":
+                    return "fs";
+
+                case "VB":
+                    return "vb";
 
-        protected GitVersionTaskBase()
+                default:
+                    throw new Exception( $"Unknown language detected: '{language}'" );
+            }
+        }
+
+        public static FileWriteInfo GetWorkingDirectoryAndFileNameAndExtension(
+            this String intermediateOutputPath,
+            String language,
+            String projectFile,
+            Func<String, String, String> fileNameWithIntermediatePath,
+            Func<String, String, String> fileNameNoIntermediatePath
+            )
         {
-            var fileSystem = new FileSystem();
-            executeCore = new ExecuteCore(fileSystem);
+            var fileExtension = language.GetFileExtension();
+            String workingDirectory, fileName;
+            if ( intermediateOutputPath == null )
+            {
+                fileName = fileNameWithIntermediatePath(projectFile, fileExtension);
+                workingDirectory = TempFileTracker.TempPath;
+            }
+            else
+            {
+                workingDirectory = intermediateOutputPath;
+                fileName = fileNameNoIntermediatePath(projectFile, fileExtension);
+            }
+            return new FileWriteInfo(workingDirectory, fileName, fileExtension);
         }
+    }
 
-        protected ExecuteCore ExecuteCore
+    public sealed class FileWriteInfo
+    {
+        public FileWriteInfo(
+            String workingDirectory,
+            String fileName,
+            String fileExtension
+            )
         {
-            get { return executeCore; }
+            this.WorkingDirectory = workingDirectory;
+            this.FileName = fileName;
+            this.FileExtension = fileExtension;
         }
+
+        public String WorkingDirectory { get; }
+        public String FileName { get; }
+        public String FileExtension { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersionTask/InvalidFileChecker.cs b/src/GitVersionTask/InvalidFileChecker.cs
index d20be03e56..8cc308fddb 100644
--- a/src/GitVersionTask/InvalidFileChecker.cs
+++ b/src/GitVersionTask/InvalidFileChecker.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion;
-using Microsoft.Build.Framework;
 
 public static class InvalidFileChecker
 {
@@ -14,7 +13,7 @@ public static class InvalidFileChecker
         { ".vb", VisualBasicFileContainsVersionAttribute }
     };
 
-    public static void CheckForInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile)
+    public static void CheckForInvalidFiles(IEnumerable<String> compileFiles, string projectFile)
     {
         foreach (var compileFile in GetInvalidFiles(compileFiles, projectFile))
         {
@@ -98,9 +97,9 @@ static bool VisualBasicFileContainsVersionAttribute(string compileFile, string p
 \s*\(\s*\)\s*\>                         # End brackets ()>");
     }
 
-    static IEnumerable<string> GetInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile)
+    static IEnumerable<string> GetInvalidFiles(IEnumerable<String> compileFiles, string projectFile)
     {
-        return compileFiles.Select(x => x.ItemSpec)
+        return compileFiles
             .Where(compileFile => compileFile.Contains("AssemblyInfo"))
             .Where(s => FileContainsVersionAttribute(s, projectFile));
     }
diff --git a/src/GitVersionTask/UtilPack.Version.props b/src/GitVersionTask/NuGetUtils.MSBuild.Exec.Version.props
similarity index 57%
rename from src/GitVersionTask/UtilPack.Version.props
rename to src/GitVersionTask/NuGetUtils.MSBuild.Exec.Version.props
index 109fbf9d1e..a00890c752 100644
--- a/src/GitVersionTask/UtilPack.Version.props
+++ b/src/GitVersionTask/NuGetUtils.MSBuild.Exec.Version.props
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PackageVersion_UtilPackNuGetMSBuild>2.9.1</PackageVersion_UtilPackNuGetMSBuild>
+    <PackageVersion_NuGetUtilsMSBuildExec>2.0.5</PackageVersion_NuGetUtilsMSBuildExec>
   </PropertyGroup>
 </Project>
 
diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.nuspec b/src/GitVersionTask/NugetAssets/GitVersionTask.nuspec
index b3436fdce8..4a95b6e0d8 100644
--- a/src/GitVersionTask/NugetAssets/GitVersionTask.nuspec
+++ b/src/GitVersionTask/NugetAssets/GitVersionTask.nuspec
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>GitVersionTask</id>
@@ -17,15 +17,15 @@
     <tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
     <dependencies>
       <group>
-        <dependency id="UtilPack.NuGet.MSBuild" version="$utilpackversion$" exclude="Build,Analyzers" />
+        <dependency id="NuGetUtils.MSBuild.Exec" version="$utilpackversion$" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETStandard2.0">
-         <dependency id="UtilPack.NuGet.MSBuild" version="$utilpackversion$" exclude="Build,Analyzers" />
+         <dependency id="NuGetUtils.MSBuild.Exec" version="$utilpackversion$" exclude="Build,Analyzers" />
          <dependency id="LibGit2Sharp" version="$libgit2sharpversion$" exclude="Build,Analyzers" />
          <dependency id="YamlDotNet" version="$yamldotnetversion$" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.6.1">
-         <dependency id="UtilPack.NuGet.MSBuild" version="$utilpackversion$" exclude="Build,Analyzers" />
+         <dependency id="NuGetUtils.MSBuild.Exec" version="$utilpackversion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
@@ -33,6 +33,6 @@
     <file src="..\NugetAssets\build\**" target="build" />
     <file src="..\NugetAssets\build\GitVersionTask.targets" target="buildMultiTargeting" />
     <file src="..\bin\$configuration$\**" target="build" />
-    <file src="..\UtilPack.Version.props" target="build" />
+    <file src="..\NuGetUtils.MSBuild.Exec.Version.props" target="build" />
   </files>
 </package>
diff --git a/src/GitVersionTask/NugetAssets/build/Infrastructure.props b/src/GitVersionTask/NugetAssets/build/Infrastructure.props
index e5ff8092e1..4ef57bf76a 100644
--- a/src/GitVersionTask/NugetAssets/build/Infrastructure.props
+++ b/src/GitVersionTask/NugetAssets/build/Infrastructure.props
@@ -1,5 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)\UtilPack.Version.props" Condition="exists('$(MSBuildThisFileDirectory)\UtilPack.Version.props')" />
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)\NuGetUtils.MSBuild.Exec.Version.props" Condition="exists('$(MSBuildThisFileDirectory)\NuGetUtils.MSBuild.Exec.Version.props')" />
 
   <!-- Properties containing paths to functionality files and directories. -->
   <PropertyGroup>
@@ -9,22 +9,21 @@
     <GitVersionTaskBuildTools_FunctionalityObjFolder>$(GitVersionTaskBuildTools_FunctionalityDir)obj/</GitVersionTaskBuildTools_FunctionalityObjFolder>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(UtilPackNuGetMSBuildAssemblyPath)' == ''">
-    <UtilPackVersion>$(PackageVersion_UtilPackNuGetMSBuild)</UtilPackVersion>
-    <UtilPackNuGetMSBuildPropsPath Condition=" '$(UtilPackNuGetMSBuildPropsPath)' == ''">$(MSBuildThisFileDirectory)../../../utilpack.nuget.msbuild/$(UtilPackVersion)/build/UtilPack.NuGet.MSBuild.props</UtilPackNuGetMSBuildPropsPath>
+  <PropertyGroup Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' == ''">
+    <UtilPackVersion>$(PackageVersion_NuGetUtilsMSBuildExec)</UtilPackVersion>
+    <UtilPackNuGetMSBuildPropsPath Condition=" '$(UtilPackNuGetMSBuildPropsPath)' == ''">$(MSBuildThisFileDirectory)../../../nugetutils.msbuild.exec/$(UtilPackVersion)/build/NuGetUtils.MSBuild.Exec.props</UtilPackNuGetMSBuildPropsPath>
     <UtilPackNuGetMSBuildPropsAbsolutePath>$([System.IO.Path]::GetFullPath('$(UtilPackNuGetMSBuildPropsPath)'))</UtilPackNuGetMSBuildPropsAbsolutePath>
     <!-- Set absolute path to empty string if automatic deduction failed. -->
     <UtilPackNuGetMSBuildPropsAbsolutePath Condition=" '$(UtilPackNuGetMSBuildPropsAbsolutePath)' == '' or !Exists('$(UtilPackNuGetMSBuildPropsAbsolutePath)') "></UtilPackNuGetMSBuildPropsAbsolutePath>
   </PropertyGroup>
 
   <PropertyGroup>
-    <GitVersionTaskBuildTools_CanCallDirectly Condition=" '$(UtilPackNuGetMSBuildAssemblyPath)' != '' or '$(UtilPackNuGetMSBuildPropsAbsolutePath)' != '' ">true</GitVersionTaskBuildTools_CanCallDirectly>
+    <GitVersionTaskBuildTools_CanCallDirectly Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' or '$(UtilPackNuGetMSBuildPropsAbsolutePath)' != '' ">true</GitVersionTaskBuildTools_CanCallDirectly>
   </PropertyGroup>
 
   <PropertyGroup>
     <UtilPackTaskFactoryParametersXML Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
-      <NuGetFramework>.NETFramework</NuGetFramework>
-      <NuGetFrameworkVersion>4.6.1</NuGetFrameworkVersion>
+      <NuGetFramework>net461</NuGetFramework>
     </UtilPackTaskFactoryParametersXML>
     <UtilPackTaskFactoryParametersXML>
       $(UtilPackTaskFactoryParametersXML)
@@ -35,7 +34,7 @@
 
   <!-- Import the UtilPack.NuGet.MSBuild props file directly, if we managed to deduce it. -->
   <ImportGroup>
-    <Import Condition=" '$(UtilPackNuGetMSBuildAssemblyPath)' == '' and '$(UtilPackNuGetMSBuildPropsAbsolutePath)' != '' " Project="$(UtilPackNuGetMSBuildPropsAbsolutePath)" />
+    <Import Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' == '' and '$(UtilPackNuGetMSBuildPropsAbsolutePath)' != '' " Project="$(UtilPackNuGetMSBuildPropsAbsolutePath)" />
     <Import Condition=" '$(GitVersionTaskBuildTools_CanCallDirectly)' == 'true' " Project="$(GitVersionTaskBuildTools_FunctionalityFile)"/>
   </ImportGroup>  
 
diff --git a/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props b/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props
index 36b320e5a5..5e868860fb 100644
--- a/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props
+++ b/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
@@ -40,43 +40,55 @@
 
   </PropertyGroup>
   <UsingTask
-    Condition=" '$(UtilPackNuGetMSBuildAssemblyPath)' != '' "
-    TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
-    AssemblyFile="$(UtilPackNuGetMSBuildAssemblyPath)"
+    Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+    TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+    AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
     TaskName="GitVersionTask.UpdateAssemblyInfo">
     <Task>
-      <NuGetTaskInfo>$(UtilPackTaskFactoryParametersXML)</NuGetTaskInfo>
+      <NuGetTaskInfo>
+        $(UtilPackTaskFactoryParametersXML)
+        <EntryPointMethodName>Execute</EntryPointMethodName>
+      </NuGetTaskInfo>
     </Task>
   </UsingTask>
   <UsingTask
-      Condition=" '$(UtilPackNuGetMSBuildAssemblyPath)' != '' "
-      TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
-      AssemblyFile="$(UtilPackNuGetMSBuildAssemblyPath)"
+      Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+      TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+      AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
       TaskName="GitVersionTask.GenerateGitVersionInformation">
     <Task>
-      <NuGetTaskInfo>$(UtilPackTaskFactoryParametersXML)</NuGetTaskInfo>
+      <NuGetTaskInfo>
+        $(UtilPackTaskFactoryParametersXML)
+        <EntryPointMethodName>Execute</EntryPointMethodName>
+      </NuGetTaskInfo>
     </Task>
   </UsingTask>
   <UsingTask
-      Condition=" '$(UtilPackNuGetMSBuildAssemblyPath)' != '' "
-      TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
-      AssemblyFile="$(UtilPackNuGetMSBuildAssemblyPath)"
+      Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+      TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+      AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
       TaskName="GitVersionTask.GetVersion">
     <Task>
-      <NuGetTaskInfo>$(UtilPackTaskFactoryParametersXML)</NuGetTaskInfo>
+      <NuGetTaskInfo>
+        $(UtilPackTaskFactoryParametersXML)
+        <EntryPointMethodName>Execute</EntryPointMethodName>
+      </NuGetTaskInfo>
     </Task>
   </UsingTask>
   <UsingTask
-      Condition=" '$(UtilPackNuGetMSBuildAssemblyPath)' != '' "
-      TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
-      AssemblyFile="$(UtilPackNuGetMSBuildAssemblyPath)"
+      Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+      TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+      AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
       TaskName="GitVersionTask.WriteVersionInfoToBuildLog">
     <Task>
-      <NuGetTaskInfo>$(UtilPackTaskFactoryParametersXML)</NuGetTaskInfo>
+      <NuGetTaskInfo>
+        $(UtilPackTaskFactoryParametersXML)
+        <EntryPointMethodName>Execute</EntryPointMethodName>
+      </NuGetTaskInfo>
     </Task>
   </UsingTask>
   <PropertyGroup>
     <GitVersion_Task_targets_Imported>True</GitVersion_Task_targets_Imported>
   </PropertyGroup>
   <Import Project="$(GitVersionCustomizeTargetFile)" Condition="'$(GitVersionCustomizeTargetFile)' != '' and Exists('$(GitVersionCustomizeTargetFile)')" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/GitVersionTask/TaskLogger.cs b/src/GitVersionTask/TaskLogger.cs
index ba33729ed8..baa46b9b09 100644
--- a/src/GitVersionTask/TaskLogger.cs
+++ b/src/GitVersionTask/TaskLogger.cs
@@ -1,26 +1,32 @@
-using Microsoft.Build.Framework;
+using System;
+using System.IO;
 
 class TaskLogger
 {
-    ITask task;
+    private readonly TextWriter stdout;
+    private readonly TextWriter stderr;
 
-    public TaskLogger(ITask task)
+    public TaskLogger(
+        TextWriter paramStdout = null,
+        TextWriter paramStderr = null
+        )
     {
-        this.task = task;
+        this.stdout = paramStdout ?? Console.Out;
+        this.stderr = paramStderr ?? Console.Error;
     }
 
     public void LogWarning(string message)
     {
-        task.BuildEngine.LogWarningEvent(new BuildWarningEventArgs(string.Empty, string.Empty, null, 0, 0, 0, 0, message, string.Empty, "GitVersionTask"));
+        this.stdout.WriteLine( message );
     }
 
     public void LogInfo(string message)
     {
-        task.BuildEngine.LogMessageEvent(new BuildMessageEventArgs(message, string.Empty, "GitVersionTask", MessageImportance.Normal));
+        this.stdout.WriteLine( message );
     }
 
-    public void LogError(string message, string file = null)
+    public void LogError(string message)
     {
-        task.BuildEngine.LogErrorEvent(new BuildErrorEventArgs(string.Empty, string.Empty, file, 0, 0, 0, 0, message, string.Empty, "GitVersionTask"));
+        this.stderr.WriteLine( message );
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersionTask/UpdateAssemblyInfo.cs b/src/GitVersionTask/UpdateAssemblyInfo.cs
index 27ccab47d1..87744a9c01 100644
--- a/src/GitVersionTask/UpdateAssemblyInfo.cs
+++ b/src/GitVersionTask/UpdateAssemblyInfo.cs
@@ -5,113 +5,112 @@ namespace GitVersionTask
 
     using GitVersion;
     using GitVersion.Helpers;
-    using Microsoft.Build.Framework;
 
-    public class UpdateAssemblyInfo : GitVersionTaskBase
+    public static class UpdateAssemblyInfo
     {
-        TaskLogger logger;
-
-        public UpdateAssemblyInfo()
+        public static Output Execute(
+            Input input
+            )
         {
-            logger = new TaskLogger(this);
-            Logger.SetLoggers(this.LogDebug, this.LogInfo, this.LogWarning, s => this.LogError(s));
-        }
-
-        [Required]
-        public string SolutionDirectory { get; set; }
-
-        [Required]
-        public string ProjectFile { get; set; }
-
-        [Required]
-        public string IntermediateOutputPath { get; set; }
-
-        [Required]
-        public ITaskItem[] CompileFiles { get; set; }
-
-        [Required]
-        public string Language { get; set; }
-
-        [Output]
-        public string AssemblyInfoTempFilePath { get; set; }
+            if ( !input.ValidateInput() )
+            {
+                throw new Exception( "Invalid input." );
+            }
 
-        public bool NoFetch { get; set; }
+            var logger = new TaskLogger();
+            Logger.SetLoggers( logger.LogInfo, logger.LogInfo, logger.LogWarning, s => logger.LogError( s ) );
 
-        public override bool Execute()
-        {
+            Output output = null;
             try
             {
-                InnerExecute();
-                return true;
+                output = InnerExecute( input );
             }
             catch (WarningException errorException)
             {
                 logger.LogWarning(errorException.Message);
-                return true;
+                output = new Output();
             }
             catch (Exception exception)
             {
                 logger.LogError("Error occurred: " + exception);
-                return false;
+                throw;
             }
             finally
             {
                 Logger.Reset();
             }
+
+            return output;
         }
 
-        void InnerExecute()
+        private static Output InnerExecute( Input input )
         {
+            var execute = GitVersionTaskBase.CreateExecuteCore();
+
             TempFileTracker.DeleteTempFiles();
 
-            InvalidFileChecker.CheckForInvalidFiles(CompileFiles, ProjectFile);
+            InvalidFileChecker.CheckForInvalidFiles(input.CompileFiles, input.ProjectFile);
 
-            VersionVariables versionVariables;
-            if (!ExecuteCore.TryGetVersion(SolutionDirectory, out versionVariables, NoFetch, new Authentication()))
+            if (!execute.TryGetVersion( input.SolutionDirectory, out var versionVariables, input.NoFetch, new Authentication()))
             {
-                return;
+                return null;
             }
 
-            CreateTempAssemblyInfo(versionVariables);
+            return CreateTempAssemblyInfo(input, versionVariables);
         }
 
-        void CreateTempAssemblyInfo(VersionVariables versionVariables)
+        private static Output CreateTempAssemblyInfo( Input input, VersionVariables versionVariables)
         {
-            var fileExtension = GetFileExtension();
-            var assemblyInfoFileName = $"GitVersionTaskAssemblyInfo.g.{fileExtension}";
-
-            if (IntermediateOutputPath == null)
+            var fileWriteInfo = input.IntermediateOutputPath.GetWorkingDirectoryAndFileNameAndExtension(
+                input.Language,
+                input.ProjectFile,
+                ( pf, ext ) => $"GitVersionTaskAssemblyInfo.g.{ext}",
+                ( pf, ext ) => $"AssemblyInfo_{Path.GetFileNameWithoutExtension( pf )}_{Path.GetRandomFileName()}.g.{ext}"
+                );
+
+            var output = new Output()
             {
-                assemblyInfoFileName = $"AssemblyInfo_{Path.GetFileNameWithoutExtension(ProjectFile)}_{Path.GetRandomFileName()}.g.{fileExtension}";
-            }
-
-            var workingDirectory = IntermediateOutputPath ?? TempFileTracker.TempPath;
+                AssemblyInfoTempFilePath = Path.Combine( fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName )
+            };
 
-            AssemblyInfoTempFilePath = Path.Combine(workingDirectory, assemblyInfoFileName);
-
-            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFileName, workingDirectory, versionVariables, new FileSystem(), true))
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater( fileWriteInfo.FileName, fileWriteInfo.WorkingDirectory, versionVariables, new FileSystem(), true))
             {
                 assemblyInfoFileUpdater.Update();
                 assemblyInfoFileUpdater.CommitChanges();
             }
+
+            return output;
         }
 
-        string GetFileExtension()
+        public sealed class Input
         {
-            switch(Language)
-            {
-                case "C#":
-                    return "cs";
+            public string SolutionDirectory { get; set; }
 
-                case "F#":
-                    return "fs";
+            public string ProjectFile { get; set; }
 
-                case "VB":
-                    return "vb";
+            public string IntermediateOutputPath { get; set; }
 
-                default:
-                    throw new Exception($"Unknown language detected: '{Language}'");
-            }
+            public String[] CompileFiles { get; set; }
+
+            public string Language { get; set; }
+
+            public bool NoFetch { get; set; }
+        }
+
+        private static Boolean ValidateInput(this Input input)
+        {
+            return input != null
+                && !String.IsNullOrEmpty( input.SolutionDirectory )
+                && !String.IsNullOrEmpty( input.ProjectFile )
+                && !String.IsNullOrEmpty( input.IntermediateOutputPath )
+                && input.CompileFiles != null
+                && !String.IsNullOrEmpty( input.Language )
+                ;
+        }
+
+        public sealed class Output
+        {
+            public string AssemblyInfoTempFilePath { get; set; }
         }
     }
 }
diff --git a/src/GitVersionTask/WriteVersionInfoToBuildLog.cs b/src/GitVersionTask/WriteVersionInfoToBuildLog.cs
index fcc1f8998d..777dca7192 100644
--- a/src/GitVersionTask/WriteVersionInfoToBuildLog.cs
+++ b/src/GitVersionTask/WriteVersionInfoToBuildLog.cs
@@ -3,58 +3,63 @@ namespace GitVersionTask
     using System;
     using System.Collections.Generic;
     using GitVersion;
-    using Microsoft.Build.Framework;
 
-    public class WriteVersionInfoToBuildLog : GitVersionTaskBase
+    public static class WriteVersionInfoToBuildLog
     {
-        readonly TaskLogger logger;
 
-        public WriteVersionInfoToBuildLog()
+        public static Output Execute(
+            Input input
+            )
         {
-            logger = new TaskLogger(this);
-            Logger.SetLoggers(this.LogDebug, this.LogInfo, this.LogWarning, s => this.LogError(s));
-        }
+            if ( !input.ValidateInput() )
+            {
+                throw new Exception( "Invalid input." );
+            }
 
-        [Required]
-        public string SolutionDirectory { get; set; }
+            var logger = new TaskLogger();
+            Logger.SetLoggers( logger.LogInfo, logger.LogInfo, logger.LogWarning, s => logger.LogError( s ) );
 
-        public bool NoFetch { get; set; }
 
-        public override bool Execute()
-        {
+            Output output = null;
             try
             {
-                InnerExecute();
-                return true;
+                output = InnerExecute(logger, input);
             }
             catch (WarningException errorException)
             {
                 logger.LogWarning(errorException.Message);
-                return true;
+                output = new Output();
             }
             catch (Exception exception)
             {
                 logger.LogError("Error occurred: " + exception);
-                return false;
+                throw;
             }
             finally
             {
                 Logger.Reset();
             }
+
+            return output;
         }
 
-        void InnerExecute()
+        private static Output InnerExecute(
+            TaskLogger logger,
+            Input input
+            )
         {
-            VersionVariables result;
-            if (!ExecuteCore.TryGetVersion(SolutionDirectory, out result, NoFetch, new Authentication()))
+            var execute = GitVersionTaskBase.CreateExecuteCore();
+            if (!execute.TryGetVersion(input.SolutionDirectory, out var result, input.NoFetch, new Authentication()))
             {
-                return;
+                return null;
             }
 
-            WriteIntegrationParameters(BuildServerList.GetApplicableBuildServers(), result);
+            WriteIntegrationParameters(logger, BuildServerList.GetApplicableBuildServers(), result);
+
+            return new Output();
         }
 
-        void WriteIntegrationParameters(IEnumerable<IBuildServer> applicableBuildServers, VersionVariables variables)
+        private static void WriteIntegrationParameters(TaskLogger logger, IEnumerable<IBuildServer> applicableBuildServers, VersionVariables variables)
         {
             foreach (var buildServer in applicableBuildServers)
             {
@@ -67,5 +72,22 @@ void WriteIntegrationParameters(IEnumerable<IBuildServer> applicableBuildServers
                 }
             }
         }
+
+        public sealed class Input
+        {
+            public string SolutionDirectory { get; set; }
+
+            public bool NoFetch { get; set; }
+        }
+
+        public static Boolean ValidateInput(this Input input)
+        {
+            return !String.IsNullOrEmpty( input?.SolutionDirectory );
+        }
+
+        public sealed class Output
+        {
+            // No output for this task
+        }
     }
 }