From 3a5d4272b528a3bf46f2556e022a68358caac7a1 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Sat, 8 Jul 2023 15:04:55 +0200
Subject: [PATCH] [WiP] Drop support for .NET Standard 2.0 and Mono

See: https://devblogs.microsoft.com/dotnet/the-future-of-net-standard/
---
 .github/workflows/ci.yml                      |  4 -
 README.md                                     |  5 +-
 build.ps1                                     |  2 +-
 build.sh                                      |  8 +-
 build/Build.cs                                | 11 ---
 build/native/NetVips.Native.linux-arm.nuspec  |  5 +-
 .../native/NetVips.Native.linux-arm64.nuspec  |  5 +-
 .../NetVips.Native.linux-musl-arm64.nuspec    |  3 +-
 .../NetVips.Native.linux-musl-x64.nuspec      |  5 +-
 build/native/NetVips.Native.linux-x64.nuspec  |  5 +-
 build/native/NetVips.Native.nuspec            | 17 +---
 build/native/NetVips.Native.osx-arm64.nuspec  |  3 +-
 build/native/NetVips.Native.osx-x64.nuspec    |  5 +-
 build/native/NetVips.Native.win-arm64.nuspec  |  3 +-
 build/native/NetVips.Native.win-x64.nuspec    |  4 +-
 build/native/NetVips.Native.win-x86.nuspec    |  4 +-
 .../targets/NetVips.Native.linux-arm.targets  | 18 -----
 .../NetVips.Native.linux-arm64.targets        | 18 -----
 .../NetVips.Native.linux-musl-x64.targets     | 18 -----
 .../targets/NetVips.Native.linux-x64.targets  | 18 -----
 .../targets/NetVips.Native.osx-x64.targets    | 18 -----
 build/test-mono.sh                            | 45 -----------
 docker.sh                                     |  2 +-
 .../NetVips.Extensions.csproj                 | 15 ++--
 src/NetVips/ExtensionMethods.cs               | 13 ---
 src/NetVips/GObject.cs                        |  2 +-
 src/NetVips/Interop/Libraries.OSX.cs          | 15 ----
 src/NetVips/Interop/Libraries.Unix.cs         | 15 ----
 src/NetVips/Interop/Libraries.Windows.cs      | 12 ---
 src/NetVips/Interop/Libraries.cs              | 13 +++
 src/NetVips/ModuleInitializer.cs              | 80 +++++++++++++++++++
 src/NetVips/ModuleInitializerAttribute.cs     |  4 +-
 src/NetVips/NetVips.cs                        |  4 +-
 src/NetVips/NetVips.csproj                    | 36 +--------
 src/NetVips/SourceCustom.cs                   |  8 +-
 src/NetVips/TargetCustom.cs                   |  6 +-
 src/NetVips/VipsBlob.cs                       |  4 +-
 src/NetVips/VipsObject.cs                     |  2 +-
 tests/NetVips.Tests/NetVips.Tests.csproj      | 19 +----
 39 files changed, 138 insertions(+), 336 deletions(-)
 delete mode 100644 build/native/targets/NetVips.Native.linux-arm.targets
 delete mode 100644 build/native/targets/NetVips.Native.linux-arm64.targets
 delete mode 100644 build/native/targets/NetVips.Native.linux-musl-x64.targets
 delete mode 100644 build/native/targets/NetVips.Native.linux-x64.targets
 delete mode 100644 build/native/targets/NetVips.Native.osx-x64.targets
 delete mode 100755 build/test-mono.sh
 delete mode 100644 src/NetVips/Interop/Libraries.OSX.cs
 delete mode 100644 src/NetVips/Interop/Libraries.Unix.cs
 delete mode 100644 src/NetVips/Interop/Libraries.Windows.cs
 create mode 100644 src/NetVips/Interop/Libraries.cs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 316f4dfd..b1d5a62d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,10 +17,6 @@ jobs:
           - os: ubuntu-22.04
             container: mcr.microsoft.com/dotnet/sdk:7.0-alpine3.16
             script: ./build.sh
-          # TODO(kleisauke): Re-enable Mono CI when C# 9 features are supported.
-          # - os: ubuntu-22.04
-          #   script: ./build/test-mono.sh
-          #   allow_failures: true
           - os: macos-12
             script: ./build.sh
           - os: windows-2022
diff --git a/README.md b/README.md
index d45a4d05..39cd9896 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,8 @@ which gives some more background.
 
 ## Supported platforms
 
-- .NET Framework (4.5.2 and higher)
-- .NET Core (.NETStandard 2.0 and higher on Windows, Linux and macOS)
-- Mono
+- .NET Framework 4.5.2 and higher
+- .NET 6.0 and higher
 
 ## Install
 
diff --git a/build.ps1 b/build.ps1
index f561725f..ec978393 100644
--- a/build.ps1
+++ b/build.ps1
@@ -34,7 +34,7 @@ if ((Get-Command "dotnet" -ErrorAction SilentlyContinue) -eq $null) {
 	exit 1
 }
 
-Write-Output "Microsoft (R) .NET Core SDK version $(& dotnet --version)"
+Write-Output "Microsoft (R) .NET SDK version $(& dotnet --version)"
 
 ExecSafe { & dotnet build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false /nologo /clp:NoSummary --verbosity quiet }
 ExecSafe { & dotnet run --project $BuildProjectFile --no-build -- $BuildArguments }
