added updates to get runtime directory

Author: maksymkeihz

MuPDF.NET/MuPDF.NET.csproj

@@ -16,7 +16,7 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>MuPDF.NET</Title>
-		<Version>3.1.2-beta</Version>
+		<Version>3.1.2-rc.1</Version>
 		<Authors>Maksym Tkachuk, Jamie Lemon, Chris Palman</Authors>
 		<Company>Artifex</Company>
 		<Description>A C# binding for MuPDF</Description>
@@ -33,14 +33,6 @@
 	  <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup>
-	  <Compile Remove="libs\mupdf\linux\mupdf.cs" />
-	</ItemGroup>
-	
-	<ItemGroup>
-	  <Compile Remove="libs\mupdf\windows\mupdf.cs" />
-	</ItemGroup>
-	
 	<ItemGroup>
 	  <None Include="..\LICENSE.md">
 	    <Pack>True</Pack>

MuPDF.NET/Utils.cs

@@ -6793,22 +6793,23 @@ internal static string GetFontName(fz_font font)
 
         internal static void LoadEmbeddedDllForWindows()
         {
-            if (!File.Exists("mupdfcpp64.dll"))
+            string binaryDir = AppContext.BaseDirectory;
+            if (!File.Exists(binaryDir + "mupdfcpp64.dll"))
             {
                 var assembly = Assembly.GetExecutingAssembly();
                 var resourceStream = assembly.GetManifestResourceStream("mupdfcpp64.dll");
-                var tempFile = File.Create("mupdfcpp64.dll");
+                var tempFile = File.Create(binaryDir + "mupdfcpp64.dll");
 
                 resourceStream?.CopyTo(tempFile);
                 resourceStream?.Dispose();
                 tempFile.Dispose();
             }
 
-            if (!File.Exists("mupdfcsharp.dll"))
+            if (!File.Exists(binaryDir + "mupdfcsharp.dll"))
             {
                 var assembly = Assembly.GetExecutingAssembly();
                 var resourceStream = assembly.GetManifestResourceStream("mupdfcsharp.dll");
-                var tempFile = File.Create("mupdfcsharp.dll");
+                var tempFile = File.Create(binaryDir + "mupdfcsharp.dll");
 
                 resourceStream?.CopyTo(tempFile);
                 resourceStream?.Dispose();
@@ -6818,65 +6819,66 @@ internal static void LoadEmbeddedDllForWindows()
 
         internal static void LoadEmbeddedDllForLinux()
         {
-            if (!File.Exists("libmupdf.so"))
+            string binaryDir = AppContext.BaseDirectory;
+            if (!File.Exists(binaryDir + "libmupdf.so"))
             {
                 var assembly = Assembly.GetExecutingAssembly();
                 var resourceStream = assembly.GetManifestResourceStream("libmupdf.so");
                 if (resourceStream != null)
                 {
-                    var tempFile = File.Create("libmupdf.so");
+                    var tempFile = File.Create(binaryDir + "libmupdf.so");
                     resourceStream.CopyTo(tempFile);
                     resourceStream.Dispose();
                     tempFile.Dispose();
                 }
             }
 
-            if (!File.Exists("libmupdf.so.26.0"))
+            if (!File.Exists(binaryDir + "libmupdf.so.26.0"))
             {
                 var assembly = Assembly.GetExecutingAssembly();
                 var resourceStream = assembly.GetManifestResourceStream("libmupdf.so.26.0");
                 if (resourceStream != null)
                 {
-                    var tempFile = File.Create("libmupdf.so.26.0");
+                    var tempFile = File.Create(binaryDir + "libmupdf.so.26.0");
                     resourceStream.CopyTo(tempFile);
                     resourceStream.Dispose();
                     tempFile.Dispose();
                 }
             }
 
-            if (!File.Exists("libmupdfcpp.so"))
+            if (!File.Exists(binaryDir + "libmupdfcpp.so"))
             {
                 var assembly = Assembly.GetExecutingAssembly();
                 var resourceStream = assembly.GetManifestResourceStream("libmupdfcpp.so");
                 if (resourceStream != null)
                 {
-                    var tempFile = File.Create("libmupdfcpp.so");
+                    var tempFile = File.Create(binaryDir + "libmupdfcpp.so");
                     resourceStream.CopyTo(tempFile);
                     resourceStream.Dispose();
                     tempFile.Dispose();
                 }
             }
 
-            if (!File.Exists("libmupdfcpp.so.26.0"))
+            if (!File.Exists(binaryDir + "libmupdfcpp.so.26.0"))
             {
                 var assembly = Assembly.GetExecutingAssembly();
                 var resourceStream = assembly.GetManifestResourceStream("libmupdfcpp.so.26.0");
                 if (resourceStream != null)
                 {
-                    var tempFile = File.Create("libmupdfcpp.so.26.0");
+                    var tempFile = File.Create(binaryDir + "libmupdfcpp.so.26.0");
                     resourceStream.CopyTo(tempFile);
                     resourceStream.Dispose();
                     tempFile.Dispose();
                 }
             }
 
-            if (!File.Exists("mupdfcsharp.dll"))
+            if (!File.Exists(binaryDir + "mupdfcsharp.dll"))
             {
                 var assembly = Assembly.GetExecutingAssembly();
                 var resourceStream = assembly.GetManifestResourceStream("mupdfcsharp.so");
                 if (resourceStream != null)
                 {
-                    var tempFile = File.Create("mupdfcsharp.dll");
+                    var tempFile = File.Create(binaryDir + "mupdfcsharp.dll");
                     resourceStream.CopyTo(tempFile);
                     resourceStream.Dispose();
                     tempFile.Dispose();