Simplify and improve pdfium native lib loading

.github/workflows/dotnet.yml

@@ -71,6 +71,18 @@ jobs:
           dotnet-version: 7.x
       - name: Setup .NET workload android
         run: dotnet workload install android
+      - name: Setup .NET workload maui-android
+        run: dotnet workload install maui-android
+      - name: Setup .NET workload ios
+        run: dotnet workload install ios
+      - name: Setup .NET workload maui-ios
+        run: dotnet workload install maui-ios
+      - name: Setup .NET workload maccatalyst
+        run: dotnet workload install maccatalyst
+      - name: Setup .NET workload maui-maccatalyst
+        run: dotnet workload install maui-maccatalyst
+      - name: Setup .NET workload maui-windows
+        run: dotnet workload install maui-windows
       - name: Setup .NET workload wasm-tools
         run: dotnet workload install wasm-tools
       - name: Setup JDK 17
@@ -80,7 +92,7 @@ jobs:
           java-package: jdk
           distribution: 'zulu'
       - name: Restore
-        run: dotnet restore src/PDFtoImage.sln
+        run: msbuild src/PDFtoImage.sln /t:restore
       - name: Build
         run: msbuild src/PDFtoImage.sln /p:Configuration=${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} /p:VersionSuffix=ci /p:RestorePackages=false
       - name: Pack
@@ -214,8 +226,6 @@ jobs:
         run: dotnet tool install --global dotnet-coverage
       - name: Setup .NET workload android
         run: dotnet workload install android
-      - name: Setup .NET workload wasm-tools
-        run: dotnet workload install wasm-tools
       - name: Setup JDK 17
         uses: actions/setup-java@main
         with:
@@ -248,7 +258,7 @@ jobs:
         shell: powershell
         run: |
           .\.sonar\scanner\dotnet-sonarscanner begin /k:"sungaila_PDFtoImage" /o:"sungaila" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
-          dotnet restore src/PDFtoImage.sln
-          msbuild src/PDFtoImage.sln /p:Configuration=${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} 
-          dotnet-coverage collect "dotnet test src/PDFtoImage.sln --verbosity detailed" -f xml -o "coverage.xml"
+          dotnet restore src/PDFtoImage.SonarCloud.slnf
+          msbuild src/PDFtoImage.SonarCloud.slnf /p:Configuration=${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} 
+          dotnet-coverage collect "dotnet test src/PDFtoImage.SonarCloud.slnf --verbosity detailed" -f xml -o "coverage.xml"
           .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

.github/workflows/githubpages.yml

@@ -27,8 +27,6 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: 7.x
-      - name: Setup .NET workload android
-        run: dotnet workload install android
       - name: Setup .NET workload wasm-tools
         run: dotnet workload install wasm-tools
       - name: Update relative paths

.gitignore

@@ -395,4 +395,37 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
+*.sln.iml
+
+# Xamarin
+*.userprefs
+*.user
+bin
+Configuration.Override.props
+Configuration.OperatingSystem.props
+obj
+packages
+.DS_Store
+.nuget
+*.nupkg
+TestResult.xml
+TestResult-*.xml
+TestResult-*.csv
+.vs/
+.vscode/
+.gradle/
+Resource.designer.cs
+logcat-*.txt
+apk-sizes-*.txt
+*.rawproto
+*.binlog
+*.ProjectImports.zip
+*~
+external/monodroid/
+external/mono/
+tests/api-compatibility/reference/*/*.dll
+tests/api-compatibility/reference/*/*.cs
+Novell
+*.patch
+*.keystore
+/omnisharp.json

src/Console/Console.csproj

@@ -7,7 +7,7 @@
     <AssemblyName>PDFtoImage.Console</AssemblyName>
     <RootNamespace>PDFtoImage.Console</RootNamespace>
     <StartupObject>PDFtoImage.Console.Program</StartupObject>
-    <Version>2.4.2</Version>
+    <Version>2.5.0</Version>
     <Configurations>Debug;Release;ReleaseSigned</Configurations>
   </PropertyGroup>
 

src/FrameworkTests/AspNetCore/AspNetCore.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <AssemblyName>PDFtoImage.FrameworkTests.AspNetCore</AssemblyName>
+    <RootNamespace>PDFtoImage.FrameworkTests.AspNetCore</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\PDFtoImage\PDFtoImage.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="wwwroot\SocialPreview.pdf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>

src/FrameworkTests/AspNetCore/Program.cs

