Yay! Nuget win!

Former-commit-id: 40f0544ad15cd88e7d6c71294cc3729d8799a891

build/NuSpecs/ImageProcessor.nuspec

@@ -22,16 +22,11 @@ Feedback is always welcome.</description>
         <copyright>James South</copyright>
         <language>en-GB</language>
         <tags>Image Imaging ASP Performance Processing Resize AutoRotate Rotate RoundedCorners Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg Bitmap Png Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF</tags>
-        <references>
-            <reference file="ImageProcessor.dll"/>
-        </references>
     </metadata>
     <files>
         <file src="..\_BuildOutput\ImageProcessor\lib\ImageProcessor.dll" target="lib\ImageProcessor.dll" />
-        <file src="..\_BuildOutput\ImageProcessor\lib\x86\libwebp.dll" target="lib\x86\libwebp.dll" />
+        <file src="..\_BuildOutput\ImageProcessor\lib\x86\libwebp.dll" target="build\native\lib\x86\libwebp.dll" />
-        <file src="..\_BuildOutput\ImageProcessor\lib\x64\libwebp.dll" target="lib\x64\libwebp.dll" />
+        <file src="..\_BuildOutput\ImageProcessor\lib\x64\libwebp.dll" target="build\native\lib\x64\libwebp.dll" />
-        <file src="..\tools\install.ps1" target="tools\install.ps1" />
+        <file src="..\content\ImageProcessor\imageprocessor.targets" target="build\imageprocessor.targets" /> 
-        <file src="..\tools\uninstall.ps1" target="tools\uninstall.ps1" />
-        <file src="..\tools\imageprocessor.ps1" target="tools\imagprocessor.ps1" />
     </files>
 </package>

build/content/ImageProcessor/imageprocessor.targets

@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- This copies the native binaries to the bin folder. -->
+  <ItemGroup>
-  <Target Name="Init" BeforeTargets="BeforeBuild">
+    <AvailableItemName Include="NativeBinaries" />
-    <ItemGroup>
+  </ItemGroup>
-      <NativeBinaries Include="$(MSBuildThisFileDirectory)..\..\build\native\lib\**\*" />
+  <ItemGroup>
-    </ItemGroup>
+ <NativeBinaries Include="$(MSBuildThisFileDirectory)native\lib\**\*" />
-    <Copy SourceFiles="%(NativeBinaries.FullPath)" DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+  <PropertyGroup>
+    <PrepareForRunDependsOn>
+      $(PrepareForRunDependsOn);
+      CopyNativeBinaries
+    </PrepareForRunDependsOn>
+  </PropertyGroup>
+  <Target Name="CopyNativeBinaries" DependsOnTargets="CopyFilesToOutputDirectory">
+    <Copy SourceFiles="@(NativeBinaries)"
+          DestinationFiles="@(NativeBinaries->'$(OutDir)\%(RecursiveDir)\%(Filename).%(Extension)')">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
   </Target>
 </Project>

build/tools/imageprocessor.ps1

@@ -1,12 +0,0 @@
-$solutionDir = [System.IO.Path]::GetDirectoryName($dte.Solution.FullName) + "\"
-$path = $installPath.Replace($solutionDir, "`$(SolutionDir)")
-
-$NativeAssembliesDir = Join-Path $path "lib"
-$x86 = $(Join-Path $NativeAssembliesDir "x86\*.*")
-$x64 = $(Join-Path $NativeAssembliesDir "x64\*.*")
-
-$ImageProcessorPostBuildCmd = "
-if not exist `"`$(TargetDir)x86`" md `"`$(TargetDir)x86`"
-xcopy /s /y `"$x86`" `"`$(TargetDir)x86`"
-if not exist `"`$(TargetDir)amd64`" md `"`$(TargetDir)x64`"
-xcopy /s /y `"$x64`" `"`$(TargetDir)x64`""

build/tools/install.ps1

@@ -1,11 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-. (Join-Path $toolsPath "imageprocessor.ps1")
-
-# Get the current Post Build Event cmd
-$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
-
-# Append our post build command if it's not already there
-if (!$currentPostBuildCmd.Contains($ImageProcessorPostBuildCmd)) {
-    $project.Properties.Item("PostBuildEvent").Value += $ImageProcessorPostBuildCmd
-}

build/tools/uninstall.ps1

@@ -1,9 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-. (Join-Path $toolsPath "imageprocessor.ps1")
-
-# Get the current Post Build Event cmd
-$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
-
-# Remove our post build command from it (if it's there)
-$project.Properties.Item("PostBuildEvent").Value = $currentPostBuildCmd.Replace($ImageProcessorPostBuildCmd, "")