diff --git a/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs index 43a1be5e..a21f3d77 100644 --- a/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs +++ b/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs @@ -18,6 +18,8 @@ static class Script { static public void Main() { + var ttt = WixTools.FindWixExtensionDll("WixToolset.UI.wixext"); + return; Feature poFeature = new Feature("PO", "PO", "INSTALLDIR"); var project = new ManagedProject("My Product", diff --git a/Source/src/WixSharp.Samples/Wix# Samples/testpad/testpad.csproj b/Source/src/WixSharp.Samples/Wix# Samples/testpad/testpad.csproj index 6eaa83cf..70144d97 100644 --- a/Source/src/WixSharp.Samples/Wix# Samples/testpad/testpad.csproj +++ b/Source/src/WixSharp.Samples/Wix# Samples/testpad/testpad.csproj @@ -21,6 +21,7 @@ + diff --git a/Source/src/WixSharp/Utilities/WixTools.cs b/Source/src/WixSharp/Utilities/WixTools.cs index eb416887..b3606563 100644 --- a/Source/src/WixSharp/Utilities/WixTools.cs +++ b/Source/src/WixSharp/Utilities/WixTools.cs @@ -324,11 +324,13 @@ static public string FindWixExtensionDll(string name, string version = null) static string FindWixExtensionDll(string extensionDir, string name, string version) { + if (!extensionDir.PathCombine(name).PathExists()) + return null; + // 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(extensionDir.PathCombine(name)) .Select(x => new