diff --git a/build.sh b/build.sh
index 6afa515d..406277bf 100755
--- a/build.sh
+++ b/build.sh
@@ -18,16 +18,12 @@ export NUKE_TELEMETRY_OPTOUT=1
 # EXECUTION
 ###########################################################################
 
-# Do not use -x to check for the presence of dotnet,
-# because that might fail on bash under Alpine 3.14, see:
-# https://github.com/alpinelinux/docker-alpine/issues/156
-# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
-if ! [ -e "$(command -v dotnet)" ]; then
+if ! [ -x "$(command -v dotnet)" ]; then
     echo 'Error: dotnet is not installed.' >&2
     exit 1
 fi
 
-echo "Microsoft (R) .NET Core SDK version $(dotnet --version)"
+echo "Microsoft (R) .NET SDK version $(dotnet --version)"
 
 dotnet build "$BUILD_PROJECT_FILE" -nodeReuse:false -p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
 dotnet run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"
diff --git a/build/Build.cs b/build/Build.cs
index 5f127d12..6d8ffd29 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -132,21 +132,10 @@ protected override void OnBuildInitialized()
         .DependsOn(Clean)
         .Executes(() =>
         {
-            // Need to build the macOS and *nix DLL first.
-            DotNetBuild(c => c
-                .SetProjectFile(Solution.NetVips)
-                .SetConfiguration(Configuration)
-                .SetFramework("netstandard2.0")
-                .AddProperty("Platform", "AnyCPU")
-                .CombineWith(
-                    new[] { "OSX", "Unix" },
-                    (_, os) => _.AddProperty("TargetOS", os)));
-
             DotNetPack(c => c
                 .SetProject(Solution.NetVips)
                 .SetConfiguration(Configuration)
                 .SetOutputDirectory(ArtifactsDirectory)
-                .AddProperty("TargetOS", "Windows")
             );
         });
 
diff --git a/build/native/NetVips.Native.linux-arm.nuspec b/build/native/NetVips.Native.linux-arm.nuspec
index 72caaec9..0451a10c 100644
--- a/build/native/NetVips.Native.linux-arm.nuspec
+++ b/build/native/NetVips.Native.linux-arm.nuspec
@@ -22,9 +22,6 @@
   </metadata>
   <files>
 
-    <!-- The .NET Framework >= 4.6.1 build bits for Mono runtime -->
-    <file src="targets\NetVips.Native.linux-arm.targets" target="build/net461" />
-
     <!-- Include libvips Linux ARM64v8 binaries -->
     <file src="pack\linux-arm\*.so*" target="runtimes/linux-arm/native" />
 
@@ -35,7 +32,7 @@
     <file src="pack\linux-arm\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <file src="_._" target="lib/netstandard1.0" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.linux-arm64.nuspec b/build/native/NetVips.Native.linux-arm64.nuspec
index 5d0ab745..851791d1 100644
--- a/build/native/NetVips.Native.linux-arm64.nuspec
+++ b/build/native/NetVips.Native.linux-arm64.nuspec
@@ -22,9 +22,6 @@
   </metadata>
   <files>
 
-    <!-- The .NET Framework >= 4.6.1 build bits for Mono runtime -->
-    <file src="targets\NetVips.Native.linux-arm64.targets" target="build/net461" />
-
     <!-- Include libvips Linux ARM64v8 binaries -->
     <file src="pack\linux-arm64\*.so*" target="runtimes/linux-arm64/native" />
 
@@ -35,7 +32,7 @@
     <file src="pack\linux-arm64\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <file src="_._" target="lib/netstandard1.0" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.linux-musl-arm64.nuspec b/build/native/NetVips.Native.linux-musl-arm64.nuspec
index 55078f30..ee36a3ae 100644
--- a/build/native/NetVips.Native.linux-musl-arm64.nuspec
+++ b/build/native/NetVips.Native.linux-musl-arm64.nuspec
@@ -32,8 +32,7 @@
     <file src="pack\linux-musl-arm64\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <!-- Note: Linux musl ARM64v8 is supported since .NET Core 3.0 (.NET Standard 2.1) -->
-    <file src="_._" target="lib/netstandard2.1" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.linux-musl-x64.nuspec b/build/native/NetVips.Native.linux-musl-x64.nuspec
index cb10a20e..ae087d69 100644
--- a/build/native/NetVips.Native.linux-musl-x64.nuspec
+++ b/build/native/NetVips.Native.linux-musl-x64.nuspec
@@ -22,9 +22,6 @@
   </metadata>
   <files>
 
-    <!-- The .NET Framework >= 4.6.1 build bits for Mono runtime -->
-    <file src="targets\NetVips.Native.linux-musl-x64.targets" target="build/net461" />
-
     <!-- Include libvips Linux musl x64 binaries -->
     <file src="pack\linux-musl-x64\*.so*" target="runtimes/linux-musl-x64/native" />
 
@@ -35,7 +32,7 @@
     <file src="pack\linux-musl-x64\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <file src="_._" target="lib/netstandard1.0" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.linux-x64.nuspec b/build/native/NetVips.Native.linux-x64.nuspec
index 044dd606..caa04483 100644
--- a/build/native/NetVips.Native.linux-x64.nuspec
+++ b/build/native/NetVips.Native.linux-x64.nuspec
@@ -22,9 +22,6 @@
   </metadata>
   <files>
 
