From e9af5dc63e0a8c62ebdb59b06d90925b5584e490 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 3 Aug 2021 17:34:50 -0400
Subject: [PATCH] Fix up VS props file.

---
 vcnet/libcups2_native.nuspec        |  6 +++---
 vcnet/libcups2_native.props         | 16 +++++++++-------
 vcnet/libcups2_native.redist.nuspec |  2 +-
 vcnet/libcups2_native.targets       | 16 ----------------
 4 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 vcnet/libcups2_native.targets

diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec
index 9952544c72..f9238287a3 100644
--- a/vcnet/libcups2_native.nuspec
+++ b/vcnet/libcups2_native.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native</id>
         <title>OpenPrinting CUPS Library for VS2019+</title>
-        <version>2.4.0-b1</version>
+        <version>2.4.0-b4</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -16,13 +16,13 @@ and other Unix®-like operating systems. The CUPS library provides a convenient
         <copyright>Copyright © 2020-2021 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
 	<dependencies>
-	    <dependency id="libcups2_native.redist" version="2.4.0-b1" />
+	    <dependency id="libcups2_native.redist" version="2.4.0-b4" />
 	</dependencies>
     </metadata>
     <files>
         <file src="..\desktop\cups-128.png" target="build\native" />
         <file src="..\README.md" target="build\native" />
-        <file src="libcups2_native.props" target="build" />
+        <file src="libcups2_native.props" target="build\native" />
         <file src="..\cups\array.h" target="build\native\include\cups" />
         <file src="..\cups\cups.h" target="build\native\include\cups" />
         <file src="..\cups\dir.h" target="build\native\include\cups" />
diff --git a/vcnet/libcups2_native.props b/vcnet/libcups2_native.props
index 192513b1c1..ce73a0e731 100644
--- a/vcnet/libcups2_native.props
+++ b/vcnet/libcups2_native.props
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <PropertyGroup>
-    <LibraryName Condition="'$(Configuration)'=='Debug'">libcups2d</LibraryName>
-    <LibraryName Condition="'$(Configuration)'=='Release'">libcups2</LibraryName>
-  </PropertyGroup>
   <ItemGroup>
-    <LinkLibrary Include="$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\$(LibraryName).lib" />
+    <LinkLibrary Include="$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\*.lib" />
   </ItemGroup>
   <ItemDefinitionGroup>
-    <ClCompile>   <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include</AdditionalIncludeDirectories></ClCompile>
+    <ClCompile>
+      <AdditionalIncludeDirectories>
+        $(MSBuildThisFileDirectory)\include
+      </AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
-      <AdditionalDependencies>@$(LinkLibrary);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+        $(LinkLibrary);%(AdditionalDependencies)
+      </AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/vcnet/libcups2_native.redist.nuspec b/vcnet/libcups2_native.redist.nuspec
index 33796560b6..f6f0ebadb4 100644
--- a/vcnet/libcups2_native.redist.nuspec
+++ b/vcnet/libcups2_native.redist.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native.redist</id>
         <title>OpenPrinting CUPS Library for VS2019+ Redist</title>
-        <version>2.4.0-b1</version>
+        <version>2.4.0-b4</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
diff --git a/vcnet/libcups2_native.targets b/vcnet/libcups2_native.targets
deleted file mode 100644
index 192513b1c1..0000000000
--- a/vcnet/libcups2_native.targets
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <PropertyGroup>
-    <LibraryName Condition="'$(Configuration)'=='Debug'">libcups2d</LibraryName>
-    <LibraryName Condition="'$(Configuration)'=='Release'">libcups2</LibraryName>
-  </PropertyGroup>
-  <ItemGroup>
-    <LinkLibrary Include="$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\$(LibraryName).lib" />
-  </ItemGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>   <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include</AdditionalIncludeDirectories></ClCompile>
-    <Link>
-      <AdditionalDependencies>@$(LinkLibrary);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
-- 
2.47.2