aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs46
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs14
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs26
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs17
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs16
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs16
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs16
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs11
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs8
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs6
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs4
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs8
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs8
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs4
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs14
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs20
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs14
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs4
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs10
36 files changed, 214 insertions, 218 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
index 56f8ba82..fe5bb531 100644
--- a/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
@@ -125,6 +125,52 @@ namespace WixToolsetTest.CoreIntegration
125 }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray()); 125 }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
126 } 126 }
127 } 127 }
128
129 [Fact]
130 public void CanGetWithMultiNestedSubdirectory()
131 {
132 var folder = TestData.Get(@"TestData");
133
134 using (var fs = new DisposableFileSystem())
135 {
136 var baseFolder = fs.GetFolder();
137 var intermediateFolder = Path.Combine(baseFolder, "obj");
138 var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
139
140 var result = WixRunner.Execute(new[]
141 {
142 "build",
143 "-arch", "x64",
144 Path.Combine(folder, "Directory", "Nested.wxs"),
145 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
146 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
147 "-intermediateFolder", intermediateFolder,
148 "-o", msiPath
149 });
150
151 result.AssertSuccess();
152
153 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
154 var section = intermediate.Sections.Single();
155
156 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
157 Assert.Equal(new[]
158 {
159 "BinFolder:ProgramFilesFolder:Example Corporation\\Test Product\\bin",
160 "ProgramFilesFolder:TARGETDIR:PFiles",
161 "TARGETDIR::SourceDir"
162 }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
163
164 var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
165 var directoryRows = data.Tables["Directory"].Rows;
166 Assert.Equal(new[]
167 {
168 "d4EceYatXTyy8HXPt5B6DT9Rj.wE:ProgramFilesFolder:u7-b4gch|Example Corporation",
169 "dSJ1pgiASlW7kJTu0wqsGBklJsS0:d4EceYatXTyy8HXPt5B6DT9Rj.wE:vjj-gxay|Test Product",
170 "BinFolder:dSJ1pgiASlW7kJTu0wqsGBklJsS0:bin",
171 "ProgramFilesFolder:TARGETDIR:PFiles",
172 "TARGETDIR::SourceDir"
173 }, directoryRows.Select(r => r.FieldAsString(0) + ":" + r.FieldAsString(1) + ":" + r.FieldAsString(2)).ToArray());
128 } 174 }
129 } 175 }
130 } 176 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
index b67abbde..6b9fe013 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
@@ -1,14 +1,12 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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}"> 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 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <StandardDirectory Id="ProgramFilesFolder">
4 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb"> 5 <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
6 <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32"> 6 <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
7 <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="SourceDir\\MsiPackage\test.txt" /> 7 </Component>
8 </Component>
9 </Directory>
10 </Directory> 8 </Directory>
11 </Directory> 9 </StandardDirectory>
12 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle"> 10 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
13 <ComponentRef Id="test.txt" /> 11 <ComponentRef Id="test.txt" />
14 </Feature> 12 </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
index 50282522..c345305d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -10,10 +10,8 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="INSTALLFOLDER" Name="AssemblyMsiPackage" />
15 <Directory Id="INSTALLFOLDER" Name="AssemblyMsiPackage" /> 15 </StandardDirectory>
16 </Directory>
17 </Directory>
18 </Fragment> 16 </Fragment>
19</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
index 43af2ffe..514f9243 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
@@ -1,20 +1,18 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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}"> 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 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <StandardDirectory Id="ProgramFilesFolder">
4 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq"> 5 <Component Id="ProgIdComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32">
6 <Component Id="ProgIdComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32"> 6 <Class Id="{F12A6F69-117F-471F-AE73-F8E74218F498}" Context="LocalServer32" Description="FakeClassF12A" Advertise="yes">
7 <Class Id="{F12A6F69-117F-471F-AE73-F8E74218F498}" Context="LocalServer32" Description="FakeClassF12A" Advertise="yes"> 7 <ProgId Id="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Description="FakeClassF12A" Advertise="yes" />
8 <ProgId Id="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Description="FakeClassF12A" Advertise="yes" /> 8 </Class>
9 </Class> 9 <File Id="filTki4JQ2gSapF7wK4K1vd.4mDSFQ" Name="ProgIdComp.txt" KeyPath="yes" ShortName="bnvvntsc.txt" Source="MsiPackage\ProgIdComp.txt" />
10 <File Id="filTki4JQ2gSapF7wK4K1vd.4mDSFQ" Name="ProgIdComp.txt" KeyPath="yes" ShortName="bnvvntsc.txt" Source="SourceDir\\MsiPackage\ProgIdComp.txt" /> 10 <RegistryValue Id="regUIIK326nDZpkWHuexeF58EikQvA" Root="HKCR" Key="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Name="NoOpen" Value="NoOpen73E7" Type="string" />
11 <RegistryValue Id="regUIIK326nDZpkWHuexeF58EikQvA" Root="HKCR" Key="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Name="NoOpen" Value="NoOpen73E7" Type="string" /> 11 <RegistryValue Id="regY1F4E2lvu_Up6gV6c3jeN5ukn8s" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\LocalServer32" Name="ThreadingModel" Value="Apartment" Type="string" />
12 <RegistryValue Id="regY1F4E2lvu_Up6gV6c3jeN5ukn8s" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\LocalServer32" Name="ThreadingModel" Value="Apartment" Type="string" /> 12 <RegistryValue Id="regvrhMurMp98anbQJkpgA8yJCefdM" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\Version" Value="0.0.0.1" Type="string" />
13 <RegistryValue Id="regvrhMurMp98anbQJkpgA8yJCefdM" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\Version" Value="0.0.0.1" Type="string" /> 13 </Component>
14 </Component>
15 </Directory>
16 </Directory> 14 </Directory>
17 </Directory> 15 </StandardDirectory>
18 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle"> 16 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
19 <ComponentRef Id="ProgIdComp" Primary="yes" /> 17 <ComponentRef Id="ProgIdComp" Primary="yes" />
20 </Feature> 18 </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
index 23923426..db07af2c 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 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="no" InstallerVersion="200" Scope="perMachine"> 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 3
4 4
@@ -15,10 +15,8 @@
15 </Package> 15 </Package>
16 16
17 <Fragment> 17 <Fragment>
18 <Directory Id="TARGETDIR" Name="SourceDir"> 18 <StandardDirectory Id="ProgramFilesFolder">
19 <Directory Id="ProgramFilesFolder"> 19 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
20 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 20 </StandardDirectory>
21 </Directory>
22 </Directory>
23 </Fragment> 21 </Fragment>
24</Wix> 22</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
index 0607c718..d7b5bdc0 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -10,10 +10,8 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 15 </StandardDirectory>
16 </Directory>
17 </Directory>
18 </Fragment> 16 </Fragment>
19</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
index 935cc8b3..d7d86008 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
@@ -12,17 +12,14 @@
12 <Data Column="Component_" Value="test.txt" /> 12 <Data Column="Component_" Value="test.txt" />
13 </Row> 13 </Row>
14 </CustomTable> 14 </CustomTable>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <StandardDirectory Id="ProgramFiles6432Folder">
16 <Directory Id="ProgramFilesFolder" Name="PFiles"> 16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj">
17 <Directory Id="ProgramFiles6432Folder"> 17 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
18 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj"> 18 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
19 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32"> 19 </Component>
20 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\PFiles\\MsiPackage\test.txt" />
21 </Component>
22 </Directory>
23 </Directory>
24 </Directory> 20 </Directory>
25 </Directory> 21 </StandardDirectory>
22 <StandardDirectory Id="ProgramFilesFolder" />
26 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle"> 23 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
27 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" /> 24 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
28 </Feature> 25 </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
index 050adbd5..71553e2a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
@@ -1,18 +1,16 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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}"> 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 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <StandardDirectory Id="ProgramFilesFolder">
4 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq"> 5 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="" Bitness="always32">
6 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="" Bitness="always32"> 6 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
7 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" /> 7 </Component>
8 </Component>
9 </Directory>
10 </Directory> 8 </Directory>
11 </Directory> 9 </StandardDirectory>
12 <Feature Id="ProductFeature" Level="1" Title="MsiPackage"> 10 <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
13 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" /> 11 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
14 </Feature> 12 </Feature>
15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 13 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16 <Media Id="1" Cabinet="example.cab" /> 14 <Media Id="1" Cabinet="example.cab" />
17 </Package> 15 </Package>
18</Wix> \ No newline at end of file 16</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
index e1fb426e..246bcafc 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
@@ -1,18 +1,16 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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}"> 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 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <StandardDirectory Id="ProgramFilesFolder">
4 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq"> 5 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
6 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32"> 6 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
7 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" /> 7 </Component>
8 </Component>
9 </Directory>
10 </Directory> 8 </Directory>
11 </Directory> 9 </StandardDirectory>
12 <Feature Id="ProductFeature" Level="1" Title="MsiPackage"> 10 <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
13 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" /> 11 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
14 </Feature> 12 </Feature>
15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 13 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16 <Media Id="1" Cabinet="example.cab" /> 14 <Media Id="1" Cabinet="example.cab" />
17 </Package> 15 </Package>
18</Wix> \ No newline at end of file 16</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
index fed69a1e..81915759 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
@@ -1,18 +1,16 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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}"> 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 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <StandardDirectory Id="ProgramFiles64Folder">
4 <Directory Id="ProgramFiles64Folder"> 4 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq"> 5 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always64">
6 <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always64"> 6 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
7 <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" /> 7 </Component>
8 </Component>
9 </Directory>
10 </Directory> 8 </Directory>
11 </Directory> 9 </StandardDirectory>
12 <Feature Id="ProductFeature" Level="1" Title="MsiPackage"> 10 <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
13 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" /> 11 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
14 </Feature> 12 </Feature>
15 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 13 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16 <Media Id="1" Cabinet="example.cab" /> 14 <Media Id="1" Cabinet="example.cab" />
17 </Package> 15 </Package>
18</Wix> \ No newline at end of file 16</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs
new file mode 100644
index 00000000..cc87b49f
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs
@@ -0,0 +1,11 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Fragment>
4 <ComponentGroup Id="ProductComponents" Directory="BinFolder" />
5 </Fragment>
6 <Fragment>
7 <StandardDirectory Id="ProgramFilesFolder">
8 <Directory Id="BinFolder" Name="Example Corporation\Test Product\bin" />
9 </StandardDirectory>
10 </Fragment>
11</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
index 75707f3d..287085e8 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -13,10 +13,8 @@
13 </Package> 13 </Package>
14 14
15 <Fragment> 15 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 16 <StandardDirectory Id="ProgramFilesFolder">
17 <Directory Id="ProgramFilesFolder"> 17 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 18 </StandardDirectory>
19 </Directory>
20 </Directory>
21 </Fragment> 19 </Fragment>
22</Wix> 20</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
index b3fd3672..5c84f33e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 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="no" InstallerVersion="200" Scope="perMachine"> 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 3
4 4
@@ -14,10 +14,8 @@
14 </Package> 14 </Package>
15 15
16 <Fragment> 16 <Fragment>
17 <Directory Id="TARGETDIR" Name="SourceDir"> 17 <StandardDirectory Id="ProgramFilesFolder">
18 <Directory Id="ProgramFilesFolder"> 18 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
19 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 19 </StandardDirectory>
20 </Directory>
21 </Directory>
22 </Fragment> 20 </Fragment>
23</Wix> 21</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
index 91ac6537..8fff563e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -12,10 +12,8 @@
12 </Package> 12 </Package>
13 13
14 <Fragment> 14 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <StandardDirectory Id="ProgramFilesFolder">
16 <Directory Id="ProgramFilesFolder"> 16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 17 </StandardDirectory>
18 </Directory>
19 </Directory>
20 </Fragment> 18 </Fragment>
21</Wix> 19</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
index 48a38e85..0bd80c50 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
@@ -11,10 +11,8 @@
11 </Package> 11 </Package>
12 12
13 <Fragment> 13 <Fragment>
14 <Directory Id="TARGETDIR" Name="SourceDir"> 14 <StandardDirectory Id="ProgramFilesFolder">
15 <Directory Id="ProgramFilesFolder"> 15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 16 </StandardDirectory>
17 </Directory>
18 </Directory>
19 </Fragment> 17 </Fragment>
20</Wix> 18</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
index befab53e..7826d673 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 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="no" InstallerVersion="200" Scope="perMachine"> 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 3
4 4
@@ -16,10 +16,8 @@
16 </Package> 16 </Package>
17 17
18 <Fragment> 18 <Fragment>
19 <Directory Id="TARGETDIR" Name="SourceDir"> 19 <StandardDirectory Id="ProgramFilesFolder">
20 <Directory Id="ProgramFilesFolder"> 20 <Directory Id="INSTALLFOLDER" Name="MsiPackageInstance" />
21 <Directory Id="INSTALLFOLDER" Name="MsiPackageInstance" /> 21 </StandardDirectory>
22 </Directory>
23 </Directory>
24 </Fragment> 22 </Fragment>
25</Wix> 23</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
index db15796d..13c79e90 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
@@ -11,8 +11,8 @@
11 </Package> 11 </Package>
12 12
13 <Fragment> 13 <Fragment>
14 <DirectoryRef Id="ProgramFilesFolder"> 14 <StandardDirectory Id="ProgramFilesFolder">
15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 15 <Directory Id="INSTALLFOLDER" Name="Example Corporation\MsiPackage" />
16 </DirectoryRef> 16 </StandardDirectory>
17 </Fragment> 17 </Fragment>
18</Wix> 18</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
index 090c7724..4fd3493a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 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="no" InstallerVersion="200" Scope="perMachine"> 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 3
4 4
@@ -17,10 +17,8 @@
17 </Package> 17 </Package>
18 18
19 <Fragment> 19 <Fragment>
20 <Directory Id="TARGETDIR" Name="SourceDir"> 20 <StandardDirectory Id="ProgramFilesFolder">
21 <Directory Id="ProgramFilesFolder"> 21 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
22 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 22 </StandardDirectory>
23 </Directory>
24 </Directory>
25 </Fragment> 23 </Fragment>
26</Wix> 24</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
index bc7450e3..2b1a1a0f 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 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" Scope="perMachine"> 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 3
4 4
@@ -19,10 +19,8 @@
19 </Package> 19 </Package>
20 20
21 <Fragment> 21 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <StandardDirectory Id="ProgramFilesFolder">
23 <Directory Id="ProgramFilesFolder"> 23 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 24 </StandardDirectory>
25 </Directory>
26 </Directory>
27 </Fragment> 25 </Fragment>
28</Wix> 26</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
index 6d9e854d..0bf0e963 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 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="no" InstallerVersion="200" Scope="perMachine"> 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 3
4 4
@@ -41,10 +41,8 @@
41 </Fragment> 41 </Fragment>
42 42
43 <Fragment Id="Directories"> 43 <Fragment Id="Directories">
44 <Directory Id="TARGETDIR" Name="SourceDir"> 44 <StandardDirectory Id="ProgramFilesFolder">
45 <Directory Id="ProgramFilesFolder"> 45 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
46 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 46 </StandardDirectory>
47 </Directory>
48 </Directory>
49 </Fragment> 47 </Fragment>
50</Wix> 48</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
index 5ad21a75..dab959d5 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
@@ -4,9 +4,9 @@
4 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." /> 4 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
5 <MediaTemplate EmbedCab="yes" /> 5 <MediaTemplate EmbedCab="yes" />
6 6
7 <DirectoryRef Id="ProgramFilesFolder"> 7 <StandardDirectory Id="ProgramFilesFolder">
8 <Directory Id="INSTALLFOLDER" Name="~Test App" /> 8 <Directory Id="INSTALLFOLDER" Name="~Test App" />
9 </DirectoryRef> 9 </StandardDirectory>
10 10
11 <Feature Id="Main"> 11 <Feature Id="Main">
12 <ComponentGroupRef Id="Components" /> 12 <ComponentGroupRef Id="Components" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
index 2d5fbc6d..62a89af3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
@@ -15,11 +15,9 @@
15 </Package> 15 </Package>
16 16
17 <Fragment> 17 <Fragment>
18 <Directory Id="TARGETDIR" Name="SourceDir"> 18 <StandardDirectory Id="ProgramFilesFolder">
19 <Directory Id="ProgramFilesFolder"> 19 <Directory Id="INSTALLFOLDER" Name="~Test A" />
20 <Directory Id="INSTALLFOLDER" Name="~Test A" /> 20 </StandardDirectory>
21 </Directory>
22 </Directory>
23 </Fragment> 21 </Fragment>
24 22
25 <Fragment> 23 <Fragment>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
index 72424986..e3845382 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
@@ -1,15 +1,13 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
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"> 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 3
4 4
5 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
6 <MediaTemplate EmbedCab="yes" /> 6 <MediaTemplate EmbedCab="yes" />
7 7
8 <Directory Id="TARGETDIR" Name="SourceDir"> 8 <StandardDirectory Id="ProgramFilesFolder">
9 <Directory Id="ProgramFilesFolder"> 9 <Directory Id="INSTALLFOLDER" Name="~Test A" />
10 <Directory Id="INSTALLFOLDER" Name="~Test App" /> 10 </StandardDirectory>
11 </Directory>
12 </Directory>
13 11
14 <Feature Id="Main"> 12 <Feature Id="Main">
15 <ComponentGroupRef Id="Components" /> 13 <ComponentGroupRef Id="Components" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs
index 17543c1a..5bf78a9d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs
@@ -11,10 +11,8 @@
11 </Package> 11 </Package>
12 12
13 <Fragment> 13 <Fragment>
14 <Directory Id="TARGETDIR" Name="SourceDir"> 14 <StandardDirectory Id="ProgramFilesFolder">
15 <Directory Id="ProgramFilesFolder"> 15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 16 </StandardDirectory>
17 </Directory>
18 </Directory>
19 </Fragment> 17 </Fragment>
20</Wix> 18</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
index 5a4e2c07..b71627a2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
@@ -9,8 +9,8 @@
9 </Package> 9 </Package>
10 10
11 <Fragment> 11 <Fragment>
12 <DirectoryRef Id="ProgramFiles6432Folder"> 12 <StandardDirectory Id="ProgramFiles6432Folder">
13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14 </DirectoryRef> 14 </StandardDirectory>
15 </Fragment> 15 </Fragment>
16</Wix> 16</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
index 0d2d5032..d3b31db5 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -10,10 +10,8 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 15 </StandardDirectory>
16 </Directory>
17 </Directory>
18 </Fragment> 16 </Fragment>
19</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs
index 6a95e9da..8f4f661d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4 4
@@ -13,11 +13,9 @@
13 </Package> 13 </Package>
14 14
15 <Fragment> 15 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 16 <StandardDirectory Id="ProgramFilesFolder">
17 <Directory Id="ProgramFilesFolder"> 17 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 18 </StandardDirectory>
19 </Directory>
20 </Directory>
21 </Fragment> 19 </Fragment>
22 20
23 <Fragment> 21 <Fragment>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
index 6924f37a..d5379e7b 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
@@ -1,15 +1,13 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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}"> 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 <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" /> 3 <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" />
4 <Directory Id="TARGETDIR" Name="SourceDir"> 4 <StandardDirectory Id="ProgramFilesFolder">
5 <Directory Id="ProgramFilesFolder"> 5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
6 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb"> 6 <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
7 <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32"> 7 <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
8 <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="SourceDir\\MsiPackage\test.txt" /> 8 </Component>
9 </Component>
10 </Directory>
11 </Directory> 9 </Directory>
12 </Directory> 10 </StandardDirectory>
13 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle"> 11 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
14 <ComponentRef Id="test.txt" /> 12 <ComponentRef Id="test.txt" />
15 </Feature> 13 </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
index c8289464..d3f8accf 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -12,10 +12,8 @@
12 </Package> 12 </Package>
13 13
14 <Fragment> 14 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <StandardDirectory Id="ProgramFilesFolder">
16 <Directory Id="ProgramFilesFolder"> 16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 17 </StandardDirectory>
18 </Directory>
19 </Directory>
20 </Fragment> 18 </Fragment>
21</Wix> 19</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
index ab57b0cd..da1e4f38 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
@@ -1,17 +1,15 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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}"> 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 <Directory Id="TARGETDIR" Name="SourceDir"> 3 <StandardDirectory Id="ProgramFilesFolder">
4 <Directory Id="ProgramFilesFolder"> 4 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
5 <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb"> 5 <Component Id="ShortcutComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32">
6 <Component Id="ShortcutComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32"> 6 <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
7 <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="SourceDir\\MsiPackage\test.txt" /> 7 <Shortcut Id="FileTargetShortcut" Directory="INSTALLFOLDER" Name="FileTargetShortcut" ShortName="lm2tdtqp" Target="[#test.txt]" />
8 <Shortcut Id="FileTargetShortcut" Directory="INSTALLFOLDER" Name="FileTargetShortcut" ShortName="lm2tdtqp" Target="[#test.txt]" /> 8 <Shortcut Id="CustomTargetShortcut" Directory="INSTALLFOLDER" Name="Planner" ShortName="PLANNER" Target="[INSTALLFOLDER]custom.target" />
9 <Shortcut Id="CustomTargetShortcut" Directory="INSTALLFOLDER" Name="Planner" ShortName="PLANNER" Target="[INSTALLFOLDER]custom.target" /> 9 <Shortcut Id="AdvtShortcut" Directory="INSTALLFOLDER" Name="AdvtShortcut" ShortName="mdbqel9r" Advertise="yes" />
10 <Shortcut Id="AdvtShortcut" Directory="INSTALLFOLDER" Name="AdvtShortcut" ShortName="mdbqel9r" Advertise="yes" /> 10 </Component>
11 </Component>
12 </Directory>
13 </Directory> 11 </Directory>
14 </Directory> 12 </StandardDirectory>
15 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle"> 13 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
16 <ComponentRef Id="ShortcutComp" Primary="yes" /> 14 <ComponentRef Id="ShortcutComp" Primary="yes" />
17 </Feature> 15 </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
index a858b351..3c999812 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -10,13 +10,11 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="INSTALLFOLDER" Name="MsiPackage">
15 <Directory Id="INSTALLFOLDER" Name="MsiPackage"> 15 <!-- -->
16 <!-- --> 16 <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" />
17 <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" />
18 </Directory>
19 </Directory> 17 </Directory>
20 </Directory> 18 </StandardDirectory>
21 </Fragment> 19 </Fragment>
22</Wix> 20</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
index 0607c718..d7b5bdc0 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -10,10 +10,8 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 15 </StandardDirectory>
16 </Directory>
17 </Directory>
18 </Fragment> 16 </Fragment>
19</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
index 852d1aed..baa0c6b1 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -18,10 +18,8 @@
18 </Package> 18 </Package>
19 19
20 <Fragment> 20 <Fragment>
21 <Directory Id="TARGETDIR" Name="SourceDir"> 21 <StandardDirectory Id="ProgramFilesFolder">
22 <Directory Id="ProgramFilesFolder"> 22 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
23 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 23 </StandardDirectory>
24 </Directory>
25 </Directory>
26 </Fragment> 24 </Fragment>
27</Wix> 25</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
index 70fdbb46..59839f30 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
@@ -9,8 +9,8 @@
9 </Package> 9 </Package>
10 10
11 <Fragment> 11 <Fragment>
12 <DirectoryRef Id="ProgramFilesFolder"> 12 <StandardDirectory Id="ProgramFilesFolder">
13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14 </DirectoryRef> 14 </StandardDirectory>
15 </Fragment> 15 </Fragment>
16</Wix> 16</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs
index e1cf7394..f8203a07 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -12,10 +12,8 @@
12 </Package> 12 </Package>
13 13
14 <Fragment> 14 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <StandardDirectory Id="ProgramFilesFolder">
16 <Directory Id="ProgramFilesFolder"> 16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 17 </StandardDirectory>
18 </Directory>
19 </Directory>
20 </Fragment> 18 </Fragment>
21</Wix> 19</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
index d9714e7a..7e6eee9f 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
@@ -1,4 +1,4 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<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"> 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 3
4 4
@@ -12,10 +12,8 @@
12 </Package> 12 </Package>
13 13
14 <Fragment> 14 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <StandardDirectory Id="ProgramFilesFolder">
16 <Directory Id="ProgramFilesFolder"> 16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 17 </StandardDirectory>
18 </Directory>
19 </Directory>
20 </Fragment> 18 </Fragment>
21</Wix> 19</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-23 05:45:41 +0000