diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-07 15:39:09 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-07 15:42:46 -0700 |
commit | 399ab500b78b0bbd4735cdce560b0f389f2603a0 (patch) | |
tree | 2f838e92c591dc565c8dd8dc53c0bb5bb8d6795a | |
parent | f3a228eaf7d40bcd46b64c3d49aa23df23e79aec (diff) | |
download | wix-399ab500b78b0bbd4735cdce560b0f389f2603a0.tar.gz wix-399ab500b78b0bbd4735cdce560b0f389f2603a0.tar.bz2 wix-399ab500b78b0bbd4735cdce560b0f389f2603a0.zip |
Address code review feedback
-rw-r--r-- | src/WixToolset.Core/Compiler_Package.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 2 | ||||
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs | 4 |
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 | |||
2171 | this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, directoryId); | 2171 | this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, directoryId); |
2172 | break; | 2172 | break; |
2173 | case "Subdirectory": | 2173 | case "Subdirectory": |
2174 | directoryId = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, allowRelative: true); | 2174 | subdirectory = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, allowRelative: true); |
2175 | break; | 2175 | break; |
2176 | case "Name": | 2176 | case "Name": |
2177 | name = this.Core.GetAttributeLongFilename(sourceLineNumbers, attrib, true); | 2177 | 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 | |||
103 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, id); | 103 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, id); |
104 | } | 104 | } |
105 | 105 | ||
106 | return id; //this.ParseInlineSyntax(section, sourceLineNumbers, attribute, inlineSyntax, sectionCachedInlinedDirectoryIds); | 106 | return id; |
107 | } | 107 | } |
108 | 108 | ||
109 | public string CreateGuid(Guid namespaceGuid, string value) | 109 | 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 | |||
38 | var section = intermediate.Sections.Single(); | 38 | var section = intermediate.Sections.Single(); |
39 | 39 | ||
40 | var directorySymbols = section.Symbols.OfType<DirectorySymbol>(); | 40 | var directorySymbols = section.Symbols.OfType<DirectorySymbol>(); |
41 | Assert.Equal(new[] | 41 | WixAssert.CompareLineByLine(new[] |
42 | { | 42 | { |
43 | "INSTALLFOLDER:Example Corporation\\MsiPackage", | 43 | "INSTALLFOLDER:Example Corporation\\MsiPackage", |
44 | "ProgramFilesFolder:PFiles", | 44 | "ProgramFilesFolder:PFiles", |
@@ -56,7 +56,7 @@ namespace WixToolsetTest.CoreIntegration | |||
56 | 56 | ||
57 | var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); | 57 | var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
58 | var directoryRows = data.Tables["Directory"].Rows; | 58 | var directoryRows = data.Tables["Directory"].Rows; |
59 | Assert.Equal(new[] | 59 | WixAssert.CompareLineByLine(new[] |
60 | { | 60 | { |
61 | "d4EceYatXTyy8HXPt5B6DT9Rj.wE:u7-b4gch|Example Corporation", | 61 | "d4EceYatXTyy8HXPt5B6DT9Rj.wE:u7-b4gch|Example Corporation", |
62 | "INSTALLFOLDER:oekcr5lq|MsiPackage", | 62 | "INSTALLFOLDER:oekcr5lq|MsiPackage", |