@joebigelow / wix-1 / commits / a500693e

Update tests to use TestVersion property instead of generic Version property

The MSBuild Version property is well-known and can be set by standard processes. That can cause problem in the tests where the version is explicitly set to validate WiX behaviors. So, we've switched to using the TestVersion property that will be specific for our testing purposes.

Rob Mensching committed Apr 25, 2024 at 11:10 UTC a500693e3c9e94304c8b9a8229203b2b750900aa
107 files changed +209 -209
src/test/burn/Directory.wixproj.targets
+1 -1
@@ -13,6 +13,6 @@
13 <DefineConstants Condition=" '$(ProductCode)' != '' ">ProductCode=$(ProductCode);$(DefineConstants)</DefineConstants>
14 <DefineConstants Condition=" '$(ProductComponentsRef)' == 'true' ">ProductComponents=1;$(DefineConstants)</DefineConstants>
15 <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
16 - <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
16 + <DefineConstants Condition=" '$(TestVersion)' != '' ">TestVersion=$(TestVersion);$(DefineConstants)</DefineConstants>
17 </PropertyGroup>
18 </Project>
src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
src/test/burn/TestData/BAFunctionsTests/PackageAv2/PackageAv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleA.props" />
4 <PropertyGroup>
5 - <Version>1.0.0.0</Version>
5 + <TestVersion>1.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
+4 -4
@@ -9,11 +9,11 @@
9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
12 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
13 - InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
14 - RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
12 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
13 + InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
14 + RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
15 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
16 - <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
16 + <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
17 <PayloadGroupRef Id="TestExePayloads" />
18 </ExePackage>
19 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
+4 -4
@@ -9,11 +9,11 @@
9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
11 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
12 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
13 - InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
14 - RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
12 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
13 + InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
14 + RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
15 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
16 - <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
16 + <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
17 <PayloadGroupRef Id="TestExePayloads" />
18 </ExePackage>
19 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wxs
+4 -4
@@ -9,11 +9,11 @@
9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv2.TargetPath)" />
11 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
12 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
13 - InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
14 - RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
12 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
13 + InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
14 + RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
15 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
16 - <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
16 + <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
17 <PayloadGroupRef Id="TestExePayloads" />
18 </ExePackage>
19 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleB/Bundle.wxs
+3 -3
@@ -1,12 +1,12 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <!-- ProviderKey should be the only thing different from the template -->
9 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="WiX.$(var.TestGroupName).$(var.BundleName).B">
9 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="WiX.$(var.TestGroupName).$(var.BundleName).B">
10 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
11
12 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{228859BB-F917-4F43-A1E0-50C8DCCA92EF}</UpgradeCode>
6 - <Version>1.0.0.0</Version>
6 + <TestVersion>1.0.0.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
+4 -4
@@ -10,11 +10,11 @@
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11 <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
12 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
13 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
14 - InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
15 - RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
13 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
14 + InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
15 + RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
16 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
17 - <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
17 + <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
18 <PayloadGroupRef Id="TestExePayloads" />
19 </ExePackage>
20 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj
+1 -1
@@ -4,7 +4,7 @@
4 <OutputType>Bundle</OutputType>
5 <!-- Same as BundleA -->
6 <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
7 - <Version>1.0.1.0</Version>
7 + <TestVersion>1.0.1.0</TestVersion>
8 </PropertyGroup>
9 <ItemGroup>
10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj
+1 -1
@@ -4,7 +4,7 @@
4 <OutputType>Bundle</OutputType>
5 <!-- Same as BundleA -->
6 <UpgradeCode>{6950EF3F-674E-4689-A5C8-80D12AB6E34F}</UpgradeCode>
7 - <Version>1.0.1.0</Version>
7 + <TestVersion>1.0.1.0</TestVersion>
8 <SuppressSpecificWarnings>1153</SuppressSpecificWarnings>
9 </PropertyGroup>
10 <ItemGroup>
src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{250B4261-E67F-47E0-AB15-209EF58B769D}</UpgradeCode>
6 - <Version>1.0.0.0</Version>
6 + <TestVersion>1.0.0.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
+2 -2
@@ -10,8 +10,8 @@
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11 <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
12 <ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603" UninstallArguments=""
13 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)">
14 - <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
13 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)">
14 + <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
15 <PayloadGroupRef Id="TestExePayloads" />
16 </ExePackage>
17 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <Import Project="BundleF.props" />
4 <PropertyGroup>
5 <OutputType>Bundle</OutputType>
6 - <Version>1.0.0.0</Version>
6 + <TestVersion>1.0.0.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{022D0F5D-D140-47E1-A19A-5B2CEEE52668}</UpgradeCode>
6 - <Version>1.0.0.0</Version>
6 + <TestVersion>1.0.0.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
+4 -4
@@ -11,11 +11,11 @@
11 <PackageGroup Id="BundlePackages">
12 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
13 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
14 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
15 - InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
16 - RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
14 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
15 + InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
16 + RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
17 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
18 - <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
18 + <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
19 <PayloadGroupRef Id="TestExePayloads" />
20 </ExePackage>
21 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{8AB16F34-CA65-46E1-BDC0-08F157B4781C}</UpgradeCode>
6 - <Version>1.0.0.0</Version>
6 + <TestVersion>1.0.0.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
+4 -4
@@ -11,11 +11,11 @@
11 <PackageGroup Id="BundlePackages">
12 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
13 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
14 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
15 - InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
16 - RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
14 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
15 + InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
16 + RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
17 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
18 - <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
18 + <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.TestVersion)" />
19 <PayloadGroupRef Id="TestExePayloads" />
20 </ExePackage>
21 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleF_PatchA.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
+2 -2
@@ -3,10 +3,10 @@
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
6 -
6 +
7 <PackageGroup Id="BundlePackages">
8 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
9 - <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
9 + <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.TestVersion)" />
10 </MspPackage>
11 </PackageGroup>
12 </Fragment>
src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleF_PatchAv1_0_1\BundleF_PatchA.props" />
4 <PropertyGroup>
5 - <Version>1.0.2.0</Version>
5 + <TestVersion>1.0.2.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PatchA\PatchA.wixproj" />
src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
+3 -3
@@ -3,13 +3,13 @@
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Fragment>
5 <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
6 -
6 +
7 <PackageGroup Id="BundlePackages">
8 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
9 - <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
9 + <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.TestVersion)" />
10 </MspPackage>
11 <MspPackage Id="PatchB" SourceFile="$(var.PatchB.TargetPath)" PerMachine="yes">
12 - <Provides Key="$(var.TestGroupName)_PatchB" Version="$(var.Version)" />
12 + <Provides Key="$(var.TestGroupName)_PatchB" Version="$(var.TestVersion)" />
13 </MspPackage>
14 </PackageGroup>
15 </Fragment>
src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleF\BundleF.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleHv1\BundleH.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{37BDF884-C24A-4C12-9D0C-421FC30747F2}</UpgradeCode>
6 - <Version>1.0.0.0</Version>
6 + <TestVersion>1.0.0.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{353B5A34-3B46-424E-8817-25B3D01C8C16}</UpgradeCode>
6 - <Version>1.0.1.0</Version>
6 + <TestVersion>1.0.1.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
+1 -1
@@ -8,7 +8,7 @@
8
9 <PackageGroup Id="BundlePackages">
10 <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
11 - <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.Version)" />
11 + <Provides Key="$(var.TestGroupName)_PatchA" Version="$(var.TestVersion)" />
12 </MspPackage>
13 <MsiPackage Id="PackageE" Name="PackageEv1.msi" SourceFile="$(var.PackageEv1_0_1.TargetPath)" />
14 </PackageGroup>
src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleKv1\BundleK.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageFv1\PackageFv1.wixproj" />
src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleNv1\BundleN.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageC\PackageC.wixproj" />
src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleNv1\BundleN.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageC\PackageC.wixproj" />
src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+2 -2
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageAv1.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" />
12 </ItemGroup>
13 -</Project>
\ No newline at end of file
13 +</Project>
src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
+2 -2
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageAv1.props" />
4 <PropertyGroup>
5 - <Version>1.0.2.0</Version>
5 + <TestVersion>1.0.2.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" />
12 </ItemGroup>
13 -</Project>
\ No newline at end of file
13 +</Project>
src/test/burn/TestData/DependencyTests/PackageAv2/PackageAv2.wixproj
+2 -2
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" />
12 </ItemGroup>
13 -</Project>
\ No newline at end of file
13 +</Project>
src/test/burn/TestData/DependencyTests/PackageDv1/Package.wxs
+4 -4
@@ -2,8 +2,8 @@
2
3
4
5 -<?ifndef Version?>
6 -<?define Version = 1.0.0.0?>
5 +<?ifndef TestVersion?>
6 +<?define TestVersion = 1.0.0.0?>
7 <?endif?>
8
9 <?ifndef ProductCode?>
@@ -11,7 +11,7 @@
11 <?endif?>
12
13 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
14 - <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
14 + <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
15 <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." IgnoreLanguage="yes" />
16 <?ifndef CabPrefix?>
17 <MediaTemplate EmbedCab="yes" />
@@ -58,6 +58,6 @@
58 </Fragment>
59
60 <Fragment>
61 - <Property Id="TestVersion" Value="$(var.Version)" />
61 + <Property Id="TestVersion" Value="$(var.TestVersion)" />
62 </Fragment>
63 </Wix>
src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
+2 -2
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageDv1\PackageD.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageDv1\Package.wxs" Link="Package.wxs" />
@@ -10,4 +10,4 @@
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" />
12 </ItemGroup>
13 -</Project>
\ No newline at end of file
13 +</Project>
src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
+2 -2
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageEv1\PackageE.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageEv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
@@ -10,4 +10,4 @@
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Dependency.wixext" />
12 </ItemGroup>
13 -</Project>
\ No newline at end of file
13 +</Project>
src/test/burn/TestData/DependencyTests/PackageFv1_0_1/PackageFv1_0_1.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageFv1\PackageFv1.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/DependencyTests/PackageFv2/PackageFv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageFv1\PackageF.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/DependencyTests/PackageGv1_0_1/PackageGv1_0_1.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageGv1\PackageGv1.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/DependencyTests/PackageGv2/PackageGv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageGv1\PackageG.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
14 />
15 </Media>
16
17 - <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
17 + <PatchFamily Id="A" Version="$(var.TestVersion)" Supersede="yes">
18 <ComponentRef Id="RegistryComponent"/>
19 <PropertyRef Id="TestVersion"/>
20 </PatchFamily>
src/test/burn/TestData/DependencyTests/PatchB/PatchB.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
14 />
15 </Media>
16
17 - <PatchFamily Id="B" Version="$(var.Version)" Supersede="yes">
17 + <PatchFamily Id="B" Version="$(var.TestVersion)" Supersede="yes">
18 <PropertyRef Id="TestVersion"/>
19 </PatchFamily>
20 </Patch>
src/test/burn/TestData/FailureTests/BundleB/Bundle.wxs
+3 -3
@@ -1,11 +1,11 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
8 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{3C1A4842-81AC-4C90-8B35-A5E18F034C8D}</UpgradeCode>
6 - <Version>1.0.0.0</Version>
6 + <TestVersion>1.0.0.0</TestVersion>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/FailureTests/BundleD/BundleD.wxs
+3 -3
@@ -8,9 +8,9 @@
8
9 <PackageGroup Id="BundlePackages">
10 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
11 - DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
12 - InstallArguments="/s 5000 /regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
13 - RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
11 + DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
12 + InstallArguments="/s 5000 /regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
13 + RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
14 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&quot;">
15 <PayloadGroupRef Id="TestExePayloads" />
16 </ExePackage>
src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleA.props" />
4 <PropertyGroup>
5 - <Version>1.0.0.0</Version>
5 + <TestVersion>1.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs
+4 -4
@@ -2,8 +2,8 @@
2
3
4
5 -<?ifndef Version?>
6 -<?define Version = 1.0.0.0?>
5 +<?ifndef TestVersion?>
6 +<?define TestVersion = 1.0.0.0?>
7 <?endif?>
8
9 <?ifndef ProductCode?>
@@ -11,7 +11,7 @@
11 <?endif?>
12
13 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14 - <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
14 + <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
15 <MediaTemplate EmbedCab="yes" />
16 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
17
@@ -58,6 +58,6 @@
58 </Fragment>
59
60 <Fragment>
61 - <Property Id="TestVersion" Value="$(var.Version)" />
61 + <Property Id="TestVersion" Value="$(var.TestVersion)" />
62 </Fragment>
63 </Wix>
src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+2 -2
@@ -2,9 +2,9 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageAv1.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\Package.wxs" Link="Package.wxs" />
9 </ItemGroup>
10 -</Project>
\ No newline at end of file
10 +</Project>
src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{6A348108-8ACE-4D13-A352-D8F76785BFE4}</UpgradeCode>
6 - <DefineConstants>$(DefineConstants);BaseOutputPath=$(BaseOutputPath);Version=1.1</DefineConstants>
6 + <DefineConstants>$(DefineConstants);BaseOutputPath=$(BaseOutputPath);TestVersion=1.1</DefineConstants>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\WixStdBaTests\BundleA\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/Bundle.wxs
+3 -3
@@ -1,12 +1,12 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <!-- ProviderKey should be the only thing different from the template -->
9 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleA">
9 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleA">
10 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
11
12 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\BundleAv1\Bundle.wxs" />
src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/Bundle.wxs
+3 -3
@@ -1,12 +1,12 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <!-- ProviderKey should be the only thing different from the template -->
9 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleC">
9 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProviderKey="~$(var.TestGroupName)_BundleC">
10 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
11
12 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleCv1\BundleC.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\BundleCv1\Bundle.wxs" />
src/test/burn/TestData/ForwardCompatibleBundleTests/PackageAv2/PackageAv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/ForwardCompatibleBundleTests/PackageCv2/PackageCv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageCv1\PackageC.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs
+3 -3
@@ -1,11 +1,11 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
8 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
9 <!-- PayloadGroupRef should be the only thing different from the template -->
10 <PayloadGroupRef Id="LayoutOnlyPayloads" />
11
src/test/burn/TestData/Manual/BundleB/Bundle.wxs
+3 -3
@@ -1,12 +1,12 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <!-- The only difference from the template should be the SplashScreen -->
9 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" SplashScreenSourceFile="..\BafThmutilTesting\theme\star_transparent.bmp">
9 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" SplashScreenSourceFile="..\BafThmutilTesting\theme\star_transparent.bmp">
10 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
11
12 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+1 -1
@@ -4,7 +4,7 @@
4 <PropertyGroup>
5 <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6 <BA>TestBAdnc</BA>
7 - <Version>2.0.0.0</Version>
7 + <TestVersion>2.0.0.0</TestVersion>
8 </PropertyGroup>
9 <ItemGroup>
10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
src/test/burn/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageBv1\PackageB.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageCv1\PackageC.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
+1 -1
@@ -6,7 +6,7 @@
6 <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode>
7 </PropertyGroup>
8 <PropertyGroup>
9 - <Version>1.0.1.0</Version>
9 + <TestVersion>1.0.1.0</TestVersion>
10 </PropertyGroup>
11 <ItemGroup>
12 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+2 -2
@@ -2,9 +2,9 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10 -</Project>
\ No newline at end of file
10 +</Project>
src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
14 />
15 </Media>
16
17 - <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
17 + <PatchFamily Id="A" Version="$(var.TestVersion)" Supersede="yes">
18 <SoftwareTagRef Regid="regid.1995-08.com.example" />
19
20 <ComponentRef Id="RegistryComponent"/>
src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
14 />
15 </Media>
16
17 - <PatchFamily Id="A2" Version="$(var.Version)" Supersede="yes">
17 + <PatchFamily Id="A2" Version="$(var.TestVersion)" Supersede="yes">
18 <SoftwareTagRef Regid="regid.1995-08.com.example" />
19
20 <ComponentRef Id="RegistryComponent2"/>
src/test/burn/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj
+2 -2
@@ -2,9 +2,9 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>0.9.0.0</Version>
5 + <TestVersion>0.9.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10 -</Project>
\ No newline at end of file
10 +</Project>
src/test/burn/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+2 -2
@@ -2,9 +2,9 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageAv1.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10 -</Project>
\ No newline at end of file
10 +</Project>
src/test/burn/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj
+2 -2
@@ -2,9 +2,9 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageBv1\PackageB.props" />
4 <PropertyGroup>
5 - <Version>1.0.1.0</Version>
5 + <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\PackageBv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup>
10 -</Project>
\ No newline at end of file
10 +</Project>
src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
14 />
15 </Media>
16
17 - <PatchFamily Id="A" Version="$(var.Version)" Supersede="yes">
17 + <PatchFamily Id="A" Version="$(var.TestVersion)" Supersede="yes">
18 <ComponentRef Id="RegistryComponent" />
19 <PropertyRef Id="TestVersion" />
20 </PatchFamily>
src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -19,7 +19,7 @@
19 />
20 </Media>
21
22 - <PatchFamily Id="AB" Version="$(var.Version)" Supersede="yes">
22 + <PatchFamily Id="AB" Version="$(var.TestVersion)" Supersede="yes">
23 <ComponentRef Id="RegistryComponent" />
24 <PropertyRef Id="TestVersion" />
25 </PatchFamily>
src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -19,7 +19,7 @@
19 />
20 </Media>
21
22 - <PatchFamily Id="AB2" Version="$(var.Version)" Supersede="yes">
22 + <PatchFamily Id="AB2" Version="$(var.TestVersion)" Supersede="yes">
23 <ComponentRef Id="RegistryComponent2" />
24 </PatchFamily>
25 </Patch>
src/test/burn/TestData/Templates/Bundle.wxs
+3 -3
@@ -1,14 +1,14 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6 <?ifndef BundleLogDirectory?>
7 <?define BundleLogDirectory = .?>
8 <?endif?>
9
10 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
11 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
11 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
12 <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
13
14 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/Templates/Package.wxs
+4 -4
@@ -2,8 +2,8 @@
2
3
4
5 -<?ifndef Version?>
6 -<?define Version = 1.0.0.0?>
5 +<?ifndef TestVersion?>
6 +<?define TestVersion = 1.0.0.0?>
7 <?endif?>
8
9 <?ifndef ProductCode?>
@@ -11,7 +11,7 @@
11 <?endif?>
12
13 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14 - <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
14 + <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16 <?ifndef CabPrefix?>
17 <MediaTemplate EmbedCab="yes" />
@@ -63,6 +63,6 @@
63 </Fragment>
64
65 <Fragment>
66 - <Property Id="TestVersion" Value="$(var.Version)" />
66 + <Property Id="TestVersion" Value="$(var.TestVersion)" />
67 </Fragment>
68 </Wix>
src/test/burn/TestData/Templates/PackageFail.wxs
+4 -4
@@ -2,12 +2,12 @@
2
3
4
5 -<?ifndef Version?>
6 -<?define Version = 1.0.0.0?>
5 +<?ifndef TestVersion?>
6 +<?define TestVersion = 1.0.0.0?>
7 <?endif?>
8
9 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
10 - <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
10 + <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
11 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
12 <MediaTemplate EmbedCab="yes" />
13
@@ -45,6 +45,6 @@
45 </Fragment>
46
47 <Fragment>
48 - <Property Id="TestVersion" Value="$(var.Version)" />
48 + <Property Id="TestVersion" Value="$(var.TestVersion)" />
49 </Fragment>
50 </Wix>
src/test/burn/TestData/Templates/PackagePerUser.wxs
+4 -4
@@ -2,8 +2,8 @@
2
3
4
5 -<?ifndef Version?>
6 -<?define Version = 1.0.0.0?>
5 +<?ifndef TestVersion?>
6 +<?define TestVersion = 1.0.0.0?>
7 <?endif?>
8
9 <?ifndef ProductCode?>
@@ -11,7 +11,7 @@
11 <?endif?>
12
13 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14 - <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
14 + <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16 <?ifndef CabPrefix?>
17 <MediaTemplate EmbedCab="yes" />
@@ -57,6 +57,6 @@
57 </Fragment>
58
59 <Fragment>
60 - <Property Id="TestVersion" Value="$(var.Version)" />
60 + <Property Id="TestVersion" Value="$(var.TestVersion)" />
61 </Fragment>
62 </Wix>
src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
+3 -3
@@ -1,11 +1,11 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
8 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
9 <!-- Update should be the only thing different from the template -->
10 <Update Location="$(var.WebServerBaseUrl)BundleB/feed" />
11
src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleBv1\BundleB.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\BundleBv1\Bundle.wxs" />
src/test/burn/TestData/UpdateBundleTests/PackageAv2/PackageAv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/UpdateBundleTests/PackageBv2/PackageBv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageBv1\PackageB.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="BundleAwixstdba.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj
+1 -1
@@ -4,7 +4,7 @@
4 <PropertyGroup>
5 <BA>TestBA_x64</BA>
6 <InstallerPlatform>X64</InstallerPlatform>
7 - <Version>2.0.0.0</Version>
7 + <TestVersion>2.0.0.0</TestVersion>
8 </PropertyGroup>
9 <ItemGroup>
10 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
4 <PropertyGroup>
5 - <Version>3.0.0.0</Version>
5 + <TestVersion>3.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv3\PackageAv3.wixproj" />
src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj
+1 -1
@@ -2,7 +2,7 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv2wixstdba\BundleAwixstdba.props" />
4 <PropertyGroup>
5 - <Version>3.0.0.0</Version>
5 + <TestVersion>3.0.0.0</TestVersion>
6 </PropertyGroup>
7 <ItemGroup>
8 <ProjectReference Include="..\PackageAv3\PackageAv3.wixproj" />
src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v2/BundleD_x64_v2.wixproj
+1 -1
@@ -5,7 +5,7 @@
5 <BA>WixBAdnc_x64</BA>
6 <UpgradeCode>{62E3DFA4-6849-44F0-93A1-C8F60DBB76E3}</UpgradeCode>
7 <InstallerPlatform>x64</InstallerPlatform>
8 - <Version>2.0.0.0</Version>
8 + <TestVersion>2.0.0.0</TestVersion>
9 </PropertyGroup>
10 <ItemGroup>
11 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/UpgradeRelatedBundleTests/BundleD_x64_v3/BundleD_x64_v3.wixproj
+1 -1
@@ -5,7 +5,7 @@
5 <BA>WixBAdnc_x64</BA>
6 <UpgradeCode>{62E3DFA4-6849-44F0-93A1-C8F60DBB76E3}</UpgradeCode>
7 <InstallerPlatform>x64</InstallerPlatform>
8 - <Version>3.0.0.0</Version>
8 + <TestVersion>3.0.0.0</TestVersion>
9 </PropertyGroup>
10 <ItemGroup>
11 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv2/PackageAv2.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>2.0.0.0</Version>
5 + <TestVersion>2.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/UpgradeRelatedBundleTests/PackageAv3/PackageAv3.wixproj
+2 -2
@@ -2,6 +2,6 @@
2 <Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup>
5 - <Version>3.0.0.0</Version>
5 + <TestVersion>3.0.0.0</TestVersion>
6 </PropertyGroup>
7 -</Project>
\ No newline at end of file
7 +</Project>
src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs
+3 -3
@@ -1,12 +1,12 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6
7 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <!-- CommandLineVariables should be the only thing different from the template -->
9 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseInsensitive">
9 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseInsensitive">
10 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
11
12 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6 <?ifndef BundleLogDirectory?>
7 <?define BundleLogDirectory = .?>
@@ -9,7 +9,7 @@
9
10 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
11 <!-- The only difference from the template should be the SplashScreen and uncompressed -->
12 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
12 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
13 <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
14
15 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6 <?ifndef BundleLogDirectory?>
7 <?define BundleLogDirectory = .?>
@@ -9,7 +9,7 @@
9
10 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
11 <!-- The only difference from the template should be the SplashScreen and uncompressed -->
12 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
12 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
13 <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
14
15 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
+3 -3
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 -<?ifndef Version?>
4 -<?define Version = 1.0.0.0?>
3 +<?ifndef TestVersion?>
4 +<?define TestVersion = 1.0.0.0?>
5 <?endif?>
6 <?ifndef BundleLogDirectory?>
7 <?define BundleLogDirectory = .?>
@@ -9,7 +9,7 @@
9
10 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
11 <!-- The only difference from the template should be the SplashScreen and uncompressed -->
12 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
12 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
13 <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
14
15 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wixproj
+1 -1
@@ -5,7 +5,7 @@
5 <OutputType>Bundle</OutputType>
6 <BA>hyperlinkLicense</BA>
7 <UpgradeCode>{42CCE8AB-777A-481F-9EA2-0B5B10179E8A}</UpgradeCode>
8 - <DefineConstants>$(DefineConstants);Version=1.0</DefineConstants>
8 + <DefineConstants>$(DefineConstants);TestVersion=1.0</DefineConstants>
9 </PropertyGroup>
10
11 <ItemGroup>
src/test/burn/TestData/WixStdBaTests/BalCondition/BalCondition.wxs
+1 -1
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
4 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
5 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
6
7 <BootstrapperApplication>
src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
+1 -1
@@ -1,7 +1,7 @@
1 <!-- 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. -->
2
3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4 - <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseSensitive">
4 + <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseSensitive">
5 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
6
7 <?ifndef UpdateFeed ?>
src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
6 - <DefineConstants>$(DefineConstants);Version=12.34;UpdateFeed=http://wixtoolsetZZZ.org/releases/feed/vSECRET.FEED</DefineConstants>
6 + <DefineConstants>$(DefineConstants);TestVersion=12.34;UpdateFeed=http://wixtoolsetZZZ.org/releases/feed/vSECRET.FEED</DefineConstants>
7 <OutputName>WixStdBaTest_BadUpdateFeed</OutputName>
8 </PropertyGroup>
9 <ItemGroup>
src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
6 - <DefineConstants>$(DefineConstants);Version=1.1</DefineConstants>
6 + <DefineConstants>$(DefineConstants);TestVersion=1.1</DefineConstants>
7 <OutputName>WixStdBaTest1_v11</OutputName>
8 </PropertyGroup>
9 <ItemGroup>
src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
6 - <DefineConstants>$(DefineConstants);Version=1.2</DefineConstants>
6 + <DefineConstants>$(DefineConstants);TestVersion=1.2</DefineConstants>
7 <OutputName>WixStdBaTest1_v12</OutputName>
8 </PropertyGroup>
9 <ItemGroup>
src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
6 - <DefineConstants>$(DefineConstants);Version=1.3</DefineConstants>
6 + <DefineConstants>$(DefineConstants);TestVersion=1.3</DefineConstants>
7 <OutputName>WixStdBaTest1_v13</OutputName>
8 </PropertyGroup>
9 <ItemGroup>
src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj
+1 -1
@@ -4,7 +4,7 @@
4 <OutputType>Bundle</OutputType>
5 <BA>hyperlinkLicense</BA>
6 <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
7 - <DefineConstants>$(DefineConstants);Version=1.0</DefineConstants>
7 + <DefineConstants>$(DefineConstants);TestVersion=1.0</DefineConstants>
8 <OutputName>WixStdBaTest1_v10</OutputName>
9 </PropertyGroup>
10 <ItemGroup>
src/test/msi/Directory.wixproj.targets
+1 -1
@@ -8,6 +8,6 @@
8 <DefineConstants Condition=" '$(ProductCode)' != '' ">ProductCode=$(ProductCode);$(DefineConstants)</DefineConstants>
9 <DefineConstants Condition=" '$(ProductComponentsRef)' == 'true' ">ProductComponents=1;$(DefineConstants)</DefineConstants>
10 <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
11 - <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
11 + <DefineConstants Condition=" '$(TestVersion)' != '' ">TestVersion=$(TestVersion);$(DefineConstants)</DefineConstants>
12 </PropertyGroup>
13 </Project>
src/test/msi/TestData/Templates/Product.wxs
+3 -3
@@ -2,8 +2,8 @@
2
3
4
5 -<?ifndef Version?>
6 -<?define Version = 1.0.0.0?>
5 +<?ifndef TestVersion?>
6 +<?define TestVersion = 1.0.0.0?>
7 <?endif?>
8
9 <?ifndef ProductCode?>
@@ -11,7 +11,7 @@
11 <?endif?>
12
13 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14 - <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
14 + <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.TestVersion)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16 <?ifndef CabPrefix?>
17 <MediaTemplate EmbedCab="yes" />