[pull] master from cyanfish:master

.github/workflows/dotnet.yml

@@ -0,0 +1,38 @@
+name: .NET
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-2022, ubuntu-24.04, macos-15]
+    steps:
+    - name: Install OS dependencies
+      if: matrix.os == 'ubuntu-24.04'
+      run: sudo apt-get install -y fonts-liberation2 fonts-noto-core fonts-noto-cjk
+    - uses: actions/checkout@v4
+    - name: Setup .NET 9
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.0.x
+    - name: Install workloads
+      if: matrix.os == 'macos-15'
+      run: dotnet workload install macos
+    - name: Build
+      run: dotnet run --project NAPS2.Tools -- build debug -v
+    - name: Test
+      if: matrix.os != 'macos-15'
+      run: dotnet run --project NAPS2.Tools -- test -v --nogui
+    - name: Test (mac)
+      if: matrix.os == 'macos-15'
+      run: dotnet run --project NAPS2.Tools -- test -v --nogui --nonetwork
+    - name: Test (WPF images)
+      if: matrix.os == 'windows-2022'
+      run: dotnet run --project NAPS2.Tools -- test -v --nogui --images wpf --scope sdk
+    - name: Test (ImageSharp images)
+      if: matrix.os == 'ubuntu-24.04'
+      run: dotnet run --project NAPS2.Tools -- test -v --nogui --images is --scope sdk

.gitignore

@@ -1,4 +1,5 @@
 Desktop.ini
+.DS_Store
 packages/
 *.user
 *.suo

CONTRIBUTORS

@@ -1,5 +1,5 @@
 Primary NAPS2 developer:
-Ben Olden-Cooligan (Copyright 2012-2022)
+Ben Olden-Cooligan (Copyright 2012-2025)
 
 Original NAPS developer:
 Pavel Sorejs (Copyright 2009)
@@ -10,3 +10,6 @@ Luca De Petrillo (Copyright 2015)
 Peter De Leeuw
 Peter Hommel
 Alexander Rabenstein
+
+And others:
+https://github.com/cyanfish/naps2/graphs/contributors

LICENSE

@@ -1,7 +1,7 @@
 NAPS2 - Not Another PDF Scanner
 https://www.naps2.com
 
-Copyright 2009-2022 NAPS2 Contributors
+Copyright 2009-2025 NAPS2 Contributors
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

NAPS2.App.Console/NAPS2.App.Console.csproj

@@ -1,36 +1,39 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6-windows;net462</TargetFrameworks>
+    <TargetFramework>net9-windows</TargetFramework>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <OutputType>Exe</OutputType>
-    <AppConfig>app.config</AppConfig>
-    <LargeAddressAware>true</LargeAddressAware>
     <RootNamespace>NAPS2.Console</RootNamespace>
     <AssemblyName>NAPS2.Console</AssemblyName>
-
+
+    <SelfContained>true</SelfContained>
+    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+    <!-- TODO: Re-enable trimming if we can fix startup time as well as WIA being broken -->
+    <PublishTrimmed>false</PublishTrimmed>
+    <TrimMode>none</TrimMode>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+
     <Title>NAPS2 - Not Another PDF Scanner</Title>
     <Product>NAPS2 - Not Another PDF Scanner</Product>
-    <Copyright>Copyright 2009, 2012-2020 NAPS2 Contributors; Icons from http://www.fatcow.com/free-icons</Copyright>
-
-    <!--
-    We reference the 32-bit worker directly so the EXE is included in the output.
-    -->
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
 
   <Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
   <Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
   <Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NAPS2.Wia" Version="1.0.1" />
-
-    <ProjectReference Include="..\NAPS2.App.Worker\NAPS2.App.Worker.csproj" />
     <ProjectReference Include="..\NAPS2.Images.Gdi\NAPS2.Images.Gdi.csproj" />
     <ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
+    <ProjectReference Include="..\NAPS2.Lib.WinForms\NAPS2.Lib.WinForms.csproj" />
+  </ItemGroup>
 
