From 4ec19545f35d5c84cfb0f0be75269837d1f0d1c0 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Tue, 24 Aug 2021 13:49:21 -0400
Subject: [PATCH] Update NuGet files.

---
 pdfio_native.nuspec        | 17 +++++++----------
 pdfio_native.props         |  9 +--------
 pdfio_native.redist.nuspec | 27 ---------------------------
 3 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 pdfio_native.redist.nuspec

diff --git a/pdfio_native.nuspec b/pdfio_native.nuspec
index 3a3b7b5..21c4664 100644
--- a/pdfio_native.nuspec
+++ b/pdfio_native.nuspec
@@ -14,17 +14,14 @@
         <summary>PDFio is a simple C library for reading and writing PDF files. PDFio is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</summary>
         <copyright>Copyright © 2019-2021 by Michael R Sweet</copyright>
         <tags>pdf file native</tags>
-	<dependencies>
-	    <dependency id="pdfio_native.redist" version="1.0-b0" />
-	</dependencies>
     </metadata>
     <files>
-        <file src="doc\pdfio-128.png" target="native" />
-        <file src="README.md" target="native" />
-        <file src="pdfio_native.props" target="native" />
-        <file src="pdfio.h" target="native\include" />
-        <file src="pdfio-content.h" target="native\include" />
-        <!--<file src="Win32\**\pdfio*.lib" target="native\lib\Win32" />-->
-        <file src="x64\**\pdfio*.lib" target="native\lib\x64" />
+        <file src="doc\pdfio-128.png" target="build\native" />
+        <file src="README.md" target="build\native" />
+        <file src="pdfio_native.props" target="build\native" />
+        <file src="pdfio.h" target="build\native\include" />
+        <file src="pdfio-content.h" target="build\native\include" />
+        <!--<file src="Win32\**\pdfio*.lib" target="build\native\lib\Win32" />-->
+        <file src="x64\**\pdfio.lib" target="build\native\lib\x64" />
     </files>
 </package>
diff --git a/pdfio_native.props b/pdfio_native.props
index c2fcd75..009125d 100644
--- a/pdfio_native.props
+++ b/pdfio_native.props
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <PropertyGroup>
-    <LibraryName Condition="'$(Configuration)'=='Debug'">pappld</LibraryName>
-    <LibraryName Condition="'$(Configuration)'=='Release'">pappl</LibraryName>
-  </PropertyGroup>
-  <ItemGroup>
-    <LinkLibrary Include="$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\$(LibraryName).lib" />
-  </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>   <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include</AdditionalIncludeDirectories></ClCompile>
     <Link>
-      <AdditionalDependencies>@$(LinkLibrary);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\pdfio.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/pdfio_native.redist.nuspec b/pdfio_native.redist.nuspec
deleted file mode 100644
index d7fe99d..0000000
--- a/pdfio_native.redist.nuspec
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>pdfio_native.redist</id>
-        <title>PDFio Library for VS2019+ Redist</title>
-        <version>1.0-b0</version>
-        <authors>Michael R Sweet</authors>
-        <owners>michaelrsweet</owners>
-        <projectUrl>https://github.com/michaelrsweet/pappl</projectUrl>
-        <license type="expression">Apache-2.0</license>
-        <icon>native/pdfio-128.png</icon>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Redistributable components for package 'pdfio_native'. This package should only be installed as a dependency.</description>
-        <summary>PDFio is a simple C library for reading and writing PDF files. This package provides the redistributable content for PDFio. PDFio is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</summary>
-        <copyright>Copyright © 2021 by Michael R Sweet</copyright>
-        <tags>pdf file native</tags>
-	<dependencies>
-	    <dependency id="zlib_native.redist" version="1.2.11" />
-	</dependencies>
-    </metadata>
-    <files>
-        <file src="doc\pdfio-128.png" target="native" />
-        <file src="README.md" target="native" />
-        <!--<file src="Win32\**\pdfio*.dll" target="native\bin\Win32" />-->
-        <file src="x64\**\pdfio.dll" target="native\bin\x64" />
-    </files>
-</package>