Expose only abstracts and enums from WixToolset.Extensibility

35 files changed, 150 insertions, 207 deletions

diff --git a/src/WixToolset.Extensibility/BaseBinderExtension.cs b/src/WixToolset.Extensibility/BaseBinderExtension.cs
index d533b0cb..3869d1ed 100644
--- a/src/WixToolset.Extensibility/BaseBinderExtension.cs
+++ b/src/WixToolset.Extensibility/BaseBinderExtension.cs
@@ -40,7 +40,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called at the end of bind.
         /// </summary>
-        public virtual void PostBind(BindResult result)
+        public virtual void PostBind(IBindResult result)
         {
         }
     }
diff --git a/src/WixToolset.Extensibility/BaseCompilerExtension.cs b/src/WixToolset.Extensibility/BaseCompilerExtension.cs
index e1584bc3..51fbcd0b 100644
--- a/src/WixToolset.Extensibility/BaseCompilerExtension.cs
+++ b/src/WixToolset.Extensibility/BaseCompilerExtension.cs
@@ -35,6 +35,11 @@ namespace WixToolset.Extensibility
         public abstract XNamespace Namespace { get; }
 
         /// <summary>
+        /// Creates a component key path.
+        /// </summary>
+        protected IComponentKeyPath CreateComponentKeyPath() => this.Context.ServiceProvider.GetService<IComponentKeyPath>();
+
+        /// <summary>
         /// Called at the beginning of the compilation of a source file.
         /// </summary>
         public virtual void PreCompile(ICompileContext context)
@@ -75,7 +80,7 @@ namespace WixToolset.Extensibility
         /// <param name="element">Element to process.</param>
         /// <param name="keyPath">Explicit key path.</param>
         /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
-        public virtual ComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
+        public virtual IComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
         {
             this.ParseElement(intermediate, section, parentElement, element, context);
             return null;
diff --git a/src/WixToolset.Extensibility/BaseResolverExtension.cs b/src/WixToolset.Extensibility/BaseResolverExtension.cs
index fcd2eed9..bf606d58 100644
--- a/src/WixToolset.Extensibility/BaseResolverExtension.cs
+++ b/src/WixToolset.Extensibility/BaseResolverExtension.cs
@@ -22,6 +22,11 @@ namespace WixToolset.Extensibility
         protected IMessaging Messaging { get; private set; }
 
         /// <summary>
+        /// Creates a resolve file result.
+        /// </summary>
+        protected IResolveFileResult CreateResolveFileResult() => this.Context.ServiceProvider.GetService<IResolveFileResult>();
+
+        /// <summary>
         /// Called at the beginning of the resolving variables and files.
         /// </summary>
         public virtual void PreResolve(IResolveContext context)
@@ -31,7 +36,7 @@ namespace WixToolset.Extensibility
             this.Messaging = context.ServiceProvider.GetService<IMessaging>();
         }
 
-        public virtual ResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
+        public virtual IResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
         {
             return null;
         }
@@ -39,7 +44,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called at the end of resolve.
         /// </summary>
-        public virtual void PostResolve(ResolveResult result)
+        public virtual void PostResolve(IResolveResult result)
         {
         }
     }
diff --git a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
index c5ee9d1b..f02875cd 100644
--- a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
+++ b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
@@ -34,6 +34,11 @@ namespace WixToolset.Extensibility
         /// </summary>
         protected virtual TableDefinition[] TableDefinitionsForTuples { get; }
 
+        /// <summary>
+        /// Creates a resolved cabinet result.
+        /// </summary>
+        protected IResolvedCabinet CreateResolvedCabinet() => this.Context.ServiceProvider.GetService<IResolvedCabinet>();
+
         public virtual void PreBackendBind(IBindContext context)
         {
             this.Context = context;
@@ -43,7 +48,7 @@ namespace WixToolset.Extensibility
             this.BackendHelper = context.ServiceProvider.GetService<IWindowsInstallerBackendHelper>();
         }
 
-        public virtual ResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<BindFileWithPath> files)
+        public virtual IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files)
         {
             return null;
         }
@@ -63,7 +68,7 @@ namespace WixToolset.Extensibility
             return false;
         }
 
