Update Base

src/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Version>1.0.5</Version>
@@ -47,8 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.8" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
   </ItemGroup>
 
   <ItemGroup>

src/PdfiumViewer.Demo/Properties/Annotations.cs

@@ -122,6 +122,9 @@ public sealed class ItemCanBeNullAttribute : Attribute { }
     AttributeTargets.Property | AttributeTargets.Delegate)]
   public sealed class StringFormatMethodAttribute : Attribute
   {
+    /// <summary>
+    /// Set the format string of an annotated method.
+    /// </summary>
     /// <param name="formatParameterName">
     /// Specifies which parameter of an annotated method should be treated as the format string
     /// </param>

src/PdfiumViewer/Core/NativeMethods.Pdfium.cs

@@ -16,19 +16,19 @@ partial class NativeMethods
         // threads, even when there are multiple AppDomain's in play.
         private static readonly string LockString = string.Intern("e362349b-001d-4cb2-bf55-a71606a3e36f");
 
-        public static void FPDF_AddRef()
+        public static void FPDF_InitLibrary()
         {
             lock (LockString)
             {
-                Imports.FPDF_AddRef();
+                Imports.FPDF_InitLibrary();
             }
         }
 
-        public static void FPDF_Release()
+        public static void FPDF_DestroyLibrary()
         {
             lock (LockString)
             {
-                Imports.FPDF_Release();
+                Imports.FPDF_DestroyLibrary();
             }
         }
 
@@ -589,11 +589,22 @@ private static int FPDF_SaveBlock(IntPtr fileWrite, IntPtr data, uint size)
 
         private static class Imports
         {
-            [DllImport("pdfium.dll")]
-            public static extern void FPDF_AddRef();
-
-            [DllImport("pdfium.dll")]
-            public static extern void FPDF_Release();
+            // LibraryImport is not supported by Blazor WebAssembly
+#if NET7_0_OR_GREATER && FALSE
+            [LibraryImport("pdfium")]
+            [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+            public static partial void FPDF_InitLibrary();
+
+            [LibraryImport("pdfium")]
+            [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+            public static partial void FPDF_DestroyLibrary();
+#else
+            [DllImport("pdfium", CallingConvention = CallingConvention.Cdecl)]
+            public static extern void FPDF_InitLibrary();
+
+            [DllImport("pdfium", CallingConvention = CallingConvention.Cdecl)]
+            public static extern void FPDF_DestroyLibrary();
+#endif
 
             [DllImport("pdfium.dll", CharSet = CharSet.Ansi)]
             public static extern IntPtr FPDF_LoadCustomDocument([MarshalAs(UnmanagedType.LPStruct)] FPDF_FILEACCESS access, string password);

src/PdfiumViewer/Core/NativeMethods.cs

@@ -67,7 +67,14 @@ private static bool TryLoadNativeLibrary(string path)
             if (path == null)
                 return false;
 
-            path = Path.Combine(path, IntPtr.Size == 4 ? "x86" : "x64");
+            if(IntPtr.Size == 4)
+            {
+                path = Path.Combine(path, "runtimes", "win-x86","native");
+            }
+            else
+            {
+                path = Path.Combine(path, "runtimes", "win-x64", "native");
+            }
             path = Path.Combine(path, "Pdfium.dll");
 
             return File.Exists(path) && LoadLibrary(path) != IntPtr.Zero;
@@ -119,16 +126,13 @@ public enum FileMapAccess : uint
         [DllImport("user32.dll")]
         public static extern int ScrollWindowEx(IntPtr hWnd, int dx, int dy, IntPtr prcScroll, IntPtr prcClip, IntPtr hrgnUpdate, IntPtr prcUpdate, uint flags);
 
-        [SecurityPermission(SecurityAction.InheritanceDemand, UnmanagedCode = true)]
-        [SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]
         public class MemoryMappedHandle : SafeHandleZeroOrMinusOneIsInvalid
         {
             public MemoryMappedHandle()
                 : base(true)
             {
             }
 
-            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
             protected override bool ReleaseHandle()
             {
                 return CloseHandle(handle);

src/PdfiumViewer/Core/PdfException.cs

@@ -1,6 +1,5 @@
-using System;
-using System.Runtime.Serialization;
-using PdfiumViewer.Enums;
+using PdfiumViewer.Enums;
+using System;
 
 #pragma warning disable 1591
 
@@ -50,10 +49,5 @@ public PdfException(string message, Exception innerException)
             : base(message, innerException)
         {
         }
-
-        protected PdfException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
     }
 }

src/PdfiumViewer/Core/PdfLibrary.cs

@@ -20,7 +20,7 @@ public static void EnsureLoaded()
 
         private PdfLibrary()
         {
-            NativeMethods.FPDF_AddRef();
+            NativeMethods.FPDF_InitLibrary();
         }
 
         ~PdfLibrary()
@@ -39,7 +39,7 @@ private void Dispose(bool disposing)
         {
             if (!_disposed)
             {
-                NativeMethods.FPDF_Release();
+                NativeMethods.FPDF_DestroyLibrary();
 
                 _disposed = true;
             }

src/PdfiumViewer/PdfiumViewer.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <Version>1.0.6</Version>
     <Authors>Behzad Khosravifar</Authors>
@@ -18,13 +18,13 @@
     <PackageReleaseNotes>.Net 5 Support</PackageReleaseNotes>
     <AssemblyVersion>1.0.6.0</AssemblyVersion>
     <FileVersion>1.0.6.0</FileVersion>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PdfiumViewer.Native.x86.v8-xfa" Version="2018.4.8.256" />
-    <PackageReference Include="PdfiumViewer.Native.x86_64.v8-xfa" Version="2018.4.8.256" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.8" />
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="bblanchon.PDFiumV8.Win32" Version="124.0.6350"/>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>

src/PdfiumViewer/ScrollPanel.PdfDocument.cs

@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
+using CommunityToolkit.Mvvm.ComponentModel;
 using PdfiumViewer.Core;
 using PdfiumViewer.Drawing;
 using PdfiumViewer.Enums;