Update test authoring for Package/SummaryInformation change.
Bob Arnson committed
Oct 24, 2020 at 20:31 UTC
1ba5b0818ceeb14f5c66794d729314ecb56660ca
7 files changed
+27
-38
src/ThmViewerPackage/Package.wxs
+4
-6
@@ -1,9 +1,7 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4
- <Product Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033"
5
- Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89">
6
- <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
3
+ <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89" Compressed="yes" InstallerVersion="200">
4
+
5
6
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7
<MediaTemplate EmbedCab="yes" />
@@ -11,7 +9,7 @@
9
<Feature Id="Main">
10
<ComponentGroupRef Id="Components" />
11
</Feature>
14
- </Product>
12
+ </Package>
13
14
<Fragment>
15
<ComponentGroup Id="Components" Directory="INSTALLFOLDER:\bin\">
src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
+4
-6
@@ -1,8 +1,6 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4
- <Product Id="*" Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
5
- <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
+ <Package Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
3
+
4
5
<MediaTemplate />
6
@@ -10,7 +8,7 @@
8
<ComponentGroupRef Id="TxtProductComponents" />
9
<ComponentGroupRef Id="JsonProductComponents" />
10
</Feature>
13
- </Product>
11
+ </Package>
12
13
<Fragment>
14
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
+4
-6
@@ -1,15 +1,13 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4
- <Product Id="*" Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
5
- <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
+ <Package Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
3
+
4
5
<MediaTemplate />
6
7
<Feature Id="ProductFeature" Title="HeatFileFeature">
8
<ComponentGroupRef Id="ProductComponents" />
9
</Feature>
12
- </Product>
10
+ </Package>
11
12
<Fragment>
13
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
+4
-5
@@ -1,14 +1,13 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4
- <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
1
+<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
+
4
5
<MediaTemplate />
6
7
<Feature Id="ProductFeature" Title="ATitle">
8
<MergeRef Id="SimpleMM" />
9
</Feature>
11
- </Product>
10
+ </Package>
11
12
<Fragment>
13
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
+3
-4
@@ -1,7 +1,6 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <Module Id="SimpleMM" Language="1033" Version="1.0.0.0">
4
- <Package Id="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200" Manufacturer="Example Corporation" />
1
+<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
+ <SummaryInformation Manufacturer="Example Corporation" />
4
5
<ComponentGroupRef Id="ProductComponents" />
6
</Module>
src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+4
-5
@@ -1,7 +1,6 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4
- <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
1
+<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
+
4
5
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6
<MediaTemplate />
@@ -9,7 +8,7 @@
8
<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
9
<ComponentGroupRef Id="ProductComponents" />
10
</Feature>
12
- </Product>
11
+ </Package>
12
13
<Fragment>
14
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+4
-6
@@ -1,11 +1,9 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<?define Variable = "Value" ?>
1
+<?define Variable = "Value" ?>
2
<?define Variable = "DifferentValue" ?>
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
7
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
8
- <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
5
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
6
+
7
8
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
9
<MediaTemplate />
@@ -13,7 +11,7 @@
11
<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
12
<ComponentGroupRef Id="ProductComponents" />
13
</Feature>
16
- </Product>
14
+ </Package>
15
16
<Fragment>
17
<Directory Id="TARGETDIR" Name="SourceDir">