-    <PackageReference Include="LargeAddressAware" Version="1.0.3" />
+  <ItemGroup>
+    <ContentWithTargetPath Include="..\NAPS2.Setup\appsettings.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Link>appsettings.xml</Link>
+      <TargetPath>appsettings.xml</TargetPath>
+    </ContentWithTargetPath>
   </ItemGroup>
-  
+
 </Project>

NAPS2.App.Console/Program.cs

@@ -1,4 +1,5 @@
-using NAPS2.EntryPoints;
+using System.Runtime;
+using NAPS2.EntryPoints;
 
 namespace NAPS2.Console;
 
@@ -10,7 +11,11 @@ static class Program
     [STAThread]
     static int Main(string[] args)
     {
-        // Use reflection to avoid antivirus false positives (yes, really)
-        return (int) typeof(WindowsConsoleEntryPoint).GetMethod("Run")!.Invoke(null, new object[] { args })!;
+        var profilesPath = Path.Combine(Paths.AppData, "jit");
+        Directory.CreateDirectory(profilesPath);
+        ProfileOptimization.SetProfileRoot(profilesPath);
+        ProfileOptimization.StartProfile("naps2.console.jit");
+
+        return WindowsConsoleEntryPoint.Run(args);
     }
 }

NAPS2.App.Gtk/NAPS2.App.Gtk.csproj

@@ -1,34 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
+        <TargetFramework>net9</TargetFramework>
         <OutputType>Exe</OutputType>
         <RootNamespace>NAPS2</RootNamespace>
         <AssemblyName>naps2</AssemblyName>
-        <Version>7.0.1</Version>
         <ApplicationIcon>../NAPS2.Lib/Icons/favicon.ico</ApplicationIcon>
 
         <SelfContained>true</SelfContained>
         <PublishSingleFile>true</PublishSingleFile>
         <PublishTrimmed>true</PublishTrimmed>
+        <TrimMode>partial</TrimMode>
 
-        <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+	<RuntimeIdentifiers>linux-x64;linux-arm64</RuntimeIdentifiers>
 
         <Title>NAPS2 - Not Another PDF Scanner</Title>
         <Product>NAPS2 - Not Another PDF Scanner</Product>
-        <Copyright>Copyright 2009, 2012-2022 NAPS2 Contributors</Copyright>
     </PropertyGroup>
 
     <Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
-    <Import Project="..\NAPS2.Setup\targets\NativeLibs.Linux.targets" />
     <Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
 
     <ItemGroup>
-        <PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
+        <PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.2.0" />
+        <PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.4.0" />
 
         <ProjectReference Include="..\NAPS2.Lib.Gtk\NAPS2.Lib.Gtk.csproj" />
 
-        <PackageReference Include="Eto.Platform.Gtk" Version="2.7.2" />
+        <PackageReference Include="Eto.Platform.Gtk" Version="2.8.3" />
         <!-- This shouldn't need a reference normally, but otherwise "dotnet restore" doesn't pick
              it up, which breaks the flatpak build. -->
         <PackageReference Include="Microsoft.NETCore.App" Version="2.1.*" />

NAPS2.App.Gtk/Program.cs

@@ -1,4 +1,5 @@
-using NAPS2.EntryPoints;
+using System.Runtime;
+using NAPS2.EntryPoints;
 
 namespace NAPS2;
 
@@ -9,6 +10,11 @@ static class Program
     /// </summary>
     static void Main(string[] args)
     {
+        var profilesPath = Path.Combine(Paths.AppData, "jit");
+        Directory.CreateDirectory(profilesPath);
+        ProfileOptimization.SetProfileRoot(profilesPath);
+        ProfileOptimization.StartProfile("naps2.jit");
+
         // Use reflection to avoid antivirus false positives (yes, really)
         typeof(GtkEntryPoint).GetMethod("Run").Invoke(null, new object[] { args });
     }

NAPS2.App.Mac/Entitlements.plist

@@ -4,5 +4,13 @@
   <dict>
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
+    <!-- Some macOS versions have trouble loading sane without dyld (see WorkerFactory.cs).
+         From a security perspective this should be ok as libraries will still need to have the right signature. -->
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <!-- Needed for SANE to work properly.
+         Unfortunate, but .NET is a managed language so the potential attack surface is minimal. -->
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
   </dict>
 </plist>

