17 files changed, 40 insertions, 52 deletions

diff --git a/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs b/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
index 28fc4817..c6e21973 100644
--- a/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
+++ b/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
@@ -28,19 +28,16 @@ namespace WixToolset.Core.Bind
         /// <returns>The extract path for the embedded file.</returns>
         public string AddEmbeddedFileIndex(Uri uri, int embeddedFileIndex, string tempPath)
         {
-            string extractPath;
-            SortedList<int, string> extracts;
-
             // 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 extracts))
+            if (!filesWithEmbeddedFiles.TryGetValue(uri, out var extracts))
             {
                 extracts = new SortedList<int, string>();
                 filesWithEmbeddedFiles.Add(uri, extracts);
             }
 
             // If the embedded file is not already tracked in the dictionary of extracts, add it.
-            if (!extracts.TryGetValue(embeddedFileIndex, out extractPath))
+            if (!extracts.TryGetValue(embeddedFileIndex, out var extractPath))
             {
                 string localFileNameWithoutExtension = Path.GetFileNameWithoutExtension(uri.LocalPath);
                 string unique = this.HashUri(uri.AbsoluteUri);
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 79bacd22..7a63b869 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -168,8 +168,10 @@ namespace WixToolset.Core
             var context = this.ServiceProvider.GetService<ILinkContext>();
             context.Messaging = Messaging.Instance;
             context.Extensions = this.ExtensionManager.Create<ILinkerExtension>();
-            context.Intermediates = intermediates.Union(libraries).ToList();
+            context.ExtensionData = this.ExtensionManager.Create<IExtensionData>();
             context.ExpectedOutputType = this.OutputType;
+            context.Intermediates = intermediates.Union(libraries).ToList();
+            context.TupleDefinitionCreator = creator;
 
             var linker = new Linker();
             var output = linker.Link(context);
diff --git a/src/WixToolset.Core/LinkContext.cs b/src/WixToolset.Core/LinkContext.cs
index c3631f72..1384cf98 100644
--- a/src/WixToolset.Core/LinkContext.cs
+++ b/src/WixToolset.Core/LinkContext.cs
@@ -21,8 +21,12 @@ namespace WixToolset.Core
 
         public IEnumerable<ILinkerExtension> Extensions { get; set; }
 
+        public IEnumerable<IExtensionData> ExtensionData { get; set; }
+
         public OutputType ExpectedOutputType { get; set; }
 
         public IEnumerable<Intermediate> Intermediates { get; set; }
+
+        public ITupleDefinitionCreator TupleDefinitionCreator { get; set; }
     }
 }
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index 7faf69ba..c893a01d 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -56,32 +56,6 @@ namespace WixToolset.Core
         //internal IBindVariableResolver WixVariableResolver { get; set; }
 
         /// <summary>
-        /// Adds an extension.
-        /// </summary>
-        /// <param name="extension">The extension to add.</param>
-        //public void AddExtensionData(IExtensionData extension)
-        //{
-        //    if (null != extension.TableDefinitions)
-        //    {
-        //        foreach (TableDefinition tableDefinition in extension.TableDefinitions)
-        //        {
-        //            if (!this.tableDefinitions.Contains(tableDefinition.Name))
-        //            {
-        //                this.tableDefinitions.Add(tableDefinition);
-        //            }
-        //            else
-        //            {
-        //                throw new WixException(WixErrors.DuplicateExtensionTable(extension.GetType().ToString(), tableDefinition.Name));
-        //            }
-        //        }
-        //    }
-
-        //    // keep track of extension data so the libraries can be loaded from these later once all the table definitions
-        //    // are loaded; this will allow extensions to have cross table definition dependencies
-        //    this.extensionData.Add(extension);
-        //}
-
-        /// <summary>
         /// Links a collection of sections into an output.
         /// </summary>
         /// <param name="inputs">The collection of sections to link together.</param>
@@ -91,10 +65,19 @@ namespace WixToolset.Core
         {
             this.Context = context ?? throw new ArgumentNullException(nameof(context));
 
-            //IEnumerable<Section> inputs, OutputType expectedOutputType
-
             var sections = this.Context.Intermediates.SelectMany(i => i.Sections).ToList();
 
+            // Add sections from the extensions with data.
+            foreach (var data in context.ExtensionData)
+            {
+                var library = data.GetLibrary(context.TupleDefinitionCreator);
+
+                if (library != null)
+                {
+                    sections.AddRange(library.Sections);
+                }
+            }
+
 #if MOVE_TO_BACKEND
                 bool containsModuleSubstitution = false;
                 bool containsModuleConfiguration = false;
@@ -144,19 +127,6 @@ namespace WixToolset.Core
                 }
 #endif
 
