diff options
Diffstat (limited to 'src/test/WixToolsetTest.Sdk/TestData/MergeModule')
| -rw-r--r-- | src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs | 14 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs | 6 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs index 71d8fff6..ef62c31b 100644 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs +++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200"> |
| 3 | |||
| 4 | |||
| 5 | <MediaTemplate /> | 3 | <MediaTemplate /> |
| 6 | 4 | ||
| 7 | <Feature Id="ProductFeature" Title="ATitle"> | 5 | <Feature Id="ProductFeature" Title="ATitle"> |
| @@ -10,12 +8,10 @@ | |||
| 10 | </Package> | 8 | </Package> |
| 11 | 9 | ||
| 12 | <Fragment> | 10 | <Fragment> |
| 13 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
| 14 | <Directory Id="ProgramFilesFolder"> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> |
| 15 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> | 13 | <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" /> |
| 16 | <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" /> | ||
| 17 | </Directory> | ||
| 18 | </Directory> | 14 | </Directory> |
| 19 | </Directory> | 15 | </StandardDirectory> |
| 20 | </Fragment> | 16 | </Fragment> |
| 21 | </Wix> | 17 | </Wix> |
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs index 19a7b7e4..b892debd 100644 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs +++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Module Id="SimpleMM" Language="1033" Version="1.0.0.0" Guid="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200"> | 2 | <Module Id="SimpleMM" Language="1033" Version="1.0.0.0" Guid="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200"> |
| 3 | <SummaryInformation Manufacturer="Example Corporation" /> | 3 | <SummaryInformation Manufacturer="Example Corporation" /> |
| 4 | 4 | ||
| @@ -6,9 +6,7 @@ | |||
| 6 | </Module> | 6 | </Module> |
| 7 | 7 | ||
| 8 | <Fragment> | 8 | <Fragment> |
| 9 | <Directory Id="TARGETDIR" Name="SourceDir"> | 9 | <Directory Id="MergeRedirectFolder" /> |
| 10 | <Directory Id="MergeRedirectFolder" /> | ||
| 11 | </Directory> | ||
| 12 | </Fragment> | 10 | </Fragment> |
| 13 | 11 | ||
| 14 | <Fragment> | 12 | <Fragment> |