diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-01 10:12:40 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-01 12:23:34 -0800 |
| commit | 697f2cdbdcd8198d06ebf14fc2b65f0ce3fa5a94 (patch) | |
| tree | 8616e852092f56985cd5e51c7615b9b78b471737 | |
| parent | ead8def989c291fa8f9e31760fd2c7a815595481 (diff) | |
| download | wix-697f2cdbdcd8198d06ebf14fc2b65f0ce3fa5a94.tar.gz wix-697f2cdbdcd8198d06ebf14fc2b65f0ce3fa5a94.tar.bz2 wix-697f2cdbdcd8198d06ebf14fc2b65f0ce3fa5a94.zip | |
TARGETDIR is the default directory root, so allow it
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 5 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs | 12 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index ac99a8a1..384f8795 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -4226,11 +4226,6 @@ namespace WixToolset.Core | |||
| 4226 | { | 4226 | { |
| 4227 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ShortName", "Name")); | 4227 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ShortName", "Name")); |
| 4228 | } | 4228 | } |
| 4229 | |||
| 4230 | if (null == parentId) | ||
| 4231 | { | ||
| 4232 | this.Core.Write(ErrorMessages.DirectoryRootWithoutName(sourceLineNumbers, node.Name.LocalName, "Name")); | ||
| 4233 | } | ||
| 4234 | } | 4229 | } |
| 4235 | else if (!String.IsNullOrEmpty(name)) | 4230 | else if (!String.IsNullOrEmpty(name)) |
| 4236 | { | 4231 | { |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs index 737ac8df..9a523162 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs | |||
| @@ -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"> | 2 | <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE" InstallerVersion="200"> |
| 3 | <SummaryInformation Manufacturer="!(loc.Manufacturer)" /> | 3 | <SummaryInformation Manufacturer="!(loc.Manufacturer)" /> |
| 4 | 4 | ||
| 5 | <Directory Id="TARGETDIR" Name="SourceDir"> | 5 | <Directory Id="MergeRedirectFolder"> |
| 6 | <Directory Id="MergeRedirectFolder"> | ||
| 7 | 6 | ||
| 8 | <Component Id="ModuleComponent" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45"> | 7 | <Component Id="ModuleComponent" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45"> |
| 9 | <File Source="test.txt" /> | 8 | <File Source="test.txt" /> |
| 10 | </Component> | 9 | </Component> |
| 11 | 10 | ||
| 12 | </Directory> | ||
| 13 | </Directory> | 11 | </Directory> |
| 14 | </Module> | 12 | </Module> |
| 15 | </Wix> | 13 | </Wix> |
