From 4f761ebde9e935d43233aeea1e4cfc81a655e902 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 13 Jan 2022 13:09:59 -0800
Subject: Add WixVersion and WixMajorMinorVersion properties to wix.targets

---
 src/Directory.Build.targets                  |  1 +
 src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj | 21 +++++++++++++++++++++
 src/wix/WixToolset.Sdk/tools/wix.props       |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 969bbcc1..cbf2e648 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -34,6 +34,7 @@
       <AssemblyVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</AssemblyVersion>
       <FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</FileVersion>
       <PackageVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)</PackageVersion>
+      <MajorMinorVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor)</MajorMinorVersion>
       <Version>$(PackageVersion)</Version>
       <InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha)</InformationalVersion>
       <!-- We already included the $(GitSha) in the informational version so do not include it again.  -->
diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index d1f8c75b..f2549605 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -23,4 +23,25 @@
     <Content Include="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="Sdk\Sdk.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
+
+  <Target Name="PokeWixVersion"
+          AfterTargets="Publish">
+    <PropertyGroup>
+      <Namespaces>
+        <Namespace Prefix="msb" Uri="http://schemas.microsoft.com/developer/msbuild/2003" />
+      </Namespaces>
+    </PropertyGroup>
+
+    <XmlPoke
+      XmlInputPath="$(PublishDir)tools\wix.props"
+      Namespaces="$(Namespaces)"
+      Query="//msb:WixToolsetVersion"
+      Value="$(Version)" />
+
+    <XmlPoke
+      XmlInputPath="$(PublishDir)tools\wix.props"
+      Namespaces="$(Namespaces)"
+      Query="//msb:WixToolsetMajorMinorVersion"
+      Value="$(MajorMinorVersion)" />
+  </Target>
 </Project>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.props b/src/wix/WixToolset.Sdk/tools/wix.props
index 2d88bc10..4e73e51f 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.props
+++ b/src/wix/WixToolset.Sdk/tools/wix.props
@@ -4,6 +4,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <WixPropsImported>true</WixPropsImported>
+    <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion>
+    <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion>
   </PropertyGroup>
 
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-- 
cgit v1.2.3-55-g6feb