summaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/DependencyTests/BundleAv1_0_1
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/DependencyTests/BundleAv1_0_1
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/DependencyTests/BundleAv1_0_1')
-rw-r--r--src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj2
-rw-r--r--src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs8
2 files changed, 5 insertions, 5 deletions
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 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" /> 3 <Import Project="..\BundleAv1\BundleA.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 <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> 8 <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 @@
9 <PackageGroup Id="BundlePackages"> 9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" /> 10 <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
11 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes" 11 <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
12 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)" 12 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.TestVersion)"
13 InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;" 13 InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
14 RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;" 14 RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.TestVersion)&quot;"
15 UninstallArguments="/regd &quot;HKLM\$(var.TestExeRegistryKey),Version&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" /> 17 <PayloadGroupRef Id="TestExePayloads" />
18 </ExePackage> 18 </ExePackage>
19 </PackageGroup> 19 </PackageGroup>