Skip to content

Commit 28b4639

Browse files
authored
Merge pull request #68 from dellis1972/fixwindowssearch
Fix Windows to look in Assembly Directory for 32bit dll.
2 parents b332af0 + fdabcda commit 28b4639

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

LibZipSharp.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<_LibZipSharpNugetVersion>1.0.17</_LibZipSharpNugetVersion>
3+
<_LibZipSharpNugetVersion>1.0.18</_LibZipSharpNugetVersion>
44
</PropertyGroup>
55
</Project>

Native.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,7 @@ static Native ()
415415
{
416416
if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
417417
string executingDirectory = System.IO.Path.GetDirectoryName (typeof(Native).Assembly.Location);
418-
if (Environment.Is64BitProcess) {
419-
SetDllDirectory (System.IO.Path.Combine (executingDirectory, "lib64"));
420-
}
418+
SetDllDirectory (Environment.Is64BitProcess ? System.IO.Path.Combine (executingDirectory, "lib64") : executingDirectory);
421419
}
422420
}
423421
}

0 commit comments

Comments
 (0)