diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-01-08 13:46:36 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-01-08 15:47:31 -0800 |
| commit | c1605aa577e304fe0fb4c57056b58754bfaf3666 (patch) | |
| tree | 2bd363058d48134ef23ddcf557d91386295baecc /src/test/WixToolsetTest.CoreIntegration/TestData | |
| parent | e35ee2e8c58bf55da5f3d04915d588fb04d6809d (diff) | |
| download | wix-c1605aa577e304fe0fb4c57056b58754bfaf3666.tar.gz wix-c1605aa577e304fe0fb4c57056b58754bfaf3666.tar.bz2 wix-c1605aa577e304fe0fb4c57056b58754bfaf3666.zip | |
Require or recommend ExePackage/@DetectCondition
Fixes wixtoolset/issues#6197
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')
3 files changed, 21 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/MissingDetectCondition.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/MissingDetectCondition.wxs new file mode 100644 index 00000000..21b4269b --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/MissingDetectCondition.wxs | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <PackageGroup Id="TestPackageGroup"> | ||
| 5 | <ExePackage InstallCommand="-install" | ||
| 6 | SourceFile="testsetup.exe" /> | ||
| 7 | </PackageGroup> | ||
| 8 | </Fragment> | ||
| 9 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/RequireDetectCondition.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/RequireDetectCondition.wxs new file mode 100644 index 00000000..42253f18 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ExePackage/RequireDetectCondition.wxs | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <PackageGroup Id="TestPackageGroup"> | ||
| 5 | <ExePackage DetectCondition="" | ||
| 6 | InstallCommand="-install" | ||
| 7 | UninstallCommand="-uninstall" | ||
| 8 | SourceFile="testsetup.exe" /> | ||
| 9 | </PackageGroup> | ||
| 10 | </Fragment> | ||
| 11 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExePackageGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExePackageGroup.wxs index 9d7a9511..cad1f049 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExePackageGroup.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExePackageGroup.wxs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 3 | <Fragment> | 3 | <Fragment> |
| 4 | <PackageGroup Id="BundlePackages"> | 4 | <PackageGroup Id="BundlePackages"> |
| 5 | <ExePackage SourceFile="burn.exe" /> | 5 | <ExePackage DetectCondition="DetectedSomething" SourceFile="burn.exe" /> |
| 6 | </PackageGroup> | 6 | </PackageGroup> |
| 7 | </Fragment> | 7 | </Fragment> |
| 8 | </Wix> | 8 | </Wix> |