From 860f77f7c9d522074dc7e44cfe11281efd20687f Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 5 Apr 2021 12:55:26 -0700
Subject: Introduce "Subdirectory" which simplifies inline directory syntax

Completes wixtoolset/issues#4727
---
 src/WixToolset.Core/CompilerCore.cs | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'src/WixToolset.Core/CompilerCore.cs')

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
         /// Creates directories using the inline directory syntax.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information.</param>
-        /// <param name="attribute">Attribute containing the inline syntax.</param>
         /// <param name="parentId">Optional identifier of parent directory.</param>
         /// <param name="inlineSyntax">Optional inline syntax to override attribute's value.</param>
         /// <returns>Identifier of the leaf directory created.</returns>
-        public string CreateDirectoryReferenceFromInlineSyntax(SourceLineNumber sourceLineNumbers, XAttribute attribute, string parentId, string inlineSyntax = null)
+        public string CreateDirectoryReferenceFromInlineSyntax(SourceLineNumber sourceLineNumbers, string parentId, string inlineSyntax = null)
         {
-            return this.parseHelper.CreateDirectoryReferenceFromInlineSyntax(this.ActiveSection, sourceLineNumbers, attribute, parentId, inlineSyntax, this.activeSectionCachedInlinedDirectoryIds);
+            return this.parseHelper.CreateDirectoryReferenceFromInlineSyntax(this.ActiveSection, sourceLineNumbers, attribute: null, parentId, inlineSyntax, this.activeSectionCachedInlinedDirectoryIds);
         }
 
         /// <summary>
@@ -784,7 +783,7 @@ namespace WixToolset.Core
         /// <param name="attribute">The attribute containing the value to get.</param>
         /// <param name="allowWildcards">true if wildcards are allowed in the filename.</param>
         /// <returns>The attribute's short filename value.</returns>
-        public string GetAttributeShortFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards)
+        public string GetAttributeShortFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards = false)
         {
             if (null == attribute)
             {
@@ -1021,16 +1020,6 @@ namespace WixToolset.Core
             }
         }
 
-        /// <summary>
-        /// Adds inline directory syntax generated identifier.
-        /// </summary>
-        /// <param name="inlineSyntax">Inline directory syntax the identifier was generated.</param>
-        /// <param name="id">Generated identifier for inline syntax.</param>
-        internal void AddInlineDirectoryId(string inlineSyntax, string id)
-        {
-            this.activeSectionCachedInlinedDirectoryIds.Add(inlineSyntax, id);
-        }
-
         /// <summary>
         /// Creates a new section and makes it the active section in the core.
         /// </summary>
-- 
cgit v1.2.3-55-g6feb