Replacing all UtilPack references with NuGetUtils references.

Author: stazz

src/GitVersionTask/GitVersionTask.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="$(MSBuildThisFileDirectory)\NuGetUtils.MSBuild.Exec.Version.props" Condition="exists('$(MSBuildThisFileDirectory)\NuGetUtils.MSBuild.Exec.Version.props')" />
@@ -17,7 +17,7 @@
 
     <NuspecFile>NugetAssets\GitVersionTask.nuspec</NuspecFile>
     <PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
-    <NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);utilpackversion=$(PackageVersion_NuGetUtilsMSBuildExec);libgit2sharpversion=$(PackageVersion_LibGit2Sharp);yamldotnetversion=$(PackageVersion_YamlDotNet)</NuspecProperties>
+    <NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);nugetutilsversion=$(PackageVersion_NuGetUtilsMSBuildExec);libgit2sharpversion=$(PackageVersion_LibGit2Sharp);yamldotnetversion=$(PackageVersion_YamlDotNet)</NuspecProperties>
 
     <Product>$(AssemblyName)</Product>
 

src/GitVersionTask/NugetAssets/GitVersionTask.nuspec

@@ -17,15 +17,15 @@
     <tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
     <dependencies>
       <group>
-        <dependency id="NuGetUtils.MSBuild.Exec" version="$utilpackversion$" exclude="Build,Analyzers" />
+        <dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETStandard2.0">
-         <dependency id="NuGetUtils.MSBuild.Exec" version="$utilpackversion$" exclude="Build,Analyzers" />
+         <dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" 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="NuGetUtils.MSBuild.Exec" version="$utilpackversion$" exclude="Build,Analyzers" />
+         <dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>

src/GitVersionTask/NugetAssets/build/Infrastructure.props

@@ -10,31 +10,31 @@
   </PropertyGroup>
 
   <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>
+    <NuGetUtilsVersion>$(PackageVersion_NuGetUtilsMSBuildExec)</NuGetUtilsVersion>
+    <NuGetUtilsMSBuildPropsPath Condition=" '$(NuGetUtilsMSBuildPropsPath)' == ''">$(MSBuildThisFileDirectory)../../../nugetutils.msbuild.exec/$(NuGetUtilsVersion)/build/NuGetUtils.MSBuild.Exec.props</NuGetUtilsMSBuildPropsPath>
+    <NuGetUtilsMSBuildPropsAbsolutePath>$([System.IO.Path]::GetFullPath('$(NuGetUtilsMSBuildPropsPath)'))</NuGetUtilsMSBuildPropsAbsolutePath>
     <!-- Set absolute path to empty string if automatic deduction failed. -->
-    <UtilPackNuGetMSBuildPropsAbsolutePath Condition=" '$(UtilPackNuGetMSBuildPropsAbsolutePath)' == '' or !Exists('$(UtilPackNuGetMSBuildPropsAbsolutePath)') "></UtilPackNuGetMSBuildPropsAbsolutePath>
+    <NuGetUtilsMSBuildPropsAbsolutePath Condition=" '$(NuGetUtilsMSBuildPropsAbsolutePath)' == '' or !Exists('$(NuGetUtilsMSBuildPropsAbsolutePath)') "></NuGetUtilsMSBuildPropsAbsolutePath>
   </PropertyGroup>
 
   <PropertyGroup>
-    <GitVersionTaskBuildTools_CanCallDirectly Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' or '$(UtilPackNuGetMSBuildPropsAbsolutePath)' != '' ">true</GitVersionTaskBuildTools_CanCallDirectly>
+    <GitVersionTaskBuildTools_CanCallDirectly Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' != '' or '$(NuGetUtilsMSBuildPropsAbsolutePath)' != '' ">true</GitVersionTaskBuildTools_CanCallDirectly>
   </PropertyGroup>
 
   <PropertyGroup>
-    <UtilPackTaskFactoryParametersXML Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
+    <NuGetUtilsTaskFactoryParametersXML Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
       <NuGetFramework>net461</NuGetFramework>
-    </UtilPackTaskFactoryParametersXML>
-    <UtilPackTaskFactoryParametersXML>
-      $(UtilPackTaskFactoryParametersXML)
+    </NuGetUtilsTaskFactoryParametersXML>
+    <NuGetUtilsTaskFactoryParametersXML>
+      $(NuGetUtilsTaskFactoryParametersXML)
       <PackageIDIsSelf>true</PackageIDIsSelf>
       <AssemblyPath>GitVersionTask.dll</AssemblyPath>
-    </UtilPackTaskFactoryParametersXML>
+    </NuGetUtilsTaskFactoryParametersXML>
   </PropertyGroup>
 
-  <!-- Import the UtilPack.NuGet.MSBuild props file directly, if we managed to deduce it. -->
+  <!-- Import the NuGetUtils props file directly, if we managed to deduce it. -->
   <ImportGroup>
-    <Import Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' == '' and '$(UtilPackNuGetMSBuildPropsAbsolutePath)' != '' " Project="$(UtilPackNuGetMSBuildPropsAbsolutePath)" />
+    <Import Condition=" '$(NuGetUtilsMSBuildExecAssemblyPath)' == '' and '$(NuGetUtilsMSBuildPropsAbsolutePath)' != '' " Project="$(NuGetUtilsMSBuildPropsAbsolutePath)" />
     <Import Condition=" '$(GitVersionTaskBuildTools_CanCallDirectly)' == 'true' " Project="$(GitVersionTaskBuildTools_FunctionalityFile)"/>
   </ImportGroup>  
 

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

@@ -49,7 +49,7 @@
     TaskName="GitVersionTask.UpdateAssemblyInfo">
     <Task>
       <NuGetTaskInfo>
-        $(UtilPackTaskFactoryParametersXML)
+        $(NuGetUtilsTaskFactoryParametersXML)
         <EntryPointMethodName>Execute</EntryPointMethodName>
       </NuGetTaskInfo>
     </Task>
@@ -61,7 +61,7 @@
       TaskName="GitVersionTask.GenerateGitVersionInformation">
     <Task>
       <NuGetTaskInfo>
-        $(UtilPackTaskFactoryParametersXML)
+        $(NuGetUtilsTaskFactoryParametersXML)
         <EntryPointMethodName>Execute</EntryPointMethodName>
       </NuGetTaskInfo>
     </Task>
@@ -73,7 +73,7 @@
       TaskName="GitVersionTask.GetVersion">
     <Task>
       <NuGetTaskInfo>
-        $(UtilPackTaskFactoryParametersXML)
+        $(NuGetUtilsTaskFactoryParametersXML)
         <EntryPointMethodName>Execute</EntryPointMethodName>
       </NuGetTaskInfo>
     </Task>
@@ -85,7 +85,7 @@
       TaskName="GitVersionTask.WriteVersionInfoToBuildLog">
     <Task>
       <NuGetTaskInfo>
-        $(UtilPackTaskFactoryParametersXML)
+        $(NuGetUtilsTaskFactoryParametersXML)
         <EntryPointMethodName>Execute</EntryPointMethodName>
       </NuGetTaskInfo>
     </Task>