Address code review feedback
Rob Mensching committed
Apr 7, 2021 at 15:39 UTC
399ab500b78b0bbd4735cdce560b0f389f2603a0
3 files changed
+4
-4
src/WixToolset.Core/Compiler_Package.cs
+1
-1
@@ -2171,7 +2171,7 @@ namespace WixToolset.Core
2171
this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, directoryId);
2172
break;
2173
case "Subdirectory":
2174
- directoryId = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, allowRelative: true);
2174
+ subdirectory = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, allowRelative: true);
2175
break;
2176
case "Name":
2177
name = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, true);
src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+1
-1
@@ -103,7 +103,7 @@ namespace WixToolset.Core.ExtensibilityServices
103
this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, id);
104
}
105
106
- return id; //this.ParseInlineSyntax(section, sourceLineNumbers, attribute, inlineSyntax, sectionCachedInlinedDirectoryIds);
106
+ return id;
107
}
108
109
public string CreateGuid(Guid namespaceGuid, string value)
src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs
+2
-2
@@ -38,7 +38,7 @@ namespace WixToolsetTest.CoreIntegration
38
var section = intermediate.Sections.Single();
39
40
var directorySymbols = section.Symbols.OfType<DirectorySymbol>();
41
- Assert.Equal(new[]
41
+ WixAssert.CompareLineByLine(new[]
42
{
43
"INSTALLFOLDER:Example Corporation\\MsiPackage",
44
"ProgramFilesFolder:PFiles",
@@ -56,7 +56,7 @@ namespace WixToolsetTest.CoreIntegration
56
57
var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
58
var directoryRows = data.Tables["Directory"].Rows;
59
- Assert.Equal(new[]
59
+ WixAssert.CompareLineByLine(new[]
60
{
61
"d4EceYatXTyy8HXPt5B6DT9Rj.wE:u7-b4gch|Example Corporation",
62
"INSTALLFOLDER:oekcr5lq|MsiPackage",