-    <!-- The .NET Framework >= 4.6.1 build bits for Mono runtime -->
-    <file src="targets\NetVips.Native.linux-x64.targets" target="build/net461" />
-
     <!-- Include libvips Linux x64 binaries -->
     <file src="pack\linux-x64\*.so*" target="runtimes/linux-x64/native" />
 
@@ -35,7 +32,7 @@
     <file src="pack\linux-x64\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <file src="_._" target="lib/netstandard1.0" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.nuspec b/build/native/NetVips.Native.nuspec
index 2e157b2e..b655f72b 100644
--- a/build/native/NetVips.Native.nuspec
+++ b/build/native/NetVips.Native.nuspec
@@ -21,33 +21,20 @@
 
     <!-- dependencies -->
     <dependencies>
-	  <!-- In-sync with netstandard2.0 below except for NetVips.Native.win-arm64, NetVips.Native.linux-musl-arm64 and NetVips.Native.osx-arm64 -->
-      <group targetFramework="netstandard2.1">
+      <group targetFramework="net6.0">
         <dependency id="NetVips.Native.linux-x64" version="$version$" include="native" />
         <dependency id="NetVips.Native.linux-musl-x64" version="$version$" include="native" />
-        <!-- Linux musl ARM64v8 is supported since .NET Core 3.0 (.NET Standard 2.1) -->
         <dependency id="NetVips.Native.linux-musl-arm64" version="$version$" include="native" />
         <dependency id="NetVips.Native.linux-arm" version="$version$" include="native" />
         <dependency id="NetVips.Native.linux-arm64" version="$version$" include="native" />
         <dependency id="NetVips.Native.osx-x64" version="$version$" include="native" />
-        <!-- macOS ARM64 (Apple Silicon) is supported on .NET 6.0, but Mono has back-ported this to .NET Standard 2.1 -->
         <dependency id="NetVips.Native.osx-arm64" version="$version$" include="native" />
         <dependency id="NetVips.Native.win-x64" version="$version$" include="native" />
         <dependency id="NetVips.Native.win-x86" version="$version$" include="native" />
-        <!-- Windows ARM64 is supported since .NET 5.0 and back-ported to .NET Core 3.1 (.NET Standard 2.1) -->
         <dependency id="NetVips.Native.win-arm64" version="$version$" include="native" />
       </group>
-      <group targetFramework="netstandard2.0">
-        <dependency id="NetVips.Native.linux-x64" version="$version$" include="native" />
-        <dependency id="NetVips.Native.linux-musl-x64" version="$version$" include="native" />
-        <dependency id="NetVips.Native.linux-arm" version="$version$" include="native" />
-        <dependency id="NetVips.Native.linux-arm64" version="$version$" include="native" />
-        <dependency id="NetVips.Native.osx-x64" version="$version$" include="native" />
-        <dependency id="NetVips.Native.win-x64" version="$version$" include="native" />
-        <dependency id="NetVips.Native.win-x86" version="$version$" include="native" />
-      </group>
       <group targetFramework="net452">
-        <!-- Only .NET Framework/Mono needs to include the build directory containing the .targets file -->
+        <!-- Only .NET Framework needs to include the build directory containing the .targets file -->
         <dependency id="NetVips.Native.win-x64" version="$version$" include="native, build" />
         <dependency id="NetVips.Native.win-x86" version="$version$" include="native, build" />
       </group>
diff --git a/build/native/NetVips.Native.osx-arm64.nuspec b/build/native/NetVips.Native.osx-arm64.nuspec
index 299280d1..74bf7cd9 100644
--- a/build/native/NetVips.Native.osx-arm64.nuspec
+++ b/build/native/NetVips.Native.osx-arm64.nuspec
@@ -32,8 +32,7 @@
     <file src="pack\osx-arm64\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <!-- Note: macOS ARM64 (Apple Silicon) is supported on .NET 6.0, but Mono has back-ported this to .NET Standard 2.1 -->
-    <file src="_._" target="lib/netstandard2.1" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.osx-x64.nuspec b/build/native/NetVips.Native.osx-x64.nuspec
index 799d6e04..ce4a5866 100644
--- a/build/native/NetVips.Native.osx-x64.nuspec
+++ b/build/native/NetVips.Native.osx-x64.nuspec
@@ -22,9 +22,6 @@
   </metadata>
   <files>
 
-    <!-- The .NET Framework >= 4.6.1 build bits for Mono runtime -->
-    <file src="targets\NetVips.Native.osx-x64.targets" target="build/net461" />
-
     <!-- Include libvips macOS x64 binaries -->
     <file src="pack\osx-x64\*.dylib" target="runtimes/osx-x64/native" />
 
@@ -35,7 +32,7 @@
     <file src="pack\osx-x64\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <file src="_._" target="lib/netstandard1.0" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.win-arm64.nuspec b/build/native/NetVips.Native.win-arm64.nuspec
index 190a4722..b9d39acf 100644
--- a/build/native/NetVips.Native.win-arm64.nuspec
+++ b/build/native/NetVips.Native.win-arm64.nuspec
@@ -32,8 +32,7 @@
     <file src="pack\win-arm64\versions.json" />
 
     <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
-    <!-- Note: Windows ARM64 is supported since .NET 5.0 and back-ported to .NET Core 3.1 (.NET Standard 2.1) -->
-    <file src="_._" target="lib/netstandard2.1" />
+    <file src="_._" target="lib/net6.0" />
 
   </files>
 </package>