-#if TODO
-                // Add sections from the extensions with data.
-                foreach (IExtensionData data in this.extensionData)
-                {
-                    Library library = data.GetLibrary(this.tableDefinitions);
-
-                    if (null != library)
-                    {
-                        sections.AddRange(library.Sections);
-                    }
-                }
-#endif
-
             // First find the entry section and while processing all sections load all the symbols from all of the sections.
             // sections.FindEntrySectionAndLoadSymbols(false, this, expectedOutputType, out entrySection, out allSymbols);
             var find = new FindEntrySectionAndLoadSymbolsCommand(sections);
diff --git a/src/test/TestData/Example.Extension/Data/example.txt b/src/test/TestData/Example.Extension/Data/example.txt
new file mode 100644
index 00000000..1b4ffe8a
--- /dev/null
+++ b/src/test/TestData/Example.Extension/Data/example.txt
@@ -0,0 +1 @@
+This is example.txt.
\ No newline at end of file
diff --git a/src/test/TestData/Example.Extension/Data/example.wir b/src/test/TestData/Example.Extension/Data/example.wir
new file mode 100644
index 00000000..674f63fc
--- /dev/null
+++ b/src/test/TestData/Example.Extension/Data/example.wir
diff --git a/src/test/TestData/Example.Extension/Data/example.wxs b/src/test/TestData/Example.Extension/Data/example.wxs
new file mode 100644
index 00000000..53531e99
--- /dev/null
+++ b/src/test/TestData/Example.Extension/Data/example.wxs
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <Property Id="PropertyFromExampleWir" Value="FromWir" />
+
+    <Binary Id="BinFromWir" SourceFile="example.txt" />
+  </Fragment>
+</Wix>
diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/TestData/Example.Extension/Example.Extension.csproj
index 80c64b25..d04ce553 100644
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ b/src/test/TestData/Example.Extension/Example.Extension.csproj
@@ -8,6 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Data\Example.wir" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
     <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
 
diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/TestData/Example.Extension/ExampleCompilerExtension.cs
index 5b20e48f..5b20e48f 100644
--- a/src/test/Example.Extension/ExampleCompilerExtension.cs
+++ b/src/test/TestData/Example.Extension/ExampleCompilerExtension.cs
diff --git a/src/test/Example.Extension/ExampleExtensionData.cs b/src/test/TestData/Example.Extension/ExampleExtensionData.cs
index c3cb0473..6b179ea6 100644
--- a/src/test/Example.Extension/ExampleExtensionData.cs
+++ b/src/test/TestData/Example.Extension/ExampleExtensionData.cs
@@ -11,7 +11,7 @@ namespace Example.Extension
 
         public Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
         {
-            return null;
+            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Data.Example.wir", tupleDefinitions);
         }
 
         public bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
diff --git a/src/test/Example.Extension/ExampleExtensionFactory.cs b/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
index b91d06e9..b91d06e9 100644
--- a/src/test/Example.Extension/ExampleExtensionFactory.cs
+++ b/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
diff --git a/src/test/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs b/src/test/TestData/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
index 53394ea3..53394ea3 100644
--- a/src/test/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
+++ b/src/test/TestData/Example.Extension/ExamplePreprocessorExtensionAndCommandLine.cs
diff --git a/src/test/Example.Extension/ExampleTuple.cs b/src/test/TestData/Example.Extension/ExampleTuple.cs
index f280a5c8..f280a5c8 100644
--- a/src/test/Example.Extension/ExampleTuple.cs
+++ b/src/test/TestData/Example.Extension/ExampleTuple.cs
diff --git a/src/test/Example.Extension/TupleDefinitions.cs b/src/test/TestData/Example.Extension/TupleDefinitions.cs
index 2c320fbc..2c320fbc 100644
--- a/src/test/Example.Extension/TupleDefinitions.cs
+++ b/src/test/TestData/Example.Extension/TupleDefinitions.cs
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
index 6acf3472..bd4b70da 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -44,13 +44,13 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\example.txt")));
 
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wir"));
-                Assert.Single(intermediate.Sections);
+                var section = intermediate.Sections.Single();
 
-                var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single();
+                var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
                 Assert.Equal(Path.Combine(folder, @"data\example.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
                 Assert.Equal(@"example.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
 
-                var example = intermediate.Sections.SelectMany(s => s.Tuples).Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single();
+                var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single();
                 Assert.Equal("Foo", example.Id.Id);
                 Assert.Equal("Foo", example[0].AsString());
                 Assert.Equal("Bar", example[1].AsString());
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
index 9fd42214..bff5f609 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
@@ -8,6 +8,8 @@
 
     <Property Id="ExampleProperty" Value="$(ex.Test)" />
 
+    <PropertyRef Id="PropertyFromExampleWir" />
+
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
     </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index ed0d5f5e..af520116 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\wix\wix.csproj" />
-    <ProjectReference Include="..\Example.Extension\Example.Extension.csproj" />
+    <ProjectReference Include="..\TestData\Example.Extension\Example.Extension.csproj" />
   </ItemGroup>
 
   <ItemGroup>