Add WixVersion and WixMajorMinorVersion properties to wix.targets
Rob Mensching committed
Jan 13, 2022 at 13:09 UTC
4f761ebde9e935d43233aeea1e4cfc81a655e902
3 files changed
+24
src/Directory.Build.targets
+1
@@ -34,6 +34,7 @@
34
<AssemblyVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</AssemblyVersion>
35
<FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</FileVersion>
36
<PackageVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)</PackageVersion>
37
+ <MajorMinorVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor)</MajorMinorVersion>
38
<Version>$(PackageVersion)</Version>
39
<InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha)</InformationalVersion>
40
<!-- We already included the $(GitSha) in the informational version so do not include it again. -->
src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+21
@@ -23,4 +23,25 @@
23
<Content Include="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" />
24
<Content Include="Sdk\Sdk.targets" CopyToOutputDirectory="PreserveNewest" />
25
</ItemGroup>
26
+
27
+ <Target Name="PokeWixVersion"
28
+ AfterTargets="Publish">
29
+ <PropertyGroup>
30
+ <Namespaces>
31
+ <Namespace Prefix="msb" Uri="http://schemas.microsoft.com/developer/msbuild/2003" />
32
+ </Namespaces>
33
+ </PropertyGroup>
34
+
35
+ <XmlPoke
36
+ XmlInputPath="$(PublishDir)tools\wix.props"
37
+ Namespaces="$(Namespaces)"
38
+ Query="//msb:WixToolsetVersion"
39
+ Value="$(Version)" />
40
+
41
+ <XmlPoke
42
+ XmlInputPath="$(PublishDir)tools\wix.props"
43
+ Namespaces="$(Namespaces)"
44
+ Query="//msb:WixToolsetMajorMinorVersion"
45
+ Value="$(MajorMinorVersion)" />
46
+ </Target>
47
</Project>
src/wix/WixToolset.Sdk/tools/wix.props
+2
@@ -4,6 +4,8 @@
4
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<PropertyGroup>
6
<WixPropsImported>true</WixPropsImported>
7
+ <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion>
8
+ <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion>
9
</PropertyGroup>
10
11
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />