107 files changed, 209 insertions, 209 deletions
diff --git a/src/test/burn/Directory.wixproj.targets b/src/test/burn/Directory.wixproj.targets
index 4037e865..cec1f316 100644
--- a/src/test/burn/Directory.wixproj.targets
+++ b/src/test/burn/Directory.wixproj.targets
@@ -13,6 +13,6 @@
    <DefineConstants Condition=" '$(ProductCode)' != '' ">ProductCode=$(ProductCode);$(DefineConstants)</DefineConstants>
    <DefineConstants Condition=" '$(ProductComponentsRef)' == 'true' ">ProductComponents=1;$(DefineConstants)</DefineConstants>
    <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
-    <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(TestVersion)' != '' ">TestVersion=$(TestVersion);$(DefineConstants)</DefineConstants>
  </PropertyGroup>
 </Project>
diff --git a/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj
index 63d8079e..338306d1 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/BAFunctionsTests/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>
    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
diff --git a/src/test/burn/TestData/BAFunctionsTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/BAFunctionsTests/PackageAv2/PackageAv2.wixproj
index b419f663..d4455f2b 100644
--- a/src/test/burn/TestData/BAFunctionsTests/PackageAv2/PackageAv2.wixproj
+++ b/src/test/burn/TestData/BAFunctionsTests/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/DependencyTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
index 4f0f4bed..720c675d 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/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/DependencyTests/BundleAv1/BundleAv1.wxs b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
index 3a15fdbb..30664022 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
@@ -9,11 +9,11 @@
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
-                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&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>
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
index 82646d2d..3b6c4088 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/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/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
index 3a9fd61d..2a3bc0f1 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
@@ -9,11 +9,11 @@
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
-                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&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>
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj
index 0c1ac068..574942ce 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/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>
    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs
index 570f633f..91246949 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs
@@ -9,11 +9,11 @@
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv2.TargetPath)" />
      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
-                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&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>
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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?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)"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
-                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&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>
diff --git a/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj
index 0ec02f6a..5e2c2dff 100644
--- a/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj
@@ -4,7 +4,7 @@
    <OutputType>Bundle</OutputType>
    <!-- Same as BundleA -->
    <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj
index f44759a6..0bdab1b4 100644
--- a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj
@@ -4,7 +4,7 @@
    <OutputType>Bundle</OutputType>
    <!-- Same as BundleA -->
    <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
    <SuppressSpecificWarnings>1153</SuppressSpecificWarnings>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj
index 32ef2b42..30e0f107 100644
--- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{250B4261-E67F-47E0-AB15-209EF58B769D}</UpgradeCode>
-    <Version>1.0.0.0</Version>
+    <TestVersion>1.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
index a2372241..513a00db 100644
--- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
@@ -10,8 +10,8 @@
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
      <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
      <ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603" UninstallArguments=""
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)">
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)">
-        <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>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj
index 62617f5e..c137d2dd 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj
@@ -3,7 +3,7 @@
  <Import Project="BundleF.props" />
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
-    <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/BundleF_AddOnA/BundleF_AddOnA.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
index ea71ae07..49cf67e2 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{022D0F5D-D140-47E1-A19A-5B2CEEE52668}</UpgradeCode>
-    <Version>1.0.0.0</Version>
+    <TestVersion>1.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
index 96b7d146..78c5493d 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
@@ -11,11 +11,11 @@
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
-                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&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>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
index ed46e89c..3a301fbf 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{8AB16F34-CA65-46E1-BDC0-08F157B4781C}</UpgradeCode>
-    <Version>1.0.0.0</Version>
+    <TestVersion>1.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
index 74ed5902..5da954ea 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
@@ -11,11 +11,11 @@
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
-                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&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>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
index 89c9441a..3fc54780 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="BundleF_PatchA.props" />
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
index bfe394bc..e23c9f88 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
@@ -3,10 +3,10 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
-    
    <PackageGroup Id="BundlePackages">
      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
-        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
+        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.TestVersion)" />
      </MspPackage>
    </PackageGroup>
  </Fragment>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
index 5861f538..4b2ca8de 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleF_PatchAv1_0_1\BundleF_PatchA.props" />
  <PropertyGroup>
-    <Version>1.0.2.0</Version>
+    <TestVersion>1.0.2.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PatchA\PatchA.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
index b5316bf0..b1f60b31 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
@@ -3,13 +3,13 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
-    
    <PackageGroup Id="BundlePackages">
      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
-        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
+        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.TestVersion)" />
      </MspPackage>
      <MspPackage Id="PatchB" SourceFile="$(var.PatchB.TargetPath)" PerMachine="yes">
-        <Provides Key="$(var.TestGroupName)_PatchB" Version="$(var.Version)" />
+        <Provides Key="$(var.TestGroupName)_PatchB" Version="$(var.TestVersion)" />
      </MspPackage>
    </PackageGroup>
  </Fragment>
diff --git a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj
index a8b3c894..98754537 100644
--- a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleF\BundleF.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
index 5a0a0d8f..3748c2bd 100644
--- a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleHv1\BundleH.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
index afe4d72c..4757cc94 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{37BDF884-C24A-4C12-9D0C-421FC30747F2}</UpgradeCode>
-    <Version>1.0.0.0</Version>
+    <TestVersion>1.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
index 19dbd4d5..719d454d 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{353B5A34-3B46-424E-8817-25B3D01C8C16}</UpgradeCode>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
index 8823f4b1..3af7bbf2 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
@@ -8,7 +8,7 @@
    <PackageGroup Id="BundlePackages">
      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
-        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
+        <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.TestVersion)" />
      </MspPackage>
      <MsiPackage Id="PackageE" Name="PackageEv1.msi" SourceFile="$(var.PackageEv1_0_1.TargetPath)" />
    </PackageGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
index c234c54f..2ccd8fad 100644
--- a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleKv1\BundleK.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageFv1\PackageFv1.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj
index f90d8177..c0848f21 100644
--- a/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleNv1\BundleN.props" />
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageC\PackageC.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj
index e87d9914..e07c06d4 100644
--- a/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleNv1\BundleN.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageC\PackageC.wixproj" />
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
index e1081745..5a70eefb 100644
--- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -2,7 +2,7 @@
 <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\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
  <ItemGroup>
    <PackageReference Include="WixToolset.Dependency.wixext" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
index 60b64c9f..d644627f 100644
--- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageAv1\PackageAv1.props" />
  <PropertyGroup>
-    <Version>1.0.2.0</Version>
+    <TestVersion>1.0.2.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
  <ItemGroup>
    <PackageReference Include="WixToolset.Dependency.wixext" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj
index b61d09f5..7bbbaf55 100644
--- a/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageAv1\PackageA.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
  <ItemGroup>
    <PackageReference Include="WixToolset.Dependency.wixext" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs b/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
index d22f2449..04e7f3ac 100644
--- a/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
+++ b/src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
@@ -2,8 +2,8 @@
-<?ifndef Version?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <?ifndef ProductCode?>
@@ -11,7 +11,7 @@
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
-  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
    <?ifndef CabPrefix?>
    <MediaTemplate EmbedCab="yes" />
@@ -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/DependencyTests/PackageDv2/PackageDv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
index 41df45d5..bbeaa87b 100644
--- a/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageDv1\PackageD.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\PackageDv1\Package.wxs" Link="Package.wxs" />
@@ -10,4 +10,4 @@
  <ItemGroup>
    <PackageReference Include="WixToolset.Dependency.wixext" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
index 888b3ceb..7dc91aee 100644
--- a/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageEv1\PackageE.props" />
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\PackageEv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
  <ItemGroup>
    <PackageReference Include="WixToolset.Dependency.wixext" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/PackageFv1_0_1/PackageFv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageFv1_0_1/PackageFv1_0_1.wixproj
index a92682bf..b8fba91a 100644
--- a/src/test/burn/TestData/DependencyTests/PackageFv1_0_1/PackageFv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageFv1_0_1/PackageFv1_0_1.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageFv1\PackageFv1.props" />
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/PackageFv2/PackageFv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageFv2/PackageFv2.wixproj
index f9ca3be0..0c25cb7c 100644
--- a/src/test/burn/TestData/DependencyTests/PackageFv2/PackageFv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageFv2/PackageFv2.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageFv1\PackageF.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/DependencyTests/PackageGv1_0_1/PackageGv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageGv1_0_1/PackageGv1_0_1.wixproj
index 3af8e1d0..d4b656ce 100644
--- a/src/test/burn/TestData/DependencyTests/PackageGv1_0_1/PackageGv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageGv1_0_1/PackageGv1_0_1.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageGv1\PackageGv1.props" />
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/PackageGv2/PackageGv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageGv2/PackageGv2.wixproj
index 6ffe6e55..7341fd3d 100644
--- a/src/test/burn/TestData/DependencyTests/PackageGv2/PackageGv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/PackageGv2/PackageGv2.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageGv1\PackageG.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/DependencyTests/PatchA/PatchA.wxs b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs
index acb6f887..e51c0c5a 100644
--- a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs
+++ b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
            />
        </Media>
