From c2eba19264114ac382442d74a61107c35cc91407 Mon Sep 17 00:00:00 2001 From: Oleg Shilo Date: Thu, 1 Aug 2024 23:24:45 +1000 Subject: [PATCH] Wix4: #1574: Cannot build .net 8 example project (2) --- Source/src/WixSharp/Utilities/WixTools.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/src/WixSharp/Utilities/WixTools.cs b/Source/src/WixSharp/Utilities/WixTools.cs index 70cf14f2..eb416887 100644 --- a/Source/src/WixSharp/Utilities/WixTools.cs +++ b/Source/src/WixSharp/Utilities/WixTools.cs @@ -317,6 +317,12 @@ internal static bool IsHighestAvailableVersion(string pathToextensionFile) /// The version. /// static public string FindWixExtensionDll(string name, string version = null) + { + return FindWixExtensionDll(WixExtensionsDir, name, version) ?? // the extension is installed with the wix.exe + FindWixExtensionDll(NuGetDir, name, version); // the extension is installed as a nuget package + } + + static string FindWixExtensionDll(string extensionDir, string name, string version) { // C:\Users\user\.wix\extensions\WixToolset.UI.wixext\5.0.0\wixext5\WixToolset.UI.wixext.dll // C:\Users\user\.wix\extensions\WixToolset.UI.wixext\4.0.4\wixext4\WixToolset.UI.wixext.dll @@ -324,7 +330,7 @@ static public string FindWixExtensionDll(string name, string version = null) // C:\Users\user\.wix\extensions\WixToolset.Bal.wixext\5.0.0\wixext5\WixToolset.BootstrapperApplications.wixext.dll var candidates = Directory - .GetDirectories(WixExtensionsDir.PathCombine(name)) + .GetDirectories(extensionDir.PathCombine(name)) .Select(x => new { version = x.PathGetFileName().SemanticVersionToVersion(),