4 files changed, 110 insertions, 1 deletions

diff --git a/src/api/wix/WixToolset.Extensibility/BaseOptimizerExtension.cs b/src/api/wix/WixToolset.Extensibility/BaseOptimizerExtension.cs
new file mode 100644
index 00000000..5bb89272
--- /dev/null
+++ b/src/api/wix/WixToolset.Extensibility/BaseOptimizerExtension.cs
@@ -0,0 +1,26 @@
+// 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.Extensibility.Data;
+
+    /// <summary>
+    /// Base class for creating an optimizer extension.
+    /// </summary>
+    public abstract class BaseOptimizerExtension : IOptimizerExtension
+    {
+        /// <summary>
+        /// Called after all files have been compiled, before built-in optimizations, and before all sections are linked into a single section.
+        /// </summary>
+        public virtual void PreOptimize(IOptimizeContext context)
+        {
+        }
+
+        /// <summary>
+        /// Called after all files have been compiled, after built-in optimizations, and before all sections are linked into a single section.
+        /// </summary>
+        public virtual void PostOptimize(IOptimizeContext context)
+        {
+        }
+    }
+}
diff --git a/src/api/wix/WixToolset.Extensibility/Data/ICompileContext.cs b/src/api/wix/WixToolset.Extensibility/Data/ICompileContext.cs
index 7006fde8..cfccd0a9 100644
--- a/src/api/wix/WixToolset.Extensibility/Data/ICompileContext.cs
+++ b/src/api/wix/WixToolset.Extensibility/Data/ICompileContext.cs
@@ -55,7 +55,7 @@ namespace WixToolset.Extensibility.Data
         XDocument Source { get; set; }
 
         /// <summary>
-        /// Cancellation token to abort cancellation.
+        /// Cancellation token.
         /// </summary>
         CancellationToken CancellationToken { get; set; }
     }
diff --git a/src/api/wix/WixToolset.Extensibility/Data/IOptimizeContext.cs b/src/api/wix/WixToolset.Extensibility/Data/IOptimizeContext.cs
new file mode 100644
index 00000000..5684ebcd
--- /dev/null
+++ b/src/api/wix/WixToolset.Extensibility/Data/IOptimizeContext.cs
@@ -0,0 +1,61 @@
+// 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;
+    using System.Collections.Generic;
+    using System.Threading;
+    using WixToolset.Data;
+
+    /// <summary>
+    /// Context provided to the optimizer.
+    /// </summary>
+    public interface IOptimizeContext
+    {
+        /// <summary>
+        /// Service provider made available to the optimizer and its extensions.
+        /// </summary>
+        IServiceProvider ServiceProvider { get; }
+
+        /// <summary>
+        /// Set of extensions provided to the optimizer.
+        /// </summary>
+        IReadOnlyCollection<IOptimizerExtension> Extensions { get; set; }
+
+        /// <summary>
+        /// Intermediate folder.
+        /// </summary>
+        string IntermediateFolder { get; set; }
+
+        /// <summary>
+        /// Collection of bindpaths used to bind files.
+        /// </summary>
+        IReadOnlyCollection<IBindPath> BindPaths { get; set; }
+
+        /// <summary>
+        /// Bind variables used during optimization.
+        /// </summary>
+        IDictionary<string, string> BindVariables { get; set; }
+
+        /// <summary>
+        /// Gets or sets the platform which the optimizer will use when defaulting 64-bit symbol properties.
+        /// </summary>
+        /// <value>The platform which the optimizer will use when defaulting 64-bit symbol properties.</value>
+        Platform Platform { get; set; }
+
+        /// <summary>
+        /// Collection of intermediates to optimize.
+        /// </summary>
+        IReadOnlyCollection<Intermediate> Intermediates { get; set; }
+
+        /// <summary>
+        /// Collection of localization files to use in the optimizer.
+        /// </summary>
+        IReadOnlyCollection<Localization> Localizations { get; set; }
+
+        /// <summary>
+        /// Cancellation token.
+        /// </summary>
+        CancellationToken CancellationToken { get; set; }
+    }
+}
diff --git a/src/api/wix/WixToolset.Extensibility/IOptimizerExtension.cs b/src/api/wix/WixToolset.Extensibility/IOptimizerExtension.cs
new file mode 100644
index 00000000..589e7ecc
--- /dev/null
+++ b/src/api/wix/WixToolset.Extensibility/IOptimizerExtension.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.Extensibility.Data;
+
+    /// <summary>
+    /// Interface that all optimizer extensions implement.
+    /// </summary>
+    public interface IOptimizerExtension
+    {
+        /// <summary>
+        /// Called after all files have been compiled, before built-in optimizations, and before all sections are linked into a single section.
+        /// </summary>
+        void PreOptimize(IOptimizeContext context);
+
+        /// <summary>
+        /// Called after all files have been compiled, after built-in optimizations, and before all sections are linked into a single section.
+        /// </summary>
+        void PostOptimize(IOptimizeContext context);
+    }
+}