Added CppSharp submodule to reference required Marshal utilities.

Updated for new netcoreapp3.1 version of CppSharp.
Updated for new pdfium-darwin-x64 and pdfium-darwin-arm64 packages.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/CppSharp"]
+	path = src/CppSharp
+	url = [email protected]:mono/CppSharp.git

CreateBindingsPackage.bat

@@ -1,4 +1,5 @@
 git clean -fxd
-"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" src\PDFiumCoreBindingsGenerator\PDFiumCoreBindingsGenerator.csproj -r
-cd src\PDFiumCoreBindingsGenerator\bin\Debug\net48
-CreatePackage.bat
+dotnet build src\PDFiumCoreBindingsGenerator\PDFiumCoreBindingsGenerator.csproj -c Release
+cd .\src\PDFiumCoreBindingsGenerator\bin\Release\netcoreapp3.1
+CreatePackage.bat
+pause

src/PDFiumCore/PDFiumCore.csproj

@@ -14,4 +14,13 @@
   <ItemGroup>
     <Content Include="runtimes/**" PackagePath="runtimes" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CppSharp\src\Runtime\MarshalUtil.cs" Link="CppSharp\MarshalUtil.cs" />
+    <Compile Include="..\CppSharp\src\Runtime\Pointer.cs" Link="CppSharp\Pointer.cs" />
+    <Compile Include="..\CppSharp\src\Runtime\SafeUnmanagedMemoryHandle.cs" Link="CppSharp\SafeUnmanagedMemoryHandle.cs" />
+    <Compile Include="..\CppSharp\src\Runtime\SymbolResolver.cs" Link="CppSharp\SymbolResolver.cs" />
+    <Compile Include="..\CppSharp\src\Runtime\UTF32Marshaller.cs" Link="CppSharp\UTF32Marshaller.cs" />
+    <Compile Include="..\CppSharp\src\Runtime\UTF8Marshaller.cs" Link="CppSharp\UTF8Marshaller.cs" />
+    <Compile Include="..\CppSharp\src\Runtime\VTables.cs" Link="CppSharp\VTables.cs" />
+  </ItemGroup>
 </Project>

src/PDFiumCoreBindingsGenerator/CreatePackage.bat

@@ -1 +1 @@
-PDFiumCoreBindingsGenerator.exe "https://api.github.com/repos/bblanchon/pdfium-binaries/releases/35761882" "0" true >build.log & type build.log
+PDFiumCoreBindingsGenerator.exe "https://api.github.com/repos/bblanchon/pdfium-binaries/releases/latest" "0" true >build.log & type build.log

src/PDFiumCoreBindingsGenerator/PDFiumCoreBindingsGenerator.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
@@ -10,10 +10,10 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CppSharp" Version="0.10.5">
+    <PackageReference Include="CppSharp" Version="0.11.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" version="12.0.3" />
-    <PackageReference Include="SharpZipLib" Version="1.2.0" />
+    <PackageReference Include="SharpZipLib" Version="1.3.1" />
   </ItemGroup>
 </Project>

src/PDFiumCoreBindingsGenerator/PDFiumCoreLibrary.cs

@@ -14,18 +14,21 @@ public PDFiumCoreLibrary(string directoryName)
         {
             _directoryName = directoryName;
         }
-        public void Postprocess(Driver driver, ASTContext ctx)
+
+        public override void Preprocess(Driver driver, ASTContext ctx)
+        {
+
+        }
+
+        public override void Postprocess(Driver driver, ASTContext ctx)
         {
             // Fix for generating code which will not compile.
             var fpdfLibraryConfig = ctx.FindClass("FPDF_LIBRARY_CONFIG_");
             fpdfLibraryConfig.First().Properties.First(f => f.OriginalName == "m_pUserFontPaths").Ignore = true;
         }
 
-        public void Preprocess(Driver driver, ASTContext ctx)
-        {
-        }
 
-        public void Setup(Driver driver)
+        public override void Setup(Driver driver)
         {
             var includeDirectory = Path.Combine(_directoryName, "include");
             driver.ParserOptions.SetupMSVC(VisualStudioVersion.Latest);
@@ -54,7 +57,7 @@ public void Setup(Driver driver)
             }
         }
 
-        public void SetupPasses(Driver driver)
+        public override void SetupPasses(Driver driver)
         {
             driver.AddTranslationUnitPass(new FixCommentsPass());
 

src/PDFiumCoreBindingsGenerator/Program.cs

@@ -75,9 +75,13 @@ static void Main(string[] args)
             File.Copy("pdfium-linux/lib/libpdfium.so", "../../../../PDFiumCore/runtimes/linux/native/pdfium.so");
             File.Copy("pdfium-linux/LICENSE", "../../../../PDFiumCore/runtimes/linux/native/PDFium-LICENSE");
 
-            Directory.CreateDirectory("../../../../PDFiumCore/runtimes/osx/native/");
-            File.Copy("pdfium-darwin/lib/libpdfium.dylib", "../../../../PDFiumCore/runtimes/osx/native/pdfium.dylib");
-            File.Copy("pdfium-darwin/LICENSE", "../../../../PDFiumCore/runtimes/osx/native/PDFium-LICENSE");
+            Directory.CreateDirectory("../../../../PDFiumCore/runtimes/osx-x64/native/");
+            File.Copy("pdfium-darwin-x64/lib/libpdfium.dylib", "../../../../PDFiumCore/runtimes/osx-x64/native/pdfium.dylib");
+            File.Copy("pdfium-darwin-x64/LICENSE", "../../../../PDFiumCore/runtimes/osx-x64/native/PDFium-LICENSE");
+
+            Directory.CreateDirectory("../../../../PDFiumCore/runtimes/osx-arm64/native/");
+            File.Copy("pdfium-darwin-arm64/lib/GNUSparseFile.0/libpdfium.dylib", "../../../../PDFiumCore/runtimes/osx-arm64/native/pdfium.dylib");
+            File.Copy("pdfium-darwin-arm64/LICENSE", "../../../../PDFiumCore/runtimes/osx-arm64/native/PDFium-LICENSE");
 
             Process cmd = new Process
             {