\ No newline at end of file
diff --git a/build/native/NetVips.Native.win-x64.nuspec b/build/native/NetVips.Native.win-x64.nuspec
index 1be73f0b..3ff799a0 100644
--- a/build/native/NetVips.Native.win-x64.nuspec
+++ b/build/native/NetVips.Native.win-x64.nuspec
@@ -22,8 +22,8 @@
   </metadata>
   <files>
 
-    <!-- The .NET Framework >= 4.5 build bits -->
-    <file src="targets\NetVips.Native.win-x64.targets" target="build/net45" />
+    <!-- The .NET Framework >= 4.5.2 build bits -->
+    <file src="targets\NetVips.Native.win-x64.targets" target="build/net452" />
 
     <!-- Include libvips Windows x64 binaries -->
     <file src="pack\win-x64\*.dll" target="runtimes/win-x64/native" />
diff --git a/build/native/NetVips.Native.win-x86.nuspec b/build/native/NetVips.Native.win-x86.nuspec
index 4c208d2a..3d53872a 100644
--- a/build/native/NetVips.Native.win-x86.nuspec
+++ b/build/native/NetVips.Native.win-x86.nuspec
@@ -22,8 +22,8 @@
   </metadata>
   <files>
 
-    <!-- The .NET Framework >= 4.5 build bits -->
-    <file src="targets\NetVips.Native.win-x86.targets" target="build/net45" />
+    <!-- The .NET Framework >= 4.5.2 build bits -->
+    <file src="targets\NetVips.Native.win-x86.targets" target="build/net452" />
 
     <!-- Include libvips Windows x86 binaries -->
     <file src="pack\win-x86\*.dll" target="runtimes/win-x86/native" />
diff --git a/build/native/targets/NetVips.Native.linux-arm.targets b/build/native/targets/NetVips.Native.linux-arm.targets
deleted file mode 100644
index 242b3a50..00000000
--- a/build/native/targets/NetVips.Native.linux-arm.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <PropertyGroup>
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' == ''"></LibvipsOutputBase>
-        <!-- EnsureTrailingSlash is only available since VS 2017 -->
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' != '' AND !HasTrailingSlash('$(LibvipsOutputBase)')">$(LibvipsOutputBase)\</LibvipsOutputBase>
-    </PropertyGroup>
-
-    <!-- Mono still needs to copy the native dependencies to the output directory -->
-    <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Mono'">
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\*">
-            <Link>$(LibvipsOutputBase)%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/build/native/targets/NetVips.Native.linux-arm64.targets b/build/native/targets/NetVips.Native.linux-arm64.targets
deleted file mode 100644
index 62c13e13..00000000
--- a/build/native/targets/NetVips.Native.linux-arm64.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <PropertyGroup>
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' == ''"></LibvipsOutputBase>
-        <!-- EnsureTrailingSlash is only available since VS 2017 -->
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' != '' AND !HasTrailingSlash('$(LibvipsOutputBase)')">$(LibvipsOutputBase)\</LibvipsOutputBase>
-    </PropertyGroup>
-
-    <!-- Mono still needs to copy the native dependencies to the output directory -->
-    <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Mono'">
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm64\native\*">
-            <Link>$(LibvipsOutputBase)%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/build/native/targets/NetVips.Native.linux-musl-x64.targets b/build/native/targets/NetVips.Native.linux-musl-x64.targets
deleted file mode 100644
index 84c5c801..00000000
--- a/build/native/targets/NetVips.Native.linux-musl-x64.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <PropertyGroup>
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' == ''"></LibvipsOutputBase>
-        <!-- EnsureTrailingSlash is only available since VS 2017 -->
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' != '' AND !HasTrailingSlash('$(LibvipsOutputBase)')">$(LibvipsOutputBase)\</LibvipsOutputBase>
-    </PropertyGroup>
-
-    <!-- Mono still needs to copy the native dependencies to the output directory -->
-    <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Mono'">
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x64\native\*">
-            <Link>$(LibvipsOutputBase)%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/build/native/targets/NetVips.Native.linux-x64.targets b/build/native/targets/NetVips.Native.linux-x64.targets
deleted file mode 100644
index 1696b03c..00000000
--- a/build/native/targets/NetVips.Native.linux-x64.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <PropertyGroup>
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' == ''"></LibvipsOutputBase>
-        <!-- EnsureTrailingSlash is only available since VS 2017 -->
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' != '' AND !HasTrailingSlash('$(LibvipsOutputBase)')">$(LibvipsOutputBase)\</LibvipsOutputBase>
-    </PropertyGroup>
-
-    <!-- Mono still needs to copy the native dependencies to the output directory -->
-    <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Mono'">
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\*">
-            <Link>$(LibvipsOutputBase)%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/build/native/targets/NetVips.Native.osx-x64.targets b/build/native/targets/NetVips.Native.osx-x64.targets
deleted file mode 100644
index 60abfd51..00000000
--- a/build/native/targets/NetVips.Native.osx-x64.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <PropertyGroup>
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' == ''"></LibvipsOutputBase>
-        <!-- EnsureTrailingSlash is only available since VS 2017 -->
-        <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' != '' AND !HasTrailingSlash('$(LibvipsOutputBase)')">$(LibvipsOutputBase)\</LibvipsOutputBase>
-    </PropertyGroup>
-
-    <!-- Mono still needs to copy the native dependencies to the output directory -->
-    <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Mono'">
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx-x64\native\*">
-            <Link>$(LibvipsOutputBase)%(Filename)%(Extension)</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/build/test-mono.sh b/build/test-mono.sh
deleted file mode 100755
index 7265bd1f..00000000
--- a/build/test-mono.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-###########################################################################
-# CONFIGURATION
-###########################################################################
-
-BUILD_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
-SCRIPT_DIR=$(dirname "$BUILD_DIR")
-
-XUNIT_RUNNER="$SCRIPT_DIR/packages/xunit.runner.console/tools/net472/xunit.console.exe"
-BUILD_PROJECT_FILE="$SCRIPT_DIR/tests/NetVips.Tests/NetVips.Tests.csproj"
-DLL_FILE="$SCRIPT_DIR/tests/NetVips.Tests/bin/Release/net472/NetVips.Tests.dll"
-
-# https://github.com/dotnet/runtime/issues/11540
-if [ "$(uname)" == "Darwin" ]; then
-    export DYLD_LIBRARY_PATH=$(dirname "$DLL_FILE")${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
-elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    export LD_LIBRARY_PATH=$(dirname "$DLL_FILE")${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-fi
-
-# Parse arguments
-while [ $# -gt 0 ]; do
-    case $1 in
-        --global-vips) USE_NUGET_BINARIES=false ;;
-        *) echo "Unknown parameter passed: $1" >&2; exit 1 ;;
-    esac
-    shift
-done
-
-###########################################################################
-# EXECUTION
-###########################################################################
-
-if ! [ -x "$(command -v mono)" ]; then
-    echo 'Error: mono is not installed.' >&2
-    exit 1
-fi
-
-echo "Mono version $(mono --version)"
-
-nuget install xunit.runner.console -ExcludeVersion -o packages
-msbuild $BUILD_PROJECT_FILE -t:build -restore -p:TargetFramework="net472" -p:Configuration=Release -p:TestWithNuGetBinaries=${USE_NUGET_BINARIES:-true} -nodeReuse:false
-mono $XUNIT_RUNNER $DLL_FILE
diff --git a/docker.sh b/docker.sh
index c31de595..72c24fb8 100755
--- a/docker.sh
+++ b/docker.sh
@@ -5,7 +5,7 @@ if ! [ -x "$(command -v docker)" ]; then
   exit 1
 fi
 
-# Ensure latest .NET Core SDK
+# Ensure latest .NET SDK
 docker pull mcr.microsoft.com/dotnet/sdk:7.0-alpine
 
 # Create a machine image with all the required build tools pre-installed
diff --git a/src/NetVips.Extensions/NetVips.Extensions.csproj b/src/NetVips.Extensions/NetVips.Extensions.csproj
index 09ce78aa..10ec9478 100644
--- a/src/NetVips.Extensions/NetVips.Extensions.csproj
+++ b/src/NetVips.Extensions/NetVips.Extensions.csproj
@@ -3,10 +3,10 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net70;net60;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net461</TargetFrameworks>
     <!-- Avoid building for all target frameworks when not packaging -->
-    <TargetFrameworks Condition="'$(_IsPacking)' != 'true'">net70</TargetFrameworks>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('Windows'))">netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(_IsPacking)' != 'true'">net7.0</TargetFrameworks>
+    <TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>NetVips.Extensions</PackageId>
     <AssemblyName>NetVips.Extensions</AssemblyName>
