diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-01-05 15:13:37 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-01-05 23:18:34 -0800 |
| commit | 0d1851c79901ba6ddbba9bb63f758760fe5be994 (patch) | |
| tree | 2ccb45459fe4290e9c3fb4ad698c20f9cd55203d /src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs | |
| parent | b00c72ed0ef19d2e46f60361fa06821b0bd5ec94 (diff) | |
| download | wix-0d1851c79901ba6ddbba9bb63f758760fe5be994.tar.gz wix-0d1851c79901ba6ddbba9bb63f758760fe5be994.tar.bz2 wix-0d1851c79901ba6ddbba9bb63f758760fe5be994.zip | |
Fix handling of duplicate directories
Diffstat (limited to 'src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs')
| -rw-r--r-- | src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs b/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs index db53f1ce..cbf48abe 100644 --- a/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs +++ b/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
| 2 | 2 | ||
| 3 | namespace WixToolset.Core.Link | 3 | namespace WixToolset.Core.Link |
| 4 | { | 4 | { |
| @@ -9,10 +9,10 @@ namespace WixToolset.Core.Link | |||
| 9 | public static bool IsIdentical(this IntermediateSymbol first, IntermediateSymbol second) | 9 | public static bool IsIdentical(this IntermediateSymbol first, IntermediateSymbol second) |
| 10 | { | 10 | { |
| 11 | var identical = (first.Definition.Type == second.Definition.Type && | 11 | var identical = (first.Definition.Type == second.Definition.Type && |
| 12 | first.Definition.Name == second.Definition.Name && | 12 | (first.Definition.Type != SymbolDefinitionType.MustBeFromAnExtension || first.Definition.Name == second.Definition.Name) && |
| 13 | first.Definition.FieldDefinitions.Length == second.Definition.FieldDefinitions.Length); | 13 | first.Definition.FieldDefinitions.Length == second.Definition.FieldDefinitions.Length); |
| 14 | 14 | ||
| 15 | for (int i = 0; identical && i < first.Definition.FieldDefinitions.Length; ++i) | 15 | for (var i = 0; identical && i < first.Definition.FieldDefinitions.Length; ++i) |
| 16 | { | 16 | { |
| 17 | var firstField = first[i]; | 17 | var firstField = first[i]; |
| 18 | var secondField = second[i]; | 18 | var secondField = second[i]; |
