aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/PatchTests
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-04-25 11:10:50 -0700
committerRob Mensching <rob@firegiant.com>2024-04-25 13:31:39 -0700
commita500693e3c9e94304c8b9a8229203b2b750900aa (patch)
treee99d90f31e2848a695f47423a440fb63bb9e8dae /src/test/burn/TestData/PatchTests
parent4983aeeb2da6e96bc8aad698752b3b962f58e585 (diff)
downloadwix-a500693e3c9e94304c8b9a8229203b2b750900aa.tar.gz
wix-a500693e3c9e94304c8b9a8229203b2b750900aa.tar.bz2
wix-a500693e3c9e94304c8b9a8229203b2b750900aa.zip
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.
Diffstat (limited to 'src/test/burn/TestData/PatchTests')
-rw-r--r--src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj2
-rw-r--r--src/test/burn/TestData/PatchTests/PackageAv1_0_1/PackageAv1_0_1.wixproj4
-rw-r--r--src/test/burn/TestData/PatchTests/PatchA/PatchA.wxs6
-rw-r--r--src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wxs6
4 files changed, 9 insertions, 9 deletions
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 @@
6 <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode> 6 <UpgradeCode>{AA083618-6280-44B8-9899-57BCC57906A5}</UpgradeCode>
7 </PropertyGroup> 7 </PropertyGroup>
8 <PropertyGroup> 8 <PropertyGroup>
9 <Version>1.0.1.0</Version> 9 <TestVersion>1.0.1.0</TestVersion>
10 </PropertyGroup> 10 </PropertyGroup>
11 <ItemGroup> 11 <ItemGroup>
12 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> 12 <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 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageA.props" /> 3 <Import Project="..\PackageAv1\PackageA.props" />
4 <PropertyGroup> 4 <PropertyGroup>
5 <Version>1.0.1.0</Version> 5 <TestVersion>1.0.1.0</TestVersion>
6 </PropertyGroup> 6 </PropertyGroup>
7 <ItemGroup> 7 <ItemGroup>
8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> 8 <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9 </ItemGroup> 9 </ItemGroup>
10</Project> \ No newline at end of file 10</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 @@
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. --> 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 2
3<?ifndef Version?> 3<?ifndef TestVersion?>
4<?define Version = 1.0.0.0?> 4<?define TestVersion = 1.0.0.0?>
5<?endif?> 5<?endif?>
6 6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
14 /> 14 />
15 </Media> 15 </Media>
16 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" /> 18 <SoftwareTagRef Regid="regid.1995-08.com.example" />
19 19
20 <ComponentRef Id="RegistryComponent"/> 20 <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 @@
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. --> 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 2
3<?ifndef Version?> 3<?ifndef TestVersion?>
4<?define Version = 1.0.0.0?> 4<?define TestVersion = 1.0.0.0?>
5<?endif?> 5<?endif?>
6 6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,7 +14,7 @@
14 /> 14 />
15 </Media> 15 </Media>
16 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" /> 18 <SoftwareTagRef Regid="regid.1995-08.com.example" />
19 19
20 <ComponentRef Id="RegistryComponent2"/> 20 <ComponentRef Id="RegistryComponent2"/>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-15 16:06:07 +0000