-        <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
+        <PatchFamily Id="A" Version="$(var.TestVersion)" Supersede="yes">
          <ComponentRef Id="RegistryComponent"/>
          <PropertyRef Id="TestVersion"/>
        </PatchFamily>
diff --git a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wxs b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wxs
index a906dbc8..809e12a1 100644
--- a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wxs
+++ b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
            />
        </Media>
-        <PatchFamily Id="B" Version="$(var.Version)" Supersede="yes">
+        <PatchFamily Id="B" Version="$(var.TestVersion)" Supersede="yes">
          <PropertyRef Id="TestVersion"/>
        </PatchFamily>
    </Patch>
diff --git a/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs b/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs
index ea3d029e..578413a9 100644
--- a/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs
+++ b/src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs
@@ -1,11 +1,11 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj
index 38748d4a..6379a1b2 100644
--- a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj
+++ b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{3C1A4842-81AC-4C90-8B35-A5E18F034C8D}</UpgradeCode>
-    <Version>1.0.0.0</Version>
+    <TestVersion>1.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs
index ca70236d..28614b90 100644
--- a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs
+++ b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs
@@ -8,9 +8,9 @@
    <PackageGroup Id="BundlePackages">
      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
-                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
+                  DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
-                  InstallArguments="/s 5000 /regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  InstallArguments="/s 5000 /regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
-                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
+                  RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
                  UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
        <PayloadGroupRef Id="TestExePayloads" />
      </ExePackage>
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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?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>
diff --git a/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj b/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj
index 445f4eda..1d3d6f17 100644
--- a/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj
+++ b/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{6A348108-8ACE-4D13-A352-D8F76785BFE4}</UpgradeCode>
-    <DefineConstants>$(DefineConstants);BaseOutputPath=$(BaseOutputPath);Version=1.1</DefineConstants>
+    <DefineConstants>$(DefineConstants);BaseOutputPath=$(BaseOutputPath);TestVersion=1.1</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\WixStdBaTests\BundleA\Bundle.wxs" Link="Bundle.wxs" />
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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?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>
diff --git a/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs b/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs
index e74b8394..03f50964 100644
--- a/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs
+++ b/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs
@@ -1,11 +1,11 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
    <!-- PayloadGroupRef should be the only thing different from the template -->
    <PayloadGroupRef Id="LayoutOnlyPayloads" />
diff --git a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
index eea96895..8c670577 100644
--- a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
+++ b/src/test/burn/TestData/Manual/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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <!-- The only difference from the template should be the SplashScreen -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" SplashScreenSourceFile="..\BafThmutilTesting\theme\star_transparent.bmp">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" SplashScreenSourceFile="..\BafThmutilTesting\theme\star_transparent.bmp">
    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
index c2978b3d..0d00cd24 100644
--- a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/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>
    <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
index 6cf88241..938e93bf 100644
--- a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
@@ -4,7 +4,7 @@
  <PropertyGroup>
    <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
    <BA>TestBAdnc</BA>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
diff --git a/src/test/burn/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj
index 126d0f53..2d1108ef 100644
--- a/src/test/burn/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageBv1\PackageB.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/MsiTransactionTests/PackageCv2/PackageCv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj
index 640ad21d..16d05b63 100644
--- a/src/test/burn/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/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>
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
index b0787ad7..a24025a4 100644
--- a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
@@ -6,7 +6,7 @@
    <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode>
  </PropertyGroup>
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
index 9ceda117..439ebb9f 100644
--- a/src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+++ b/src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
@@ -2,9 +2,9 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageAv1\PackageA.props" />
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs
index ba961762..1bb8aeb4 100644
--- a/src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs
+++ b/src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
            />
        </Media>
-        <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
+        <PatchFamily Id="A" Version="$(var.TestVersion)" Supersede="yes">
          <SoftwareTagRef Regid="regid.1995-08.com.example" />
          <ComponentRef Id="RegistryComponent"/>
diff --git a/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs
index e2aa3e2b..2b684064 100644
--- a/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs
+++ b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
            />
        </Media>