@@ -25,21 +25,16 @@
   <!-- Due to https://aka.ms/systemdrawingnonwindows, we constrain the System.Drawing.Common version to:
     - >= 7 for .NET 7 or higher;
     - <= 6 for .NET 6;
-    - <= 5 for .NET Standard 2.0.
   -->
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net70'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net60'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="System.Drawing.Common" Version="[4.5,6]" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Drawing.Common" Version="[4.5,5]" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
diff --git a/src/NetVips/ExtensionMethods.cs b/src/NetVips/ExtensionMethods.cs
index b61126bb..347f929d 100644
--- a/src/NetVips/ExtensionMethods.cs
+++ b/src/NetVips/ExtensionMethods.cs
@@ -38,19 +38,6 @@ internal static void Merge(this VOption self, VOption merge)
             }
         }
 
-        /// <summary>
-        /// Dereferences data from an unmanaged block of memory
-        /// to a newly allocated managed object of the specified type.
-        /// </summary>
-        /// <typeparam name="T">The type of object to be created. This object
-        /// must represent a formatted class or a structure.</typeparam>
-        /// <param name="ptr">A pointer to an unmanaged block of memory.</param>
-        /// <returns>A newly allocated managed object of the specified type.</returns>
-        internal static T Dereference<T>(this IntPtr ptr)
-        {
-            return Marshal.PtrToStructure<T>(ptr);
-        }
-
         /// <summary>
         /// Call a libvips operation.
         /// </summary>
diff --git a/src/NetVips/GObject.cs b/src/NetVips/GObject.cs
index 105e0dd8..749b6bf2 100644
--- a/src/NetVips/GObject.cs
+++ b/src/NetVips/GObject.cs
@@ -196,7 +196,7 @@ internal IntPtr ObjectRef()
         /// <summary>
         /// Get the reference count of object. Handy for debugging.
         /// </summary>
-        internal uint RefCount => handle.Dereference<Internal.GObject.Struct>().RefCount;
+        internal uint RefCount => Marshal.PtrToStructure<Internal.GObject.Struct>(handle).RefCount;
 
         // Do not provide a finalizer - SafeHandle's critical finalizer will
         // call ReleaseHandle for us.