-        public virtual void PostBackendBind(BindResult result, Pdb pdb)
+        public virtual void PostBackendBind(IBindResult result, Pdb pdb)
         {
         }
     }
diff --git a/src/WixToolset.Extensibility/CompilerConstants.cs b/src/WixToolset.Extensibility/CompilerConstants.cs
index 9f666b43..f26456fb 100644
--- a/src/WixToolset.Extensibility/CompilerConstants.cs
+++ b/src/WixToolset.Extensibility/CompilerConstants.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Extensibility
     /// <summary>
     /// Constants used by compiler.
     /// </summary>
-    public class CompilerConstants
+    public static class CompilerConstants
     {
         public const int IntegerNotSet = int.MinValue;
         public const int IllegalInteger = int.MinValue + 1;
diff --git a/src/WixToolset.Extensibility/Data/BindPath.cs b/src/WixToolset.Extensibility/Data/BindPath.cs
deleted file mode 100644
index 3b0b73bb..00000000
--- a/src/WixToolset.Extensibility/Data/BindPath.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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.Data
-{
-    using System;
-
-    /// <summary>
-    /// Bind path representation.
-    /// </summary>
-    public class BindPath
-    {
-        /// <summary>
-        /// Creates an unnamed bind path.
-        /// </summary>
-        /// <param name="path">Path for the bind path.</param>
-        public BindPath(string path) : this(String.Empty, path, BindStage.Normal)
-        {
-        }
-
-        /// <summary>
-        /// Creates a named bind path.
-        /// </summary>
-        /// <param name="name">Name of the bind path.</param>
-        /// <param name="path">Path for the bind path.</param>
-        /// <param name="stage">Stage for the bind path.</param>
-        public BindPath(string name, string path, BindStage stage = BindStage.Normal)
-        {
-            this.Name = name;
-            this.Path = path;
-            this.Stage = stage;
-        }
-
-        /// <summary>
-        /// Name of the bind path or String.Empty if the path is unnamed.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Path for the bind path.
-        /// </summary>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Stage for the bind path.
-        /// </summary>
-        public BindStage Stage { get; set; }
-
-        /// <summary>
-        /// Parses a normal bind path from its string representation
-        /// </summary>
-        /// <param name="bindPath">String representation of bind path that looks like: [name=]path</param>
-        /// <returns>Parsed normal bind path.</returns>
-        public static BindPath Parse(string bindPath)
-        {
-            string[] namedPath = bindPath.Split(new char[] { '=' }, 2);
-            return (1 == namedPath.Length) ? new BindPath(namedPath[0]) : new BindPath(namedPath[0], namedPath[1]);
-        }
-    }
-}
diff --git a/src/WixToolset.Extensibility/Data/BindResult.cs b/src/WixToolset.Extensibility/Data/BindResult.cs
deleted file mode 100644
index e467d269..00000000
--- a/src/WixToolset.Extensibility/Data/BindResult.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.Data
-{
-    using System.Collections.Generic;
-
-    public class BindResult
-    {
-        public IEnumerable<IFileTransfer> FileTransfers { get; set; }
-
-        public IEnumerable<ITrackedFile> TrackedFiles { get; set; }
-    }
-}
diff --git a/src/WixToolset.Extensibility/Data/ComponentKeyPath.cs b/src/WixToolset.Extensibility/Data/ComponentKeyPathType.cs
index 112f562c..58bbb0cf 100644
--- a/src/WixToolset.Extensibility/Data/ComponentKeyPath.cs
+++ b/src/WixToolset.Extensibility/Data/ComponentKeyPathType.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Data
 {
@@ -34,22 +34,4 @@ namespace WixToolset.Extensibility.Data
         /// </summary>
         RegistryFormatted
     }
-
-    public class ComponentKeyPath
-    {
-        /// <summary>
-        /// Identifier of the resource to be a key path.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Indicates whether the key path was explicitly set for this resource.
-        /// </summary>
-        public bool Explicit { get; set; }
-
-        /// <summary>
-        /// Type of resource to be the key path.
-        /// </summary>
-        public ComponentKeyPathType Type { get; set; }
-    }
 }
