Updated package versions.

arklumpus · Dec 24, 2024 · f952fb6 · f952fb6
1 parent 94f5a9c
commit f952fb6
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 32 deletions.
diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MuPDFCore" Version="1.10.0" />
+    <PackageReference Include="MuPDFCore" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Demo/Program.cs b/Demo/Program.cs
@@ -1,5 +1,5 @@
 using MuPDFCore;
-using System.IO;
+using MuPDFCore.StructuredText;
 
 namespace Demo
 {
@@ -12,18 +12,18 @@ static void Main()
 
             //Open a PDF document
             using MuPDFDocument doc1 = new MuPDFDocument(ctx, "Document1.pdf");
-            
+
             //Save the page as a PNG image with transparency, at a 1x zoom level (1pt = 1px).
             doc1.SaveImage(0, 1, PixelFormats.RGBA, "Raster1.png", RasterOutputFileTypes.PNG);
 
             //Open an Open XPS document
             using MuPDFDocument doc2 = new MuPDFDocument(ctx, "Document2.oxps");
-            
+
             //Save only part of the page as a PNG image with transparency, at a 2x zoom level (1pt = 2px).
             doc2.SaveImage(0, new Rectangle(87, 360, 517, 790), 2, PixelFormats.RGBA, "Raster2.png", RasterOutputFileTypes.PNG);
 
             //Merge the two documents into a single document.
-            MuPDFDocument.CreateDocument(ctx, "Merged.pdf", DocumentOutputFileTypes.PDF, true,
+            MuPDFDocument.Create.PDFDocument(ctx, "Merged.pdf",
 
                 //We take the full page from the first document
                 (doc1.Pages[0], doc1.Pages[0].Bounds, 1),

diff --git a/MuPDFCore.MuPDFRenderer/MuPDFCore.MuPDFRenderer.csproj b/MuPDFCore.MuPDFRenderer/MuPDFCore.MuPDFRenderer.csproj
@@ -10,7 +10,7 @@
     <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/arklumpus/MuPDFCore</PackageProjectUrl>
     <RepositoryUrl>https://github.com/arklumpus/MuPDFCore</RepositoryUrl>
-    <Version>1.10.2</Version>
+    <Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
 	<SignAssembly>True</SignAssembly>
 	<AssemblyOriginatorKeyFile>../strong_name_key.snk</AssemblyOriginatorKeyFile>
@@ -24,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.5" />
-    <PackageReference Include="MuPDFCore" Version="1.10.2" />
+    <PackageReference Include="Avalonia" Version="11.0.11" />
+    <PackageReference Include="MuPDFCore" Version="2.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/MuPDFCore.NativeAssets/Linux-arm64/MuPDFCore.NativeAssets.Linux-arm64.csproj b/MuPDFCore.NativeAssets/Linux-arm64/MuPDFCore.NativeAssets.Linux-arm64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides linux-arm64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-    <Version>1.10.0</Version>
+    <Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Linux-musl-arm64/MuPDFCore.NativeAssets.Linux-musl-arm64.csproj b/MuPDFCore.NativeAssets/Linux-musl-arm64/MuPDFCore.NativeAssets.Linux-musl-arm64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides linux-musl-arm64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-    <Version>1.10.0</Version>
+    <Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Linux-musl-x64/MuPDFCore.NativeAssets.Linux-musl-x64.csproj b/MuPDFCore.NativeAssets/Linux-musl-x64/MuPDFCore.NativeAssets.Linux-musl-x64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides linux-musl-x64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-	<Version>1.10.0</Version>
+	<Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Linux-x64/MuPDFCore.NativeAssets.Linux-x64.csproj b/MuPDFCore.NativeAssets/Linux-x64/MuPDFCore.NativeAssets.Linux-x64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides linux-x64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-    <Version>1.10.0</Version>
+    <Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Mac-arm64/MuPDFCore.NativeAssets.Mac-arm64.csproj b/MuPDFCore.NativeAssets/Mac-arm64/MuPDFCore.NativeAssets.Mac-arm64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides macOS-arm64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-	<Version>1.10.0</Version>
+	<Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Mac-x64/MuPDFCore.NativeAssets.Mac-x64.csproj b/MuPDFCore.NativeAssets/Mac-x64/MuPDFCore.NativeAssets.Mac-x64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides macOS-x64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-	<Version>1.10.0</Version>
+	<Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Win-arm64/MuPDFCore.NativeAssets.Win-arm64.csproj b/MuPDFCore.NativeAssets/Win-arm64/MuPDFCore.NativeAssets.Win-arm64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides Win-arm64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-	<Version>1.10.0</Version>
+	<Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Win-x64/MuPDFCore.NativeAssets.Win-x64.csproj b/MuPDFCore.NativeAssets/Win-x64/MuPDFCore.NativeAssets.Win-x64.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides Win-x64 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-    <Version>1.10.0</Version>
+    <Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore.NativeAssets/Win-x86/MuPDFCore.NativeAssets.Win-x86.csproj b/MuPDFCore.NativeAssets/Win-x86/MuPDFCore.NativeAssets.Win-x86.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>This package provides Win-x86 native assets for MuPDFCore, a set of multiplatform .NET Core bindings for MuPDF.</Description>
-	<Version>1.10.0</Version>
+	<Version>2.0.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Authors>Giorgio Bianchini</Authors>
     <Company>University of Bristol</Company>

diff --git a/MuPDFCore/MuPDFCore.csproj b/MuPDFCore/MuPDFCore.csproj
@@ -6,7 +6,7 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Description>MuPDFCore is a set of multiplatform .NET Core bindings for MuPDF. It can render PDF, XPS, EPUB and other formats to raster images returned either as raw bytes, or as image files in multiple formats (including PNG and PSD). It also supports multithreading.</Description>
-		<Version>1.10.2</Version>
+		<Version>2.0.0</Version>
 		<PackageIcon>icon.png</PackageIcon>
 		<Authors>Giorgio Bianchini</Authors>
 		<Company>University of Bristol</Company>
@@ -27,15 +27,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MuPDFCore.NativeAssets.Linux-musl-arm64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Linux-musl-x64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Linux-arm64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Linux-x64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Mac-arm64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Mac-x64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Win-arm64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Win-x64" Version="1.10.0" />
-		<PackageReference Include="MuPDFCore.NativeAssets.Win-x86" Version="1.10.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Linux-musl-arm64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Linux-musl-x64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Linux-arm64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Linux-x64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Mac-arm64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Mac-x64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Win-arm64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Win-x64" Version="2.0.0" />
+		<PackageReference Include="MuPDFCore.NativeAssets.Win-x86" Version="2.0.0" />
 		<PackageReference Include="System.Memory" Version="4.5.4" />
 	</ItemGroup>
 

diff --git a/PDFViewerDemo/PDFViewerDemo.csproj b/PDFViewerDemo/PDFViewerDemo.csproj
@@ -10,10 +10,10 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.10" />
-    <PackageReference Include="MuPDFCore.MuPDFRenderer" Version="1.10.2" />
+    <PackageReference Include="Avalonia" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.11" />
+    <PackageReference Include="MuPDFCore.MuPDFRenderer" Version="2.0.0" />
     <PackageReference Include="VectSharp.PDF" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -12,14 +12,20 @@
     <None Remove="Data\eng.traineddata" />
     <None Remove="Data\LλиՀქカかעاދदবਗગଓதతಕമසไမᠮབລខᑐᑯᒐᖃግ조한汉漢.pdf" />
     <None Remove="Data\mupdf_explored.pdf" />
+    <None Remove="Data\NoughtsCrosses.pdf" />
     <None Remove="Data\Sample-owner.pdf" />
     <None Remove="Data\Sample-user-owner.pdf" />
     <None Remove="Data\Sample-user.pdf" />
     <None Remove="Data\Sample.CMYK.pdf" />
+    <None Remove="Data\Sample.epub" />
     <None Remove="Data\Sample.Gray.pdf" />
+    <None Remove="Data\Sample.OCG.pdf" />
+    <None Remove="Data\Sample.OCGTree.pdf" />
+    <None Remove="Data\Sample.PageBoxes.pdf" />
     <None Remove="Data\Sample.pdf" />
     <None Remove="Data\Sample.png" />
     <None Remove="Data\Sample.RGB.pdf" />
+    <None Remove="Data\VectSharp.Markdown.pdf" />
   </ItemGroup>
 
   <ItemGroup>
@@ -34,6 +40,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include="Data\mupdf_explored.pdf" />
+    <EmbeddedResource Include="Data\NoughtsCrosses.pdf" />
     <EmbeddedResource Include="Data\Sample-owner.pdf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
@@ -45,13 +52,17 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Data\Sample.CMYK.pdf" />
     <EmbeddedResource Include="Data\Sample.Gray.pdf" />
+    <EmbeddedResource Include="Data\Sample.OCG.pdf" />
+    <EmbeddedResource Include="Data\Sample.OCGTree.pdf" />
+    <EmbeddedResource Include="Data\Sample.PageBoxes.pdf" />
     <EmbeddedResource Include="Data\Sample.pdf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include="Data\Sample.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include="Data\Sample.RGB.pdf" />
+    <EmbeddedResource Include="Data\VectSharp.Markdown.pdf" />
   </ItemGroup>
 
   <ItemGroup>
@@ -62,7 +73,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MuPDFCore" Version="1.10.2" />
+      <PackageReference Include="MuPDFCore" Version="2.0.0" />
   </ItemGroup>
 
 </Project>