aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-10-23 17:32:44 -0400
committerBob Arnson <bob@firegiant.com>2020-10-24 19:44:44 -0400
commit8b5505cd13367d48bce4ec8a6018e370ed3755b1 (patch)
tree97fb50229aff208bce91b160d11ffeee9b1e783a /src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge
parent95188080c8005c01c39bb071459b36f8660bcfcd (diff)
downloadwix-8b5505cd13367d48bce4ec8a6018e370ed3755b1.tar.gz
wix-8b5505cd13367d48bce4ec8a6018e370ed3755b1.tar.bz2
wix-8b5505cd13367d48bce4ec8a6018e370ed3755b1.zip
Reorganize Product/Package to Package/SummaryInformation.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
index b04c5d1a..a858b351 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/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" 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 <Product Id="*" Name="MsiPackage" Codepage="1252" 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 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
8 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 7 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
9 <MergeRef Id="TestMsm" /> 8 <MergeRef Id="TestMsm" />
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">