aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ThmViewerPackage/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs7
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs10
7 files changed, 27 insertions, 38 deletions
diff --git a/src/ThmViewerPackage/Package.wxs b/src/ThmViewerPackage/Package.wxs
index d758d4e0..e2c3c9f8 100644
--- a/src/ThmViewerPackage/Package.wxs
+++ b/src/ThmViewerPackage/Package.wxs
@@ -1,9 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 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<!-- 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. -->
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Product Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" 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">
5 Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89"> 4
6 <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
7 5
8 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
9 <MediaTemplate EmbedCab="yes" /> 7 <MediaTemplate EmbedCab="yes" />
@@ -11,7 +9,7 @@
11 <Feature Id="Main"> 9 <Feature Id="Main">
12 <ComponentGroupRef Id="Components" /> 10 <ComponentGroupRef Id="Components" />
13 </Feature> 11 </Feature>
14 </Product> 12 </Package>
15 13
16 <Fragment> 14 <Fragment>
17 <ComponentGroup Id="Components" Directory="INSTALLFOLDER:\bin\"> 15 <ComponentGroup Id="Components" Directory="INSTALLFOLDER:\bin\">
diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
index 884da274..4cdcdf15 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
@@ -1,8 +1,6 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 3
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" />
6 4
7 <MediaTemplate /> 5 <MediaTemplate />
8 6
@@ -10,7 +8,7 @@
10 <ComponentGroupRef Id="TxtProductComponents" /> 8 <ComponentGroupRef Id="TxtProductComponents" />
11 <ComponentGroupRef Id="JsonProductComponents" /> 9 <ComponentGroupRef Id="JsonProductComponents" />
12 </Feature> 10 </Feature>
13 </Product> 11 </Package>
14 12
15 <Fragment> 13 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 14 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
index e509c464..8e04a8ce 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
@@ -1,15 +1,13 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 3
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" />
6 4
7 <MediaTemplate /> 5 <MediaTemplate />
8 6
9 <Feature Id="ProductFeature" Title="HeatFileFeature"> 7 <Feature Id="ProductFeature" Title="HeatFileFeature">
10 <ComponentGroupRef Id="ProductComponents" /> 8 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 9 </Feature>
12 </Product> 10 </Package>
13 11
14 <Fragment> 12 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
index 1c25e684..71d8fff6 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/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" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
3 <Product Id="*" Name="MsiPackage" 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 <MediaTemplate /> 5 <MediaTemplate />
7 6
8 <Feature Id="ProductFeature" Title="ATitle"> 7 <Feature Id="ProductFeature" Title="ATitle">
9 <MergeRef Id="SimpleMM" /> 8 <MergeRef Id="SimpleMM" />
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">
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
index b9ab953a..19a7b7e4 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
@@ -1,7 +1,6 @@
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 <Module Id="SimpleMM" Language="1033" Version="1.0.0.0" Guid="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200">
3 <Module Id="SimpleMM" Language="1033" Version="1.0.0.0"> 3 <SummaryInformation Manufacturer="Example Corporation" />
4 <Package Id="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200" Manufacturer="Example Corporation" />
5 4
6 <ComponentGroupRef Id="ProductComponents" /> 5 <ComponentGroupRef Id="ProductComponents" />
7 </Module> 6 </Module>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
index d5a5a40d..4bdebbcf 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
@@ -1,7 +1,6 @@
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" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
3 <Product Id="*" Name="MsiPackage" 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 <MediaTemplate /> 6 <MediaTemplate />
@@ -9,7 +8,7 @@
9 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 8 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 </Product> 11 </Package>
13 12
14 <Fragment> 13 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 14 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
index f7998fff..b900447a 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
@@ -1,11 +1,9 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?define Variable = "Value" ?>
2
3<?define Variable = "Value" ?>
4<?define Variable = "DifferentValue" ?> 2<?define Variable = "DifferentValue" ?>
5 3
6<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 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"> 5 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
8 <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> 6
9 7
10 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 8 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
11 <MediaTemplate /> 9 <MediaTemplate />
@@ -13,7 +11,7 @@
13 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 11 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
14 <ComponentGroupRef Id="ProductComponents" /> 12 <ComponentGroupRef Id="ProductComponents" />
15 </Feature> 13 </Feature>
16 </Product> 14 </Package>
17 15
18 <Fragment> 16 <Fragment>
19 <Directory Id="TARGETDIR" Name="SourceDir"> 17 <Directory Id="TARGETDIR" Name="SourceDir">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-31 21:01:17 +0000