Bring back binder extensions and missing layout base extension

6 files changed, 92 insertions, 14 deletions

diff --git a/src/WixToolset.Extensibility/BaseBinderExtension.cs b/src/WixToolset.Extensibility/BaseBinderExtension.cs
new file mode 100644
index 00000000..e5e38793
--- /dev/null
+++ b/src/WixToolset.Extensibility/BaseBinderExtension.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility
+{
+    using WixToolset.Data.Bind;
+
+    /// <summary>
+    /// Base class for creating a resolver extension.
+    /// </summary>
+    public abstract class BaseBinderExtension : IBinderExtension
+    {
+        /// <summary>
+        /// Context for use by the extension.
+        /// </summary>
+        protected IBindContext Context { get; private set; }
+
+        /// <summary>
+        /// Called at the beginning of bind.
+        /// </summary>
+        public virtual void PreBind(IBindContext context)
+        {
+            this.Context = context;
+        }
+
+        /// <summary>
+        /// Called at the end of bind.
+        /// </summary>
+        public virtual void PostBind(BindResult result)
+        {
+        }
+    }
+}
diff --git a/src/WixToolset.Extensibility/BaseLayoutExtension.cs b/src/WixToolset.Extensibility/BaseLayoutExtension.cs
new file mode 100644
index 00000000..6dfe7f2c
--- /dev/null
+++ b/src/WixToolset.Extensibility/BaseLayoutExtension.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility
+{
+    /// <summary>
+    /// Base class for creating a resolver extension.
+    /// </summary>
+    public abstract class BaseLayoutExtension : ILayoutExtension
+    {
+        /// <summary>
+        /// Context for use by the extension.
+        /// </summary>
+        protected ILayoutContext Context { get; private set; }
+
+        /// <summary>
+        /// Called at the beginning of layout.
+        /// </summary>
+        public virtual void PreLayout(ILayoutContext context)
+        {
+            this.Context = context;
+        }
+
+        /// <summary>
+        /// Called at the end of ayout.
+        /// </summary>
+        public virtual void PostLayout()
+        {
+        }
+    }
+}
diff --git a/src/WixToolset.Extensibility/IBindContext.cs b/src/WixToolset.Extensibility/IBindContext.cs
index 1cb1c558..59509ecf 100644
--- a/src/WixToolset.Extensibility/IBindContext.cs
+++ b/src/WixToolset.Extensibility/IBindContext.cs
@@ -19,12 +19,14 @@ namespace WixToolset.Extensibility
 
         int Codepage { get; set; }
 
-        CompressionLevel DefaultCompressionLevel { get; set; }
+        CompressionLevel? DefaultCompressionLevel { get; set; }
 
         IEnumerable<IDelayedField> DelayedFields { get; set; }
 
         IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; }
 
+        IEnumerable<IBinderExtension> Extensions { get; set; }
+
         IEnumerable<IFileSystemExtension> FileSystemExtensions { get; set; }
 
         IEnumerable<string> Ices { get; set; }
@@ -40,13 +42,5 @@ namespace WixToolset.Extensibility
         IEnumerable<string> SuppressIces { get; set; }
 
         bool SuppressValidation { get; set; }
-
-        string ContentsFile { get; set; }
-
-        string OutputsFile { get; set; }
-
-        string BuiltOutputsFile { get; set; }
-
-        string WixprojectFile { get; set; }
     }
 }
diff --git a/src/WixToolset.Extensibility/IBindExtension.cs b/src/WixToolset.Extensibility/IBindExtension.cs
new file mode 100644
index 00000000..c9830a35
--- /dev/null
+++ b/src/WixToolset.Extensibility/IBindExtension.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility
+{
+    using WixToolset.Data.Bind;
+
+    /// <summary>
+    /// Interface all binder extensions implement.
+    /// </summary>
+    public interface IBinderExtension
+    {
+        /// <summary>
+        /// Called before binding occurs.
+        /// </summary>
+        void PreBind(IBindContext context);
+
+        /// <summary>
+        /// Called after all binding occurs.
+        /// </summary>
+        void PostBind(BindResult result);
+    }
+}
diff --git a/src/WixToolset.Extensibility/ILayoutExtension.cs b/src/WixToolset.Extensibility/ILayoutExtension.cs
index b1de5bd2..525c5053 100644
--- a/src/WixToolset.Extensibility/ILayoutExtension.cs
+++ b/src/WixToolset.Extensibility/ILayoutExtension.cs
@@ -3,17 +3,17 @@
 namespace WixToolset.Extensibility
 {
     /// <summary>
-    /// Interface all resolver extensions implement.
+    /// Interface all layout extensions implement.
     /// </summary>
     public interface ILayoutExtension
     {
         /// <summary>
-        /// Called before resolving occurs.
+        /// Called before layout occurs.
         /// </summary>
         void PreLayout(ILayoutContext context);
 
         /// <summary>
-        /// Called after all resolving occurs.
+        /// Called after all layout occurs.
         /// </summary>
         void PostLayout();
     }
diff --git a/src/WixToolset.Extensibility/ResolveResult.cs b/src/WixToolset.Extensibility/ResolveResult.cs
index 14073ab0..53f12fe9 100644
--- a/src/WixToolset.Extensibility/ResolveResult.cs
+++ b/src/WixToolset.Extensibility/ResolveResult.cs
@@ -9,10 +9,10 @@ namespace WixToolset.Extensibility
     {
         public int Codepage { get; set; }
 
-        public IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; }
-
         public IEnumerable<IDelayedField> DelayedFields { get; set; }
 
+        public IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; }
+
         public Intermediate IntermediateRepresentation { get; set; }
     }
 }
\ No newline at end of file