Integrate interface-only WixToolset.Extensibility change

2 files changed, 7 insertions, 7 deletions

diff --git a/src/WixToolset.Core/Bind/FileResolver.cs b/src/WixToolset.Core/Bind/FileResolver.cs
index 01dfe36c..a67d784d 100644
--- a/src/WixToolset.Core/Bind/FileResolver.cs
+++ b/src/WixToolset.Core/Bind/FileResolver.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.Core.Bind
 {
@@ -14,24 +14,24 @@ namespace WixToolset.Core.Bind
     {
         private const string BindPathOpenString = "!(bindpath.";
 
-        private FileResolver(IEnumerable<BindPath> bindPaths)
+        private FileResolver(IEnumerable<IBindPath> bindPaths)
         {
-            this.BindPaths = (bindPaths ?? Array.Empty<BindPath>()).ToLookup(b => b.Stage);
+            this.BindPaths = (bindPaths ?? Array.Empty<IBindPath>()).ToLookup(b => b.Stage);
             this.RebaseTarget = this.BindPaths[BindStage.Target].Any();
             this.RebaseUpdated = this.BindPaths[BindStage.Updated].Any();
         }
 
-        public FileResolver(IEnumerable<BindPath> bindPaths, IEnumerable<IResolverExtension> extensions) : this(bindPaths)
+        public FileResolver(IEnumerable<IBindPath> bindPaths, IEnumerable<IResolverExtension> extensions) : this(bindPaths)
         {
             this.ResolverExtensions = extensions ?? Array.Empty<IResolverExtension>();
         }
 
-        public FileResolver(IEnumerable<BindPath> bindPaths, IEnumerable<ILibrarianExtension> extensions) : this(bindPaths)
+        public FileResolver(IEnumerable<IBindPath> bindPaths, IEnumerable<ILibrarianExtension> extensions) : this(bindPaths)
         {
             this.LibrarianExtensions = extensions ?? Array.Empty<ILibrarianExtension>();
         }
 
-        private ILookup<BindStage, BindPath> BindPaths { get; }
+        private ILookup<BindStage, IBindPath> BindPaths { get; }
 
         public bool RebaseTarget { get; }
 
diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
index b7ed8a18..6c9f17dd 100644
--- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
@@ -20,7 +20,7 @@ namespace WixToolset.Core.Bind
 
         public IVariableResolver VariableResolver { private get; set; }
 
-        public IEnumerable<BindPath> BindPaths { private get; set; }
+        public IEnumerable<IBindPath> BindPaths { private get; set; }
 
         public IEnumerable<IResolverExtension> Extensions { private get; set; }