1 files changed, 38 insertions, 32 deletions

diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs
index 092d81dc..50357d8a 100644
--- a/src/WixToolset.Core/Librarian.cs
+++ b/src/WixToolset.Core/Librarian.cs
@@ -6,40 +6,50 @@ namespace WixToolset.Core
     using System.Collections.Generic;
     using System.Linq;
     using WixToolset.Core.Bind;
+    using WixToolset.Core.Link;
     using WixToolset.Data;
-    using WixToolset.Link;
+    using WixToolset.Extensibility;
 
     /// <summary>
     /// Core librarian tool.
     /// </summary>
     public sealed class Librarian
     {
-        public Librarian(LibraryContext context)
-        {
-            this.Context = context;
-        }
-
-        private LibraryContext Context { get; }
+        private ILibraryContext Context { get; set; }
 
         /// <summary>
         /// Create a library by combining several intermediates (objects).
         /// </summary>
         /// <param name="sections">The sections to combine into a library.</param>
         /// <returns>Returns the new library.</returns>
-        public Library Combine()
+        public Intermediate Combine(ILibraryContext context)
         {
+            this.Context = context ?? throw new ArgumentNullException(nameof(context));
+
+            if (String.IsNullOrEmpty(this.Context.LibraryId))
+            {
+                this.Context.LibraryId = Convert.ToBase64String(Guid.NewGuid().ToByteArray()).TrimEnd('=').Replace('+', '.').Replace('/', '_');
+            }
+
             foreach (var extension in this.Context.Extensions)
             {
                 extension.PreCombine(this.Context);
             }
 
+            var sections = this.Context.Intermediates.SelectMany(i => i.Sections).ToList();
+
             var fileResolver = new FileResolver(this.Context.BindPaths, this.Context.Extensions);
 
+            var embedFilePaths = ResolveFilePathsToEmbed(sections, fileResolver);
+
             var localizationsByCulture = CollateLocalizations(this.Context.Localizations);
 
-            var embedFilePaths = ResolveFilePathsToEmbed(this.Context.Sections, fileResolver);
+            foreach (var section in sections)
+            {
+                section.LibraryId = this.Context.LibraryId;
+            }
 
-            var library = new Library(this.Context.Sections, localizationsByCulture, embedFilePaths);
+            var library = new Intermediate(this.Context.LibraryId, sections, localizationsByCulture, embedFilePaths);
 
             this.Validate(library);
 
@@ -55,7 +65,7 @@ namespace WixToolset.Core
         /// Validate that a library contains one entry section and no duplicate symbols.
         /// </summary>
         /// <param name="library">Library to validate.</param>
-        private Library Validate(Library library)
+        private Intermediate Validate(Intermediate library)
         {
             FindEntrySectionAndLoadSymbolsCommand find = new FindEntrySectionAndLoadSymbolsCommand(library.Sections);
             find.Execute();
@@ -92,39 +102,35 @@ namespace WixToolset.Core
             return localizationsByCulture;
         }
 
-        private List<string> ResolveFilePathsToEmbed(IEnumerable<Section> sections, FileResolver fileResolver)
+        private List<string> ResolveFilePathsToEmbed(IEnumerable<IntermediateSection> sections, FileResolver fileResolver)
         {
             var embedFilePaths = new List<string>();
 
             // Resolve paths to files that are to be embedded in the library.
             if (this.Context.BindFiles)
             {
-                foreach (Table table in sections.SelectMany(s => s.Tables))
+                foreach (var tuple in sections.SelectMany(s => s.Tuples))
                 {
-                    foreach (Row row in table.Rows)
+                    foreach (var field in tuple.Fields.Where(f => f.Type == IntermediateFieldType.Path))
                     {
-                        foreach (ObjectField objectField in row.Fields.OfType<ObjectField>())
+                        var pathField = field.AsPath();
+
+                        if (pathField != null)
                         {
-                            if (null != objectField.Data)
+                            var resolvedPath = this.Context.WixVariableResolver.ResolveVariables(tuple.SourceLineNumbers, pathField.Path, false);
+
+                            var file = fileResolver.Resolve(tuple.SourceLineNumbers, tuple.Definition.Name, resolvedPath);
+
+                            if (!String.IsNullOrEmpty(file))
                             {
-                                string resolvedPath = this.Context.WixVariableResolver.ResolveVariables(row.SourceLineNumbers, (string)objectField.Data, false);
-
-                                string file = fileResolver.Resolve(row.SourceLineNumbers, table.Name, resolvedPath);
-
-                                if (!String.IsNullOrEmpty(file))
-                                {
-                                    // File was successfully resolved so track the embedded index as the embedded file index.
-                                    objectField.EmbeddedFileIndex = embedFilePaths.Count;
-                                    embedFilePaths.Add(file);
-                                }
-                                else
-                                {
-                                    Messaging.Instance.OnMessage(WixDataErrors.FileNotFound(row.SourceLineNumbers, (string)objectField.Data, table.Name));
-                                }
+                                // File was successfully resolved so track the embedded index as the embedded file index.
+                                field.Set(new IntermediateFieldPathValue { EmbeddedFileIndex = embedFilePaths.Count });
+
+                                embedFilePaths.Add(file);
                             }
-                            else // clear out embedded file id in case there was one there before.
+                            else
                             {
-                                objectField.EmbeddedFileIndex = null;
+                                this.Context.Messaging.OnMessage(WixDataErrors.FileNotFound(tuple.SourceLineNumbers, pathField.Path, tuple.Definition.Name));
                             }
                         }
                     }