diff options
| author | Bob Arnson <bob@joyofsetup.com> | 2020-06-22 19:35:34 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-06-22 19:44:05 -0400 |
| commit | 461350c09839f1e59fb3dafe1a67e74bf152f803 (patch) | |
| tree | 210294861118294e6546b36c76ef3a0722fc44e5 /src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge | |
| parent | 5e07fe18b6d431ceb554297c575878ed4331470d (diff) | |
| download | wix-461350c09839f1e59fb3dafe1a67e74bf152f803.tar.gz wix-461350c09839f1e59fb3dafe1a67e74bf152f803.tar.bz2 wix-461350c09839f1e59fb3dafe1a67e74bf152f803.zip | |
If no Media or MediaTemplate is present, default to a MediaTemplate.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs index 303e2ba8..b04c5d1a 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> | 4 | <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> |
| 5 | 5 | ||
| 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
| 7 | <MediaTemplate /> | ||
| 8 | 7 | ||
| 9 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | 8 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> |
| 10 | <MergeRef Id="TestMsm" /> | 9 | <MergeRef Id="TestMsm" /> |
| @@ -16,7 +15,7 @@ | |||
| 16 | <Directory Id="ProgramFilesFolder"> | 15 | <Directory Id="ProgramFilesFolder"> |
| 17 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> | 16 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> |
| 18 | <!-- --> | 17 | <!-- --> |
| 19 | <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" DiskId="1" /> | 18 | <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" /> |
| 20 | </Directory> | 19 | </Directory> |
| 21 | </Directory> | 20 | </Directory> |
| 22 | </Directory> | 21 | </Directory> |