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.

6 files changed, 12 insertions, 12 deletions

diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/Bundle.wxs b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/Bundle.wxs
index 175d9a1f..c5c1b56e 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/Bundle.wxs
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/Bundle.wxs
@@ -1,12 +1,12 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<?ifndef Version?>
-<?define Version = 1.0.0.0?>
+<?ifndef TestVersion?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <!-- ProviderKey should be the only thing different from the template -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleA">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleA">
     <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
index 595c9160..271bf54b 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
   <Import Project="..\BundleAv1\BundleA.props" />
   <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\BundleAv1\Bundle.wxs" />
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/Bundle.wxs b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/Bundle.wxs
index dd305e42..bc8c88d3 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/Bundle.wxs
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/Bundle.wxs
@@ -1,12 +1,12 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<?ifndef Version?>
-<?define Version = 1.0.0.0?>
+<?ifndef TestVersion?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <!-- ProviderKey should be the only thing different from the template -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleC">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleC">
     <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
index 5e00b79e..5dd9875d 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
   <Import Project="..\BundleCv1\BundleC.props" />
   <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\BundleCv1\Bundle.wxs" />
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageAv2/PackageAv2.wixproj
index b419f663..d4455f2b 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageAv2/PackageAv2.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageAv2/PackageAv2.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
   <Import Project="..\PackageAv1\PackageA.props" />
   <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageCv2/PackageCv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageCv2/PackageCv2.wixproj
index 640ad21d..16d05b63 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageCv2/PackageCv2.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/PackageCv2/PackageCv2.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
   <Import Project="..\PackageCv1\PackageC.props" />
   <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>