@@ -0,0 +1,35 @@
+namespace PDFtoImage.FrameworkTests.AspNetCore
+{
+    public class Program
+    {
+        private static IWebHostEnvironment? _hostingEnvironment;
+
+        public static void Main(string[] args)
+        {
+            var builder = WebApplication.CreateBuilder(args);
+            var app = builder.Build();
+
+            _hostingEnvironment = app.Services.GetService<IWebHostEnvironment>();
+
+            app.MapGet("/", GetOutput);
+
+            app.Run();
+        }
+
+        private static string GetOutput()
+        {
+            try
+            {
+                using var input = new FileStream(Path.Combine(_hostingEnvironment!.WebRootPath, "SocialPreview.pdf"), FileMode.Open, FileAccess.Read);
+
+                using var bitmap = PDFtoImage.Conversion.ToImage(input);
+
+                return $"SocialPreview.pdf size: {bitmap.Width}x{bitmap.Height}";
+            }
+            catch (Exception ex)
+            {
+                return ex.ToString();
+            }
+        }
+    }
+}

src/FrameworkTests/AspNetCore/Properties/launchSettings.json

@@ -0,0 +1,37 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:23307",
+      "sslPort": 44323
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5005",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7074;http://localhost:5005",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

src/FrameworkTests/AspNetCore/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

src/FrameworkTests/AspNetCore/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

src/FrameworkTests/MauiApp/App.xaml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Application
+    x:Class="PDFtoImage.FrameworkTests.MauiApp.App"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:MauiApp">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+                <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

src/FrameworkTests/MauiApp/App.xaml.cs

@@ -0,0 +1,12 @@
+namespace PDFtoImage.FrameworkTests.MauiApp
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+
+            MainPage = new AppShell();
+        }
+    }
+}

src/FrameworkTests/MauiApp/AppShell.xaml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Shell
+    x:Class="PDFtoImage.FrameworkTests.MauiApp.AppShell"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:PDFtoImage.FrameworkTests.MauiApp"
+    Shell.FlyoutBehavior="Disabled">
+
+    <ShellContent
+        Title="Home"
+        ContentTemplate="{DataTemplate local:MainPage}"
+        Route="MainPage" />
+
+</Shell>

src/FrameworkTests/MauiApp/AppShell.xaml.cs

@@ -0,0 +1,10 @@
+namespace PDFtoImage.FrameworkTests.MauiApp
+{
+    public partial class AppShell : Shell
+    {
+        public AppShell()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/FrameworkTests/MauiApp/MainPage.xaml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage x:Class="PDFtoImage.FrameworkTests.MauiApp.MainPage"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+    <ScrollView>
+        <VerticalStackLayout Padding="30,0"
+                             Spacing="25"
+                             VerticalOptions="Center">
+
+            <Image HeightRequest="200"
+                   HorizontalOptions="Center"
+                   SemanticProperties.Description="Cute dot net bot waving hi to you!"
+                   Source="dotnet_bot.png" />
+
+            <Label FontSize="32"
+                   HorizontalOptions="Center"
+                   SemanticProperties.HeadingLevel="Level1"
+                   Text="Hello, World!" />
+
+            <Label x:Name="OutputLabel"
+                   FontSize="18"
+                   HorizontalOptions="Center"
+                   SemanticProperties.Description="Welcome to dot net Multi platform App U I"
+                   SemanticProperties.HeadingLevel="Level2"
+                   Text="Tab the button below to test PDFtoImage." />
+
+            <Button x:Name="CounterBtn"
+                    Clicked="OnCounterClicked"
+                    HorizontalOptions="Center"
+                    SemanticProperties.Hint="Counts the number of times you click"
+                    Text="Click me" />
+
+        </VerticalStackLayout>
+    </ScrollView>
+
+</ContentPage>

src/FrameworkTests/MauiApp/MainPage.xaml.cs

@@ -0,0 +1,28 @@
+namespace PDFtoImage.FrameworkTests.MauiApp
+{
+    public partial class MainPage : ContentPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+
+        private async void OnCounterClicked(object sender, EventArgs e)
+        {
+            try
+            {
+                using var input = await FileSystem.OpenAppPackageFileAsync("SocialPreview.pdf");
+                using var ms = new MemoryStream();
+                input.CopyTo(ms);
+
+                using var bitmap = PDFtoImage.Conversion.ToImage(ms);
+
+                OutputLabel.Text = $"SocialPreview.pdf size: {bitmap.Width}x{bitmap.Height}";
+            }
+            catch (Exception ex)
+            {
+                OutputLabel.Text = ex.ToString();
+            }
+        }
+    }
+}