Implement Bundle build

3 files changed, 12 insertions, 6 deletions

diff --git a/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs b/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
index c6e21973..644e5c63 100644
--- a/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
+++ b/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
@@ -30,10 +30,10 @@ namespace WixToolset.Core.Bind
         {
             // If the uri to the file that contains the embedded file does not already have embedded files
             // being extracted, create the dictionary to track that.
-            if (!filesWithEmbeddedFiles.TryGetValue(uri, out var extracts))
+            if (!this.filesWithEmbeddedFiles.TryGetValue(uri, out var extracts))
             {
                 extracts = new SortedList<int, string>();
-                filesWithEmbeddedFiles.Add(uri, extracts);
+                this.filesWithEmbeddedFiles.Add(uri, extracts);
             }
 
             // If the embedded file is not already tracked in the dictionary of extracts, add it.
@@ -52,7 +52,7 @@ namespace WixToolset.Core.Bind
 
         public IEnumerable<ExpectedExtractFile> GetExpectedEmbeddedFiles()
         {
-            foreach (var uriWithExtracts in filesWithEmbeddedFiles)
+            foreach (var uriWithExtracts in this.filesWithEmbeddedFiles)
             {
                 foreach (var extracts in uriWithExtracts.Value)
                 {
@@ -68,7 +68,7 @@ namespace WixToolset.Core.Bind
 
         public IEnumerable<ExpectedExtractFile> GetExtractFilesForUri(Uri uri)
         {
-            if (!filesWithEmbeddedFiles.TryGetValue(uri, out var extracts))
+            if (!this.filesWithEmbeddedFiles.TryGetValue(uri, out var extracts))
             {
                 extracts = new SortedList<int, string>();
             }
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
         /// <param name="type">Optional type of source file being resolved.</param>
         /// <param name="sourceLineNumbers">Optional source line of source file being resolved.</param>
         /// <param name="bindStage">The binding stage used to determine what collection of bind paths will be used</param>
+        /// <param name="alreadyCheckedPaths">Optional collection of paths already checked.</param>
         /// <returns>Should return a valid path for the stream to be imported.</returns>
-        public string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
+        public string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, IEnumerable<string> alreadyCheckedPaths = null)
         {
             var checkedPaths = new List<string>();
 
+            if (alreadyCheckedPaths != null)
+            {
+                checkedPaths.AddRange(alreadyCheckedPaths);
+            }
+
             foreach (var extension in this.ResolverExtensions)
             {
                 var resolved = extension.ResolveFile(source, tupleDefinition, sourceLineNumbers, bindStage);
diff --git a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
index bec03907..22710aca 100644
--- a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
@@ -113,7 +113,7 @@ namespace WixToolset.Core.Bind
             }
         }
 
-        public static string ResolveDelayedVariables(SourceLineNumber sourceLineNumbers, string value, IDictionary<string, string> resolutionData)
+        private static string ResolveDelayedVariables(SourceLineNumber sourceLineNumbers, string value, IDictionary<string, string> resolutionData)
         {
             var matches = Common.WixVariableRegex.Matches(value);