Wix4: #1574: Cannot build .net 8 example project (2)

oleg-shilo · Aug 1, 2024 · c2eba19 · c2eba19
1 parent 01b640f
commit c2eba19
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Source/src/WixSharp/Utilities/WixTools.cs b/Source/src/WixSharp/Utilities/WixTools.cs
@@ -317,14 +317,20 @@ internal static bool IsHighestAvailableVersion(string pathToextensionFile)
         /// <param name="version">The version.</param>
         /// <returns></returns>
         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
             // C:\Users\user\.wix\extensions\WixToolset.Bal.wixext\4.0.2\wixext4\WixToolset.Bal.wixext.dll
             // 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(),