aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/SlipstreamTests
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/SlipstreamTests
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/SlipstreamTests')
-rw-r--r--src/test/burn/TestData/SlipstreamTests/PackageAv0_9_0/PackageAv0_9_0.wixproj4
-rw-r--r--src/test/burn/TestData/SlipstreamTests/PackageAv1_0_1/PackageAv1_0_1.wixproj4
-rw-r--r--src/test/burn/TestData/SlipstreamTests/PackageBv1_0_1/PackageBv1_0_1.wixproj4
-rw-r--r--src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wxs6
-rw-r--r--src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wxs6
-rw-r--r--src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wxs6
6 files changed, 15 insertions, 15 deletions
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 @@
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>0.9.0.0</Version> 5 <TestVersion>0.9.0.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/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 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageAv1\PackageAv1.props" /> 3 <Import Project="..\PackageAv1\PackageAv1.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/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 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\PackageBv1\PackageB.props" /> 3 <Import Project="..\PackageBv1\PackageB.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="..\PackageBv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> 8 <Compile Include="..\PackageBv1\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/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 @@
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 <ComponentRef Id="RegistryComponent" /> 18 <ComponentRef Id="RegistryComponent" />
19 <PropertyRef Id="TestVersion" /> 19 <PropertyRef Id="TestVersion" />
20 </PatchFamily> 20 </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 @@
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">
@@ -19,7 +19,7 @@
19 /> 19 />
20 </Media> 20 </Media>
21 21
22 <PatchFamily Id="AB" Version="$(var.Version)" Supersede="yes"> 22 <PatchFamily Id="AB" Version="$(var.TestVersion)" Supersede="yes">
23 <ComponentRef Id="RegistryComponent" /> 23 <ComponentRef Id="RegistryComponent" />
24 <PropertyRef Id="TestVersion" /> 24 <PropertyRef Id="TestVersion" />
25 </PatchFamily> 25 </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 @@
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">
@@ -19,7 +19,7 @@
19 /> 19 />
20 </Media> 20 </Media>
21 21
22 <PatchFamily Id="AB2" Version="$(var.Version)" Supersede="yes"> 22 <PatchFamily Id="AB2" Version="$(var.TestVersion)" Supersede="yes">
23 <ComponentRef Id="RegistryComponent2" /> 23 <ComponentRef Id="RegistryComponent2" />
24 </PatchFamily> 24 </PatchFamily>
25 </Patch> 25 </Patch>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-16 05:03:53 +0000