TARGETDIR is the default directory root, so allow it
Rob Mensching committed
Mar 1, 2021 at 10:12 UTC
697f2cdbdcd8198d06ebf14fc2b65f0ce3fa5a94
2 files changed
+5
-12
src/WixToolset.Core/Compiler.cs
-5
@@ -4226,11 +4226,6 @@ namespace WixToolset.Core
4226
{
4227
this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ShortName", "Name"));
4228
}
4229
-
4230
- if (null == parentId)
4231
- {
4232
- this.Core.Write(ErrorMessages.DirectoryRootWithoutName(sourceLineNumbers, node.Name.LocalName, "Name"));
4233
- }
4229
}
4230
else if (!String.IsNullOrEmpty(name))
4231
{
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
+5
-7
@@ -1,15 +1,13 @@
1
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
<Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200">
3
<SummaryInformation Manufacturer="!(loc.Manufacturer)" />
4
5
- <Directory Id="TARGETDIR" Name="SourceDir">
6
- <Directory Id="MergeRedirectFolder">
5
+ <Directory Id="MergeRedirectFolder">
6
8
- <Component Id="ModuleComponent" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45">
9
- <File Source="test.txt" />
10
- </Component>
7
+ <Component Id="ModuleComponent" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45">
8
+ <File Source="test.txt" />
9
+ </Component>
10
12
- </Directory>
11
</Directory>
12
</Module>
13
</Wix>