aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs4
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs32
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs19
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs30
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs7
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs9
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs9
33 files changed, 145 insertions, 201 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
index b038812d..e18990d3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
@@ -34,8 +34,8 @@ namespace WixToolsetTest.CoreIntegration
34 Assert.NotNull(result.Document); 34 Assert.NotNull(result.Document);
35 Assert.Equal(includeFile, includedFile.Path); 35 Assert.Equal(includeFile, includedFile.Path);
36 Assert.Equal(sourcePath, includedFile.SourceLineNumbers.FileName); 36 Assert.Equal(sourcePath, includedFile.SourceLineNumbers.FileName);
37 Assert.Equal(2, includedFile.SourceLineNumbers.LineNumber.Value); 37 Assert.Equal(1, includedFile.SourceLineNumbers.LineNumber.Value);
38 Assert.Equal($"{sourcePath}*2", includedFile.SourceLineNumbers.QualifiedFileName); 38 Assert.Equal($"{sourcePath}*1", includedFile.SourceLineNumbers.QualifiedFileName);
39 Assert.Null(includedFile.SourceLineNumbers.Parent); 39 Assert.Null(includedFile.SourceLineNumbers.Parent);
40 } 40 }
41 41
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
index 26649485..8d1e5de2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
@@ -1,7 +1,5 @@
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 Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{33C58183-7333-4257-AEFD-6705DA66E617}">
3 <Product Id="{33C58183-7333-4257-AEFD-6705DA66E617}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0">
4 <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" />
5 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <Directory Id="TARGETDIR" Name="SourceDir">
6 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="ProgramFilesFolder">
7 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb"> 5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
@@ -16,7 +14,6 @@
16 </Feature> 14 </Feature>
17 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
18 <Media Id="1" /> 16 <Media Id="1" />
19 <Property Id="ALLUSERS" Value="1" />
20 <Property Id="SAMPLEREGFOUND"> 17 <Property Id="SAMPLEREGFOUND">
21 <RegistrySearch Id="RegSearch" Root="HKLM" Key="Reg" Type="raw" Win64="no" /> 18 <RegistrySearch Id="RegSearch" Root="HKLM" Key="Reg" Type="raw" Win64="no" />
22 </Property> 19 </Property>
@@ -43,5 +40,5 @@
43 </DirectorySearch> 40 </DirectorySearch>
44 </RegistrySearch> 41 </RegistrySearch>
45 </Property> 42 </Property>
46 </Product> 43 </Package>
47</Wix> \ No newline at end of file 44</Wix> \ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
index dbce4c71..50282522 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/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="AssemblyMsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
3 <Product Id="*" Name="AssemblyMsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3
4 <Package InstallerVersion="200" Compressed="no" 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 <ComponentGroupRef Id="ProductComponents" /> 8 <ComponentGroupRef Id="ProductComponents" />
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.CoreIntegration/TestData/BadIf/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs
index c1cf55c2..1d7ebb94 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/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" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -13,7 +12,7 @@
13 <ComponentGroupRef Id="ProductComponents.x64" /> 12 <ComponentGroupRef Id="ProductComponents.x64" />
14 <ComponentGroupRef Id="ProductComponents.arm" /> 13 <ComponentGroupRef Id="ProductComponents.arm" />
15 </Feature> 14 </Feature>
16 </Product> 15 </Package>
17 16
18 <Fragment> 17 <Fragment>
19 <Directory Id="TARGETDIR" Name="SourceDir"> 18 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
index 86d41c50..08ced0c2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
@@ -1,7 +1,5 @@
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 Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{FE17A505-11A9-44D2-8D94-EB6BEAB8FF93}">
3 <Product Id="{FE17A505-11A9-44D2-8D94-EB6BEAB8FF93}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0">
4 <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" />
5 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <Directory Id="TARGETDIR" Name="SourceDir">
6 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="ProgramFilesFolder">
7 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq"> 5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
@@ -22,6 +20,5 @@
22 </Feature> 20 </Feature>
23 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 21 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
24 <Media Id="1" /> 22 <Media Id="1" />
25 <Property Id="ALLUSERS" Value="1" /> 23 </Package>
26 </Product>
27</Wix> \ No newline at end of file 24</Wix> \ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
index f3dd9a02..23923426 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/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="no" InstallerVersion="200" Scope="perMachine">
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="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -13,7 +12,7 @@
13 <ComponentGroupRef Id="ProductComponents" /> 12 <ComponentGroupRef Id="ProductComponents" />
14 <ComponentGroupRef Id="OtherComponents" /> 13 <ComponentGroupRef Id="OtherComponents" />
15 </Feature> 14 </Feature>
16 </Product> 15 </Package>
17 16
18 <Fragment> 17 <Fragment>
19 <Directory Id="TARGETDIR" Name="SourceDir"> 18 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
index 28d564e2..0607c718 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/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="no" 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="no" 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 <ComponentGroupRef Id="ProductComponents" /> 8 <ComponentGroupRef Id="ProductComponents" />
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.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
index 22036ae5..f87c9387 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
@@ -1,7 +1,5 @@
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 Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{83F9C623-26FE-42AB-951E-170022117F54}">
3 <Product Id="{83F9C623-26FE-42AB-951E-170022117F54}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0">
4 <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" />
5 <CustomTable Id="CustomTable1"> 3 <CustomTable Id="CustomTable1">
6 <Column Id="Column1" PrimaryKey="yes" Type="string" Width="0" Category="text" Description="The first custom column." /> 4 <Column Id="Column1" PrimaryKey="yes" Type="string" Width="0" Category="text" Description="The first custom column." />
7 <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Description="The custom table's Component reference" /> 5 <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Description="The custom table's Component reference" />
@@ -30,6 +28,5 @@
30 </Feature> 28 </Feature>
31 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 29 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
32 <Media Id="1" /> 30 <Media Id="1" />
33 <Property Id="ALLUSERS" Value="1" /> 31 </Package>
34 </Product>
35</Wix> 32</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
index fd6f81ca..e2557fe1 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
@@ -1,7 +1,5 @@
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 Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0" Compressed="yes" InstallerVersion="200" ProductCode="{6F9B5694-F0F1-437C-919B-0D2DAF2D9DEA}">
3 <Product Id="{6F9B5694-F0F1-437C-919B-0D2DAF2D9DEA}" Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0">
4 <Package Compressed="yes" Description="MsiPackage" InstallerVersion="200" Languages="1033" Manufacturer="Example Corporation" Platform="x86" />
5 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <Directory Id="TARGETDIR" Name="SourceDir">
6 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="ProgramFilesFolder">
7 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq"> 5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
@@ -16,6 +14,5 @@
16 </Feature> 14 </Feature>
17 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
18 <Media Id="1" Cabinet="example.cab" /> 16 <Media Id="1" Cabinet="example.cab" />
19 <Property Id="ALLUSERS" Value="1" /> 17 </Package>
20 </Product>
21</Wix> \ No newline at end of file 18</Wix> \ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
index b7f5ad07..38ce54b8 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
@@ -1,7 +1,5 @@
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 Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0" Compressed="yes" ProductCode="{C51B773A-B3BE-4F29-A8A9-549AAF7FF6EC}">
3 <Product Id="{C51B773A-B3BE-4F29-A8A9-549AAF7FF6EC}" Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0">
4 <Package Compressed="yes" Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x64" />
5 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <Directory Id="TARGETDIR" Name="SourceDir">
6 <Directory Id="ProgramFiles64Folder"> 4 <Directory Id="ProgramFiles64Folder">
7 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq"> 5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
@@ -16,6 +14,5 @@
16 </Feature> 14 </Feature>
17 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
18 <Media Id="1" Cabinet="example.cab" /> 16 <Media Id="1" Cabinet="example.cab" />
19 <Property Id="ALLUSERS" Value="1" /> 17 </Package>
20 </Product>
21</Wix> \ No newline at end of file 18</Wix> \ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
index 59eeb027..75707f3d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/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" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" 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="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -11,7 +10,7 @@
11 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 10 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
12 <ComponentGroupRef Id="ProductComponents" /> 11 <ComponentGroupRef Id="ProductComponents" />
13 </Feature> 12 </Feature>
14 </Product> 13 </Package>
15 14
16 <Fragment> 15 <Fragment>
17 <Directory Id="TARGETDIR" Name="SourceDir"> 16 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
index f20f5f73..b3fd3672 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/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="no" InstallerVersion="200" Scope="perMachine">
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="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -12,7 +11,7 @@
12 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 11 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
13 <ComponentGroupRef Id="ProductComponents" /> 12 <ComponentGroupRef Id="ProductComponents" />
14 </Feature> 13 </Feature>
15 </Product> 14 </Package>
16 15
17 <Fragment> 16 <Fragment>
18 <Directory Id="TARGETDIR" Name="SourceDir"> 17 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
index 3bd14fbb..91ac6537 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/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" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -10,7 +9,7 @@
10 <ComponentGroupRef Id="ProductComponents.x64" /> 9 <ComponentGroupRef Id="ProductComponents.x64" />
11 <ComponentGroupRef Id="ProductComponents.arm" /> 10 <ComponentGroupRef Id="ProductComponents.arm" />
12 </Feature> 11 </Feature>
13 </Product> 12 </Package>
14 13
15 <Fragment> 14 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
index 59c8b2b3..6269fe9d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
@@ -1,15 +1,14 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?include Package.wxi ?>
2<?include Package.wxi ?>
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <Product Id="*" Name="MsiPackage" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3 <Package Name="MsiPackage" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
5 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> 4
6 5
7 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
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.CoreIntegration/TestData/InstanceTransform/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
index e55b3ec6..befab53e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/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="no" InstallerVersion="200" Scope="perMachine">
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="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -14,7 +13,7 @@
14 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 13 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
15 <ComponentGroupRef Id="ProductComponents" /> 14 <ComponentGroupRef Id="ProductComponents" />
16 </Feature> 15 </Feature>
17 </Product> 16 </Package>
18 17
19 <Fragment> 18 <Fragment>
20 <Directory Id="TARGETDIR" Name="SourceDir"> 19 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
index 025aaaa3..090c7724 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/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="no" InstallerVersion="200" Scope="perMachine">
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="no" InstallScope="perMachine" />
5 4
6 <Upgrade Id="01120000-00E0-0000-0000-0000000FF1CE"> 5 <Upgrade Id="01120000-00E0-0000-0000-0000000FF1CE">
7 <UpgradeVersion ExcludeLanguages="no" IgnoreRemoveFailure="yes" IncludeMaximum="no" IncludeMinimum="yes" Maximum="13.0.0" Minimum="12.0.0" OnlyDetect="no" Property="BLAHBLAHBLAH" /> 6 <UpgradeVersion ExcludeLanguages="no" IgnoreRemoveFailure="yes" IncludeMaximum="no" IncludeMinimum="yes" Maximum="13.0.0" Minimum="12.0.0" OnlyDetect="no" Property="BLAHBLAHBLAH" />
@@ -15,7 +14,7 @@
15 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 14 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
16 <ComponentGroupRef Id="ProductComponents" /> 15 <ComponentGroupRef Id="ProductComponents" />
17 </Feature> 16 </Feature>
18 </Product> 17 </Package>
19 18
20 <Fragment> 19 <Fragment>
21 <Directory Id="TARGETDIR" Name="SourceDir"> 20 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
index 44b8c2b5..bc7450e3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/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" Scope="perMachine">
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 6
@@ -17,7 +16,7 @@
17 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 16 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
18 <ComponentGroupRef Id="ProductComponents" /> 17 <ComponentGroupRef Id="ProductComponents" />
19 </Feature> 18 </Feature>
20 </Product> 19 </Package>
21 20
22 <Fragment> 21 <Fragment>
23 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
index cc873a62..6d9e854d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/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="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 3
4 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
5 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
6 4
7 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
8 6
@@ -18,7 +16,7 @@
18 16
19 <!--<CustomActionRef Id="SetFoo" />--> 17 <!--<CustomActionRef Id="SetFoo" />-->
20 18
21 </Product> 19 </Package>
22 20
23 <Fragment Id="SetFoo"> 21 <Fragment Id="SetFoo">
24 <CustomAction Id="SetFoo" Property="FOO" Value="BOB" /> 22 <CustomAction Id="SetFoo" Property="FOO" Value="BOB" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
index 4baeb85b..c9dcdd72 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Package.wxs
@@ -1,29 +1,27 @@
1<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Product Id='e703bf17-4765-444c-91fd-88550fa681d4' Name='~Test Package' 2 <Package Name="~Test Package" Version="$(var.V)" Manufacturer="Example Corporation" Language="1033" UpgradeCode="e703bf17-4765-444c-91fd-88550fa681d4" Scope="perMachine" ProductCode="e703bf17-4765-444c-91fd-88550fa681d4">
3 Version='$(var.V)' Manufacturer='Example Corporation' Language='1033' 3
4 UpgradeCode='e703bf17-4765-444c-91fd-88550fa681d4'>
5 <Package InstallScope='perMachine' />
6 4
7 <MajorUpgrade DowngradeErrorMessage='Newer version already installed.' /> 5 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
8 6
9 <Directory Id='TARGETDIR' Name='SourceDir'> 7 <Directory Id="TARGETDIR" Name="SourceDir">
10 <Directory Id='ProgramFilesFolder'> 8 <Directory Id="ProgramFilesFolder">
11 <Directory Id='INSTALLFOLDER' Name='~Test App' /> 9 <Directory Id="INSTALLFOLDER" Name="~Test App" />
12 </Directory> 10 </Directory>
13 </Directory> 11 </Directory>
14 12
15 <Feature Id='Main'> 13 <Feature Id="Main">
16 <ComponentGroupRef Id='Components' /> 14 <ComponentGroupRef Id="Components" />
17 </Feature> 15 </Feature>
18 </Product> 16 </Package>
19 17
20 <Fragment> 18 <Fragment>
21 <ComponentGroup Id="Components" Directory='INSTALLFOLDER'> 19 <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
22 <Component Id='A'> 20 <Component Id="A">
23 <File Name='a.txt' Source='Av$(var.A).txt' /> 21 <File Id="a.txt" Name="a.txt" Source="Av$(var.A).txt" />
24 </Component> 22 </Component>
25 <Component Id='B'> 23 <Component Id="B">
26 <File Name='b.txt' Source='Bv$(var.B).txt' /> 24 <File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />
27 </Component> 25 </Component>
28 </ComponentGroup> 26 </ComponentGroup>
29 </Fragment> 27 </Fragment>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs
index 7c3cff7e..d39170c0 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchFamilyFilter/Patch.wxs
@@ -1,23 +1,16 @@
1<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Patch 2 <Patch AllowRemoval="yes" Manufacturer="FireGiant" MoreInfoURL="http://www.example.com/" DisplayName="~Test Patch v$(var.V)" Description="~Test Small Update Patch v($var.V)" Classification="Update">
3 AllowRemoval="yes"
4 Manufacturer="FireGiant"
5 MoreInfoURL="http://www.example.com/"
6 DisplayName="~Test Patch v$(var.V)"
7 Description="~Test Small Update Patch v($var.V)"
8 Classification="Update"
9 >
10 3
11 <Media Id="1" Cabinet="foo.cab"> 4 <Media Id="1" Cabinet="foo.cab">
12 <PatchBaseline Id="RTM"/> 5 <PatchBaseline Id="RTM" />
13 </Media> 6 </Media>
14 7
15 <PatchFamilyRef Id='SamplePatchFamily'/> 8 <PatchFamilyRef Id="SamplePatchFamily" />
16 </Patch> 9 </Patch>
17 10
18 <Fragment> 11 <Fragment>
19 <PatchFamily Id='SamplePatchFamily' Version='$(var.V)' Supersede='yes'> 12 <PatchFamily Id="SamplePatchFamily" Version="$(var.V)" Supersede="yes">
20 <ComponentRef Id="A"/> 13 <ComponentRef Id="A" />
21 </PatchFamily> 14 </PatchFamily>
22 </Fragment> 15 </Fragment>
23</Wix> 16</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
index ee133ba3..72424986 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
@@ -1,30 +1,28 @@
1<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Product Id='7d326855-e790-4a94-8611-5351f8321fca' Name='~Test Package' 2 <Package Name="~Test Package" Version="$(var.V)" Manufacturer="Example Corporation" Language="1033" UpgradeCode="7d326855-e790-4a94-8611-5351f8321fca" Compressed="yes" Scope="perMachine" ProductCode="7d326855-e790-4a94-8611-5351f8321fca">
3 Version='$(var.V)' Manufacturer='Example Corporation' Language='1033' 3
4 UpgradeCode='7d326855-e790-4a94-8611-5351f8321fca'>
5 <Package InstallScope='perMachine' Compressed='yes' />
6 4
7 <MajorUpgrade DowngradeErrorMessage='Newer version already installed.' /> 5 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
8 <MediaTemplate EmbedCab='yes' /> 6 <MediaTemplate EmbedCab="yes" />
9 7
10 <Directory Id='TARGETDIR' Name='SourceDir'> 8 <Directory Id="TARGETDIR" Name="SourceDir">
11 <Directory Id='ProgramFilesFolder'> 9 <Directory Id="ProgramFilesFolder">
12 <Directory Id='INSTALLFOLDER' Name='~Test App' /> 10 <Directory Id="INSTALLFOLDER" Name="~Test App" />
13 </Directory> 11 </Directory>
14 </Directory> 12 </Directory>
15 13
16 <Feature Id='Main'> 14 <Feature Id="Main">
17 <ComponentGroupRef Id='Components' /> 15 <ComponentGroupRef Id="Components" />
18 </Feature> 16 </Feature>
19 </Product> 17 </Package>
20 18
21 <Fragment> 19 <Fragment>
22 <ComponentGroup Id="Components" Directory='INSTALLFOLDER'> 20 <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
23 <Component> 21 <Component>
24 <File Id='a.txt' Name='a.txt' Source='Av$(var.A).txt' /> 22 <File Id="a.txt" Name="a.txt" Source="Av$(var.A).txt" />
25 </Component> 23 </Component>
26 <Component> 24 <Component>
27 <File Id='b.txt' Name='b.txt' Source='Bv$(var.B).txt' /> 25 <File Id="b.txt" Name="b.txt" Source="Bv$(var.B).txt" />
28 </Component> 26 </Component>
29 </ComponentGroup> 27 </ComponentGroup>
30 </Fragment> 28 </Fragment>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
index 5b26091a..c902c339 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.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="12E4699F-E774-4D05-8A01-5BDD41BBA127" Compressed="no" Scope="perMachine" ProductCode="83f9c623-26fe-42ab-951e-170022117f54">
3 <Product Id="83f9c623-26fe-42ab-951e-170022117f54" Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="12E4699F-E774-4D05-8A01-5BDD41BBA127"> 3
4 <Package InstallerVersion="500" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7 6
8 <Feature Id="ProductFeature" Title="MsiPackageTitle"> 7 <Feature Id="ProductFeature" Title="MsiPackageTitle">
9 <ComponentGroupRef Id="ProductComponents" /> 8 <ComponentGroupRef Id="ProductComponents" />
10 </Feature> 9 </Feature>
11 </Product> 10 </Package>
12 11
13 <Fragment> 12 <Fragment>
14 <Directory Id="INSTALLFOLDER" Name="ProgramFiles6432Folder:\MsiPackage" /> 13 <Directory Id="INSTALLFOLDER" Name="ProgramFiles6432Folder:\MsiPackage" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
index 388a271e..0d2d5032 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/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="ProgId" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
3 <Product Id="*" Name="ProgId" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3
4 <Package InstallerVersion="200" Compressed="no" 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 <ComponentGroupRef Id="ProductComponents" /> 8 <ComponentGroupRef Id="ProductComponents" />
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.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
index b8adf6e4..08af1950 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
@@ -1,7 +1,5 @@
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 Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{74C29381-1915-4948-B8B4-5646806A0BD4}">
3 <Product Id="{74C29381-1915-4948-B8B4-5646806A0BD4}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0">
4 <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" />
5 <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" /> 3 <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" />
6 <Directory Id="TARGETDIR" Name="SourceDir"> 4 <Directory Id="TARGETDIR" Name="SourceDir">
7 <Directory Id="ProgramFilesFolder"> 5 <Directory Id="ProgramFilesFolder">
@@ -17,7 +15,6 @@
17 </Feature> 15 </Feature>
18 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 16 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
19 <Media Id="1" /> 17 <Media Id="1" />
20 <Property Id="ALLUSERS" Value="1" />
21 <InstallExecuteSequence> 18 <InstallExecuteSequence>
22 <Custom Action="CustomAction2" After="CostInitialize" /> 19 <Custom Action="CustomAction2" After="CostInitialize" />
23 </InstallExecuteSequence> 20 </InstallExecuteSequence>
@@ -33,5 +30,5 @@
33 <AdvertiseExecuteSequence> 30 <AdvertiseExecuteSequence>
34 <Custom Action="CustomAction2" After="CostInitialize" /> 31 <Custom Action="CustomAction2" After="CostInitialize" />
35 </AdvertiseExecuteSequence> 32 </AdvertiseExecuteSequence>
36 </Product> 33 </Package>
37</Wix> \ No newline at end of file 34</Wix> \ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
index 879fad35..c8289464 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/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" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" 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="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -10,7 +9,7 @@
10 </Feature> 9 </Feature>
11 10
12 <SetProperty Id="INSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" /> 11 <SetProperty Id="INSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
13 </Product> 12 </Package>
14 13
15 <Fragment> 14 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
index 3a9e401c..1b602588 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
@@ -1,7 +1,5 @@
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 Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0" ProductCode="{6CA94D1D-B568-4ED6-9EBC-3534C85970BB}">
3 <Product Id="{6CA94D1D-B568-4ED6-9EBC-3534C85970BB}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0">
4 <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" />
5 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <Directory Id="TARGETDIR" Name="SourceDir">
6 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="ProgramFilesFolder">
7 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb"> 5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
@@ -19,6 +17,5 @@
19 </Feature> 17 </Feature>
20 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 18 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
21 <Media Id="1" /> 19 <Media Id="1" />
22 <Property Id="ALLUSERS" Value="1" /> 20 </Package>
23 </Product>
24</Wix> \ No newline at end of file 21</Wix> \ No newline at end of file
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">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
index 260339ba..737ac8df 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.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="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200">
3 <Module Id="MergeModule1" Language="1033" Version="1.0.0.0"> 3 <SummaryInformation Manufacturer="!(loc.Manufacturer)" />
4 <Package Id="243FB739-4D05-472F-9CFB-EF6B1017B6DE" Manufacturer="!(loc.Manufacturer)" InstallerVersion="200" />
5 4
6 <Directory Id="TARGETDIR" Name="SourceDir"> 5 <Directory Id="TARGETDIR" Name="SourceDir">
7 <Directory Id="MergeRedirectFolder"> 6 <Directory Id="MergeRedirectFolder">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
index 28d564e2..0607c718 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/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="no" 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="no" 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 <ComponentGroupRef Id="ProductComponents" /> 8 <ComponentGroupRef Id="ProductComponents" />
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.CoreIntegration/TestData/SingleFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
index c21a669c..852d1aed 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/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" Codepage="65001" 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="65001" 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
@@ -16,7 +15,7 @@
16 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 15 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
17 <ComponentGroupRef Id="ProductComponents" /> 16 <ComponentGroupRef Id="ProductComponents" />
18 </Feature> 17 </Feature>
19 </Product> 18 </Package>
20 19
21 <Fragment> 20 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 21 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
index 8d49c30e..7de55810 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
@@ -1,6 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?define Foo = "Foo" ?>
2
3<?define Foo = "Foo" ?>
4<?define Foo = "Foo" ?> 2<?define Foo = "Foo" ?>
5 3
6<?define Bar = "Bar" ?> 4<?define Bar = "Bar" ?>
@@ -13,15 +11,15 @@
13<?endif?> 11<?endif?>
14 12
15<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 13<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
16 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 14 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
17 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> 15
18 16
19 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 17 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
20 18
21 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 19 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
22 <ComponentGroupRef Id="ProductComponents" /> 20 <ComponentGroupRef Id="ProductComponents" />
23 </Feature> 21 </Feature>
24 </Product> 22 </Package>
25 23
26 <Fragment> 24 <Fragment>
27 <Directory Id="TARGETDIR" Name="SourceDir"> 25 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
index bf5223c1..d9714e7a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/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" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" 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="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 6
@@ -10,7 +9,7 @@
10 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 9 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
11 <ComponentGroupRef Id="ProductComponents" /> 10 <ComponentGroupRef Id="ProductComponents" />
12 </Feature> 11 </Feature>
13 </Product> 12 </Package>
14 13
15 <Fragment> 14 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
index 4c36f3cc..b29a785f 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixlibWithBinaries/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="no" 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="no" 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 <ComponentGroupRef Id="ProductComponents" /> 8 <ComponentGroupRef Id="ProductComponents" />
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">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 08:52:51 +0000