6 files changed, 64 insertions, 3 deletions

diff --git a/src/WixToolset.Extensibility/Data/IBindContext.cs b/src/WixToolset.Extensibility/Data/IBindContext.cs
index 355b1a53..97c7a8f2 100644
--- a/src/WixToolset.Extensibility/Data/IBindContext.cs
+++ b/src/WixToolset.Extensibility/Data/IBindContext.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
 {
@@ -10,6 +10,8 @@ namespace WixToolset.Extensibility.Data
     {
         IServiceProvider ServiceProvider { get; }
 
+        string BurnStubPath { get; set; }
+
         int CabbingThreadCount { get; set; }
 
         string CabCachePath { get; set; }
diff --git a/src/WixToolset.Extensibility/Data/IResolvedDirectory.cs b/src/WixToolset.Extensibility/Data/IResolvedDirectory.cs
new file mode 100644
index 00000000..59de6e78
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IResolvedDirectory.cs
@@ -0,0 +1,19 @@
+// 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>
+    /// Used for resolved directory information.
+    /// </summary>
+    public interface IResolvedDirectory
+    {
+        /// <summary>The directory parent.</summary>
+        string DirectoryParent { get; set; }
+
+        /// <summary>The name of this directory.</summary>
+        string Name { get; set; }
+
+        /// <summary>The path of this directory.</summary>
+        string Path { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/IBurnBackendExtension.cs b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
index acce700a..64a09e49 100644
--- a/src/WixToolset.Extensibility/IBurnBackendExtension.cs
+++ b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
@@ -3,7 +3,6 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
-    using WixToolset.Data.Bind;
     using WixToolset.Extensibility.Data;
 
     public interface IBurnBackendExtension
@@ -13,7 +12,7 @@ namespace WixToolset.Extensibility
         /// </summary>
         void PreBackendBind(IBindContext context);
 
-        string ResolveRelatedFile(string source, string relatedSource, string type, SourceLineNumber sourceLineNumbers, BindStage bindStage);
+        IResolveFileResult ResolveRelatedFile(string source, string relatedSource, string type, SourceLineNumber sourceLineNumbers, BindStage bindStage);
 
         string ResolveUrl(string url, string fallbackUrl, string packageId, string payloadId, string fileName);
 
diff --git a/src/WixToolset.Extensibility/Services/IBackendHelper.cs b/src/WixToolset.Extensibility/Services/IBackendHelper.cs
index 0622693d..756d0a97 100644
--- a/src/WixToolset.Extensibility/Services/IBackendHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IBackendHelper.cs
@@ -28,6 +28,14 @@ namespace WixToolset.Extensibility.Services
         string CreateGuid(Guid namespaceGuid, string value);
 
         /// <summary>
+        /// Creates a resolved directory.
+        /// </summary>
+        /// <param name="directoryParent">Directory parent identifier.</param>
+        /// <param name="name">Name of directory.</param>
+        /// <returns>Resolved directory.</returns>
+        IResolvedDirectory CreateResolvedDirectory(string directoryParent, string name);
+
+        /// <summary>
         /// Creates a tracked file.
         /// </summary>
         /// <param name="path">Destination path for the build output.</param>
diff --git a/src/WixToolset.Extensibility/Services/IPathResolver.cs b/src/WixToolset.Extensibility/Services/IPathResolver.cs
new file mode 100644
index 00000000..e468112f
--- /dev/null
+++ b/src/WixToolset.Extensibility/Services/IPathResolver.cs
@@ -0,0 +1,31 @@
+// 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
+{
+    using System.Collections.Generic;
+    using WixToolset.Extensibility.Data;
+
+    public interface IPathResolver
+    {
+        /// <summary>
+        /// Get the source path of a directory.
+        /// </summary>
+        /// <param name="directories">All cached directories.</param>
+        /// <param name="componentIdGenSeeds">Hash table of Component GUID generation seeds indexed by directory id.</param>
+        /// <param name="directory">Directory identifier.</param>
+        /// <param name="canonicalize">Canonicalize the path for standard directories.</param>
+        /// <returns>Source path of a directory.</returns>
+        string GetDirectoryPath(Dictionary<string, IResolvedDirectory> directories, Dictionary<string, string> componentIdGenSeeds, string directory, bool canonicalize);
+
+        /// <summary>
+        /// Gets the source path of a file.
+        /// </summary>
+        /// <param name="directories">All cached directories in <see cref="ResolvedDirectory"/>.</param>
+        /// <param name="directoryId">Parent directory identifier.</param>
+        /// <param name="fileName">File name (in long|source format).</param>
+        /// <param name="compressed">Specifies the package is compressed.</param>
+        /// <param name="useLongName">Specifies the package uses long file names.</param>
+        /// <returns>Source path of file relative to package directory.</returns>
+        string GetFileSourcePath(Dictionary<string, IResolvedDirectory> directories, string directoryId, string fileName, bool compressed, bool useLongName);
+    }
+}
diff --git a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
index 2de455fd..a783d1a4 100644
--- a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
@@ -11,5 +11,7 @@ namespace WixToolset.Extensibility.Services
     public interface IWindowsInstallerBackendHelper
     {
         bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, Output output, TableDefinition[] tableDefinitions);
+
+        bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, Output output, TableDefinition[] tableDefinitions, bool columnZeroIsId);
     }
 }