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.
author: Rob Mensching <rob@firegiant.com> 2022-03-01 20:10:52 -0800
committer: Rob Mensching <rob@firegiant.com> 2022-03-01 20:49:18 -0800
commit: 89c476396d7ad6ab7c596300ec082dd9c38b9121 (patch)
tree: 3f132caeadccc8cb7369eca2bf700991847eadcd /src/ext
parent: befcd209d62a25020f46a688002b259c59e4dc3b (diff)
download: wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.tar.gz
wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.tar.bz2
wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.zip
9 files changed, 9 insertions, 9 deletions
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
index ce4d8db7..116d5223 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -9,7 +9,7 @@
            <bal:WixDotNetCoreBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
index 3ff2a196..d888d3d9 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
@@ -5,7 +5,7 @@
            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe"  PerMachine="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  PerMachine="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index b0f7a831..5f1aa557 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -5,7 +5,7 @@
            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
index f3a2b182..cdb15bb0 100644
--- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
+++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
@@ -8,7 +8,7 @@
            <bal:WixManagedBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
index 31f1eb9b..3602f969 100644
--- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
+++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
@@ -8,7 +8,7 @@
            <bal:WixManagedBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
index 78ac8220..b29363dd 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -9,7 +9,7 @@
            <bal:WixDotNetCoreBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
index a708d0ad..56edc986 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
@@ -5,7 +5,7 @@
            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index f862d396..7ac9c34a 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -5,7 +5,7 @@
            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
        </Chain>
    </Bundle>
 </Wix>
diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
index 8d9f5ca4..5f054ca4 100644
--- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -9,7 +9,7 @@
            <bal:WixDotNetCoreBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
-            <ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
        </Chain>
    </Bundle>
 </Wix>
author	Rob Mensching <rob@firegiant.com>	2022-03-01 20:10:52 -0800
committer	Rob Mensching <rob@firegiant.com>	2022-03-01 20:49:18 -0800
commit	89c476396d7ad6ab7c596300ec082dd9c38b9121 (patch)
tree	3f132caeadccc8cb7369eca2bf700991847eadcd /src/ext
parent	befcd209d62a25020f46a688002b259c59e4dc3b (diff)
download	wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.tar.gz wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.tar.bz2 wix-89c476396d7ad6ab7c596300ec082dd9c38b9121.zip

diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index ce4d8db7..116d5223 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -9,7 +9,7 @@
9	<bal:WixDotNetCoreBootstrapperApplicationHost />	9	<bal:WixDotNetCoreBootstrapperApplicationHost />
10	</BootstrapperApplication>	10	</BootstrapperApplication>
11	<Chain>	11	<Chain>
12	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />	12	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
13	</Chain>	13	</Chain>
14	</Bundle>	14	</Bundle>
15	</Wix>	15	</Wix>


diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs index 3ff2a196..d888d3d9 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5	<PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />	5	<PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
6	</BootstrapperApplication>	6	</BootstrapperApplication>
7	<Chain>	7	<Chain>
8	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />	8	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
9	</Chain>	9	</Chain>
10	</Bundle>	10	</Bundle>
11	</Wix>	11	</Wix>


diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index b0f7a831..5f1aa557 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5	<PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />	5	<PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
6	</BootstrapperApplication>	6	</BootstrapperApplication>
7	<Chain>	7	<Chain>
8	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />	8	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
9	</Chain>	9	</Chain>
10	</Bundle>	10	</Bundle>
11	</Wix>	11	</Wix>


diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs index f3a2b182..cdb15bb0 100644 --- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
@@ -8,7 +8,7 @@
8	<bal:WixManagedBootstrapperApplicationHost />	8	<bal:WixManagedBootstrapperApplicationHost />
9	</BootstrapperApplication>	9	</BootstrapperApplication>
10	<Chain>	10	<Chain>
11	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />	11	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
12	</Chain>	12	</Chain>
13	</Bundle>	13	</Bundle>
14	</Wix>	14	</Wix>


diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs index 31f1eb9b..3602f969 100644 --- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
@@ -8,7 +8,7 @@
8	<bal:WixManagedBootstrapperApplicationHost />	8	<bal:WixManagedBootstrapperApplicationHost />
9	</BootstrapperApplication>	9	</BootstrapperApplication>
10	<Chain>	10	<Chain>
11	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />	11	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
12	</Chain>	12	</Chain>
13	</Bundle>	13	</Bundle>
14	</Wix>	14	</Wix>


diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index 78ac8220..b29363dd 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -9,7 +9,7 @@
9	<bal:WixDotNetCoreBootstrapperApplicationHost />	9	<bal:WixDotNetCoreBootstrapperApplicationHost />
10	</BootstrapperApplication>	10	</BootstrapperApplication>
11	<Chain>	11	<Chain>
12	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />	12	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
13	</Chain>	13	</Chain>
14	</Bundle>	14	</Bundle>
15	</Wix>	15	</Wix>


diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs index a708d0ad..56edc986 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5	<PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />	5	<PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
6	</BootstrapperApplication>	6	</BootstrapperApplication>
7	<Chain>	7	<Chain>
8	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />	8	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
9	</Chain>	9	</Chain>
10	</Bundle>	10	</Bundle>
11	</Wix>	11	</Wix>


diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index f862d396..7ac9c34a 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5	<PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />	5	<PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
6	</BootstrapperApplication>	6	</BootstrapperApplication>
7	<Chain>	7	<Chain>
8	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />	8	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
9	</Chain>	9	</Chain>
10	</Bundle>	10	</Bundle>
11	</Wix>	11	</Wix>


diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index 8d9f5ca4..5f054ca4 100644 --- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -9,7 +9,7 @@
9	<bal:WixDotNetCoreBootstrapperApplicationHost />	9	<bal:WixDotNetCoreBootstrapperApplicationHost />
10	</BootstrapperApplication>	10	</BootstrapperApplication>
11	<Chain>	11	<Chain>
12	<ExePackage DetectCondition="none" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />	12	<ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
13	</Chain>	13	</Chain>
14	</Bundle>	14	</Bundle>
15	</Wix>	15	</Wix>