Release NetVips.Native v8.16.0-rc1

kleisauke · Oct 14, 2024 · bb3cb6f · bb3cb6f
1 parent 92572de
commit bb3cb6f
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 19 deletions.
diff --git a/CHANGELOG.native.md b/CHANGELOG.native.md
@@ -4,6 +4,17 @@ The changes of libvips are documented [here](https://github.com/libvips/libvips/
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.16.0-rc1] - 2024-10-14
+### Note
+If you would like to see what's changed, please visit the release notes of libvips:  
+https://www.libvips.org/2024/10/10/What's-new-in-8.16.html
+
+### Added
+- Add `NetVips.Native.win-x64.net452` and `NetVips.Native.win-x86.net452` compat packages.
+
+### Changed
+- A single shared libvips binary is build for Windows ([#211](https://github.com/kleisauke/net-vips/issues/211)).
+
 ## [8.15.3] - 2024-08-14
 ### Note
 If you would like to see what's changed, please visit the release notes of libvips:  
@@ -261,6 +272,7 @@ https://www.libvips.org/2019/04/22/What's-new-in-8.8.html
 ### Changed
 - A statically linked libvips binary is build for Windows. This reduces the number of DLLs from 37 to 3 ([libvips/build-win64#21](https://github.com/libvips/build-win64/issues/21#issuecomment-458112440)).
 
+[8.16.0-rc1]: https://github.com/kleisauke/libvips-packaging/compare/v8.15.3...v8.16.0-rc1
 [8.15.3]: https://github.com/kleisauke/libvips-packaging/compare/v8.15.2...v8.15.3
 [8.15.2]: https://github.com/kleisauke/libvips-packaging/compare/v8.15.1...v8.15.2
 [8.15.1]: https://github.com/kleisauke/libvips-packaging/compare/v8.15.0...v8.15.1

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ init:
 
 # Environment
 environment:
-  VIPS_VERSION: "8.15.3"
+  VIPS_VERSION: "8.16.0-rc1"
   VIPS_WARNING: 0
 
 # Build script

diff --git a/build/Build.cs b/build/Build.cs
@@ -41,7 +41,9 @@ partial class Build : NukeBuild
     string[] NuGetArchitectures =>
     [
         "win-x64",
+        "win-x64.net452",
         "win-x86",
+        "win-x86.net452",
         "win-arm64",
         "linux-x64",
         "linux-musl-x64",

diff --git a/build/native/NetVips.Native.nuspec b/build/native/NetVips.Native.nuspec
@@ -35,8 +35,8 @@
       </group>
       <group targetFramework="net452">
         <!-- 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" />
+        <dependency id="NetVips.Native.win-x64.net452" version="$version$" include="native, build" />
+        <dependency id="NetVips.Native.win-x86.net452" version="$version$" include="native, build" />
       </group>
     </dependencies>
 

diff --git a/build/native/NetVips.Native.win-x64.net452.nuspec b/build/native/NetVips.Native.win-x64.net452.nuspec
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
+  <metadata>
+
+    <!-- package -->
+    <id>NetVips.Native.win-x64.net452</id>
+    <title>NetVips - Native binaries for Windows x64</title>
+    <version>$version$</version>
+    <description>This package complements the NetVips package and contains native binaries of libvips for Windows (x64)</description>
+    <summary>Native binaries of libvips for Windows (x64)</summary>
+    <projectUrl>https://kleisauke.github.io/net-vips</projectUrl>
+    <repository type="git" url="https://github.com/kleisauke/net-vips" />
+    <tags>libvips binaries image-processing</tags>
+
+    <!-- legal -->
+    <license type="expression">MIT</license>
+    <authors>Kleis Auke Wolthuizen</authors>
+    <owners>Kleis Auke Wolthuizen</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>Kleis Auke Wolthuizen</copyright>
+
+  </metadata>
+  <files>
+
+    <!-- The .NET Framework >= 4.5.2 build bits -->
+    <file src="targets\NetVips.Native.win-x64.net452.targets" target="build/net452" />
+
+    <!-- Include libvips Windows x64 binaries -->
+    <file src="pack\win-x64.net452\*.dll" target="runtimes/win-x64/native" />
+
+    <!-- Include the latest third-party notices -->
+    <file src="pack\win-x64.net452\THIRD-PARTY-NOTICES.md" />
+
+    <!-- Include the version numbers of libvips and its dependencies -->
+    <file src="pack\win-x64.net452\versions.json" />
+
+    <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
+    <file src="_._" target="lib/net452" />
+
+  </files>
+</package>
diff --git a/build/native/NetVips.Native.win-x64.nuspec b/build/native/NetVips.Native.win-x64.nuspec
@@ -22,9 +22,6 @@
   </metadata>
   <files>
 
-    <!-- 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" />
 
@@ -35,7 +32,7 @@
     <file src="pack\win-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>
diff --git a/build/native/NetVips.Native.win-x86.net452.nuspec b/build/native/NetVips.Native.win-x86.net452.nuspec
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
+  <metadata>
+
+    <!-- package -->
+    <id>NetVips.Native.win-x86.net452</id>
+    <title>NetVips - Native binaries for Windows x86</title>
+    <version>$version$</version>
+    <description>This package complements the NetVips package and contains native binaries of libvips for Windows (x86)</description>
+    <summary>Native binaries of libvips for Windows (x86)</summary>
+    <projectUrl>https://kleisauke.github.io/net-vips</projectUrl>
+    <repository type="git" url="https://github.com/kleisauke/net-vips" />
+    <tags>libvips binaries image-processing</tags>
+
+    <!-- legal -->
+    <license type="expression">MIT</license>
+    <authors>Kleis Auke Wolthuizen</authors>
+    <owners>Kleis Auke Wolthuizen</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>Kleis Auke Wolthuizen</copyright>
+
+  </metadata>
+  <files>
+
+    <!-- The .NET Framework >= 4.5.2 build bits -->
+    <file src="targets\NetVips.Native.win-x86.net452.targets" target="build/net452" />
+
+    <!-- Include libvips Windows x86 binaries -->
+    <file src="pack\win-x86.net452\*.dll" target="runtimes/win-x86/native" />
+
+    <!-- Include the latest third-party notices -->
+    <file src="pack\win-x86.net452\THIRD-PARTY-NOTICES.md" />
+
+    <!-- Include the version numbers of libvips and its dependencies -->
+    <file src="pack\win-x86.net452\versions.json" />
+
+    <!-- A dummy reference which prevents NuGet from adding any compilation references when this package is imported -->
+    <file src="_._" target="lib/net452" />
+
+  </files>
+</package>
diff --git a/build/native/NetVips.Native.win-x86.nuspec b/build/native/NetVips.Native.win-x86.nuspec
@@ -22,9 +22,6 @@
   </metadata>
   <files>
 
-    <!-- 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" />
 
@@ -35,7 +32,7 @@
     <file src="pack\win-x86\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>
diff --git a/...ve/targets/NetVips.Native.win-x64.targets → ...ets/NetVips.Native.win-x64.net452.targets b/...ve/targets/NetVips.Native.win-x64.targets → ...ets/NetVips.Native.win-x64.net452.targets
@@ -7,8 +7,8 @@
         <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' != '' AND !HasTrailingSlash('$(LibvipsOutputBase)')">$(LibvipsOutputBase)\</LibvipsOutputBase>
     </PropertyGroup>
 
-    <!-- This copy step is only necessary when our platform is x64 and if we are not building with .NET Core -->
-    <ItemGroup Condition="'$(MSBuildRuntimeType)' != 'Core' AND ('$(Platform)' == 'x64' OR '$(Platform)|$(Prefer32Bit)' == 'AnyCPU|false')">
+    <!-- This copy step is only necessary when our platform is x64 -->
+    <ItemGroup Condition="'$(Platform)' == 'x64' OR '$(Platform)|$(Prefer32Bit)' == 'AnyCPU|false'">
         <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*">
             <Link>$(LibvipsOutputBase)%(Filename)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/...ve/targets/NetVips.Native.win-x86.targets → ...ets/NetVips.Native.win-x86.net452.targets b/...ve/targets/NetVips.Native.win-x86.targets → ...ets/NetVips.Native.win-x86.net452.targets
@@ -7,8 +7,8 @@
         <LibvipsOutputBase Condition="'$(LibvipsOutputBase)' != '' AND !HasTrailingSlash('$(LibvipsOutputBase)')">$(LibvipsOutputBase)\</LibvipsOutputBase>
     </PropertyGroup>
 
-    <!-- This copy step is only necessary when our platform is x86 and if we are not building with .NET Core -->
-    <ItemGroup Condition="'$(MSBuildRuntimeType)' != 'Core' AND ('$(Platform)' == 'x86' OR '$(Platform)|$(Prefer32Bit)' == 'AnyCPU|true')">
+    <!-- This copy step is only necessary when our platform is x86 -->
+    <ItemGroup Condition="'$(Platform)' == 'x86' OR '$(Platform)|$(Prefer32Bit)' == 'AnyCPU|true'">
         <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\*">
             <Link>$(LibvipsOutputBase)%(Filename)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/src/NetVips/ModuleInitializer.cs b/src/NetVips/ModuleInitializer.cs
@@ -43,9 +43,9 @@ 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.
+        // `libgobject-2.0-0.dll`. Note that this is only possible when
+        // targeting .NET 6 or higher. As a result, we always ship at least
+        // 3 DLLs in a separate package for .NET Framework.
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
             return _gLibStaticallyLinked ? Libraries.Vips : libraryName;

diff --git a/tests/NetVips.Tests/NetVips.Tests.csproj b/tests/NetVips.Tests/NetVips.Tests.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="NetVips.Native" Version="8.15.3" Condition="'$(TestWithNuGetBinaries)' == 'true'" />
+    <PackageReference Include="NetVips.Native" Version="8.16.0-rc1" Condition="'$(TestWithNuGetBinaries)' == 'true'" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>