diff options
Diffstat (limited to 'src/WixToolset.Core/Bind/FileResolver.cs')
-rw-r--r-- | src/WixToolset.Core/Bind/FileResolver.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/WixToolset.Core/Bind/FileResolver.cs b/src/WixToolset.Core/Bind/FileResolver.cs index 6bc5a676..d11fcadc 100644 --- a/src/WixToolset.Core/Bind/FileResolver.cs +++ b/src/WixToolset.Core/Bind/FileResolver.cs | |||
@@ -41,13 +41,13 @@ namespace WixToolset.Core.Bind | |||
41 | 41 | ||
42 | private IEnumerable<ILibrarianExtension> LibrarianExtensions { get; } | 42 | private IEnumerable<ILibrarianExtension> LibrarianExtensions { get; } |
43 | 43 | ||
44 | public string Resolve(SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, string source) | 44 | public string Resolve(SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, string source) |
45 | { | 45 | { |
46 | var checkedPaths = new List<string>(); | 46 | var checkedPaths = new List<string>(); |
47 | 47 | ||
48 | foreach (var extension in this.LibrarianExtensions) | 48 | foreach (var extension in this.LibrarianExtensions) |
49 | { | 49 | { |
50 | var resolved = extension.ResolveFile(sourceLineNumbers, tupleDefinition, source); | 50 | var resolved = extension.ResolveFile(sourceLineNumbers, symbolDefinition, source); |
51 | 51 | ||
52 | if (resolved?.CheckedPaths != null) | 52 | if (resolved?.CheckedPaths != null) |
53 | { | 53 | { |
@@ -60,7 +60,7 @@ namespace WixToolset.Core.Bind | |||
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
63 | return this.MustResolveUsingBindPaths(source, tupleDefinition, sourceLineNumbers, BindStage.Normal, checkedPaths); | 63 | return this.MustResolveUsingBindPaths(source, symbolDefinition, sourceLineNumbers, BindStage.Normal, checkedPaths); |
64 | } | 64 | } |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
@@ -72,7 +72,7 @@ namespace WixToolset.Core.Bind | |||
72 | /// <param name="bindStage">The binding stage used to determine what collection of bind paths will be used</param> | 72 | /// <param name="bindStage">The binding stage used to determine what collection of bind paths will be used</param> |
73 | /// <param name="alreadyCheckedPaths">Optional collection of paths already checked.</param> | 73 | /// <param name="alreadyCheckedPaths">Optional collection of paths already checked.</param> |
74 | /// <returns>Should return a valid path for the stream to be imported.</returns> | 74 | /// <returns>Should return a valid path for the stream to be imported.</returns> |
75 | public string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, IEnumerable<string> alreadyCheckedPaths = null) | 75 | public string ResolveFile(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, IEnumerable<string> alreadyCheckedPaths = null) |
76 | { | 76 | { |
77 | var checkedPaths = new List<string>(); | 77 | var checkedPaths = new List<string>(); |
78 | 78 | ||
@@ -83,7 +83,7 @@ namespace WixToolset.Core.Bind | |||
83 | 83 | ||
84 | foreach (var extension in this.ResolverExtensions) | 84 | foreach (var extension in this.ResolverExtensions) |
85 | { | 85 | { |
86 | var resolved = extension.ResolveFile(source, tupleDefinition, sourceLineNumbers, bindStage); | 86 | var resolved = extension.ResolveFile(source, symbolDefinition, sourceLineNumbers, bindStage); |
87 | 87 | ||
88 | if (resolved?.CheckedPaths != null) | 88 | if (resolved?.CheckedPaths != null) |
89 | { | 89 | { |
@@ -96,10 +96,10 @@ namespace WixToolset.Core.Bind | |||
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | return this.MustResolveUsingBindPaths(source, tupleDefinition, sourceLineNumbers, bindStage, checkedPaths); | 99 | return this.MustResolveUsingBindPaths(source, symbolDefinition, sourceLineNumbers, bindStage, checkedPaths); |
100 | } | 100 | } |
101 | 101 | ||
102 | private string MustResolveUsingBindPaths(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, List<string> checkedPaths) | 102 | private string MustResolveUsingBindPaths(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, List<string> checkedPaths) |
103 | { | 103 | { |
104 | string resolved = null; | 104 | string resolved = null; |
105 | 105 | ||
@@ -180,7 +180,7 @@ namespace WixToolset.Core.Bind | |||
180 | 180 | ||
181 | if (null == resolved) | 181 | if (null == resolved) |
182 | { | 182 | { |
183 | throw new WixException(ErrorMessages.FileNotFound(sourceLineNumbers, source, tupleDefinition.Name, checkedPaths)); | 183 | throw new WixException(ErrorMessages.FileNotFound(sourceLineNumbers, source, symbolDefinition.Name, checkedPaths)); |
184 | } | 184 | } |
185 | 185 | ||
186 | return resolved; | 186 | return resolved; |