From 61aebe6c8c033c2ea65e7082e1d2cc385c825077 Mon Sep 17 00:00:00 2001 From: Ben Olden-Cooligan Date: Sat, 18 Nov 2023 11:43:50 -0800 Subject: [PATCH] Migrate to net8 --- NAPS2.App.Console/NAPS2.App.Console.csproj | 2 +- NAPS2.App.Gtk/NAPS2.App.Gtk.csproj | 2 +- NAPS2.App.Mac/NAPS2.App.Mac.csproj | 2 +- .../NAPS2.App.PortableLauncher.csproj | 2 +- NAPS2.App.Tests/NAPS2.App.Tests.csproj | 2 +- NAPS2.App.Tests/Targets/LinuxAppTestTarget.cs | 2 +- NAPS2.App.Tests/Targets/MacAppTestTarget.cs | 2 +- NAPS2.App.WinForms/NAPS2.App.WinForms.csproj | 2 +- NAPS2.App.Worker/NAPS2.App.Worker.csproj | 2 +- NAPS2.Images.Mac/NAPS2.Images.Mac.csproj | 4 ++-- NAPS2.Lib.Gtk/NAPS2.Lib.Gtk.csproj | 2 +- NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj | 2 +- NAPS2.Lib.Tests/NAPS2.Lib.Tests.csproj | 4 ++-- NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj | 2 +- NAPS2.Lib/NAPS2.Lib.csproj | 6 +++--- NAPS2.Sdk.Samples/NAPS2.Sdk.Samples.csproj | 2 +- NAPS2.Sdk.ScannerTests/NAPS2.Sdk.ScannerTests.csproj | 4 ++-- NAPS2.Sdk.Tests/NAPS2.Sdk.Tests.csproj | 6 +++--- NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Build.csproj | 2 +- NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Win32.csproj | 2 +- NAPS2.Sdk/NAPS2.Sdk.csproj | 12 ++++++------ NAPS2.Sdk/Scan/Driver.cs | 2 +- NAPS2.Sdk/Scan/Internal/ScanDriverFactory.cs | 2 +- NAPS2.Setup/NAPS2.Setup.csproj | 2 +- NAPS2.Setup/config/linux/com.naps2.Naps2.yml | 10 +++++----- NAPS2.Setup/config/linux/flatpak-dotnet-generator.py | 6 +++--- NAPS2.Tools/NAPS2.Tools.csproj | 2 +- NAPS2.Tools/Project/Packaging/DebPackager.cs | 2 +- NAPS2.Tools/Project/Packaging/MacPackager.cs | 2 +- NAPS2.Tools/Project/Packaging/PackageOptions.cs | 2 +- NAPS2.Tools/Project/Packaging/RpmPackager.cs | 2 +- NAPS2.Tools/Project/TestCommand.cs | 6 +++--- 32 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NAPS2.App.Console/NAPS2.App.Console.csproj b/NAPS2.App.Console/NAPS2.App.Console.csproj index 7a2d069bd..69ad43267 100644 --- a/NAPS2.App.Console/NAPS2.App.Console.csproj +++ b/NAPS2.App.Console/NAPS2.App.Console.csproj @@ -1,7 +1,7 @@  - net6-windows;net462 + net8-windows;net462 true Exe app.config diff --git a/NAPS2.App.Gtk/NAPS2.App.Gtk.csproj b/NAPS2.App.Gtk/NAPS2.App.Gtk.csproj index d4757a42c..e3ffa8aed 100644 --- a/NAPS2.App.Gtk/NAPS2.App.Gtk.csproj +++ b/NAPS2.App.Gtk/NAPS2.App.Gtk.csproj @@ -1,7 +1,7 @@ - net6 + net8 Exe NAPS2 naps2 diff --git a/NAPS2.App.Mac/NAPS2.App.Mac.csproj b/NAPS2.App.Mac/NAPS2.App.Mac.csproj index fcad65b21..3e329cb1d 100644 --- a/NAPS2.App.Mac/NAPS2.App.Mac.csproj +++ b/NAPS2.App.Mac/NAPS2.App.Mac.csproj @@ -1,7 +1,7 @@  - net7-macos10.15 + net8-macos10.15 Exe NAPS2 NAPS2 diff --git a/NAPS2.App.PortableLauncher/NAPS2.App.PortableLauncher.csproj b/NAPS2.App.PortableLauncher/NAPS2.App.PortableLauncher.csproj index e2f577da4..cca05817e 100644 --- a/NAPS2.App.PortableLauncher/NAPS2.App.PortableLauncher.csproj +++ b/NAPS2.App.PortableLauncher/NAPS2.App.PortableLauncher.csproj @@ -1,7 +1,7 @@  - net6;net462 + net8;net462 WinExe NAPS2.Portable NAPS2.Portable diff --git a/NAPS2.App.Tests/NAPS2.App.Tests.csproj b/NAPS2.App.Tests/NAPS2.App.Tests.csproj index 33d9467eb..3247a5100 100644 --- a/NAPS2.App.Tests/NAPS2.App.Tests.csproj +++ b/NAPS2.App.Tests/NAPS2.App.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net8 true None Debug;Release;DebugLang diff --git a/NAPS2.App.Tests/Targets/LinuxAppTestTarget.cs b/NAPS2.App.Tests/Targets/LinuxAppTestTarget.cs index 4e90031aa..0680ad648 100644 --- a/NAPS2.App.Tests/Targets/LinuxAppTestTarget.cs +++ b/NAPS2.App.Tests/Targets/LinuxAppTestTarget.cs @@ -12,7 +12,7 @@ public class LinuxAppTestTarget : IAppTestTarget { var runtime = RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "linux-arm64" : "linux-x64"; return new AppTestExe( - Path.Combine(AppTestHelper.SolutionRoot, "NAPS2.App.Gtk", "bin", "Debug", "net6", runtime), + Path.Combine(AppTestHelper.SolutionRoot, "NAPS2.App.Gtk", "bin", "Debug", "net8", runtime), "naps2", argPrefix); } diff --git a/NAPS2.App.Tests/Targets/MacAppTestTarget.cs b/NAPS2.App.Tests/Targets/MacAppTestTarget.cs index ccec634be..b8476d9e9 100644 --- a/NAPS2.App.Tests/Targets/MacAppTestTarget.cs +++ b/NAPS2.App.Tests/Targets/MacAppTestTarget.cs @@ -9,7 +9,7 @@ public class MacAppTestTarget : IAppTestTarget private AppTestExe GetAppTestExe(string argPrefix) { return new AppTestExe( - Path.Combine(AppTestHelper.SolutionRoot, "NAPS2.App.Mac", "bin", "Debug", "net7-macos10.15"), + Path.Combine(AppTestHelper.SolutionRoot, "NAPS2.App.Mac", "bin", "Debug", "net8-macos10.15"), Path.Combine("NAPS2.app", "Contents", "MacOS", "NAPS2"), argPrefix); } diff --git a/NAPS2.App.WinForms/NAPS2.App.WinForms.csproj b/NAPS2.App.WinForms/NAPS2.App.WinForms.csproj index 33952b1bc..8e26a16c7 100644 --- a/NAPS2.App.WinForms/NAPS2.App.WinForms.csproj +++ b/NAPS2.App.WinForms/NAPS2.App.WinForms.csproj @@ -1,7 +1,7 @@  - net6-windows;net462 + net8-windows;net462 true WinExe app.config diff --git a/NAPS2.App.Worker/NAPS2.App.Worker.csproj b/NAPS2.App.Worker/NAPS2.App.Worker.csproj index eacb75604..df73b8336 100644 --- a/NAPS2.App.Worker/NAPS2.App.Worker.csproj +++ b/NAPS2.App.Worker/NAPS2.App.Worker.csproj @@ -1,7 +1,7 @@  - net6-windows;net462 + net8-windows;net462 true WinExe true diff --git a/NAPS2.Images.Mac/NAPS2.Images.Mac.csproj b/NAPS2.Images.Mac/NAPS2.Images.Mac.csproj index b859924de..051f28ec2 100644 --- a/NAPS2.Images.Mac/NAPS2.Images.Mac.csproj +++ b/NAPS2.Images.Mac/NAPS2.Images.Mac.csproj @@ -1,7 +1,7 @@ - net6;net6-macos10.15 + net6;net8-macos10.15 enable true false @@ -32,7 +32,7 @@ - + diff --git a/NAPS2.Lib.Gtk/NAPS2.Lib.Gtk.csproj b/NAPS2.Lib.Gtk/NAPS2.Lib.Gtk.csproj index 70a09d1e2..1b262bc62 100644 --- a/NAPS2.Lib.Gtk/NAPS2.Lib.Gtk.csproj +++ b/NAPS2.Lib.Gtk/NAPS2.Lib.Gtk.csproj @@ -1,7 +1,7 @@ - net6 + net8 enable true NAPS2 diff --git a/NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj b/NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj index 133b2a79d..a6a999647 100644 --- a/NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj +++ b/NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj @@ -1,7 +1,7 @@ - net7-macos10.15 + net8-macos10.15 enable true NAPS2 diff --git a/NAPS2.Lib.Tests/NAPS2.Lib.Tests.csproj b/NAPS2.Lib.Tests/NAPS2.Lib.Tests.csproj index b8f55b2ec..20368b2b7 100644 --- a/NAPS2.Lib.Tests/NAPS2.Lib.Tests.csproj +++ b/NAPS2.Lib.Tests/NAPS2.Lib.Tests.csproj @@ -1,8 +1,8 @@  - net6;net462 - net6 + net8;net462 + net8 true NAPS2.Lib.Tests diff --git a/NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj b/NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj index 83186c3b1..2367c4f74 100644 --- a/NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj +++ b/NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj @@ -1,7 +1,7 @@  - net6-windows;net462 + net8-windows;net462 enable true NAPS2 diff --git a/NAPS2.Lib/NAPS2.Lib.csproj b/NAPS2.Lib/NAPS2.Lib.csproj index 851598597..5df97c11a 100644 --- a/NAPS2.Lib/NAPS2.Lib.csproj +++ b/NAPS2.Lib/NAPS2.Lib.csproj @@ -1,8 +1,8 @@  - net6;net462 - net6;net6-macos10.15;net462 + net8;net462 + net8;net8-macos10.15;net462 enable true NAPS2 @@ -15,7 +15,7 @@ - + MAC diff --git a/NAPS2.Sdk.Samples/NAPS2.Sdk.Samples.csproj b/NAPS2.Sdk.Samples/NAPS2.Sdk.Samples.csproj index 5c0d485d2..af32efd66 100644 --- a/NAPS2.Sdk.Samples/NAPS2.Sdk.Samples.csproj +++ b/NAPS2.Sdk.Samples/NAPS2.Sdk.Samples.csproj @@ -1,7 +1,7 @@  - net6;net462 + net8;net462 CA1416 diff --git a/NAPS2.Sdk.ScannerTests/NAPS2.Sdk.ScannerTests.csproj b/NAPS2.Sdk.ScannerTests/NAPS2.Sdk.ScannerTests.csproj index 84b0a6706..5f6baec6b 100644 --- a/NAPS2.Sdk.ScannerTests/NAPS2.Sdk.ScannerTests.csproj +++ b/NAPS2.Sdk.ScannerTests/NAPS2.Sdk.ScannerTests.csproj @@ -1,8 +1,8 @@ - net6;net462 - net6 + net8;net462 + net8 NAPS2.Sdk.ScannerTests diff --git a/NAPS2.Sdk.Tests/NAPS2.Sdk.Tests.csproj b/NAPS2.Sdk.Tests/NAPS2.Sdk.Tests.csproj index a266b2c77..b79400878 100644 --- a/NAPS2.Sdk.Tests/NAPS2.Sdk.Tests.csproj +++ b/NAPS2.Sdk.Tests/NAPS2.Sdk.Tests.csproj @@ -1,8 +1,8 @@  - net6;net462 - net6 + net8;net462 + net8 true true @@ -27,7 +27,7 @@ - + diff --git a/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Build.csproj b/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Build.csproj index fc0ddaf20..ea8c05fd1 100644 --- a/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Build.csproj +++ b/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Build.csproj @@ -1,7 +1,7 @@ - net6 + net8 WinExe true NAPS2.Sdk.Worker diff --git a/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Win32.csproj b/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Win32.csproj index 271ac8a08..d1d077f55 100644 --- a/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Win32.csproj +++ b/NAPS2.Sdk.Worker/NAPS2.Sdk.Worker.Win32.csproj @@ -18,7 +18,7 @@ - + lib/NAPS2.Worker.exe true true diff --git a/NAPS2.Sdk/NAPS2.Sdk.csproj b/NAPS2.Sdk/NAPS2.Sdk.csproj index b8a1e81eb..aafcd6c87 100644 --- a/NAPS2.Sdk/NAPS2.Sdk.csproj +++ b/NAPS2.Sdk/NAPS2.Sdk.csproj @@ -3,7 +3,7 @@ net6;net462 - $(TargetFrameworks);net6-macos10.15 + $(TargetFrameworks);net8-macos10.15 enable true @@ -22,7 +22,7 @@ - + MAC @@ -37,14 +37,14 @@ ..\NAPS2.Setup\lib\PdfSharpCore.dll - + ..\NAPS2.Setup\lib\NTwain.dll - - + + @@ -87,7 +87,7 @@ - + diff --git a/NAPS2.Sdk/Scan/Driver.cs b/NAPS2.Sdk/Scan/Driver.cs index 341ec6928..24f890911 100644 --- a/NAPS2.Sdk/Scan/Driver.cs +++ b/NAPS2.Sdk/Scan/Driver.cs @@ -24,7 +24,7 @@ public enum Driver /// /// Use an Apple ImageCaptureCore driver (Mac-only). You will also need to compile against a macOS framework target - /// (e.g net6-macos10.15) to use this driver type. + /// (e.g net8-macos10.15) to use this driver type. /// Apple, diff --git a/NAPS2.Sdk/Scan/Internal/ScanDriverFactory.cs b/NAPS2.Sdk/Scan/Internal/ScanDriverFactory.cs index 448eb0c55..2ff0e978d 100644 --- a/NAPS2.Sdk/Scan/Internal/ScanDriverFactory.cs +++ b/NAPS2.Sdk/Scan/Internal/ScanDriverFactory.cs @@ -37,7 +37,7 @@ internal class ScanDriverFactory : IScanDriverFactory default: throw new NotSupportedException( $"Unsupported driver: {options.Driver}. " + - "Make sure you're using the right framework target (e.g. net6-macos10.15 for the Apple driver)."); + "Make sure you're using the right framework target (e.g. net8-macos10.15 for the Apple driver)."); } } } \ No newline at end of file diff --git a/NAPS2.Setup/NAPS2.Setup.csproj b/NAPS2.Setup/NAPS2.Setup.csproj index 485a9cd34..a52b036fb 100644 --- a/NAPS2.Setup/NAPS2.Setup.csproj +++ b/NAPS2.Setup/NAPS2.Setup.csproj @@ -1,7 +1,7 @@  - net6;net462 + net8;net462 diff --git a/NAPS2.Setup/config/linux/com.naps2.Naps2.yml b/NAPS2.Setup/config/linux/com.naps2.Naps2.yml index 3ab9f1468..2b216d66c 100644 --- a/NAPS2.Setup/config/linux/com.naps2.Naps2.yml +++ b/NAPS2.Setup/config/linux/com.naps2.Naps2.yml @@ -3,7 +3,7 @@ runtime: org.freedesktop.Platform runtime-version: '22.08' sdk: org.freedesktop.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.dotnet6 + - org.freedesktop.Sdk.Extension.dotnet8 command: naps2 copy-icon: true cleanup: @@ -81,10 +81,10 @@ modules: - name: main buildsystem: simple build-options: - append-path: /usr/lib/sdk/dotnet6/bin - append-ld-library-path: /usr/lib/sdk/dotnet6/lib + append-path: /usr/lib/sdk/dotnet8/bin + append-ld-library-path: /usr/lib/sdk/dotnet8/lib env: - PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/dotnet6/lib/pkgconfig + PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/dotnet8/lib/pkgconfig DOTNET_CLI_TELEMETRY_OPTOUT: 'true' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' arch: @@ -97,7 +97,7 @@ modules: build-commands: - mkdir -p /app/bin - dotnet publish NAPS2.App.Gtk -c Release -r $RUNTIME --self-contained /p:DebugType=None /p:DebugSymbols=false --source ./nuget-sources - - cp -r --remove-destination /run/build/main/NAPS2.App.Gtk/bin/Release/net6/$RUNTIME/publish/. /app/bin/ + - cp -r --remove-destination /run/build/main/NAPS2.App.Gtk/bin/Release/net8/$RUNTIME/publish/. /app/bin/ - install -Dm644 com.naps2.Naps2.png /app/share/icons/hicolor/128x128/apps/com.naps2.Naps2.png - install -Dm644 com.naps2.Naps2.metainfo.xml /app/share/metainfo/com.naps2.Naps2.metainfo.xml - install -Dm644 com.naps2.Naps2.desktop /app/share/applications/com.naps2.Naps2.desktop diff --git a/NAPS2.Setup/config/linux/flatpak-dotnet-generator.py b/NAPS2.Setup/config/linux/flatpak-dotnet-generator.py index 9b644219f..bf26684c0 100644 --- a/NAPS2.Setup/config/linux/flatpak-dotnet-generator.py +++ b/NAPS2.Setup/config/linux/flatpak-dotnet-generator.py @@ -36,10 +36,10 @@ def main(): '--env=DOTNET_CLI_TELEMETRY_OPTOUT=true', '--env=DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true', '--command=sh', '--runtime=org.freedesktop.Sdk//22.08', '--share=network', - '--filesystem=host', 'org.freedesktop.Sdk.Extension.dotnet6//22.08', '-c', - 'PATH="${PATH}:/usr/lib/sdk/dotnet6/bin" NUGET_PACKAGES="' + + '--filesystem=host', 'org.freedesktop.Sdk.Extension.dotnet8//22.08', '-c', + 'PATH="${PATH}:/usr/lib/sdk/dotnet8/bin" NUGET_PACKAGES="' + str(Path(tmp).resolve()) + - '" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/sdk/dotnet6/lib" exec dotnet ' + cmd, + '" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/sdk/dotnet8/lib" exec dotnet ' + cmd, '--', args.project] + runtime_args) runCommand('restore -r linux-x64 "$@"') diff --git a/NAPS2.Tools/NAPS2.Tools.csproj b/NAPS2.Tools/NAPS2.Tools.csproj index 1c36c1a9c..e14741267 100644 --- a/NAPS2.Tools/NAPS2.Tools.csproj +++ b/NAPS2.Tools/NAPS2.Tools.csproj @@ -1,7 +1,7 @@  - net7 + net8 enable Exe NAPS2.Tools diff --git a/NAPS2.Tools/Project/Packaging/DebPackager.cs b/NAPS2.Tools/Project/Packaging/DebPackager.cs index 31a0112a9..6a5f19550 100644 --- a/NAPS2.Tools/Project/Packaging/DebPackager.cs +++ b/NAPS2.Tools/Project/Packaging/DebPackager.cs @@ -33,7 +33,7 @@ public static class DebPackager File.WriteAllText(Path.Combine(controlDir, "control"), template); // Copy binary files - var publishDir = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Gtk", "bin", "Release", "net6", runtimeId, + var publishDir = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Gtk", "bin", "Release", "net8", runtimeId, "publish"); var targetDir = Path.Combine(workingDir, "usr/lib/naps2"); ProjectHelper.CopyDirectory(publishDir, targetDir); diff --git a/NAPS2.Tools/Project/Packaging/MacPackager.cs b/NAPS2.Tools/Project/Packaging/MacPackager.cs index b61cb06d8..753350a70 100644 --- a/NAPS2.Tools/Project/Packaging/MacPackager.cs +++ b/NAPS2.Tools/Project/Packaging/MacPackager.cs @@ -14,7 +14,7 @@ public static class MacPackager Output.Info($"Packaging installer: {pkgPath}"); Output.Verbose("Building bundle"); - var basePath = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Mac", "bin", "Release", "net7-macos10.15"); + var basePath = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Mac", "bin", "Release", "net8-macos10.15"); string bundlePath = packageInfo.Platform switch { Platform.Mac => Path.Combine(basePath, "NAPS2.app"), diff --git a/NAPS2.Tools/Project/Packaging/PackageOptions.cs b/NAPS2.Tools/Project/Packaging/PackageOptions.cs index 61bc8ce7a..4f4616854 100644 --- a/NAPS2.Tools/Project/Packaging/PackageOptions.cs +++ b/NAPS2.Tools/Project/Packaging/PackageOptions.cs @@ -29,5 +29,5 @@ public class PackageOptions : OptionsBase [Option("debug", Required = false, HelpText = "Set DEBUG compile-time constant. Requires --build.")] public bool Debug { get; set; } - // TODO: Add net target (net462/net6/net6-windows etc.) + // TODO: Add net target (net462/net8/net8-windows etc.) } \ No newline at end of file diff --git a/NAPS2.Tools/Project/Packaging/RpmPackager.cs b/NAPS2.Tools/Project/Packaging/RpmPackager.cs index 070282419..b30ced10d 100644 --- a/NAPS2.Tools/Project/Packaging/RpmPackager.cs +++ b/NAPS2.Tools/Project/Packaging/RpmPackager.cs @@ -36,7 +36,7 @@ public static class RpmPackager File.WriteAllText(Path.Combine(workingDir, "SPECS/naps2.spec"), template); // Copy binary files - var publishDir = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Gtk", "bin", "Release", "net6", runtimeId, + var publishDir = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Gtk", "bin", "Release", "net8", runtimeId, "publish"); var filesDir = Path.Combine(workingDir, $"naps2-{pkgInfo.VersionNumber}"); var targetDir = Path.Combine(filesDir, "usr/lib/naps2"); diff --git a/NAPS2.Tools/Project/TestCommand.cs b/NAPS2.Tools/Project/TestCommand.cs index f29ae95fd..4bc38cf52 100644 --- a/NAPS2.Tools/Project/TestCommand.cs +++ b/NAPS2.Tools/Project/TestCommand.cs @@ -9,11 +9,11 @@ public class TestCommand : ICommand // TODO: Framework options (e.g. "-f net462") var arch = RuntimeInformation.OSArchitecture.ToString().ToLowerInvariant(); var depsRootPath = OperatingSystem.IsMacOS() - ? $"NAPS2.App.Mac/bin/Debug/net7-macos10.15/osx-{arch}" + ? $"NAPS2.App.Mac/bin/Debug/net8-macos10.15/osx-{arch}" : OperatingSystem.IsLinux() - ? $"NAPS2.App.Gtk/bin/Debug/net6/linux-{arch}" + ? $"NAPS2.App.Gtk/bin/Debug/net8/linux-{arch}" : "NAPS2.App.WinForms/bin/Debug/net462"; - var frameworkArg = OperatingSystem.IsWindows() ? "" : "-f net6"; + var frameworkArg = OperatingSystem.IsWindows() ? "" : "-f net8"; void RunTests(string project, bool isRetry = false) {