aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-03-01 20:10:52 -0800
committerRob Mensching <rob@firegiant.com>2022-03-01 20:49:18 -0800
commit89c476396d7ad6ab7c596300ec082dd9c38b9121 (patch)
tree3f132caeadccc8cb7369eca2bf700991847eadcd /src/test
parentbefcd209d62a25020f46a688002b259c59e4dc3b (diff)
downloadwix-89c476396d7ad6ab7c596300ec082dd9c38b9121.tar.gz
wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.tar.bz2
wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.zip
Improve error reporting wrt ExePackage and MsuPackage attributes
For example, DetectCondition is required when RepairArguments or UninstallArguments present and always recommended. Also, non-permanent ExePackages need UninstallArguments. The code was refactored to make it easier to reason over the different requirements for different package types.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
index 03b3538b..a2372241 100644
--- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
@@ -9,7 +9,7 @@
9 <PackageGroup Id="BundlePackages"> 9 <PackageGroup Id="BundlePackages">
10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" /> 10 <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
11 <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" /> 11 <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
12 <ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603" 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)"> 13 DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)">
14 <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" /> 14 <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
15 <PayloadGroupRef Id="TestExePayloads" /> 15 <PayloadGroupRef Id="TestExePayloads" />