From a500693e3c9e94304c8b9a8229203b2b750900aa Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 25 Apr 2024 11:10:50 -0700
Subject: 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.
---
 src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj   | 2 +-
 .../TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj     | 2 +-
 src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs        | 8 ++++----
 .../TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/test/burn/TestData/FeatureTests')

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 @@
 <Project Sdk="WixToolset.Sdk">
   <Import Project="BundleA.props" />
   <PropertyGroup>
-    <Version>1.0.0.0</Version>
+    <TestVersion>1.0.0.0</TestVersion>
   </PropertyGroup>
   <ItemGroup>
     <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 @@
 <Project Sdk="WixToolset.Sdk">
   <Import Project="..\BundleAv1\BundleA.props" />
   <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
   </PropertyGroup>
   <ItemGroup>
     <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 @@
 
 
 
-<?ifndef Version?>
-<?define Version = 1.0.0.0?>
+<?ifndef TestVersion?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 
 <?ifndef ProductCode?>
@@ -11,7 +11,7 @@
 <?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
     <MediaTemplate EmbedCab="yes" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
@@ -58,6 +58,6 @@
   </Fragment>
 
   <Fragment>
-    <Property Id="TestVersion" Value="$(var.Version)" />
+    <Property Id="TestVersion" Value="$(var.TestVersion)" />
   </Fragment>
 </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 @@
 <Project Sdk="WixToolset.Sdk">
   <Import Project="..\PackageAv1\PackageAv1.props" />
   <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\PackageAv1\Package.wxs" Link="Package.wxs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
-- 
cgit v1.2.3-55-g6feb