diff options
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs index a858b351..3c999812 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200" Scope="perMachine"> | 2 | <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200" Scope="perMachine"> |
| 3 | 3 | ||
| 4 | 4 | ||
| @@ -10,13 +10,11 @@ | |||
| 10 | </Package> | 10 | </Package> |
| 11 | 11 | ||
| 12 | <Fragment> | 12 | <Fragment> |
| 13 | <Directory Id="TARGETDIR" Name="SourceDir"> | 13 | <StandardDirectory Id="ProgramFilesFolder"> |
| 14 | <Directory Id="ProgramFilesFolder"> | 14 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> |
| 15 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> | 15 | <!-- --> |
| 16 | <!-- --> | 16 | <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" /> |
| 17 | <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" /> | ||
| 18 | </Directory> | ||
| 19 | </Directory> | 17 | </Directory> |
| 20 | </Directory> | 18 | </StandardDirectory> |
| 21 | </Fragment> | 19 | </Fragment> |
| 22 | </Wix> | 20 | </Wix> |