Partially changed UtilPack names to NuGetUtils.MSBuild.Exec. Need more thorough check later though.

Author: stazz

src/GitVersionTask/GitVersionTask.csproj

@@ -1,7 +1,7 @@
 <?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>
@@ -24,10 +24,10 @@
 
   </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/NugetAssets/GitVersionTask.nuspec

@@ -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>

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')" />
+  <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>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' == ''">
-    <UtilPackVersion>$(PackageVersion_UtilPackNuGetMSBuild)</UtilPackVersion>
+    <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. -->