From 08f53f409020b12dffaa2aeefa943b667a4b9328 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 14 Oct 2022 09:34:30 -0700
Subject: 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
---
 .../FileSearchHelperMethods.cs                     | 57 ----------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 src/internal/WixToolset.BaseBuildTasks.Sources/FileSearchHelperMethods.cs

(limited to 'src/internal/WixToolset.BaseBuildTasks.Sources/FileSearchHelperMethods.cs')

diff --git a/src/internal/WixToolset.BaseBuildTasks.Sources/FileSearchHelperMethods.cs b/src/internal/WixToolset.BaseBuildTasks.Sources/FileSearchHelperMethods.cs
deleted file mode 100644
index 442fedd6..00000000
--- a/src/internal/WixToolset.BaseBuildTasks.Sources/FileSearchHelperMethods.cs
+++ /dev/null
@@ -1,57 +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.BaseBuildTasks
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Contains helper methods on searching for files
-    /// </summary>
-    public static class FileSearchHelperMethods
-    {
-        /// <summary>
-        /// Searches for the existence of a file in multiple directories. 
-        /// Search is satisfied if default file path is valid and exists. If not,
-        /// file name is extracted from default path and combined with each of the directories
-        /// looking to see if it exists. If not found, input default path is returned.
-        /// </summary>
-        /// <param name="directories">Array of directories to look in, without filenames in them</param>
-        /// <param name="defaultFullPath">Default path - to use if not found</param>
-        /// <returns>File path if file found. Empty string if not found</returns>
-        public static string SearchFilePaths(string[] directories, string defaultFullPath)
-        {
-            if (String.IsNullOrEmpty(defaultFullPath))
-            {
-                return String.Empty;
-            }
-
-            if (File.Exists(defaultFullPath))
-            {
-                return defaultFullPath;
-            }
-
-            if (directories == null)
-            {
-                return String.Empty;
-            }
-
-            var fileName = Path.GetFileName(defaultFullPath);
-            foreach (var currentPath in directories)
-            {
-                if (String.IsNullOrWhiteSpace(currentPath))
-                {
-                    continue;
-                }
-
-                var path = Path.Combine(currentPath, fileName);
-                if (File.Exists(path))
-                {
-                    return path;
-                }
-            }
-
-            return String.Empty;
-        }
-    }
-}
-- 
cgit v1.2.3-55-g6feb