diff options
Diffstat (limited to 'src/test/WixToolsetTest.Sdk/TestData/MergeModule')
| -rw-r--r-- | src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs | 9 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs index 1c25e684..71d8fff6 100644 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs +++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <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"> |
| 3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 3 | |
| 4 | <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> | ||
| 5 | 4 | ||
| 6 | <MediaTemplate /> | 5 | <MediaTemplate /> |
| 7 | 6 | ||
| 8 | <Feature Id="ProductFeature" Title="ATitle"> | 7 | <Feature Id="ProductFeature" Title="ATitle"> |
| 9 | <MergeRef Id="SimpleMM" /> | 8 | <MergeRef Id="SimpleMM" /> |
| 10 | </Feature> | 9 | </Feature> |
| 11 | </Product> | 10 | </Package> |
| 12 | 11 | ||
| 13 | <Fragment> | 12 | <Fragment> |
| 14 | <Directory Id="TARGETDIR" Name="SourceDir"> | 13 | <Directory Id="TARGETDIR" Name="SourceDir"> |
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs index b9ab953a..19a7b7e4 100644 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs +++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <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"> |
| 3 | <Module Id="SimpleMM" Language="1033" Version="1.0.0.0"> | 3 | <SummaryInformation Manufacturer="Example Corporation" /> |
| 4 | <Package Id="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200" Manufacturer="Example Corporation" /> | ||
| 5 | 4 | ||
| 6 | <ComponentGroupRef Id="ProductComponents" /> | 5 | <ComponentGroupRef Id="ProductComponents" /> |
| 7 | </Module> | 6 | </Module> |