diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-24 16:28:44 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-25 23:06:35 -0500 |
| commit | f4709371fa21ca1d0c06e04d1b53c0b10bfafeed (patch) | |
| tree | 622576e0b46b0cea56143fd707936f9635389bad /src/test/WixToolsetTest.CoreIntegration/TestData/BadInput | |
| parent | 23de0a19bffe457916b0a45e07044650ace8f456 (diff) | |
| download | wix-f4709371fa21ca1d0c06e04d1b53c0b10bfafeed.tar.gz wix-f4709371fa21ca1d0c06e04d1b53c0b10bfafeed.tar.bz2 wix-f4709371fa21ca1d0c06e04d1b53c0b10bfafeed.zip | |
Perform more bundle validation during linking.
#5273, #6291, #6398
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/BadInput')
4 files changed, 30 insertions, 5 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs new file mode 100644 index 00000000..92a9602f --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.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="BundlePackages"> | ||
| 5 | <PackageGroupRef Id="MinimalPackageGroup" /> | ||
| 6 | </PackageGroup> | ||
| 7 | <PayloadGroup Id="OrphanPayloads"> | ||
| 8 | <Payload Id="OrphanPayload" SourceFile="$(sys.SOURCEFILEPATH)" /> | ||
| 9 | </PayloadGroup> | ||
| 10 | </Fragment> | ||
| 11 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs new file mode 100644 index 00000000..a00874ce --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <PackageGroup Id="BundlePackages"> | ||
| 5 | <PackageGroupRef Id="MinimalPackageGroup" /> | ||
| 6 | </PackageGroup> | ||
| 7 | <Container Id="First"> | ||
| 8 | <PackageGroupRef Id="BundlePackages" /> | ||
| 9 | </Container> | ||
| 10 | <Container Id="Second"> | ||
| 11 | <PackageGroupRef Id="BundlePackages" /> | ||
| 12 | </Container> | ||
| 13 | </Fragment> | ||
| 14 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs index ab86982d..fc53c4a2 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs | |||
| @@ -2,15 +2,15 @@ | |||
| 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 Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" /> | 5 | <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" /> |
| 6 | <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" /> | 6 | <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" /> |
| 7 | </PackageGroup> | 7 | </PackageGroup> |
| 8 | <SetVariableRef Id="Dummy" /> | 8 | <SetVariableRef Id="Dummy" /> |
| 9 | </Fragment> | 9 | </Fragment> |
| 10 | <Fragment> | 10 | <Fragment> |
| 11 | <SetVariable Id="Dummy" Variable="Dummy" /> | 11 | <SetVariable Id="Dummy" Variable="Dummy" /> |
| 12 | <PackageGroup Id="Unscheduled"> | 12 | <PackageGroup Id="Unscheduled"> |
| 13 | <ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" /> | 13 | <ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" DetectCondition="none" /> |
| 14 | </PackageGroup> | 14 | </PackageGroup> |
| 15 | </Fragment> | 15 | </Fragment> |
| 16 | </Wix> | 16 | </Wix> |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs index 8015ed92..6cf8528e 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs | |||
| @@ -2,8 +2,8 @@ | |||
| 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 Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" /> | 5 | <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" /> |
| 6 | <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" /> | 6 | <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" /> |
| 7 | </PackageGroup> | 7 | </PackageGroup> |
| 8 | <SetVariableRef Id="Dummy" /> | 8 | <SetVariableRef Id="Dummy" /> |
| 9 | </Fragment> | 9 | </Fragment> |