3 files changed, 4 insertions, 4 deletions

diff --git a/src/WixToolset.Core/Compiler_Package.cs b/src/WixToolset.Core/Compiler_Package.cs
index f9d77873..87ccceb7 100644
--- a/src/WixToolset.Core/Compiler_Package.cs
+++ b/src/WixToolset.Core/Compiler_Package.cs
@@ -2171,7 +2171,7 @@ namespace WixToolset.Core
                         this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, directoryId);
                         break;
                     case "Subdirectory":
-                        directoryId = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, allowRelative: true);
+                        subdirectory = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, allowRelative: true);
                         break;
                     case "Name":
                         name = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, true);
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 4b7b5ca4..c1368190 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -103,7 +103,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, id);
             }
 
-            return id; //this.ParseInlineSyntax(section, sourceLineNumbers, attribute, inlineSyntax, sectionCachedInlinedDirectoryIds);
+            return id;
         }
 
         public string CreateGuid(Guid namespaceGuid, string value)
diff --git a/src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs b/src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs
index 610e44b8..db9708a7 100644
--- a/src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs
@@ -38,7 +38,7 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var directorySymbols = section.Symbols.OfType<DirectorySymbol>();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "INSTALLFOLDER:Example Corporation\\MsiPackage",
                     "ProgramFilesFolder:PFiles",
@@ -56,7 +56,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var directoryRows = data.Tables["Directory"].Rows;
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "d4EceYatXTyy8HXPt5B6DT9Rj.wE:u7-b4gch|Example Corporation",
                     "INSTALLFOLDER:oekcr5lq|MsiPackage",