-        <PatchFamily Id="A2" Version="$(var.Version)" Supersede="yes">
+        <PatchFamily Id="A2" Version="$(var.TestVersion)" Supersede="yes">
          <SoftwareTagRef Regid="regid.1995-08.com.example" />
          <ComponentRef Id="RegistryComponent2"/>
diff --git a/src/test/burn/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj b/src/test/burn/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj
index 50aa6ec6..b5ce8773 100644
--- a/src/test/burn/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj
@@ -2,9 +2,9 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageAv1\PackageA.props" />
  <PropertyGroup>
-    <Version>0.9.0.0</Version>
+    <TestVersion>0.9.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
index dbce9cfe..b57e75b2 100644
--- a/src/test/burn/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/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\ProductComponents.wxs" Link="ProductComponents.wxs" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj b/src/test/burn/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj
index 3ec790ad..2b3effee 100644
--- a/src/test/burn/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj
@@ -2,9 +2,9 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageBv1\PackageB.props" />
  <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <TestVersion>1.0.1.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\PackageBv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wxs b/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wxs
index 7c3818b0..fdecdc36 100644
--- a/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wxs
+++ b/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
            />
        </Media>
-        <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
+        <PatchFamily Id="A" Version="$(var.TestVersion)" Supersede="yes">
          <ComponentRef Id="RegistryComponent" />
          <PropertyRef Id="TestVersion" />
        </PatchFamily>
diff --git a/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wxs b/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wxs
index f700f35c..426ed799 100644
--- a/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wxs
+++ b/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -19,7 +19,7 @@
            />
        </Media>
-        <PatchFamily Id="AB" Version="$(var.Version)" Supersede="yes">
+        <PatchFamily Id="AB" Version="$(var.TestVersion)" Supersede="yes">
          <ComponentRef Id="RegistryComponent" />
          <PropertyRef Id="TestVersion" />
        </PatchFamily>
diff --git a/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs b/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs
index ebd5bed0..9075e31e 100644
--- a/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs
+++ b/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -19,7 +19,7 @@
            />
        </Media>
-        <PatchFamily Id="AB2" Version="$(var.Version)" Supersede="yes">
+        <PatchFamily Id="AB2" Version="$(var.TestVersion)" Supersede="yes">
          <ComponentRef Id="RegistryComponent2" />
        </PatchFamily>
    </Patch>
diff --git a/src/test/burn/TestData/Templates/Bundle.wxs b/src/test/burn/TestData/Templates/Bundle.wxs
index ee3b5f4e..e278a0ef 100644
--- a/src/test/burn/TestData/Templates/Bundle.wxs
+++ b/src/test/burn/TestData/Templates/Bundle.wxs
@@ -1,14 +1,14 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <?ifndef BundleLogDirectory?>
 <?define BundleLogDirectory = .?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
    <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/Templates/Package.wxs b/src/test/burn/TestData/Templates/Package.wxs
index a1189fd9..757a2625 100644
--- a/src/test/burn/TestData/Templates/Package.wxs
+++ b/src/test/burn/TestData/Templates/Package.wxs
@@ -2,8 +2,8 @@
-<?ifndef Version?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?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)">
    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
    <?ifndef CabPrefix?>
    <MediaTemplate EmbedCab="yes" />
@@ -63,6 +63,6 @@
  </Fragment>
  <Fragment>
-    <Property Id="TestVersion" Value="$(var.Version)" />
+    <Property Id="TestVersion" Value="$(var.TestVersion)" />
  </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/Templates/PackageFail.wxs b/src/test/burn/TestData/Templates/PackageFail.wxs
index b3e59540..26750e7f 100644
--- a/src/test/burn/TestData/Templates/PackageFail.wxs
+++ b/src/test/burn/TestData/Templates/PackageFail.wxs
@@ -2,12 +2,12 @@
-<?ifndef Version?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
    <MediaTemplate EmbedCab="yes" />
@@ -45,6 +45,6 @@
  </Fragment>
  <Fragment>
-    <Property Id="TestVersion" Value="$(var.Version)" />
+    <Property Id="TestVersion" Value="$(var.TestVersion)" />
  </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/Templates/PackagePerUser.wxs b/src/test/burn/TestData/Templates/PackagePerUser.wxs
