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.

3 files changed, 8 insertions, 8 deletions

diff --git a/src/test/burn/TestData/DependencyTests/BundleB/Bundle.wxs b/src/test/burn/TestData/DependencyTests/BundleB/Bundle.wxs
index 8d2dce60..3fa90749 100644
--- a/src/test/burn/TestData/DependencyTests/BundleB/Bundle.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleB/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="WiX.$(var.TestGroupName).$(var.BundleName).B">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="WiX.$(var.TestGroupName).$(var.BundleName).B">
     <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj
index 4a659ab1..afd71646 100644
--- a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
     <UpgradeCode>{228859BB-F917-4F43-A1E0-50C8DCCA92EF}</UpgradeCode>
-    <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/DependencyTests/BundleB/BundleB.wxs b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
index 670a812c..0b5f2c84 100644
--- a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
@@ -10,11 +10,11 @@
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
       <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
-                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
+                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
                   UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
-        <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
+        <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
         <PayloadGroupRef Id="TestExePayloads" />
       </ExePackage>
     </PackageGroup>