aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Librarian.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Librarian.cs')
-rw-r--r--src/WixToolset.Core/Librarian.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs
index 0c519b88..6dc8611d 100644
--- a/src/WixToolset.Core/Librarian.cs
+++ b/src/WixToolset.Core/Librarian.cs
@@ -89,17 +89,17 @@ namespace WixToolset.Core
89 89
90 var fileResolver = new FileResolver(context.BindPaths, context.Extensions); 90 var fileResolver = new FileResolver(context.BindPaths, context.Extensions);
91 91
92 foreach (var tuple in sections.SelectMany(s => s.Tuples)) 92 foreach (var symbol in sections.SelectMany(s => s.Symbols))
93 { 93 {
94 foreach (var field in tuple.Fields.Where(f => f?.Type == IntermediateFieldType.Path)) 94 foreach (var field in symbol.Fields.Where(f => f?.Type == IntermediateFieldType.Path))
95 { 95 {
96 var pathField = field.AsPath(); 96 var pathField = field.AsPath();
97 97
98 if (pathField != null && !String.IsNullOrEmpty(pathField.Path)) 98 if (pathField != null && !String.IsNullOrEmpty(pathField.Path))
99 { 99 {
100 var resolution = variableResolver.ResolveVariables(tuple.SourceLineNumbers, pathField.Path); 100 var resolution = variableResolver.ResolveVariables(symbol.SourceLineNumbers, pathField.Path);
101 101
102 var file = fileResolver.Resolve(tuple.SourceLineNumbers, tuple.Definition, resolution.Value); 102 var file = fileResolver.Resolve(symbol.SourceLineNumbers, symbol.Definition, resolution.Value);
103 103
104 if (!String.IsNullOrEmpty(file)) 104 if (!String.IsNullOrEmpty(file))
105 { 105 {
@@ -108,7 +108,7 @@ namespace WixToolset.Core
108 } 108 }
109 else 109 else
110 { 110 {
111 this.Messaging.Write(ErrorMessages.FileNotFound(tuple.SourceLineNumbers, pathField.Path, tuple.Definition.Name)); 111 this.Messaging.Write(ErrorMessages.FileNotFound(symbol.SourceLineNumbers, pathField.Path, symbol.Definition.Name));
112 } 112 }
113 } 113 }
114 } 114 }