@joebigelow / wix-1 / commits / c532140c

Update test authoring for Package/SummaryInformation change.

Bob Arnson committed Oct 26, 2020 at 21:09 UTC c532140cff9e3f2603a0ca823a410b10d8d8938b
9 files changed +18 -35
global.json
+1 -1
@@ -1,6 +1,6 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0159"
3 + "WixToolset.Sdk": "4.0.0-build-0162"
4 },
5 "sdk": {
6 "allowPrerelease": false
src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
+2 -5
@@ -1,16 +1,13 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 - <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 - <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 -
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6 - <MediaTemplate />
4
5 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
6 <ComponentGroupRef Id="ProductComponents" />
7 </Feature>
8
9 <util:CloseApplication Id="CloseMyApp" CloseMessage="yes" Property="MYAPPISRUNNING" Target="explorer.exe" />
13 - </Product>
10 + </Package>
11
12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
+2 -5
@@ -1,14 +1,11 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 - <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 - <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 -
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6 - <MediaTemplate />
4
5 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
6 <ComponentGroupRef Id="ProductComponents" />
7 </Feature>
11 - </Product>
8 + </Package>
9
10 <Fragment>
11 <Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+2 -5
@@ -1,14 +1,11 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 - <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 - <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 -
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6 - <MediaTemplate />
4
5 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
6 <ComponentGroupRef Id="ProductComponents" />
7 </Feature>
11 - </Product>
8 + </Package>
9
10 <Fragment>
11 <Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
+3 -3
@@ -1,6 +1,6 @@
1 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 - <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule">
3 - <Package Id="047730a5-30fe-4a62-a520-da9381b8226a" Manufacturer="Example Corporation" />
1 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 + <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
3 + <SummaryInformation Manufacturer="Example Corporation" />
4
5 <ComponentGroupRef Id="ProductComponents" />
6 </Module>
src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
+2 -5
@@ -1,14 +1,11 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 - <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 - <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 -
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6 - <MediaTemplate />
4
5 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
6 <ComponentGroupRef Id="ProductComponents" />
7 </Feature>
11 - </Product>
8 + </Package>
9
10 <Fragment>
11 <Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+3 -5
@@ -1,7 +1,5 @@
1 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 - <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 - <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 -
1 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
5 <util:BroadcastEnvironmentChange />
@@ -12,7 +10,7 @@
10 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
11 <ComponentGroupRef Id="ProductComponents" />
12 </Feature>
15 - </Product>
13 + </Package>
14
15 <Fragment>
16 <util:BroadcastSettingChange />
src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
+2 -5
@@ -1,14 +1,11 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 - <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 -
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6 - <MediaTemplate />
4
5 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
6 <ComponentGroupRef Id="ProductComponents" />
7 </Feature>
11 - </Product>
8 + </Package>
9
10 <Fragment>
11 <Directory Id="TARGETDIR" Name="SourceDir">
src/wixext/UtilCompiler.cs
+1 -1
@@ -210,7 +210,7 @@ namespace WixToolset.Util
210 case "Bundle":
211 case "Fragment":
212 case "Module":
213 - case "Product":
213 + case "Package":
214 switch (element.Name.LocalName)
215 {
216 case "CloseApplication":