aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/CompilerCore.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/CompilerCore.cs')
-rw-r--r--src/WixToolset.Core/CompilerCore.cs17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs
index df532d74..8705cacd 100644
--- a/src/WixToolset.Core/CompilerCore.cs
+++ b/src/WixToolset.Core/CompilerCore.cs
@@ -386,13 +386,12 @@ namespace WixToolset.Core
386 /// Creates directories using the inline directory syntax. 386 /// Creates directories using the inline directory syntax.
387 /// </summary> 387 /// </summary>
388 /// <param name="sourceLineNumbers">Source line information.</param> 388 /// <param name="sourceLineNumbers">Source line information.</param>
389 /// <param name="attribute">Attribute containing the inline syntax.</param>
390 /// <param name="parentId">Optional identifier of parent directory.</param> 389 /// <param name="parentId">Optional identifier of parent directory.</param>
391 /// <param name="inlineSyntax">Optional inline syntax to override attribute's value.</param> 390 /// <param name="inlineSyntax">Optional inline syntax to override attribute's value.</param>
392 /// <returns>Identifier of the leaf directory created.</returns> 391 /// <returns>Identifier of the leaf directory created.</returns>
393 public string CreateDirectoryReferenceFromInlineSyntax(SourceLineNumber sourceLineNumbers, XAttribute attribute, string parentId, string inlineSyntax = null) 392 public string CreateDirectoryReferenceFromInlineSyntax(SourceLineNumber sourceLineNumbers, string parentId, string inlineSyntax = null)
394 { 393 {
395 return this.parseHelper.CreateDirectoryReferenceFromInlineSyntax(this.ActiveSection, sourceLineNumbers, attribute, parentId, inlineSyntax, this.activeSectionCachedInlinedDirectoryIds); 394 return this.parseHelper.CreateDirectoryReferenceFromInlineSyntax(this.ActiveSection, sourceLineNumbers, attribute: null, parentId, inlineSyntax, this.activeSectionCachedInlinedDirectoryIds);
396 } 395 }
397 396
398 /// <summary> 397 /// <summary>
@@ -784,7 +783,7 @@ namespace WixToolset.Core
784 /// <param name="attribute">The attribute containing the value to get.</param> 783 /// <param name="attribute">The attribute containing the value to get.</param>
785 /// <param name="allowWildcards">true if wildcards are allowed in the filename.</param> 784 /// <param name="allowWildcards">true if wildcards are allowed in the filename.</param>
786 /// <returns>The attribute's short filename value.</returns> 785 /// <returns>The attribute's short filename value.</returns>
787 public string GetAttributeShortFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards) 786 public string GetAttributeShortFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards = false)
788 { 787 {
789 if (null == attribute) 788 if (null == attribute)
790 { 789 {
@@ -1022,16 +1021,6 @@ namespace WixToolset.Core
1022 } 1021 }
1023 1022
1024 /// <summary> 1023 /// <summary>
1025 /// Adds inline directory syntax generated identifier.
1026 /// </summary>
1027 /// <param name="inlineSyntax">Inline directory syntax the identifier was generated.</param>
1028 /// <param name="id">Generated identifier for inline syntax.</param>
1029 internal void AddInlineDirectoryId(string inlineSyntax, string id)
1030 {
1031 this.activeSectionCachedInlinedDirectoryIds.Add(inlineSyntax, id);
1032 }
1033
1034 /// <summary>
1035 /// Creates a new section and makes it the active section in the core. 1024 /// Creates a new section and makes it the active section in the core.
1036 /// </summary> 1025 /// </summary>
1037 /// <param name="id">Unique identifier for the section.</param> 1026 /// <param name="id">Unique identifier for the section.</param>