Release 1.4.1 with fix for #11 (#12)

* Release 1.4.1 with fix for #11 * Removed PackageLicenseFile, PackageLicenseExpression should be enough
sandrohanea · Sep 11, 2023 · 5fd27b0 · 5fd27b0
1 parent 825e61a
commit 5fd27b0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/PdfiumPrinter/LibraryLoader/NativeLibraryLoader.cs b/PdfiumPrinter/LibraryLoader/NativeLibraryLoader.cs
@@ -67,10 +67,15 @@ _ when RuntimeInformation.IsOSPlatform(OSPlatform.OSX) => ("osx", "libpdfium.dyl
                 Path.GetDirectoryName(Environment.GetCommandLineArgs()[0])
             }.Where(it => !string.IsNullOrEmpty(it)).FirstOrDefault();
 
-            path = string.IsNullOrEmpty(assemblySearchPath)
-                ? Path.Combine("runtimes", $"{platform}-{architecture}", fileName)
-                : Path.Combine(assemblySearchPath, "runtimes", $"{platform}-{architecture}", "native", fileName);
+            var isNetFramework = RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework");
 
+            path = isNetFramework switch
+            {
+                true when string.IsNullOrEmpty(assemblySearchPath) => Path.Combine(architecture, fileName),
+                true => Path.Combine(assemblySearchPath, architecture, fileName),
+                false when string.IsNullOrEmpty(assemblySearchPath) => Path.Combine("runtimes", $"{platform}-{architecture}", "native", fileName),
+                _ => Path.Combine(assemblySearchPath, "runtimes", $"{platform}-{architecture}", "native", fileName)
+            };
         }
 
         if (defaultLibraryLoader != null)
@@ -81,7 +86,7 @@ _ when RuntimeInformation.IsOSPlatform(OSPlatform.OSX) => ("osx", "libpdfium.dyl
         if (!File.Exists(path))
         {
             throw new FileNotFoundException($"Native Library not found in path {path}. " +
-                $"Verify you have have included the native Pdfium library in your application, " +
+                $"Verify you have included the native Pdfium library in your application, " +
                 $"or install the default libraries with the bblanchon.PDFium NuGet.");
         }
 

diff --git a/PdfiumPrinter/PdfiumPrinter.csproj b/PdfiumPrinter/PdfiumPrinter.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>PdfiumPrinter</AssemblyName>
     <RootNamespace>PdfiumPrinter</RootNamespace>
     <LangVersion>10</LangVersion>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <Description>This package can help you to print or render pdfs using netstandard and pdfium.</Description>
     <Authors>Sandro Hanea</Authors>
     <Company />
@@ -14,9 +14,15 @@
     <RepositoryUrl>https://github.com/sandrohanea/PdfiumPrinter</RepositoryUrl>
     <RepositoryType>GIT</RepositoryType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageReadmeFile>readme.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath="" />
+    <None Include="..\readme.md" Pack="true" PackagePath="" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ To install PdfiumPrinter, run the following command in the [Package Manager Cons
 
 or simply add a package reference in your csproj:
 ```
-    <PackageReference Include="PdfiumPrinter" Version="1.4.0" />
+    <PackageReference Include="PdfiumPrinter" Version="1.4.1" />
 ```
-Original file line number
+Diff line change
@@ Expand Up @@
     or simply add a package reference in your csproj:
     ```
-        <PackageReference Include="PdfiumPrinter" Version="1.4.0" />
+        <PackageReference Include="PdfiumPrinter" Version="1.4.1" />
     ```
@@ Expand Down @@