From 3d9728ad38903c2bbe0ca05178878b971aefafac Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Wed, 6 Jun 2018 22:34:11 +0200
Subject: [PATCH] Prepare 1.0.3 release

---
 CHANGELOG.md          |  9 +++++++++
 README.md             | 25 ++++++++++++++++++++++---
 appveyor.yml          |  2 +-
 build.cake            |  9 +++++++++
 build/NetVips.targets |  2 +-
 build/common.props    |  2 +-
 6 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b355db0d..d08cc5b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 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).
 
+## [1.0.3] - 2018-06-06
+### Added
+- Bundle pre-compiled libvips binary and its dependencies for 64-bit Windows.
+
+### Changed
+- Target .NET Standard 2.0 instead of .NET Core 2.0.
+- Lower the minimum required .NET Framework version to 4.5.
+
 ## [1.0.2] - 2018-04-23
 ### Added
 - Add missing libvips 8.7 methods.
@@ -22,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Added
 - First release!
 
+[1.0.3]: https://github.com/kleisauke/net-vips/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/kleisauke/net-vips/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/kleisauke/net-vips/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/kleisauke/net-vips/releases/tag/v1.0.0
diff --git a/README.md b/README.md
index 23b0db73..aea82715 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,7 @@ http://libvips.blogspot.co.uk/2012/06/how-libvips-opens-file.html
 
 You need the libvips shared library on your library search path, version 8.2 or
 later. On Linux and macOS, you can install via your package manager; on 
-Windows you can download a pre-compiled binary from the libvips website:
-
-https://jcupitt.github.io/libvips/
+Windows the pre-compiled binary is bundled with NuGet.
 
 Then just install this package, perhaps:
 
@@ -63,6 +61,27 @@ If NetVips was not able to find libvips you might see:
 
     Unable to init libvips
 
+## Bundled libvips Windows binary
+
+From NetVips version 1.0.3 upwards the pre-compiled libvips Windows binary is
+bundled with NuGet. It's therefore no longer necessary to download the
+pre-compiled binary and to set the `PATH` environment variable.
+
+If you wish to not use the bundled libvips, you could set the
+`UseGlobalLibvips` property to `true`:
+```xml
+<PropertyGroup>
+  <UseGlobalLibvips>true</UseGlobalLibvips>
+</PropertyGroup>
+```
+
+```bash
+dotnet build /p:UseGlobalLibvips=true
+```
+
+This property prevents that the bundled libvips binary and its
+dependencies will be copied to your project's output directory.
+
 ## Example
 
 ```csharp
diff --git a/appveyor.yml b/appveyor.yml
index 0763902f..45baa35f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # Version format
-version: 1.0.2.{build}
+version: 1.0.3.{build}
 
 init:
   - git config --global core.autocrlf true
diff --git a/build.cake b/build.cake
index fa88ff6b..cd1995ea 100644
--- a/build.cake
+++ b/build.cake
@@ -86,6 +86,15 @@ Task("Pack")
     .WithCriteria((isOnAppVeyorAndNotPR || string.Equals(target, "pack", StringComparison.OrdinalIgnoreCase)) && IsRunningOnWindows())
     .Does(() =>
     {
+        if (DirectoryExists(dllPackDir))
+        {
+            Information("Removing old packaging directory");
+            DeleteDirectory(dllPackDir, new DeleteDirectorySettings {
+                Recursive = true,
+                Force = true
+            });
+        }
+
         EnsureDirectoryExists(dllPackDir);
     
         // Copy binaries to packaging directory
diff --git a/build/NetVips.targets b/build/NetVips.targets
index 33f1772a..82353b27 100644
--- a/build/NetVips.targets
+++ b/build/NetVips.targets
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <ItemGroup Condition="'$(OS)' == 'Windows_NT' And '$(UseGlobalLibvips)' != 'true'">
         <NativeDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\*.dll" />
         <Content Include="@(NativeDLL)">
             <Link>%(FileName)%(Extension)</Link>
diff --git a/build/common.props b/build/common.props
index 87e3bf8e..e76a2ace 100644
--- a/build/common.props
+++ b/build/common.props
@@ -18,7 +18,7 @@
 
     <Major>1</Major>
     <Minor>0</Minor>
-    <Revision>2</Revision>
+    <Revision>3</Revision>
 
     <BuildNumber Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>