aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/FeatureTests
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-04-25 11:10:50 -0700
committerRob Mensching <rob@firegiant.com>2024-04-25 13:31:39 -0700
commita500693e3c9e94304c8b9a8229203b2b750900aa (patch)
treee99d90f31e2848a695f47423a440fb63bb9e8dae /src/test/burn/TestData/FeatureTests
parent4983aeeb2da6e96bc8aad698752b3b962f58e585 (diff)
downloadwix-a500693e3c9e94304c8b9a8229203b2b750900aa.tar.gz
wix-a500693e3c9e94304c8b9a8229203b2b750900aa.tar.bz2
wix-a500693e3c9e94304c8b9a8229203b2b750900aa.zip
Update tests to use TestVersion property instead of generic Version property
The MSBuild Version property is well-known and can be set by standard processes. That can cause problem in the tests where the version is explicitly set to validate WiX behaviors. So, we've switched to using the TestVersion property that will be specific for our testing purposes.
Diffstat (limited to 'src/test/burn/TestData/FeatureTests')
-rw-r--r--src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj2
-rw-r--r--src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj2
-rw-r--r--src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs8
-rw-r--r--src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
index 4f0f4bed..720c675d 100644
--- a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
@@ -2,7 +2,7 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleA.props" /> 3 <Import Project="BundleA.props" />
4 <PropertyGroup> 4 <PropertyGroup>
5 <Version>1.0.0.0</Version> 5 <TestVersion>1.0.0.0</TestVersion>
6 </PropertyGroup> 6 </PropertyGroup>
7 <ItemGroup> 7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> 8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
index 82646d2d..3b6c4088 100644
--- a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
@@ -2,7 +2,7 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" /> 3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup> 4 <PropertyGroup>
5 <Version>1.0.1.0</Version> 5 <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup> 6 </PropertyGroup>
7 <ItemGroup> 7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> 8 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs b/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs
index 572cb0b3..17027fb9 100644
--- a/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs
+++ b/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs
@@ -2,8 +2,8 @@
2 2
3 3
4 4
5<?ifndef Version?> 5<?ifndef TestVersion?>
6<?define Version = 1.0.0.0?> 6<?define TestVersion = 1.0.0.0?>
7<?endif?> 7<?endif?>
8 8
9<?ifndef ProductCode?> 9<?ifndef ProductCode?>
@@ -11,7 +11,7 @@
11<?endif?> 11<?endif?>
12 12
13<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 13<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14 <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)"> 14 <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
15 <MediaTemplate EmbedCab="yes" /> 15 <MediaTemplate EmbedCab="yes" />
16 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 16 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
17 17
@@ -58,6 +58,6 @@
58 </Fragment> 58 </Fragment>
59 59
60 <Fragment> 60 <Fragment>
61 <Property Id="TestVersion" Value="$(var.Version)" /> 61 <Property Id="TestVersion" Value="$(var.TestVersion)" />
62 </Fragment> 62 </Fragment>
63</Wix> 63</Wix>
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
index 74d94a41..3b961b2b 100644
--- a/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+++ b/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -2,9 +2,9 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageAv1.props" /> 3 <Import Project="..\PackageAv1\PackageAv1.props" />
4 <PropertyGroup> 4 <PropertyGroup>
5 <Version>1.0.1.0</Version> 5 <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup> 6 </PropertyGroup>
7 <ItemGroup> 7 <ItemGroup>
8 <Compile Include="..\PackageAv1\Package.wxs" Link="Package.wxs" /> 8 <Compile Include="..\PackageAv1\Package.wxs" Link="Package.wxs" />
9 </ItemGroup> 9 </ItemGroup>
10</Project> \ No newline at end of file 10</Project>