Bump GitInfo and unify how we reference it

Instead of having it scattered all over, keep it in PackageVersion.targets

Author: kzu

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj

@@ -6,7 +6,6 @@
     <NuGetBuildTasksPackTargets>NO-SDK-PACK</NuGetBuildTasksPackTargets>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GitInfo" Version="1.1.61" PrivateAssets="all" />
     <PackageReference Include="ILRepack" Version="2.0.13" PrivateAssets="all" />
     <PackageReference Include="netfx-System.StringResources" Version="3.1.5" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build" Version="14.3.0" PrivateAssets="all" />

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.targets

@@ -12,8 +12,8 @@
 	</ItemDefinitionGroup>
 
 	<PropertyGroup>
-	    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-	
+		<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+
 		<PackageId>NuGet.Build.Packaging</PackageId>
 		<Title>NuGetizer-3000</Title>
 		<Description>NuGetizer-3000</Description>

src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.csproj

@@ -13,7 +13,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitInfo" Version="1.1.61" />
     <PackageReference Include="Microsoft.Build" Version="14.3.0" />
     <PackageReference Include="Microsoft.Build.Logging.StructuredLogger" Version="1.1.168" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3.0" />

src/NuGet.Build.Packaging.Shared.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="..\build.props" />
-	
+
 	<PropertyGroup>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -10,7 +10,7 @@
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 		<AssemblyName>$(MSBuildProjectName)</AssemblyName>
 		<RootNamespace>NuGet.Build.Packaging</RootNamespace>
-		
+
 		<OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(Configuration)\</OutputPath>
 		<OutputType>Library</OutputType>
 		<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -46,11 +46,11 @@
 
 	<!-- Redefined by the GitInfo targets import -->
 	<Target Name="GitVersion" />
-	
+
 	<Import Project="$(MSBuildProjectDirectory)\$(MSBuildProjectName).props" Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).props')" />
 
 	<PropertyGroup>
-	    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>	
+		<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
 		<NuGetPackagingPropsImported>true</NuGetPackagingPropsImported>
 	</PropertyGroup>
 

src/NuGet.Build.Packaging.Shared.targets

@@ -10,7 +10,7 @@
 	<Import Project="$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets" Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).targets')" />
 
 	<PropertyGroup>
-	    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>	
+		<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
 		<NuGetPackagingTargetsImported>true</NuGetPackagingTargetsImported>
 	</PropertyGroup>
 

src/PackageVersion.targets

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<PropertyGroup>
-	    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+		<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
 		<!-- We use branch and file version sources only -->
 		<GitIgnoreTagVersion>true</GitIgnoreTagVersion>
 		<BuildDependsOn>
@@ -11,6 +11,10 @@
 		</BuildDependsOn>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<PackageReference Include="GitInfo" Version="2.0.7" PrivateAssets="all" />
+	</ItemGroup>
+
 	<Target Name="GetPackageVersion" BeforeTargets="ThisProjectInfo" DependsOnTargets="GitVersion" Returns="$(PackageVersion)">
 		<PropertyGroup>
 			<!-- PR builds are *always* prerelease -->

src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj

@@ -47,7 +47,6 @@
     <PackageReference Include="Clarius.VisualStudio" Version="2.0.13" />
     <PackageReference Include="Clide" Version="3.0.107-pre" />
     <PackageReference Include="Clide.Installer" Version="3.0.107-pre" />
-    <PackageReference Include="GitInfo" Version="1.1.61" />
     <PackageReference Include="Merq" Version="1.0.0-rc" />
     <PackageReference Include="Merq.Async" Version="1.1.17-rc" />
     <PackageReference Include="Microsoft.Build" Version="15.1.548" />

src/VisualStudio/NuGet.Packaging.VisualStudio/NuGet.Packaging.VisualStudio.csproj

@@ -29,7 +29,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Clide" Version="3.0.107-pre" />
-    <PackageReference Include="GitInfo" Version="1.1.61" />
     <PackageReference Include="Merq" Version="1.0.0-rc" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" />