index daac7658..01cf1a88 100644
--- a/src/test/burn/TestData/Templates/PackagePerUser.wxs
+++ b/src/test/burn/TestData/Templates/PackagePerUser.wxs
@@ -2,8 +2,8 @@
-<?ifndef Version?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?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)" Scope="perUser">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
    <?ifndef CabPrefix?>
    <MediaTemplate EmbedCab="yes" />
@@ -57,6 +57,6 @@
  </Fragment>
  <Fragment>
-    <Property Id="TestVersion" Value="$(var.Version)" />
+    <Property Id="TestVersion" Value="$(var.TestVersion)" />
  </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj
index 3c678f95..3fcf388b 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/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>
    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
index 63f3043b..7c43c59d 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
@@ -1,11 +1,11 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
    <!-- Update should be the only thing different from the template -->
    <Update Location="$(var.WebServerBaseUrl)BundleB/feed" />
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
index 8f21192f..13e94a58 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleBv1\BundleB.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\BundleBv1\Bundle.wxs" />
diff --git a/src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj
index b419f663..d4455f2b 100644
--- a/src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/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/UpdateBundleTests/PackageBv2/PackageBv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj
index 126d0f53..2d1108ef 100644
--- a/src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageBv1\PackageB.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/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
index 3c678f95..3fcf388b 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/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>
    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj
index afee7005..697dd143 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="BundleAwixstdba.props" />
  <PropertyGroup>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj
index 1cb94b43..d81e0295 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj
@@ -4,7 +4,7 @@
  <PropertyGroup>
    <BA>TestBA_x64</BA>
    <InstallerPlatform>X64</InstallerPlatform>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj
index a59e6767..bb255a3c 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleAv1\BundleA.props" />
  <PropertyGroup>
-    <Version>3.0.0.0</Version>
+    <TestVersion>3.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageAv3\PackageAv3.wixproj" />
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj
index 7b385e47..a42b99a0 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\BundleAv2wixstdba\BundleAwixstdba.props" />
  <PropertyGroup>
-    <Version>3.0.0.0</Version>
+    <TestVersion>3.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageAv3\PackageAv3.wixproj" />
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj
index b124ba5d..293eaafd 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj
@@ -5,7 +5,7 @@
    <BA>WixBAdnc_x64</BA>
    <UpgradeCode>{62E3DFA4-6849-44F0-93A1-C8F60DBB76E3}</UpgradeCode>
    <InstallerPlatform>x64</InstallerPlatform>
-    <Version>2.0.0.0</Version>
+    <TestVersion>2.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj
index 55c89060..c8e97cda 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj
@@ -5,7 +5,7 @@
    <BA>WixBAdnc_x64</BA>
    <UpgradeCode>{62E3DFA4-6849-44F0-93A1-C8F60DBB76E3}</UpgradeCode>
    <InstallerPlatform>x64</InstallerPlatform>
-    <Version>3.0.0.0</Version>
+    <TestVersion>3.0.0.0</TestVersion>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv2/PackageAv2.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv2/PackageAv2.wixproj
index b419f663..d4455f2b 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv2/PackageAv2.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/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/UpgradeRelatedBundleTests/PackageAv3/PackageAv3.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv3/PackageAv3.wixproj
index f3c121af..4ba31755 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv3/PackageAv3.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv3/PackageAv3.wixproj
@@ -2,6 +2,6 @@
 <Project Sdk="WixToolset.Sdk">
  <Import Project="..\PackageAv1\PackageA.props" />
  <PropertyGroup>
-    <Version>3.0.0.0</Version>
+    <TestVersion>3.0.0.0</TestVersion>
  </PropertyGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs b/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs
index 4a8cb43e..d6e0fd98 100644
--- a/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs
+++ b/src/test/burn/TestData/VariableTests/BundleA/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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <!-- CommandLineVariables should be the only thing different from the template -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseInsensitive">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseInsensitive">
    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs
index 195c159e..89efe183 100644
--- a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs
+++ b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <?ifndef BundleLogDirectory?>
 <?define BundleLogDirectory = .?>
@@ -9,7 +9,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <!-- The only difference from the template should be the SplashScreen and uncompressed -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
    <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs
index 195c159e..89efe183 100644
--- a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <?ifndef BundleLogDirectory?>
 <?define BundleLogDirectory = .?>
@@ -9,7 +9,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <!-- The only difference from the template should be the SplashScreen and uncompressed -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
    <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
