Skip to content

Commit 43a419f

Browse files
committed
Wix automatic versioning
1 parent 9104746 commit 43a419f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Setup/Product.wxs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
3-
<Product Id="*" Name="WorkloadTools" Language="1033" Version="1.0.0.0" Manufacturer="sqlconsulting.it" UpgradeCode="EF0F1905-E03F-4634-BB2E-3A5C3369AB23">
3+
<?include ProductVersion.wxi?>
4+
<Product Id="*" Name="WorkloadTools" Language="1033" Version="$(var.ProductVersion)" Manufacturer="sqlconsulting.it" UpgradeCode="EF0F1905-E03F-4634-BB2E-3A5C3369AB23">
45
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
56

67
<MajorUpgrade AllowDowngrades="yes" />

Setup/ProductVersion.wxi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Include>
2+
<?define ProductVersion=1.0.2?>
3+
</Include>

Setup/Setup.wixproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
<Compile Include="harvest.wxs" />
2323
<Compile Include="Product.wxs" />
2424
</ItemGroup>
25-
<ItemGroup>
26-
<Content Include="ExcludeNonRelease.xsl" />
27-
</ItemGroup>
2825
<ItemGroup>
2926
<ProjectReference Include="..\SqlWorkload\SqlWorkload.csproj">
3027
<Name>SqlWorkload</Name>
@@ -36,6 +33,9 @@
3633
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
3734
</ProjectReference>
3835
</ItemGroup>
36+
<ItemGroup>
37+
<Content Include="ProductVersion.wxi" />
38+
</ItemGroup>
3939
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
4040
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
4141
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

0 commit comments

Comments
 (0)