@joebigelow / wix / commits / 86e59fdb

Introduce StandardDirectory for referencing standard directories

Completes wixtoolset/issues#6416

Rob Mensching committed Apr 6, 2021 at 09:34 UTC 86e59fdbc94ae661ca682f04cddb60d7830ae8a8
42 files changed +345 -248
src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+40 -30
@@ -4289,53 +4289,57 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
4289 foreach (var row in table.Rows)
4290 {
4291 var id = row.FieldAsString(0);
4292 - var xDirectory = new XElement(Names.DirectoryElement,
4292 + var elementName = WindowsInstallerStandard.IsStandardDirectory(id) ? Names.StandardDirectoryElement : Names.DirectoryElement;
4293 + var xDirectory = new XElement(elementName,
4294 new XAttribute("Id", id));
4295
4295 - var names = this.BackendHelper.SplitMsiFileName(row.FieldAsString(2));
4296 -
4297 - if (String.Equals(id, "TARGETDIR", StringComparison.Ordinal) && !String.Equals(names[0], "SourceDir", StringComparison.Ordinal))
4298 - {
4299 - this.Messaging.Write(WarningMessages.TargetDirCorrectedDefaultDir());
4300 - xDirectory.SetAttributeValue("Name", "SourceDir");
4301 - }
4302 - else
4296 + if (!WindowsInstallerStandard.IsStandardDirectory(id))
4297 {
4304 - if (null != names[0] && "." != names[0])
4298 + var names = this.BackendHelper.SplitMsiFileName(row.FieldAsString(2));
4299 +
4300 + if (id == "TARGETDIR" && names[0] != "SourceDir")
4301 {
4306 - if (null != names[1])
4302 + this.Messaging.Write(WarningMessages.TargetDirCorrectedDefaultDir());
4303 + xDirectory.SetAttributeValue("Name", "SourceDir");
4304 + }
4305 + else
4306 + {
4307 + if (null != names[0] && "." != names[0])
4308 {
4308 - xDirectory.SetAttributeValue("ShortName", names[0]);
4309 + if (null != names[1])
4310 + {
4311 + xDirectory.SetAttributeValue("ShortName", names[0]);
4312 + }
4313 + else
4314 + {
4315 + xDirectory.SetAttributeValue("Name", names[0]);
4316 + }
4317 }
4310 - else
4318 +
4319 + if (null != names[1])
4320 {
4312 - xDirectory.SetAttributeValue("Name", names[0]);
4321 + xDirectory.SetAttributeValue("Name", names[1]);
4322 }
4323 }
4324
4316 - if (null != names[1])
4325 + if (null != names[2])
4326 {
4318 - xDirectory.SetAttributeValue("Name", names[1]);
4327 + if (null != names[3])
4328 + {
4329 + xDirectory.SetAttributeValue("ShortSourceName", names[2]);
4330 + }
4331 + else
4332 + {
4333 + xDirectory.SetAttributeValue("SourceName", names[2]);
4334 + }
4335 }
4320 - }
4336
4322 - if (null != names[2])
4323 - {
4337 if (null != names[3])
4338 {
4326 - xDirectory.SetAttributeValue("ShortSourceName", names[2]);
4327 - }
4328 - else
4329 - {
4330 - xDirectory.SetAttributeValue("SourceName", names[2]);
4339 + xDirectory.SetAttributeValue("SourceName", names[3]);
4340 }
4341 }
4342
4334 - if (null != names[3])
4335 - {
4336 - xDirectory.SetAttributeValue("SourceName", names[3]);
4337 - }
4338 -
4343 this.IndexElement(row, xDirectory);
4344 }
4345
@@ -4344,7 +4348,13 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
4348 {
4349 var xDirectory = this.GetIndexedElement(row);
4350
4347 - if (row.IsColumnNull(1))
4351 + var id = row.FieldAsString(0);
4352 +
4353 + if (id == "TARGETDIR")
4354 + {
4355 + // Skip TARGETDIR.
4356 + }
4357 + else if (row.IsColumnNull(1) || WindowsInstallerStandard.IsStandardDirectory(id))
4358 {
4359 this.RootElement.Add(xDirectory);
4360 }
src/WixToolset.Core.WindowsInstaller/Decompile/Names.cs
+1
@@ -69,6 +69,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
69
70 public static readonly XName LevelElement = WxsNamespace + "Level";
71 public static readonly XName DialogElement = WxsNamespace + "Dialog";
72 + public static readonly XName StandardDirectoryElement = WxsNamespace + "StandardDirectory";
73 public static readonly XName DirectoryElement = WxsNamespace + "Directory";
74 public static readonly XName DirectorySearchElement = WxsNamespace + "DirectorySearch";
75 public static readonly XName CopyFileElement = WxsNamespace + "CopyFile";
src/WixToolset.Core/Compiler.cs
+72
@@ -4427,6 +4427,10 @@ namespace WixToolset.Core
4427 {
4428 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
4429 }
4430 + else if (WindowsInstallerStandard.IsStandardDirectory(id))
4431 + {
4432 + this.Core.Write(CompilerWarnings.DirectoryRefStandardDirectoryDeprecated(sourceLineNumbers, id));
4433 + }
4434
4435 if (!String.IsNullOrEmpty(fileSource) && !fileSource.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal))
4436 {
@@ -6324,6 +6328,9 @@ namespace WixToolset.Core
6328 string parentName = null;
6329 this.ParseSFPCatalogElement(child, ref parentName);
6330 break;
6331 + case "StandardDirectory":
6332 + this.ParseStandardDirectoryElement(child);
6333 + break;
6334 case "UI":
6335 this.ParseUIElement(child);
6336 break;
@@ -7558,6 +7565,71 @@ namespace WixToolset.Core
7565 }
7566 }
7567
7568 + /// <summary>
7569 + /// Parses a standard directory element.
7570 + /// </summary>
7571 + /// <param name="node">Element to parse.</param>
7572 + private void ParseStandardDirectoryElement(XElement node)
7573 + {
7574 + var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
7575 + string id = null;
7576 +
7577 + foreach (var attrib in node.Attributes())
7578 + {
7579 + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || CompilerCore.WixNamespace == attrib.Name.Namespace)
7580 + {
7581 + switch (attrib.Name.LocalName)
7582 + {
7583 + case "Id":
7584 + id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
7585 + break;
7586 + default:
7587 + this.Core.UnexpectedAttribute(node, attrib);
7588 + break;
7589 + }
7590 + }
7591 + else
7592 + {
7593 + this.Core.ParseExtensionAttribute(node, attrib);
7594 + }
7595 + }
7596 +
7597 + if (String.IsNullOrEmpty(id))
7598 + {
7599 + this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
7600 + }
7601 + else if (!WindowsInstallerStandard.IsStandardDirectory(id))
7602 + {
7603 + this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Id", id, String.Join(", \"", WindowsInstallerStandard.StandardDirectories().Select(d => d.Id.Id))));
7604 + }
7605 +
7606 + foreach (var child in node.Elements())
7607 + {
7608 + if (CompilerCore.WixNamespace == child.Name.Namespace)
7609 + {
7610 + switch (child.Name.LocalName)
7611 + {
7612 + case "Component":
7613 + this.ParseComponentElement(child, ComplexReferenceParentType.Unknown, null, null, diskId: CompilerConstants.IntegerNotSet, id, srcPath: String.Empty);
7614 + break;
7615 + case "Directory":
7616 + this.ParseDirectoryElement(child, id, diskId: CompilerConstants.IntegerNotSet, fileSource: String.Empty);
7617 + break;
7618 + case "Merge":
7619 + this.ParseMergeElement(child, id, diskId: CompilerConstants.IntegerNotSet);
7620 + break;
7621 + default:
7622 + this.Core.UnexpectedElement(node, child);
7623 + break;
7624 + }
7625 + }
7626 + else
7627 + {
7628 + this.Core.ParseExtensionElement(node, child);
7629 + }
7630 + }
7631 + }
7632 +
7633 /// <summary>
7634 /// Parses a configuration data element.
7635 /// </summary>
src/WixToolset.Core/CompilerWarnings.cs
+12
@@ -6,6 +6,16 @@ namespace WixToolset.Core
6
7 internal static class CompilerWarnings
8 {
9 + public static Message DirectoryRefStandardDirectoryDeprecated(SourceLineNumber sourceLineNumbers, string directoryId)
10 + {
11 + return Message(sourceLineNumbers, Ids.DirectoryRefStandardDirectoryDeprecated, "Using DirectoryRef to reference the standard directory '{0}' is deprecated. Use the StandardDirectory element instead.", directoryId);
12 + }
13 +
14 + public static Message DefiningStandardDirectoryDeprecated(SourceLineNumber sourceLineNumbers, string directoryId)
15 + {
16 + return Message(sourceLineNumbers, Ids.DefiningStandardDirectoryDeprecated, "It is no longer necessary to define the standard directory '{0}'. Use the StandardDirectory element instead.", directoryId);
17 + }
18 +
19 public static Message DiscouragedVersionAttribute(SourceLineNumber sourceLineNumbers)
20 {
21 return Message(sourceLineNumbers, Ids.DiscouragedVersionAttribute, "The Provides/@Version attribute should not be specified in an MSI package. The ProductVersion will be used by default.");
@@ -48,6 +58,8 @@ namespace WixToolset.Core
58 PropertyRemoved = 5433,
59 DiscouragedVersionAttribute = 5434,
60 Win64Component = 5435,
61 + DirectoryRefStandardDirectoryDeprecated = 5436,
62 + DefiningStandardDirectoryDeprecated = 5437,
63 }
64 }
65 }
src/WixToolset.Core/Compiler_Module.cs
+3
@@ -203,6 +203,9 @@ namespace WixToolset.Core
203 string parentName = null;
204 this.ParseSFPCatalogElement(child, ref parentName);
205 break;
206 + case "StandardDirectory":
207 + this.ParseStandardDirectoryElement(child);
208 + break;
209 case "Substitution":
210 this.ParseSubstitutionElement(child);
211 break;
src/WixToolset.Core/Compiler_Package.cs
+3
@@ -316,6 +316,9 @@ namespace WixToolset.Core
316 case "SoftwareTag":
317 this.ParsePackageTagElement(child);
318 break;
319 + case "StandardDirectory":
320 + this.ParseStandardDirectoryElement(child);
321 + break;
322 case "SummaryInformation":
323 this.ParseSummaryInformationElement(child, ref isCodepageSet, ref isPackageNameSet, ref isKeywordsSet, ref isPackageAuthorSet);
324 break;
src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
+46
@@ -125,6 +125,52 @@ namespace WixToolsetTest.CoreIntegration
125 }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray());
126 }
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());
174 }
175 }
176 }
src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
+6 -8
@@ -1,14 +1,12 @@
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}">
3 - <Directory Id="TARGETDIR" Name="SourceDir">
4 - <Directory Id="ProgramFilesFolder">
5 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
6 - <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
7 - <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="SourceDir\\MsiPackage\test.txt" />
8 - </Component>
9 - </Directory>
3 + <StandardDirectory Id="ProgramFilesFolder">
4 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
5 + <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 + </Component>
8 </Directory>
11 - </Directory>
9 + </StandardDirectory>
10 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
11 <ComponentRef Id="test.txt" />
12 </Feature>
src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs
+4 -6
@@ -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">
3
4
@@ -10,10 +10,8 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="AssemblyMsiPackage" />
16 - </Directory>
17 - </Directory>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="INSTALLFOLDER" Name="AssemblyMsiPackage" />
15 + </StandardDirectory>
16 </Fragment>
17 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/Class/DecompiledOldClassTableDef.wxs
+12 -14
@@ -1,20 +1,18 @@
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}">
3 - <Directory Id="TARGETDIR" Name="SourceDir">
4 - <Directory Id="ProgramFilesFolder">
5 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
6 - <Component Id="ProgIdComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32">
7 - <Class Id="{F12A6F69-117F-471F-AE73-F8E74218F498}" Context="LocalServer32" Description="FakeClassF12A" Advertise="yes">
8 - <ProgId Id="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Description="FakeClassF12A" Advertise="yes" />
9 - </Class>
10 - <File Id="filTki4JQ2gSapF7wK4K1vd.4mDSFQ" Name="ProgIdComp.txt" KeyPath="yes" ShortName="bnvvntsc.txt" Source="SourceDir\\MsiPackage\ProgIdComp.txt" />
11 - <RegistryValue Id="regUIIK326nDZpkWHuexeF58EikQvA" Root="HKCR" Key="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Name="NoOpen" Value="NoOpen73E7" Type="string" />
12 - <RegistryValue Id="regY1F4E2lvu_Up6gV6c3jeN5ukn8s" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\LocalServer32" Name="ThreadingModel" Value="Apartment" Type="string" />
13 - <RegistryValue Id="regvrhMurMp98anbQJkpgA8yJCefdM" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\Version" Value="0.0.0.1" Type="string" />
14 - </Component>
15 - </Directory>
3 + <StandardDirectory Id="ProgramFilesFolder">
4 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 + <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 + <ProgId Id="73E7DF7E-EFAC-4E11-90E2-6EBAEB8DE58D" Description="FakeClassF12A" Advertise="yes" />
8 + </Class>
9 + <File Id="filTki4JQ2gSapF7wK4K1vd.4mDSFQ" Name="ProgIdComp.txt" KeyPath="yes" ShortName="bnvvntsc.txt" Source="MsiPackage\ProgIdComp.txt" />
10 + <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="regvrhMurMp98anbQJkpgA8yJCefdM" Root="HKCR" Key="CLSID\{F12A6F69-117F-471F-AE73-F8E74218F498}\Version" Value="0.0.0.1" Type="string" />
13 + </Component>
14 </Directory>
17 - </Directory>
15 + </StandardDirectory>
16 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
17 <ComponentRef Id="ProgIdComp" Primary="yes" />
18 </Feature>
src/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs
+4 -6
@@ -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">
3
4
@@ -15,10 +15,8 @@
15 </Package>
16
17 <Fragment>
18 - <Directory Id="TARGETDIR" Name="SourceDir">
19 - <Directory Id="ProgramFilesFolder">
20 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
21 - </Directory>
22 - </Directory>
18 + <StandardDirectory Id="ProgramFilesFolder">
19 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
20 + </StandardDirectory>
21 </Fragment>
22 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
+4 -6
@@ -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">
3
4
@@ -10,10 +10,8 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 - </Directory>
17 - </Directory>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 + </StandardDirectory>
16 </Fragment>
17 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
+7 -10
@@ -12,17 +12,14 @@
12 <Data Column="Component_" Value="test.txt" />
13 </Row>
14 </CustomTable>
15 - <Directory Id="TARGETDIR" Name="SourceDir">
16 - <Directory Id="ProgramFilesFolder" Name="PFiles">
17 - <Directory Id="ProgramFiles6432Folder">
18 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj">
19 - <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
20 - <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\PFiles\\MsiPackage\test.txt" />
21 - </Component>
22 - </Directory>
23 - </Directory>
15 + <StandardDirectory Id="ProgramFiles6432Folder">
16 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj">
17 + <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
18 + <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" />
19 + </Component>
20 </Directory>
25 - </Directory>
21 + </StandardDirectory>
22 + <StandardDirectory Id="ProgramFilesFolder" />
23 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
24 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
25 </Feature>
src/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
+7 -9
@@ -1,18 +1,16 @@
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}">
3 - <Directory Id="TARGETDIR" Name="SourceDir">
4 - <Directory Id="ProgramFilesFolder">
5 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
6 - <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="" Bitness="always32">
7 - <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
8 - </Component>
9 - </Directory>
3 + <StandardDirectory Id="ProgramFilesFolder">
4 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 + <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="" Bitness="always32">
6 + <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
7 + </Component>
8 </Directory>
11 - </Directory>
9 + </StandardDirectory>
10 <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
11 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
12 </Feature>
13 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
14 <Media Id="1" Cabinet="example.cab" />
15 </Package>
18 -</Wix>
\ No newline at end of file
16 +</Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed/Expected.wxs
+7 -9
@@ -1,18 +1,16 @@
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}">
3 - <Directory Id="TARGETDIR" Name="SourceDir">
4 - <Directory Id="ProgramFilesFolder">
5 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
6 - <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
7 - <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
8 - </Component>
9 - </Directory>
3 + <StandardDirectory Id="ProgramFilesFolder">
4 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 + <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 + </Component>
8 </Directory>
11 - </Directory>
9 + </StandardDirectory>
10 <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
11 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
12 </Feature>
13 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
14 <Media Id="1" Cabinet="example.cab" />
15 </Package>
18 -</Wix>
\ No newline at end of file
16 +</Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/DecompileSingleFileCompressed64/Expected.wxs
+7 -9
@@ -1,18 +1,16 @@
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}">
3 - <Directory Id="TARGETDIR" Name="SourceDir">
4 - <Directory Id="ProgramFiles64Folder">
5 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
6 - <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always64">
7 - <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\File\filcV1yrx0x8wJWj4qMzcH21jwkPko" />
8 - </Component>
9 - </Directory>
3 + <StandardDirectory Id="ProgramFiles64Folder">
4 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
5 + <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 + </Component>
8 </Directory>
11 - </Directory>
9 + </StandardDirectory>
10 <Feature Id="ProductFeature" Level="1" Title="MsiPackage">
11 <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" />
12 </Feature>
13 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
14 <Media Id="1" Cabinet="example.cab" />
15 </Package>
18 -</Wix>
\ No newline at end of file
16 +</Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Nested.wxs new
+11
@@ -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>
src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs
+4 -6
@@ -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">
3
4
@@ -13,10 +13,8 @@
13 </Package>
14
15 <Fragment>
16 - <Directory Id="TARGETDIR" Name="SourceDir">
17 - <Directory Id="ProgramFilesFolder">
18 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
19 - </Directory>
20 - </Directory>
16 + <StandardDirectory Id="ProgramFilesFolder">
17 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 + </StandardDirectory>
19 </Fragment>
20 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
+4 -6
@@ -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">
3
4
@@ -14,10 +14,8 @@
14 </Package>
15
16 <Fragment>
17 - <Directory Id="TARGETDIR" Name="SourceDir">
18 - <Directory Id="ProgramFilesFolder">
19 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
20 - </Directory>
21 - </Directory>
17 + <StandardDirectory Id="ProgramFilesFolder">
18 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
19 + </StandardDirectory>
20 </Fragment>
21 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
+4 -6
@@ -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">
3
4
@@ -12,10 +12,8 @@
12 </Package>
13
14 <Fragment>
15 - <Directory Id="TARGETDIR" Name="SourceDir">
16 - <Directory Id="ProgramFilesFolder">
17 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 - </Directory>
19 - </Directory>
15 + <StandardDirectory Id="ProgramFilesFolder">
16 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 + </StandardDirectory>
18 </Fragment>
19 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/IncludePath/Package.wxs
+3 -5
@@ -11,10 +11,8 @@
11 </Package>
12
13 <Fragment>
14 - <Directory Id="TARGETDIR" Name="SourceDir">
15 - <Directory Id="ProgramFilesFolder">
16 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 - </Directory>
18 - </Directory>
14 + <StandardDirectory Id="ProgramFilesFolder">
15 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 + </StandardDirectory>
17 </Fragment>
18 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
+4 -6
@@ -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">
3
4
@@ -16,10 +16,8 @@
16 </Package>
17
18 <Fragment>
19 - <Directory Id="TARGETDIR" Name="SourceDir">
20 - <Directory Id="ProgramFilesFolder">
21 - <Directory Id="INSTALLFOLDER" Name="MsiPackageInstance" />
22 - </Directory>
23 - </Directory>
19 + <StandardDirectory Id="ProgramFilesFolder">
20 + <Directory Id="INSTALLFOLDER" Name="MsiPackageInstance" />
21 + </StandardDirectory>
22 </Fragment>
23 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
+3 -3
@@ -11,8 +11,8 @@
11 </Package>
12
13 <Fragment>
14 - <DirectoryRef Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 - </DirectoryRef>
14 + <StandardDirectory Id="ProgramFilesFolder">
15 + <Directory Id="INSTALLFOLDER" Name="Example Corporation\MsiPackage" />
16 + </StandardDirectory>
17 </Fragment>
18 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/ManualUpgrade/Package.wxs
+4 -6
@@ -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">
3
4
@@ -17,10 +17,8 @@
17 </Package>
18
19 <Fragment>
20 - <Directory Id="TARGETDIR" Name="SourceDir">
21 - <Directory Id="ProgramFilesFolder">
22 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
23 - </Directory>
24 - </Directory>
20 + <StandardDirectory Id="ProgramFilesFolder">
21 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
22 + </StandardDirectory>
23 </Fragment>
24 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs
+4 -6
@@ -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">
3
4
@@ -19,10 +19,8 @@
19 </Package>
20
21 <Fragment>
22 - <Directory Id="TARGETDIR" Name="SourceDir">
23 - <Directory Id="ProgramFilesFolder">
24 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
25 - </Directory>
26 - </Directory>
22 + <StandardDirectory Id="ProgramFilesFolder">
23 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24 + </StandardDirectory>
25 </Fragment>
26 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs
+4 -6
@@ -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">
3
4
@@ -41,10 +41,8 @@
41 </Fragment>
42
43 <Fragment Id="Directories">
44 - <Directory Id="TARGETDIR" Name="SourceDir">
45 - <Directory Id="ProgramFilesFolder">
46 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
47 - </Directory>
48 - </Directory>
44 + <StandardDirectory Id="ProgramFilesFolder">
45 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
46 + </StandardDirectory>
47 </Fragment>
48 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
+2 -2
@@ -4,9 +4,9 @@
4 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
5 <MediaTemplate EmbedCab="yes" />
6
7 - <DirectoryRef Id="ProgramFilesFolder">
7 + <StandardDirectory Id="ProgramFilesFolder">
8 <Directory Id="INSTALLFOLDER" Name="~Test App" />
9 - </DirectoryRef>
9 + </StandardDirectory>
10
11 <Feature Id="Main">
12 <ComponentGroupRef Id="Components" />
src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
+3 -5
@@ -15,11 +15,9 @@
15 </Package>
16
17 <Fragment>
18 - <Directory Id="TARGETDIR" Name="SourceDir">
19 - <Directory Id="ProgramFilesFolder">
20 - <Directory Id="INSTALLFOLDER" Name="~Test A" />
21 - </Directory>
22 - </Directory>
18 + <StandardDirectory Id="ProgramFilesFolder">
19 + <Directory Id="INSTALLFOLDER" Name="~Test A" />
20 + </StandardDirectory>
21 </Fragment>
22
23 <Fragment>
src/test/WixToolsetTest.CoreIntegration/TestData/PatchSingle/Package.wxs
+4 -6
@@ -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">
3
4
5 <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
6 <MediaTemplate EmbedCab="yes" />
7
8 - <Directory Id="TARGETDIR" Name="SourceDir">
9 - <Directory Id="ProgramFilesFolder">
10 - <Directory Id="INSTALLFOLDER" Name="~Test App" />
11 - </Directory>
12 - </Directory>
8 + <StandardDirectory Id="ProgramFilesFolder">
9 + <Directory Id="INSTALLFOLDER" Name="~Test A" />
10 + </StandardDirectory>
11
12 <Feature Id="Main">
13 <ComponentGroupRef Id="Components" />
src/test/WixToolsetTest.CoreIntegration/TestData/ProductTag/PackageWithTag.wxs
+3 -5
@@ -11,10 +11,8 @@
11 </Package>
12
13 <Fragment>
14 - <Directory Id="TARGETDIR" Name="SourceDir">
15 - <Directory Id="ProgramFilesFolder">
16 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 - </Directory>
18 - </Directory>
14 + <StandardDirectory Id="ProgramFilesFolder">
15 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 + </StandardDirectory>
17 </Fragment>
18 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+2 -2
@@ -9,8 +9,8 @@
9 </Package>
10
11 <Fragment>
12 - <DirectoryRef Id="ProgramFiles6432Folder">
12 + <StandardDirectory Id="ProgramFiles6432Folder">
13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14 - </DirectoryRef>
14 + </StandardDirectory>
15 </Fragment>
16 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/ProgId/Package.wxs
+4 -6
@@ -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">
3
4
@@ -10,10 +10,8 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 - </Directory>
17 - </Directory>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 + </StandardDirectory>
16 </Fragment>
17 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/PublishComponent/Package.wxs
+4 -6
@@ -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">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
@@ -13,11 +13,9 @@
13 </Package>
14
15 <Fragment>
16 - <Directory Id="TARGETDIR" Name="SourceDir">
17 - <Directory Id="ProgramFilesFolder">
18 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
19 - </Directory>
20 - </Directory>
16 + <StandardDirectory Id="ProgramFilesFolder">
17 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 + </StandardDirectory>
19 </Fragment>
20
21 <Fragment>
src/test/WixToolsetTest.CoreIntegration/TestData/SequenceTables/DecompiledSequenceTables.wxs
+6 -8
@@ -1,15 +1,13 @@
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}">
3 <CustomAction Id="CustomAction2" Property="TestAdvtExecuteSequenceProperty" Value="1" />
4 - <Directory Id="TARGETDIR" Name="SourceDir">
5 - <Directory Id="ProgramFilesFolder">
6 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
7 - <Component Id="test.txt" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32">
8 - <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="SourceDir\\MsiPackage\test.txt" />
9 - </Component>
10 - </Directory>
4 + <StandardDirectory Id="ProgramFilesFolder">
5 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
6 + <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 + </Component>
9 </Directory>
12 - </Directory>
10 + </StandardDirectory>
11 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
12 <ComponentRef Id="test.txt" />
13 </Feature>
src/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/Package.wxs
+4 -6
@@ -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">
3
4
@@ -12,10 +12,8 @@
12 </Package>
13
14 <Fragment>
15 - <Directory Id="TARGETDIR" Name="SourceDir">
16 - <Directory Id="ProgramFilesFolder">
17 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 - </Directory>
19 - </Directory>
15 + <StandardDirectory Id="ProgramFilesFolder">
16 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 + </StandardDirectory>
18 </Fragment>
19 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/DecompiledShortcuts.wxs
+9 -11
@@ -1,17 +1,15 @@
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}">
3 - <Directory Id="TARGETDIR" Name="SourceDir">
4 - <Directory Id="ProgramFilesFolder">
5 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
6 - <Component Id="ShortcutComp" Guid="{5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8}" Bitness="always32">
7 - <File Id="test.txt" Name="test.txt" KeyPath="yes" Source="SourceDir\\MsiPackage\test.txt" />
8 - <Shortcut Id="FileTargetShortcut" Directory="INSTALLFOLDER" Name="FileTargetShortcut" ShortName="lm2tdtqp" Target="[#test.txt]" />
9 - <Shortcut Id="CustomTargetShortcut" Directory="INSTALLFOLDER" Name="Planner" ShortName="PLANNER" Target="[INSTALLFOLDER]custom.target" />
10 - <Shortcut Id="AdvtShortcut" Directory="INSTALLFOLDER" Name="AdvtShortcut" ShortName="mdbqel9r" Advertise="yes" />
11 - </Component>
12 - </Directory>
3 + <StandardDirectory Id="ProgramFilesFolder">
4 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="ykd0udtb">
5 + <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 + <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="AdvtShortcut" Directory="INSTALLFOLDER" Name="AdvtShortcut" ShortName="mdbqel9r" Advertise="yes" />
10 + </Component>
11 </Directory>
14 - </Directory>
12 + </StandardDirectory>
13 <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle">
14 <ComponentRef Id="ShortcutComp" Primary="yes" />
15 </Feature>
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
+6 -8
@@ -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">
3
4
@@ -10,13 +10,11 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="MsiPackage">
16 - <!-- -->
17 - <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" />
18 - </Directory>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="INSTALLFOLDER" Name="MsiPackage">
15 + <!-- -->
16 + <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" />
17 </Directory>
20 - </Directory>
18 + </StandardDirectory>
19 </Fragment>
20 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
+4 -6
@@ -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">
3
4
@@ -10,10 +10,8 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 - </Directory>
17 - </Directory>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 + </StandardDirectory>
16 </Fragment>
17 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
+4 -6
@@ -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">
3
4
@@ -18,10 +18,8 @@
18 </Package>
19
20 <Fragment>
21 - <Directory Id="TARGETDIR" Name="SourceDir">
22 - <Directory Id="ProgramFilesFolder">
23 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24 - </Directory>
25 - </Directory>
21 + <StandardDirectory Id="ProgramFilesFolder">
22 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
23 + </StandardDirectory>
24 </Fragment>
25 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
+2 -2
@@ -9,8 +9,8 @@
9 </Package>
10
11 <Fragment>
12 - <DirectoryRef Id="ProgramFilesFolder">
12 + <StandardDirectory Id="ProgramFilesFolder">
13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14 - </DirectoryRef>
14 + </StandardDirectory>
15 </Fragment>
16 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/WixVariableOverride/Package.wxs
+4 -6
@@ -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">
3
4
@@ -12,10 +12,8 @@
12 </Package>
13
14 <Fragment>
15 - <Directory Id="TARGETDIR" Name="SourceDir">
16 - <Directory Id="ProgramFilesFolder">
17 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 - </Directory>
19 - </Directory>
15 + <StandardDirectory Id="ProgramFilesFolder">
16 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 + </StandardDirectory>
18 </Fragment>
19 </Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/Wixipl/Package.wxs
+4 -6
@@ -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">
3
4
@@ -12,10 +12,8 @@
12 </Package>
13
14 <Fragment>
15 - <Directory Id="TARGETDIR" Name="SourceDir">
16 - <Directory Id="ProgramFilesFolder">
17 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 - </Directory>
19 - </Directory>
15 + <StandardDirectory Id="ProgramFilesFolder">
16 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 + </StandardDirectory>
18 </Fragment>
19 </Wix>