diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-07 11:18:13 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-07 11:59:14 -0700 |
| commit | 860676fa5b40a1904478151e9b4934c004e7db63 (patch) | |
| tree | 83fabd53f2a68dcf56bc8da66d88e115af3764b0 /src/WixToolset.Core/Bind/FileResolver.cs | |
| parent | 3b98dac62b47d590f3465985362d6e6fd100b1c0 (diff) | |
| download | wix-860676fa5b40a1904478151e9b4934c004e7db63.tar.gz wix-860676fa5b40a1904478151e9b4934c004e7db63.tar.bz2 wix-860676fa5b40a1904478151e9b4934c004e7db63.zip | |
Implement Bundle build
Diffstat (limited to 'src/WixToolset.Core/Bind/FileResolver.cs')
| -rw-r--r-- | src/WixToolset.Core/Bind/FileResolver.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/WixToolset.Core/Bind/FileResolver.cs b/src/WixToolset.Core/Bind/FileResolver.cs index a67d784d..b1676fad 100644 --- a/src/WixToolset.Core/Bind/FileResolver.cs +++ b/src/WixToolset.Core/Bind/FileResolver.cs | |||
| @@ -70,11 +70,17 @@ namespace WixToolset.Core.Bind | |||
| 70 | /// <param name="type">Optional type of source file being resolved.</param> | 70 | /// <param name="type">Optional type of source file being resolved.</param> |
| 71 | /// <param name="sourceLineNumbers">Optional source line of source file being resolved.</param> | 71 | /// <param name="sourceLineNumbers">Optional source line of source file being resolved.</param> |
| 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 | /// <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> |
| 74 | public string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage) | 75 | public string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, IEnumerable<string> alreadyCheckedPaths = null) |
| 75 | { | 76 | { |
| 76 | var checkedPaths = new List<string>(); | 77 | var checkedPaths = new List<string>(); |
| 77 | 78 | ||
| 79 | if (alreadyCheckedPaths != null) | ||
| 80 | { | ||
| 81 | checkedPaths.AddRange(alreadyCheckedPaths); | ||
| 82 | } | ||
| 83 | |||
| 78 | foreach (var extension in this.ResolverExtensions) | 84 | foreach (var extension in this.ResolverExtensions) |
| 79 | { | 85 | { |
| 80 | var resolved = extension.ResolveFile(source, tupleDefinition, sourceLineNumbers, bindStage); | 86 | var resolved = extension.ResolveFile(source, tupleDefinition, sourceLineNumbers, bindStage); |