diff --git a/src/NetVips/Interop/Libraries.OSX.cs b/src/NetVips/Interop/Libraries.OSX.cs
deleted file mode 100644
index 572edcf2..00000000
--- a/src/NetVips/Interop/Libraries.OSX.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace NetVips.Interop
-{
-    internal static partial class Libraries
-    {
-        // We can safely define all these variables as `libvips.42.dylib` since
-        // DLLImport uses dlsym() on macOS. This function also searches for named
-        // symbols in the dependencies of the shared library. Therefore, we can
-        // provide libvips as a single shared library with all dependencies
-        // statically linked without breaking compatibility with shared builds
-        // (i.e. what is usually installed via package managers).
-        internal const string GLib = "libvips.42.dylib",
-                              GObject = "libvips.42.dylib",
-                              Vips = "libvips.42.dylib";
-    }
-}
\ No newline at end of file
diff --git a/src/NetVips/Interop/Libraries.Unix.cs b/src/NetVips/Interop/Libraries.Unix.cs
deleted file mode 100644
index 93d2e274..00000000
--- a/src/NetVips/Interop/Libraries.Unix.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace NetVips.Interop
-{
-    internal static partial class Libraries
-    {
-        // We can safely define all these variables as `libvips.so.42` since
-        // DLLImport uses dlsym() on *nix. This function also searches for named
-        // symbols in the dependencies of the shared library. Therefore, we can
-        // provide libvips as a single shared library with all dependencies
-        // statically linked without breaking compatibility with shared builds
-        // (i.e. what is usually installed via package managers).
-        internal const string GLib = "libvips.so.42",
-                              GObject = "libvips.so.42",
-                              Vips = "libvips.so.42";
-    }
-}
\ No newline at end of file
diff --git a/src/NetVips/Interop/Libraries.Windows.cs b/src/NetVips/Interop/Libraries.Windows.cs
deleted file mode 100644
index 002daed4..00000000
--- a/src/NetVips/Interop/Libraries.Windows.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace NetVips.Interop
-{
-    internal static partial class Libraries
-    {
-        // We cannot define all these variables as `libvips-42.dll` without
-        // breaking compatibility with the shared Windows build. Therefore,
-        // we always ship at least 3 DLLs.
-        internal const string GLib = "libglib-2.0-0.dll",
-                              GObject = "libgobject-2.0-0.dll",
-                              Vips = "libvips-42.dll";
-    }
-}
\ No newline at end of file
diff --git a/src/NetVips/Interop/Libraries.cs b/src/NetVips/Interop/Libraries.cs
new file mode 100644
index 00000000..dcb80b4a
--- /dev/null
+++ b/src/NetVips/Interop/Libraries.cs
@@ -0,0 +1,13 @@
+namespace NetVips.Interop
+{
+    internal static class Libraries
+    {
+        /// <remarks>
+        /// These library names are remapped in a cross-platform manner,
+        /// <see cref="ModuleInitializer.Initialize"/>.
+        /// </remarks>
+        internal const string GLib = "libglib-2.0-0.dll",
+                              GObject = "libgobject-2.0-0.dll",
+                              Vips = "libvips-42.dll";
+    }
+}
\ No newline at end of file
diff --git a/src/NetVips/ModuleInitializer.cs b/src/NetVips/ModuleInitializer.cs
index 43b184b0..e428d4c7 100644
--- a/src/NetVips/ModuleInitializer.cs
+++ b/src/NetVips/ModuleInitializer.cs
@@ -1,6 +1,10 @@
 namespace NetVips
 {
     using System;
+    using System.Reflection;
+    using System.Collections.Generic;
+    using System.Runtime.InteropServices;
+    using Interop;
 
     /// <summary>
     /// All code inside the <see cref="Initialize"/> method is ran as soon as the assembly is loaded.
@@ -22,12 +26,75 @@ public static class ModuleInitializer
         /// </summary>
         public static int? Version;
 
+#if NET6_0_OR_GREATER
+        /// <summary>
+        /// Windows specific: is GLib statically-linked in `libvips-42.dll`?
+        /// </summary>
+        [System.Runtime.Versioning.SupportedOSPlatform("windows")]
+        private static bool _gLibStaticallyLinked = true;
+
+        /// <summary>
+        /// A cache for <see cref="DllImportResolver"/>.
+        /// </summary>
+        internal static readonly Dictionary<string, IntPtr> DllImportCache =
+            new Dictionary<string, IntPtr>();
+
+        internal static string RemapLibraryName(string libraryName)
+        {
+            // For Windows, we try to locate the GLib symbols within
+            // `libvips-42.dll` first. If these symbols cannot be found there,
+            // we proceed to locate them within `libglib-2.0-0.dll` and
+            // `libgobject-2.0-0.dll`. Note that distributing a single shared
+            // library is only possible when we drop support for .NET Framework.
+            // Therefore, we always ship at least 3 DLLs for now.
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                return _gLibStaticallyLinked ? Libraries.Vips : libraryName;
+            }
+
+            // We can safely remap the library names to `libvips.so.42` on *nix
+            // and `libvips.42.dylib` on macOS since DLLImport uses dlsym() there.
+            // This function also searches for named symbols in the dependencies
+            // of the shared library. Therefore, we can provide libvips as a
+            // single shared library with all dependencies statically linked
+            // without breaking compatibility with the shared builds
+            // (i.e. what is usually installed via package managers).
+            return RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
+                ? "libvips.42.dylib"
+                : "libvips.so.42";
+        }
+
+        internal static IntPtr DllImportResolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
+        {
+            libraryName = RemapLibraryName(libraryName);
+            if (DllImportCache.TryGetValue(libraryName, out var cachedHandle))
+            {
+                return cachedHandle;
+            }
+
+            if (NativeLibrary.TryLoad(libraryName, assembly, searchPath, out var handle))
+            {
+                DllImportCache[libraryName] = handle;
+                return handle;
+            }
+
+            // Fallback to the default import resolver.
+            return IntPtr.Zero;
+        }
+#endif
+
         /// <summary>
         /// Initializes the module.
         /// </summary>
