Simplify reference resolution

WiX v3 extension loading had options that were rarely if ever used
and library paths modeled after C++. Given the new Sdk-style model
in WiX v4, we can simplify reference resolution.

Fixes 6945, 6946

1 files changed, 0 insertions, 73 deletions

diff --git a/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.cs b/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
index 152992dd..d950bca9 100644
--- a/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
+++ b/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
@@ -76,79 +76,6 @@ namespace WixToolset.BaseBuildTasks
         }
 
         /// <summary>
-        /// Build the extensions argument. Each extension is searched in the current folder, user defined search
-        /// directories (ReferencePath), HintPath, and under Wix Extension Directory in that order.
-        /// The order of precedence is based off of that described in Microsoft.Common.Targets's SearchPaths
-        /// property for the ResolveAssemblyReferences task.
-        /// </summary>
-        /// <param name="extensions">The list of extensions to include.</param>
-        /// <param name="wixExtensionDirectory">Evaluated default folder for Wix Extensions</param>
-        /// <param name="referencePaths">User defined reference directories to search in</param>
-        public void AppendExtensions(ITaskItem[] extensions, string wixExtensionDirectory, string [] referencePaths)
-        {
-            if (extensions == null)
-            {
-                return;
-            }
-
-            foreach (ITaskItem extension in extensions)
-            {
-                string className = extension.GetMetadata("Class");
-
-                string fileName = Path.GetFileName(extension.ItemSpec);
-
-                if (String.IsNullOrEmpty(Path.GetExtension(fileName)))
-                {
-                    fileName += ".dll";
-                }
-
-                // First try reference paths
-                var resolvedPath = FileSearchHelperMethods.SearchFilePaths(referencePaths, fileName);
-
-                if (String.IsNullOrEmpty(resolvedPath))
-                {
-                    // Now try HintPath
-                    resolvedPath = extension.GetMetadata("HintPath");
-
-                    if (!File.Exists(resolvedPath))
-                    {
-                        // Now try the item itself
-                        resolvedPath = extension.ItemSpec;
-
-                        if (String.IsNullOrEmpty(Path.GetExtension(resolvedPath)))
-                        {
-                            resolvedPath += ".dll";
-                        }
-
-                        if (!File.Exists(resolvedPath))
-                        {
-                            if (!String.IsNullOrEmpty(wixExtensionDirectory))
-                            {
-                                // Now try the extension directory
-                                resolvedPath = Path.Combine(wixExtensionDirectory, Path.GetFileName(resolvedPath));
-                            }
-
-                            if (!File.Exists(resolvedPath))
-                            {
-                                // Extension wasn't found, just set it to the extension name passed in
-                                resolvedPath = extension.ItemSpec;
-                            }
-                        }
-                    }
-                }
-
-                if (String.IsNullOrEmpty(className))
-                {
-                    this.AppendSwitchIfNotNull("-ext ", resolvedPath);
-                }
-                else
-                {
-                    this.AppendSwitchIfNotNull("-ext ", className + ", " + resolvedPath);
-                }
-            }
-        }
-
-        /// <summary>
         /// Append arbitrary text to the command-line if specified.
         /// </summary>
         /// <param name="textToAppend">Text to append.</param>