Updating UtilPack.NuGet.MSBuild to NuGetUtils.MSBuild.Exec

src/GitVersionTask/GetVersion.cs

@@ -45,22 +45,21 @@ Input input
             {
                 Logger.Reset();
             }
-
             return output;
         }
 
+        private static Boolean ValidateInput(this Input input)
+        {
+            return !String.IsNullOrEmpty( input?.SolutionDirectory );
+        }
+
         public sealed class Input
         {
             public string SolutionDirectory { get; set; }
 
             public bool NoFetch { get; set; }
         }
 
-        private static Boolean ValidateInput(this Input input)
-        {
-            return !String.IsNullOrEmpty( input?.SolutionDirectory );
-        }
-
         public sealed class Output
         {
             public string Major { get; set; }
@@ -109,18 +108,18 @@ public sealed class Output
 
             public string NuGetVersionV2 { get; set; }
 
-            public string VersionSourceSha { get; set; }
-
-            public string CommitsSinceVersionSource { get; set; }
-
             public string NuGetVersion { get; set; }
+
+            public string VersionSourceSha { get; set; }
 
             public string NuGetPreReleaseTagV2 { get; set; }
 
             public string NuGetPreReleaseTag { get; set; }
 
             public string CommitDate { get; set; }
 
+            public string CommitsSinceVersionSource { get; set; }
+
             public string CommitsSinceVersionSourcePadded { get; set; }
         }
     }

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,17 +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>
@@ -38,7 +38,7 @@
     <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)">
         <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="NuGetUtils.MSBuild.Exec" Version="$(PackageVersion_UtilPackNuGetMSBuild)">
+    <PackageReference Include="NuGetUtils.MSBuild.Exec" Version="$(PackageVersion_NuGetUtilsMSBuildExec)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/GitVersionTask/GitVersionTaskBase.cs

@@ -60,7 +60,7 @@ public FileWriteInfo(
             String fileExtension
             )
         {
-            this.WorkingDirectory = this.WorkingDirectory;
+            this.WorkingDirectory = workingDirectory;
             this.FileName = fileName;
             this.FileExtension = fileExtension;
         }

src/GitVersionTask/UtilPack.Version.props → src/GitVersionTask/NuGetUtils.MSBuild.Exec.Version.props

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PackageVersion_UtilPackNuGetMSBuild>2.0.0</PackageVersion_UtilPackNuGetMSBuild>
+    <PackageVersion_NuGetUtilsMSBuildExec>2.0.4</PackageVersion_NuGetUtilsMSBuildExec>
   </PropertyGroup>
 </Project>
 

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,22 +17,22 @@
     <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>
   <files>
     <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>

src/GitVersionTask/NugetAssets/build/Infrastructure.props

@@ -1,5 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<<<<<<< HEAD
   <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')" />
+>>>>>>> 854f16b6753d84214c78af52224f90500da7ac11
 
   <!-- Properties containing paths to functionality files and directories. -->
   <PropertyGroup>
@@ -10,7 +14,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' == ''">
+<<<<<<< HEAD
     <UtilPackVersion>$(PackageVersion_UtilPackNuGetMSBuild)</UtilPackVersion>
+=======
+    <UtilPackVersion>$(PackageVersion_NuGetUtilsMSBuildExec)</UtilPackVersion>
+>>>>>>> 854f16b6753d84214c78af52224f90500da7ac11
     <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. -->
@@ -23,8 +31,7 @@
 
   <PropertyGroup>
     <UtilPackTaskFactoryParametersXML Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
-      <NuGetFramework>.NETFramework</NuGetFramework>
-      <NuGetFrameworkVersion>4.6.1</NuGetFrameworkVersion>
+      <NuGetFramework>net461</NuGetFramework>
     </UtilPackTaskFactoryParametersXML>
     <UtilPackTaskFactoryParametersXML>
       $(UtilPackTaskFactoryParametersXML)

src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props

@@ -41,7 +41,11 @@
   </PropertyGroup>
   <UsingTask
     Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+<<<<<<< HEAD
     TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
+=======
+    TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+>>>>>>> 854f16b6753d84214c78af52224f90500da7ac11
     AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
     TaskName="GitVersionTask.UpdateAssemblyInfo">
     <Task>
@@ -53,7 +57,11 @@
   </UsingTask>
   <UsingTask
       Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+<<<<<<< HEAD
       TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
+=======
+      TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+>>>>>>> 854f16b6753d84214c78af52224f90500da7ac11
       AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
       TaskName="GitVersionTask.GenerateGitVersionInformation">
     <Task>
@@ -65,7 +73,11 @@
   </UsingTask>
   <UsingTask
       Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+<<<<<<< HEAD
       TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
+=======
+      TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+>>>>>>> 854f16b6753d84214c78af52224f90500da7ac11
       AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
       TaskName="GitVersionTask.GetVersion">
     <Task>
@@ -77,7 +89,11 @@
   </UsingTask>
   <UsingTask
       Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' "
+<<<<<<< HEAD
       TaskFactory="UtilPack.NuGet.MSBuild.NuGetTaskRunnerFactory"
+=======
+      TaskFactory="NuGetUtils.MSBuild.Exec.NuGetExecutionTaskFactory"
+>>>>>>> 854f16b6753d84214c78af52224f90500da7ac11
       AssemblyFile="$(NuGetUtilsMSBuildExecAssemblyPath)"
       TaskName="GitVersionTask.WriteVersionInfoToBuildLog">
     <Task>

src/GitVersionTask/UpdateAssemblyInfo.cs

@@ -8,7 +8,6 @@ namespace GitVersionTask
 
     public static class UpdateAssemblyInfo
     {
-
         public static Output Execute(
             Input input
             )