index 195c159e..89efe183 100644
--- a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
@@ -1,7 +1,7 @@
 <!-- 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?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?define TestVersion = 1.0.0.0?>
 <?endif?>
 <?ifndef BundleLogDirectory?>
 <?define BundleLogDirectory = .?>
@@ -9,7 +9,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <!-- The only difference from the template should be the SplashScreen and uncompressed -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
    <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wixproj b/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wixproj
index 7e0224e2..39079c89 100644
--- a/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wixproj
@@ -5,7 +5,7 @@
    <OutputType>Bundle</OutputType>
    <BA>hyperlinkLicense</BA>
    <UpgradeCode>{42CCE8AB-777A-481F-9EA2-0B5B10179E8A}</UpgradeCode>
-    <DefineConstants>$(DefineConstants);Version=1.0</DefineConstants>
+    <DefineConstants>$(DefineConstants);TestVersion=1.0</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wxs b/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wxs
index e3c36df7..755c2351 100644
--- a/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wxs
+++ b/src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wxs
@@ -1,7 +1,7 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
    <BootstrapperApplication>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
index 44f52817..34071cad 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
@@ -1,7 +1,7 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseSensitive">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseSensitive">
    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
    <?ifndef UpdateFeed ?>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj
index 7c8c152d..125a7c46 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
-    <DefineConstants>$(DefineConstants);Version=12.34;UpdateFeed=http://wixtoolsetZZZ.org/releases/feed/vSECRET.FEED</DefineConstants>
+    <DefineConstants>$(DefineConstants);TestVersion=12.34;UpdateFeed=http://wixtoolsetZZZ.org/releases/feed/vSECRET.FEED</DefineConstants>
    <OutputName>WixStdBaTest_BadUpdateFeed</OutputName>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
index 23129fd9..9a269aa1 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
-    <DefineConstants>$(DefineConstants);Version=1.1</DefineConstants>
+    <DefineConstants>$(DefineConstants);TestVersion=1.1</DefineConstants>
    <OutputName>WixStdBaTest1_v11</OutputName>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
index 5ae4b6cc..c50fc29a 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
-    <DefineConstants>$(DefineConstants);Version=1.2</DefineConstants>
+    <DefineConstants>$(DefineConstants);TestVersion=1.2</DefineConstants>
    <OutputName>WixStdBaTest1_v12</OutputName>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj
index 5f35d432..d293fdde 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
-    <DefineConstants>$(DefineConstants);Version=1.3</DefineConstants>
+    <DefineConstants>$(DefineConstants);TestVersion=1.3</DefineConstants>
    <OutputName>WixStdBaTest1_v13</OutputName>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj
index 6d31e417..5cdcd4b2 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj
@@ -4,7 +4,7 @@
    <OutputType>Bundle</OutputType>
    <BA>hyperlinkLicense</BA>
    <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
-    <DefineConstants>$(DefineConstants);Version=1.0</DefineConstants>
+    <DefineConstants>$(DefineConstants);TestVersion=1.0</DefineConstants>
    <OutputName>WixStdBaTest1_v10</OutputName>
  </PropertyGroup>
  <ItemGroup>
diff --git a/src/test/msi/Directory.wixproj.targets b/src/test/msi/Directory.wixproj.targets
index 7dddb141..4910941e 100644
--- a/src/test/msi/Directory.wixproj.targets
+++ b/src/test/msi/Directory.wixproj.targets
@@ -8,6 +8,6 @@
    <DefineConstants Condition=" '$(ProductCode)' != '' ">ProductCode=$(ProductCode);$(DefineConstants)</DefineConstants>
    <DefineConstants Condition=" '$(ProductComponentsRef)' == 'true' ">ProductComponents=1;$(DefineConstants)</DefineConstants>
    <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
-    <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(TestVersion)' != '' ">TestVersion=$(TestVersion);$(DefineConstants)</DefineConstants>
  </PropertyGroup>
 </Project>
diff --git a/src/test/msi/TestData/Templates/Product.wxs b/src/test/msi/TestData/Templates/Product.wxs
index c7604c1b..8fb90fed 100644
--- a/src/test/msi/TestData/Templates/Product.wxs
+++ b/src/test/msi/TestData/Templates/Product.wxs
@@ -2,8 +2,8 @@
-<?ifndef Version?>
+<?ifndef TestVersion?>
-<?define Version = 1.0.0.0?>
+<?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)">
    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
    <?ifndef CabPrefix?>
    <MediaTemplate EmbedCab="yes" />