+#pragma warning disable CA2255
         [System.Runtime.CompilerServices.ModuleInitializer]
+#pragma warning restore CA2255
         public static void Initialize()
         {
+#if NET6_0_OR_GREATER
+            NativeLibrary.SetDllImportResolver(typeof(ModuleInitializer).Assembly, DllImportResolver);
+#endif
+
             try
             {
                 VipsInitialized = NetVips.Init();
@@ -36,6 +103,19 @@ public static void Initialize()
                     Version = NetVips.Version(0, false);
                     Version = (Version << 8) + NetVips.Version(1, false);
                     Version = (Version << 8) + NetVips.Version(2, false);
+
+#if NET6_0_OR_GREATER
+                    if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return;
+
+                    try
+                    {
+                        _gLibStaticallyLinked = NetVips.TypeFromName("VipsImage") != IntPtr.Zero;
+                    }
+                    catch
+                    {
+                        _gLibStaticallyLinked = false;
+                    }
+#endif
                 }
                 else
                 {
diff --git a/src/NetVips/ModuleInitializerAttribute.cs b/src/NetVips/ModuleInitializerAttribute.cs
index 47e805e2..06d6cea3 100644
--- a/src/NetVips/ModuleInitializerAttribute.cs
+++ b/src/NetVips/ModuleInitializerAttribute.cs
@@ -1,6 +1,6 @@
-// This file enables ModuleInitializer, a C# 9 feature to work with .NET Standard/Framework.
+// This file enables ModuleInitializer, a C# 9 feature to work with .NET Framework.
 
-#if NETSTANDARD || NETFRAMEWORK
+#if NETFRAMEWORK
 namespace System.Runtime.CompilerServices
 {
     /// <inheritdoc />
diff --git a/src/NetVips/NetVips.cs b/src/NetVips/NetVips.cs
index 4cc5a55e..87ab2cec 100644
--- a/src/NetVips/NetVips.cs
+++ b/src/NetVips/NetVips.cs
@@ -511,7 +511,7 @@ IntPtr TypeMap(IntPtr type, IntPtr a, IntPtr b)
         public static Dictionary<string, int> ValuesForEnum(IntPtr type)
         {
             var typeClass = GType.ClassRef(type);
-            var enumClass = typeClass.Dereference<GEnumClass>();
+            var enumClass = Marshal.PtrToStructure<GEnumClass>(typeClass);
 
             var values = new Dictionary<string, int>((int)(enumClass.NValues - 1));
 
@@ -520,7 +520,7 @@ public static Dictionary<string, int> ValuesForEnum(IntPtr type)
             // -1 since we always have a "last" member
             for (var i = 0; i < enumClass.NValues - 1; i++)
             {
-                var enumValue = ptr.Dereference<GEnumValue>();
+                var enumValue = Marshal.PtrToStructure<GEnumValue>(ptr);
                 values[enumValue.ValueNick] = enumValue.Value;
 
                 ptr += Marshal.SizeOf(typeof(GEnumValue));
diff --git a/src/NetVips/NetVips.csproj b/src/NetVips/NetVips.csproj
index f45dba7d..07a6df5b 100644
--- a/src/NetVips/NetVips.csproj
+++ b/src/NetVips/NetVips.csproj
@@ -3,56 +3,26 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('Windows'))">netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net452</TargetFrameworks>
+    <TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
     <Platforms>x64;x86;ARM64;ARM32</Platforms>
     <Optimize>true</Optimize>
-    <DefaultItemExcludes>$(DefaultItemExcludes);Interop\Libraries.*.cs</DefaultItemExcludes>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <EnableAotAnalyzer>true</EnableAotAnalyzer>
   </PropertyGroup>
 
-  <!-- Give an initial value based on the operating system where it's currently running on. -->
-  <PropertyGroup Condition="'$(TargetOS)' == ''">
-    <TargetOS Condition="$([MSBuild]::IsOSPlatform('Linux')) OR $([MSBuild]::IsOSPlatform('FreeBSD'))">Unix</TargetOS>
-    <TargetOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">OSX</TargetOS>
-    <TargetOS Condition="$([MSBuild]::IsOSPlatform('Windows'))">Windows</TargetOS>
-  </PropertyGroup>
-
-  <!-- Append target operating system to output path -->
-  <PropertyGroup>
-    <OutputPath>$(MSBuildThisFileDirectory)bin\$(Platform)\$(Configuration)\$(TargetFramework)\$(TargetOS)</OutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Platform)\$(Configuration)\$(TargetFramework)\$(TargetOS)\</IntermediateOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
-    <Compile Include="Interop\Libraries.$(TargetOS).cs">
-        <Link>Interop\Libraries.cs</Link>
-    </Compile>
     <InternalsVisibleTo Include="$(AssemblyName).Tests" />
     <InternalsVisibleTo Include="$(AssemblyName).Samples" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
     <PackageReference Include="System.Buffers" Version="4.5.1" />
   </ItemGroup>
 
-  <!-- Include .NET Standard packages on *nix and macOS -->
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)bin\$(Platform)\$(Configuration)\netstandard2.0\Unix\$(AssemblyName).dll">
-      <Pack>true</Pack>
-      <PackagePath>runtimes\unix\lib\netstandard2.0</PackagePath>
-    </None>
-    <None Include="$(MSBuildThisFileDirectory)bin\$(Platform)\$(Configuration)\netstandard2.0\OSX\$(AssemblyName).dll">
-      <Pack>true</Pack>
-      <PackagePath>runtimes\osx\lib\netstandard2.0</PackagePath>
-    </None>
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/NetVips/SourceCustom.cs b/src/NetVips/SourceCustom.cs
index 09186160..59ede810 100644
--- a/src/NetVips/SourceCustom.cs
+++ b/src/NetVips/SourceCustom.cs
@@ -16,10 +16,10 @@ public class SourceCustom : Source
         /// A read delegate.
         /// </summary>
         /// <remarks>
-        /// The interface is exactly as <see cref="Stream.Read"/>. The handler is given a number
-        /// of bytes to fetch, and should return a bytes-like object containing up
-        /// to that number of bytes. If there is no more data available, it should
-        /// return <see langword="0"/>.
+        /// The interface is exactly as <see cref="Stream.Read(byte[], int, int)"/>.
+        /// The handler is given a number of bytes to fetch, and should return a
+        /// bytes-like object containing up to that number of bytes. If there is
+        /// no more data available, it should return <see langword="0"/>.
         /// </remarks>
         /// <param name="buffer">An array of bytes.</param>
         /// <param name="length">The maximum number of bytes to be read.</param>
diff --git a/src/NetVips/TargetCustom.cs b/src/NetVips/TargetCustom.cs
index ce27775c..335fb0b9 100644
--- a/src/NetVips/TargetCustom.cs
+++ b/src/NetVips/TargetCustom.cs
@@ -16,9 +16,9 @@ public class TargetCustom : Target
         /// A write delegate.
         /// </summary>
         /// <remarks>
-        /// The interface is the same as <see cref="Stream.Write"/>, so the handler is
-        /// given a bytes-like object to write. However, the handler MUST return the number
-        /// of bytes written.
+        /// The interface is the same as <see cref="Stream.Write(byte[], int, int)"/>.
+        /// The handler is given a bytes-like object to write. However, the handler MUST
+        /// return the number of bytes written.
         /// </remarks>
         /// <param name="buffer">An array of bytes.</param>
         /// <param name="length">The number of bytes to be written to the current target.</param>
diff --git a/src/NetVips/VipsBlob.cs b/src/NetVips/VipsBlob.cs
index 9d05046a..8404721c 100644
--- a/src/NetVips/VipsBlob.cs
+++ b/src/NetVips/VipsBlob.cs
@@ -61,11 +61,11 @@ protected override bool ReleaseHandle()
         /// <summary>
         /// Get the number of bytes of data.
         /// </summary>
-        internal ulong Length => (ulong)handle.Dereference<Internal.VipsArea.Struct>().Length;
+        internal ulong Length => (ulong)Marshal.PtrToStructure<Internal.VipsArea.Struct>(handle).Length;
 
         /// <summary>
         /// Get the reference count of the blob. Handy for debugging.
         /// </summary>
-        internal int RefCount => handle.Dereference<Internal.VipsArea.Struct>().Count;
+        internal int RefCount => Marshal.PtrToStructure<Internal.VipsArea.Struct>(handle).Count;
     }
 }
