7 files changed, 45 insertions, 13 deletions

diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
index 2ae49e19..23788d52 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -10,19 +10,27 @@
     <!-- Explicitly set the restore sources because this project may run before the build\artifacts folder has been created -->
     <RestoreSources>https://api.nuget.org/v3/index.json</RestoreSources>
     <RestoreIgnoreFailedSources>true</RestoreIgnoreFailedSources>
+
+    <Language>C#</Language>
+    <DefaultLanguageSourceExtension>.cs</DefaultLanguageSourceExtension>
+    <GitThisAssembly>true</GitThisAssembly>
   </PropertyGroup>
 
   <PropertyGroup>
     <SetBuildNumbersDependsOn>
       __SetPropertiesFromGit;
+      GitThisAssembly;
       SetAppVeyorBuildNumber;
       SetGlobalJson;
       SetDirectoryPackagesProps;
+      SetOverallWixVersions;
       InstallSigningClient
     </SetBuildNumbersDependsOn>
 
     <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath>
     <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath>
+    <OverallWixVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\wixver.props))</OverallWixVersionsPath>
+    <GitInfoThisAssemblyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\ThisAssembly.WixVer.cs))</GitInfoThisAssemblyFile>
   </PropertyGroup>
 
   <Target Name="SetAppVeyorBuildNumber"
@@ -89,6 +97,30 @@
   </Target>
 
 
+  <Target Name="SetOverallWixVersions"
+          Inputs="wixver.props.pp"
+          Outputs="$(OverallWixVersionsPath)">
+    <PropertyGroup>
+      <OverallWixVersionsTextHeader>&lt;!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\wixver.props.pp --&gt;</OverallWixVersionsTextHeader>
+      <OverallWixVersionsText>$([System.IO.File]::ReadAllText(wixver.props.pp))</OverallWixVersionsText>
+      <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionMajor}', $(GitBaseVersionMajor)))</OverallWixVersionsText>
+      <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionMinor}', $(GitBaseVersionMinor)))</OverallWixVersionsText>
+      <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionPatch}', $(GitBaseVersionPatch)))</OverallWixVersionsText>
+      <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitCommits}', $(GitCommits)))</OverallWixVersionsText>
+      <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitSemVerDashLabel}', $(GitSemVerDashLabel)))</OverallWixVersionsText>
+      <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitSha}', $(GitSha)))</OverallWixVersionsText>
+      <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitRepositoryUrl}', $(GitRepositoryUrl.Replace('.git',''))))</OverallWixVersionsText>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(OverallWixVersionsPath)"
+                      Lines="$(OverallWixVersionsTextHeader);$(OverallWixVersionsText)"
+                      Overwrite="true" 
+                      WriteOnlyWhenDifferent="true" />
+
+    <Message Importance="high" Text="$(MSBuildProjectName) -&gt; $(OverallWixVersionsPath)" />
+  </Target>
+
+
   <Target Name="InstallSigningClient"
           DependsOnTargets="_GetSignClient"
           Condition=" '$(SigningUser)'!='' ">
diff --git a/src/internal/SetBuildNumber/wixver.props.pp b/src/internal/SetBuildNumber/wixver.props.pp
new file mode 100644
index 00000000..3197181f
--- /dev/null
+++ b/src/internal/SetBuildNumber/wixver.props.pp
@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <GitInfoFromCache>true</GitInfoFromCache>
+    <GitInfoImported>true</GitInfoImported>
+    <GitBaseVersionMajor>{GitBaseVersionMajor}</GitBaseVersionMajor>
+    <GitBaseVersionMinor>{GitBaseVersionMinor}</GitBaseVersionMinor>
+    <GitBaseVersionPatch>{GitBaseVersionPatch}</GitBaseVersionPatch>
+    <GitCommits>{GitCommits}</GitCommits>
+    <GitSemVerDashLabel>{GitSemVerDashLabel}</GitSemVerDashLabel>
+    <GitSha>{GitSha}</GitSha>
+    <GitRepositoryUrl>{GitRepositoryUrl}</GitRepositoryUrl>
+  </PropertyGroup>
+</Project>
diff --git a/src/internal/WixBuildFinalize/WixBuildFinalize.proj b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
index 18c68245..d161f2cf 100644
--- a/src/internal/WixBuildFinalize/WixBuildFinalize.proj
+++ b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
@@ -6,10 +6,6 @@
     <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="GitInfo" PrivateAssets="All" />
-  </ItemGroup>
-
   <Target Name="ZipPdbs" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="AfterBuild">
     <ZipDirectory
         SourceDirectory="$(PdbsFolder)"
diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
index d12d3623..f8da4bfc 100644
--- a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
@@ -20,9 +20,4 @@
     <EmbeddedResource Include="Xsd\messages.xsd" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="GitInfo" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
index 6698bff7..5a45dba7 100644
--- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
@@ -23,6 +23,5 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
index 6525e65a..ed3d728a 100644
--- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
+++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
@@ -32,13 +32,11 @@
     </Reference>
   </ItemGroup>
 
-  <Import Project="$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" />
   <Import Project="$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets'))" />
     <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props'))" />
     <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets'))" />
     <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" />
diff --git a/src/internal/WixInternal.TestSupport.Native/packages.config b/src/internal/WixInternal.TestSupport.Native/packages.config
index ef2b43c8..603b945a 100644
--- a/src/internal/WixInternal.TestSupport.Native/packages.config
+++ b/src/internal/WixInternal.TestSupport.Native/packages.config
@@ -6,7 +6,6 @@
     Update build\WixInternal.TestSupport.Native.props and build\WixInternal.TestSupport.Native.targets
     when any of these versions are updated.
   -->
-  <package id="GitInfo" version="2.2.0" />
   <package id="xunit.abstractions" version="2.0.3" />
   <package id="xunit.assert" version="2.4.2" />
   <package id="xunit.core" version="2.4.2" />