NAPS2.App.Mac/Info.plist

@@ -2,21 +2,94 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
+
+    <!-- Basic metadata -->
     <key>CFBundleName</key>
     <string>NAPS2</string>
     <key>CFBundleIdentifier</key>
     <string>com.naps2.desktop</string>
     <key>CFBundleShortVersionString</key>
-    <string>7.0.1</string>
+    <string>8.2.1</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.15</string>
+    <string>12.0</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>CFBundleIconFile</key>
     <string>Icon.icns</string>
     <key>NSPrincipalClass</key>
+
+    <!-- We start as a background application in case we're in worker mode and don't want to show a UI.
+     If we're in GUI mode we dynamically switch to a foreground application (see MacEntryPoint.cs). -->
     <string>NSApplication</string>
+    <key>LSBackgroundOnly</key>
+    <true/>
+
+    <!-- File types for "Open With" -->
+    <key>CFBundleDocumentTypes</key>
+    <array>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeName</key>
+        <string>PDF</string>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>com.adobe.pdf</string>
+        </array>
+      </dict>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeName</key>
+        <string>JPG</string>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>public.jpeg</string>
+        </array>
+      </dict>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeName</key>
+        <string>JP2</string>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>public.jpeg-2000</string>
+        </array>
+      </dict>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeName</key>
+        <string>PNG</string>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>public.png</string>
+        </array>
+      </dict>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeName</key>
+        <string>TIFF</string>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>public.tiff</string>
+        </array>
+      </dict>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeName</key>
+        <string>BMP</string>
+        <key>LSItemContentTypes</key>
+        <array>
+          <string>com.microsoft.bmp</string>
+        </array>
+      </dict>
+    </array>
+
   </dict>
 </plist>

NAPS2.App.Mac/NAPS2.App.Mac.csproj

@@ -1,31 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7-macos10.15</TargetFramework>
+    <TargetFramework>net9-macos</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>NAPS2</RootNamespace>
     <AssemblyName>NAPS2</AssemblyName>
-    <Version>7.0.1</Version>
     <ApplicationIcon>../NAPS2.Lib/Icons/favicon.ico</ApplicationIcon>
 
-    <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
+    <SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
+    <RuntimeIdentifiers Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64;osx-arm64</RuntimeIdentifiers>
+    <TrimMode>partial</TrimMode>
 
     <Title>NAPS2 - Not Another PDF Scanner</Title>
     <Product>NAPS2 - Not Another PDF Scanner</Product>
-    <Copyright>Copyright 2009, 2012-2022 NAPS2 Contributors</Copyright>
   </PropertyGroup>
 
   <Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
-  <Import Project="..\NAPS2.Setup\targets\NativeLibs.Mac.targets" />
   <Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NAPS2.Sane.Binaries" Version="1.0.4" />
-    <PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
+    <PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.2.0" />
+    <PackageReference Include="NAPS2.Sane.Binaries" Version="1.1.0" />
+    <PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.4.0" />
 
     <ProjectReference Include="..\NAPS2.Lib.Mac\NAPS2.Lib.Mac.csproj" />
 
-    <PackageReference Include="Eto.Platform.macOS" Version="2.7.2" />
+    <PackageReference Include="Eto.Platform.macOS" Version="2.8.3" />
   </ItemGroup>
 
   <ItemGroup>

NAPS2.App.Mac/Program.cs

@@ -1,3 +1,4 @@
+using System.Runtime;
 using NAPS2.EntryPoints;
 
 namespace NAPS2;
@@ -9,6 +10,11 @@ static class Program
     /// </summary>
     static void Main(string[] args)
     {
+        var profilesPath = Path.Combine(Paths.AppData, "jit");
+        Directory.CreateDirectory(profilesPath);
+        ProfileOptimization.SetProfileRoot(profilesPath);
+        ProfileOptimization.StartProfile("naps2.jit");
+
         // Use reflection to avoid antivirus false positives (yes, really)
         typeof(MacEntryPoint).GetMethod("Run").Invoke(null, new object[] { args });
     }