\ No newline at end of file
diff --git a/src/NetVips/VipsObject.cs b/src/NetVips/VipsObject.cs
index df31bd7e..38c9d120 100644
--- a/src/NetVips/VipsObject.cs
+++ b/src/NetVips/VipsObject.cs
@@ -51,7 +51,7 @@ internal static void PrintAll()
 
             return argument != 0
                 ? default(GParamSpec.Struct?)
-                : pspec.Dereference<GParamSpec.Struct>();
+                : Marshal.PtrToStructure<GParamSpec.Struct>(pspec);
         }
 
         /// <summary>
diff --git a/tests/NetVips.Tests/NetVips.Tests.csproj b/tests/NetVips.Tests/NetVips.Tests.csproj
index 2ff718c6..4c1ca08b 100644
--- a/tests/NetVips.Tests/NetVips.Tests.csproj
+++ b/tests/NetVips.Tests/NetVips.Tests.csproj
@@ -14,30 +14,15 @@
     <TestWithNuGetBinaries>false</TestWithNuGetBinaries>
   </PropertyGroup>
 
-  <!-- https://github.com/mono/mono/issues/15569 -->
-  <PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Mono'">
-    <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</RuntimeIdentifier>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" Condition="'$(MSBuildRuntimeType)' == 'Mono'" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TestWithNuGetBinaries)' == 'true' And '$(MSBuildRuntimeType)' == 'Mono'">
-    <PackageReference Include="NetVips.Native.linux-x64" Version="8.14.5" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
-    <PackageReference Include="NetVips.Native.osx-x64" Version="8.14.5" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(MSBuildRuntimeType)' != 'Mono'">
     <PackageReference Include="NetVips.Native" Version="8.14.5" Condition="'$(TestWithNuGetBinaries)' == 'true'" />
+    <PackageReference Include="xunit" Version="2.5.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
 
   <ItemGroup>