correct nuspec and targets to correctly copy library to output and properly include targets

Author: tsmoreland

modern_win32_vc143_md.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <id>modern_win32_vc143</id>
+    <id>modern_win32_vc143_md</id>
     <version>1.0.1</version>
     <title>C++20 Wrappers around Win32 API</title>
     <authors>TS Moreland</authors>
@@ -23,13 +23,13 @@
     <file src="modern_win32_vc143_md.targets" target="build" />
     <file src="out\install\vc143-x64-release\include\**\*.*" target="lib\native\include\" />
 
-    <file src="out\install\vc143-x64-release\lib\modern_win32_md.lib" target="lib\native\x64\" />
-    <file src="out\install\vc143-x64-release\lib\modern_win32_md.dll" target="lib\native\x64\" />
-    <file src="out\install\vc143-x64-release\lib\modern_win32_md.pdb" target="lib\native\x64\" />
+    <file src="out\install\vc143-x64-release\lib\modern_win32_vc143_md.lib" target="lib\native\x64\" />
+    <file src="out\install\vc143-x64-release\lib\modern_win32_vc143_md.dll" target="lib\native\x64\" />
+    <file src="out\install\vc143-x64-release\lib\modern_win32_vc143_md.pdb" target="lib\native\x64\" />
 
-    <file src="out\install\vc143-x64-debug\lib\modern_win32_mdd.lib" target="lib\native\x64\" />
-    <file src="out\install\vc143-x64-debug\lib\modern_win32_mdd.dll" target="lib\native\x64\" />
-    <file src="out\install\vc143-x64-debug\lib\modern_win32_mdd.pdb" target="lib\native\x64\" />
+    <file src="out\install\vc143-x64-debug\lib\modern_win32_vc143_mdd.lib" target="lib\native\x64\" />
+    <file src="out\install\vc143-x64-debug\lib\modern_win32_vc143_mdd.dll" target="lib\native\x64\" />
+    <file src="out\install\vc143-x64-debug\lib\modern_win32_vc143_mdd.pdb" target="lib\native\x64\" />
 
   </files>
 </package>

modern_win32_vc143_md.targets

@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\lib\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\..\lib\native\debug\lib\modern_win32_vc143_mdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\lib\native\x64\modern_win32_vc143_mdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <NativeLibs Include="$(MSBuildThisFileDirectory)..\debug\x64\*.dll" />
-    <None Include="@(NativeLibs)">
-      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)'!='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
     <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\..\lib\native\release\lib\modern_win32_vc143_md.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\lib\native\x64\modern_win32_vc143_md.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup Condition="'$(Configuration)'!='Debug'">
-    <NativeLibs Include="$(MSBuildThisFileDirectory)..\release\x64\*.dll" />
-    <None Include="@(NativeLibs)">
-      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-</Project>
+
+  <Target Name="ModernWin32PostDebugBuildEvent" AfterTargets="Link" Condition="'$(Configuration)'=='Debug'">
+    <PropertyGroup>
+      <ModernWin32PostDebugBuildEventCommand>
+        xcopy /yfhrd "$(MSBuildThisFileDirectory)..\lib\native\x64\*_mdd.dll" "$(OutDir)"
+      </ModernWin32PostDebugBuildEventCommand>
+    </PropertyGroup>
+    <Exec Command="$(ModernWin32PostDebugBuildEventCommand)" />
+  </Target>
+  <Target Name="ModernWin32PostReleaseBuildEvent" AfterTargets="Link" Condition="'$(Configuration)'!='Debug'">
+    <PropertyGroup>
+      <ModernWin32PostReleaseBuildEventCommand>
+        xcopy /yfhrd "$(MSBuildThisFileDirectory)..\lib\native\x64\*_md.dll" "$(OutDir)"
+      </ModernWin32PostReleaseBuildEventCommand>
+    </PropertyGroup>
+    <Exec Command="$(ModernWin32PostReleaseBuildEventCommand)" />
+  </Target>
+
+</Project>