Merge pull request #1555 from glopesdev/issue-1549

Add library folders to DLL search path on windows
bonsai-rx · Sep 13, 2023 · 97b20bd · 97b20bd
2 parents 39f60ec + e3e39f9
commit 97b20bd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/Bonsai.Configuration/Bonsai.Configuration.csproj b/Bonsai.Configuration/Bonsai.Configuration.csproj
@@ -4,7 +4,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
-    <VersionPrefix>2.8.0</VersionPrefix>
+    <VersionPrefix>2.8.1</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bonsai.NuGet\Bonsai.NuGet.csproj" />

diff --git a/Bonsai.Configuration/ConfigurationHelper.cs b/Bonsai.Configuration/ConfigurationHelper.cs
@@ -37,6 +37,11 @@ static void AddLibraryPath(string path)
                 currentPath = string.Join(new string(Path.PathSeparator, 1), path, currentPath);
                 Environment.SetEnvironmentVariable(PathEnvironmentVariable, currentPath);
             }
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                NativeMethods.AddDllDirectory(path);
+            }
         }
 
         public static string GetConfigurationRoot(PackageConfiguration configuration = null)

diff --git a/Bonsai.Configuration/NativeMethods.cs b/Bonsai.Configuration/NativeMethods.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Bonsai.Configuration
+{
+    static class NativeMethods
+    {
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        internal static extern int AddDllDirectory(string NewDirectory);
+    }
+}
diff --git a/Bonsai.Player/Bonsai.Player.csproj b/Bonsai.Player/Bonsai.Player.csproj
@@ -12,7 +12,7 @@
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl></PackageIconUrl>
-    <VersionPrefix>2.8.0</VersionPrefix>
+    <VersionPrefix>2.8.1</VersionPrefix>
     <PackAsTool>true</PackAsTool>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Bonsai/Bonsai.csproj b/Bonsai/Bonsai.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <UseWindowsForms>true</UseWindowsForms>
     <TargetFramework>net48</TargetFramework>
-    <VersionPrefix>2.8.0</VersionPrefix>
+    <VersionPrefix>2.8.1</VersionPrefix>
     <OutputType>Exe</OutputType>
     <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
     <ApplicationIcon>..\Bonsai.Editor\Bonsai.ico</ApplicationIcon>