diff --git a/src/WixToolset.Extensibility/Data/IBindFileWithPath.cs b/src/WixToolset.Extensibility/Data/IBindFileWithPath.cs
new file mode 100644
index 00000000..ec78a1a0
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IBindFileWithPath.cs
@@ -0,0 +1,11 @@
+// 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.Data
+{
+    public interface IBindFileWithPath
+    {
+        string Id { get; set; }
+
+        string Path { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/BindFileWithPath.cs b/src/WixToolset.Extensibility/Data/IBindPath.cs
index d65ae1ba..5784a0e0 100644
--- a/src/WixToolset.Extensibility/Data/BindFileWithPath.cs
+++ b/src/WixToolset.Extensibility/Data/IBindPath.cs
@@ -2,19 +2,21 @@
 
 namespace WixToolset.Extensibility.Data
 {
-    /// <summary>
-    /// Bind file with its path.
-    /// </summary>
-    public class BindFileWithPath
+    public interface IBindPath
     {
         /// <summary>
-        /// Gets or sets the identifier of the file with this path.
+        /// Name of the bind path or String.Empty if the path is unnamed.
         /// </summary>
-        public string Id { get; set; }
+        string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the file path.
+        /// Path for the bind path.
         /// </summary>
-        public string Path { get; set; }
+        string Path { get; set; }
+
+        /// <summary>
+        /// Stage for the bind path.
+        /// </summary>
+        BindStage Stage { get; set; }
     }
 }
diff --git a/src/WixToolset.Extensibility/Data/IBindResult.cs b/src/WixToolset.Extensibility/Data/IBindResult.cs
new file mode 100644
index 00000000..d35e7628
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IBindResult.cs
@@ -0,0 +1,13 @@
+// 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.Data
+{
+    using System.Collections.Generic;
+
+    public interface IBindResult
+    {
+        IEnumerable<IFileTransfer> FileTransfers { get; set; }
+
+        IEnumerable<ITrackedFile> TrackedFiles { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/IComponentKeyPath.cs b/src/WixToolset.Extensibility/Data/IComponentKeyPath.cs
new file mode 100644
index 00000000..ba660b45
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IComponentKeyPath.cs
@@ -0,0 +1,13 @@
+// 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.Data
+{
+    public interface IComponentKeyPath
+    {
+        bool Explicit { get; set; }
+
+        string Id { get; set; }
+
+        ComponentKeyPathType Type { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/DecompileResult.cs b/src/WixToolset.Extensibility/Data/IDecompileResult.cs
index 27706b2c..ea993cb2 100644
--- a/src/WixToolset.Extensibility/Data/DecompileResult.cs
+++ b/src/WixToolset.Extensibility/Data/IDecompileResult.cs
@@ -5,10 +5,10 @@ namespace WixToolset.Extensibility.Data
     using System.Collections.Generic;
     using System.Xml.Linq;
 
-    public class DecompileResult
+    public interface IDecompileResult
     {
-        public XDocument Document { get; set; }
+        XDocument Document { get; set; }
 
-        public IEnumerable<string> ExtractedFilePaths { get; set; }
+        IEnumerable<string> ExtractedFilePaths { get; set; }
     }
 }
diff --git a/src/WixToolset.Extensibility/Data/ILibraryContext.cs b/src/WixToolset.Extensibility/Data/ILibraryContext.cs
index 08b4ed26..9b65ebfd 100644
--- a/src/WixToolset.Extensibility/Data/ILibraryContext.cs
+++ b/src/WixToolset.Extensibility/Data/ILibraryContext.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Data
 {
@@ -12,7 +12,7 @@ namespace WixToolset.Extensibility.Data
 
         bool BindFiles { get; set; }
 
-        IEnumerable<BindPath> BindPaths { get; set; }
+        IEnumerable<IBindPath> BindPaths { get; set; }
 
         IEnumerable<ILibrarianExtension> Extensions { get; set; }
 
diff --git a/src/WixToolset.Extensibility/Data/IResolveContext.cs b/src/WixToolset.Extensibility/Data/IResolveContext.cs
index 0e12a534..68a50268 100644
--- a/src/WixToolset.Extensibility/Data/IResolveContext.cs
+++ b/src/WixToolset.Extensibility/Data/IResolveContext.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Data
 {
@@ -11,7 +11,7 @@ namespace WixToolset.Extensibility.Data
     {
         IServiceProvider ServiceProvider { get; }
 
-        IEnumerable<BindPath> BindPaths { get; set; }
+        IEnumerable<IBindPath> BindPaths { get; set; }
 
         IEnumerable<IResolverExtension> Extensions { get; set; }
 
diff --git a/src/WixToolset.Extensibility/Data/IResolveFileResult.cs b/src/WixToolset.Extensibility/Data/IResolveFileResult.cs
new file mode 100644
index 00000000..bf0af72e
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IResolveFileResult.cs
@@ -0,0 +1,13 @@
+// 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.Data
+{
+    using System.Collections.Generic;
+
+    public interface IResolveFileResult
+    {
+        IEnumerable<string> CheckedPaths { get; set; }
+
+        string Path { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/IResolveResult.cs b/src/WixToolset.Extensibility/Data/IResolveResult.cs
new file mode 100644
index 00000000..87b9c573
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IResolveResult.cs
@@ -0,0 +1,18 @@
+// 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.Data
+{
+    using System.Collections.Generic;
+    using WixToolset.Data;
+
+    public interface IResolveResult
+    {
+        int Codepage { get; set; }
+
+        IEnumerable<IDelayedField> DelayedFields { get; set; }
+
+        IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; }
+
+        Intermediate IntermediateRepresentation { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/IResolvedCabinet.cs b/src/WixToolset.Extensibility/Data/IResolvedCabinet.cs
new file mode 100644
index 00000000..c94ff8db
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IResolvedCabinet.cs
@@ -0,0 +1,11 @@
+// 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.Data
+{
+    public interface IResolvedCabinet
+    {
+        CabinetBuildOption BuildOption { get; set; }
+
+        string Path { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/ResolveFileResult.cs b/src/WixToolset.Extensibility/Data/ResolveFileResult.cs
deleted file mode 100644
index 5ac7c426..00000000
--- a/src/WixToolset.Extensibility/Data/ResolveFileResult.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.Data
-{
-    using System.Collections.Generic;
-
-    public class ResolveFileResult
-    {
-        public string Path { get; set; }
-
-        public IEnumerable<string> CheckedPaths { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/WixToolset.Extensibility/Data/ResolveResult.cs b/src/WixToolset.Extensibility/Data/ResolveResult.cs
deleted file mode 100644
index cdc9cfcc..00000000
--- a/src/WixToolset.Extensibility/Data/ResolveResult.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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.Data
-{
-    using System.Collections.Generic;
-    using WixToolset.Data;
-
-    public class ResolveResult
-    {
-        public int Codepage { 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
diff --git a/src/WixToolset.Extensibility/Data/ResolvedCabinet.cs b/src/WixToolset.Extensibility/Data/ResolvedCabinet.cs
deleted file mode 100644
index 047b7448..00000000
--- a/src/WixToolset.Extensibility/Data/ResolvedCabinet.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.Data
-{
-    /// <summary>
-    /// Data returned from build file manager ResolveCabinet callback.
-    /// </summary>
-    public class ResolvedCabinet
-    {
-        /// <summary>
-        /// Gets or sets the build option for the resolved cabinet.
-        /// </summary>
-        public CabinetBuildOption BuildOption { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path for the resolved cabinet.
-        /// </summary>
-        public string Path { get; set; }
-    }
-}
diff --git a/src/WixToolset.Extensibility/DecompilerConstants.cs b/src/WixToolset.Extensibility/DecompilerConstants.cs
index 8cd6b19c..83393da9 100644
--- a/src/WixToolset.Extensibility/DecompilerConstants.cs
+++ b/src/WixToolset.Extensibility/DecompilerConstants.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Extensibility
     /// <summary>
     /// Constants used by decompiler.
     /// </summary>
-    public class DecompilerConstants
+    public static class DecompilerConstants
     {
         public const char PrimaryKeyDelimiter = '/';
         public const string PrimaryKeyDelimiterString = "/";
diff --git a/src/WixToolset.Extensibility/IBackend.cs b/src/WixToolset.Extensibility/IBackend.cs
index df693561..12a7e834 100644
--- a/src/WixToolset.Extensibility/IBackend.cs
+++ b/src/WixToolset.Extensibility/IBackend.cs
@@ -7,9 +7,9 @@ namespace WixToolset.Extensibility
 
     public interface IBackend
     {
-        BindResult Bind(IBindContext context);
+        IBindResult Bind(IBindContext context);
 
-        DecompileResult Decompile(IDecompileContext context);
+        IDecompileResult Decompile(IDecompileContext context);
 
         Intermediate Unbind(IUnbindContext context);
 
diff --git a/src/WixToolset.Extensibility/IBinderExtension.cs b/src/WixToolset.Extensibility/IBinderExtension.cs
index 2656e106..dba09845 100644
--- a/src/WixToolset.Extensibility/IBinderExtension.cs
+++ b/src/WixToolset.Extensibility/IBinderExtension.cs
@@ -17,6 +17,6 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called after all binding occurs.
         /// </summary>
-        void PostBind(BindResult result);
+        void PostBind(IBindResult result);
     }
 }
diff --git a/src/WixToolset.Extensibility/IBurnBackendExtension.cs b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
index bcd0d5ee..acce700a 100644
--- a/src/WixToolset.Extensibility/IBurnBackendExtension.cs
+++ b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
@@ -20,6 +20,6 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called after all output changes occur and right before the output is bound into its final format.
         /// </summary>
-        void PostBackendBind(BindResult result);
+        void PostBackendBind(IBindResult result);
     }
 }
diff --git a/src/WixToolset.Extensibility/ICompilerExtension.cs b/src/WixToolset.Extensibility/ICompilerExtension.cs
index b2dd6d04..f2fd8193 100644
--- a/src/WixToolset.Extensibility/ICompilerExtension.cs
+++ b/src/WixToolset.Extensibility/ICompilerExtension.cs
@@ -45,7 +45,7 @@ namespace WixToolset.Extensibility
         /// <param name="parentElement">Parent element of element to process.</param>
         /// <param name="element">Element to process.</param>
         /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
-        ComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context);
+        IComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context);
 
         /// <summary>
         /// Called at the end of the compilation of a source file.
diff --git a/src/WixToolset.Extensibility/IDecompilerExtension.cs b/src/WixToolset.Extensibility/IDecompilerExtension.cs
index 9ea4290b..24ef3bff 100644
--- a/src/WixToolset.Extensibility/IDecompilerExtension.cs
+++ b/src/WixToolset.Extensibility/IDecompilerExtension.cs
@@ -17,6 +17,6 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called after all decompiling occurs.
         /// </summary>
-        void PostDecompile(DecompileResult result);
+        void PostDecompile(IDecompileResult result);
     }
 }
diff --git a/src/WixToolset.Extensibility/ILibrarianExtension.cs b/src/WixToolset.Extensibility/ILibrarianExtension.cs
index b9f707e1..719ffa34 100644
--- a/src/WixToolset.Extensibility/ILibrarianExtension.cs
+++ b/src/WixToolset.Extensibility/ILibrarianExtension.cs
@@ -9,7 +9,7 @@ namespace WixToolset.Extensibility
     {
         void PreCombine(ILibraryContext context);
 
-        ResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateTupleDefinition tupleDefinition, string path);
+        IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateTupleDefinition tupleDefinition, string path);
 
         void PostCombine(Intermediate library);
     }
diff --git a/src/WixToolset.Extensibility/IResolverExtension.cs b/src/WixToolset.Extensibility/IResolverExtension.cs
index 36ada8f0..c414b19e 100644
--- a/src/WixToolset.Extensibility/IResolverExtension.cs
+++ b/src/WixToolset.Extensibility/IResolverExtension.cs
@@ -15,11 +15,11 @@ namespace WixToolset.Extensibility
         /// </summary>
         void PreResolve(IResolveContext context);
 
-        ResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage);
+        IResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage);
 
         /// <summary>
         /// Called after all resolving occurs.
         /// </summary>
-        void PostResolve(ResolveResult result);
+        void PostResolve(IResolveResult result);
     }
 }
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
index 5f34d3e1..f3b97845 100644
--- a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
+++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
@@ -18,7 +18,7 @@ namespace WixToolset.Extensibility
         /// </summary>
         void PreBackendBind(IBindContext context);
 
-        ResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<BindFileWithPath> files);
+        IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files);
 
         string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory);
 
@@ -27,6 +27,6 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called after all output changes occur and right before the output is bound into its final format.
         /// </summary>
-        void PostBackendBind(BindResult result, Pdb wixpdb);
+        void PostBackendBind(IBindResult result, Pdb wixpdb);
     }
 }
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendDecompilerExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendDecompilerExtension.cs
index 05899c1f..f858610b 100644
--- a/src/WixToolset.Extensibility/IWindowsInstallerBackendDecompilerExtension.cs
+++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendDecompilerExtension.cs
@@ -38,6 +38,6 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called after all output changes occur and right before the output is bound into its final format.
         /// </summary>
-        void PostBackendDecompile(DecompileResult result);
+        void PostBackendDecompile(IDecompileResult result);
     }
 }
diff --git a/src/WixToolset.Extensibility/Services/IParseHelper.cs b/src/WixToolset.Extensibility/Services/IParseHelper.cs
index 49218d4f..36caf192 100644
--- a/src/WixToolset.Extensibility/Services/IParseHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IParseHelper.cs
@@ -326,7 +326,7 @@ namespace WixToolset.Extensibility.Services
         /// <param name="parentElement">Element containing element to be parsed.</param>
         /// <param name="element">Element to be parsed.</param>
         /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
-        ComponentKeyPath ParsePossibleKeyPathExtensionElement(IEnumerable<ICompilerExtension> extensions, Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context);
+        IComponentKeyPath ParsePossibleKeyPathExtensionElement(IEnumerable<ICompilerExtension> extensions, Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context);
 
         /// <summary>
         /// Process all children of the element looking for extensions and erroring on the unexpected.
diff --git a/src/WixToolset.Extensibility/Services/IVariableResolution.cs b/src/WixToolset.Extensibility/Services/IVariableResolution.cs
new file mode 100644
index 00000000..efed0b1f
--- /dev/null
+++ b/src/WixToolset.Extensibility/Services/IVariableResolution.cs
@@ -0,0 +1,15 @@
+// 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.Services
+{
+    public interface IVariableResolution
+    {
+        bool DelayedResolve { get; set; }
+
+        bool IsDefault { get; set; }
+
+        bool UpdatedValue { get; set; }
+
+        string Value { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Services/IVariableResolver.cs b/src/WixToolset.Extensibility/Services/IVariableResolver.cs
index ce11aa81..794d6478 100644
--- a/src/WixToolset.Extensibility/Services/IVariableResolver.cs
+++ b/src/WixToolset.Extensibility/Services/IVariableResolver.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Services
 {
@@ -33,7 +33,7 @@ namespace WixToolset.Extensibility.Services
         /// <param name="value">The value to resolve.</param>
         /// <param name="localizationOnly">true to only resolve localization variables; false otherwise.</param>
         /// <returns>The resolved result.</returns>
-        VariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly);
+        IVariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly);
 
         /// <summary>
         /// Try to find localization information for dialog and (optional) control.
diff --git a/src/WixToolset.Extensibility/Services/VariableResolution.cs b/src/WixToolset.Extensibility/Services/VariableResolution.cs
deleted file mode 100644
index 2974e84f..00000000
--- a/src/WixToolset.Extensibility/Services/VariableResolution.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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.Services
-{
-    public class VariableResolution
-    {
-        /// <summary>
-        /// Indicates whether the variable should be delay resolved.
-        /// </summary>
-        public bool DelayedResolve { get; set; }
-
-        /// <summary>
-        /// Indicates whether the value is the default value of the variable.
-        /// </summary>
-        public bool IsDefault { get; set; }
-
-        /// <summary>
-        /// Indicates whether the value changed.
-        /// </summary>
-        public bool UpdatedValue { get; set; }
-
-        /// <summary>
-        /// Resolved value.
-        /// </summary>
-        public string Value { get; set; }
-    }
-}
\ No newline at end of file