From 433d0499bca0934ae85ac932337bca356bf01ad5 Mon Sep 17 00:00:00 2001
From: James South <james_south@hotmail.com>
Date: Wed, 25 Jun 2014 22:10:03 +0100
Subject: [PATCH] Yay! Nuget win!

Former-commit-id: 40f0544ad15cd88e7d6c71294cc3729d8799a891
---
 build/NuSpecs/ImageProcessor.nuspec           | 11 +++------
 .../ImageProcessor/imageprocessor.targets     | 23 ++++++++++++++-----
 build/tools/imageprocessor.ps1                | 12 ----------
 build/tools/install.ps1                       | 11 ---------
 build/tools/uninstall.ps1                     |  9 --------
 5 files changed, 20 insertions(+), 46 deletions(-)
 delete mode 100644 build/tools/imageprocessor.ps1
 delete mode 100644 build/tools/install.ps1
 delete mode 100644 build/tools/uninstall.ps1

diff --git a/build/NuSpecs/ImageProcessor.nuspec b/build/NuSpecs/ImageProcessor.nuspec
index f0d5f134e..8041f5dfc 100644
--- a/build/NuSpecs/ImageProcessor.nuspec
+++ b/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\x64\libwebp.dll" target="lib\x64\libwebp.dll" />
-        <file src="..\tools\install.ps1" target="tools\install.ps1" />
-        <file src="..\tools\uninstall.ps1" target="tools\uninstall.ps1" />
-        <file src="..\tools\imageprocessor.ps1" target="tools\imagprocessor.ps1" />
+        <file src="..\_BuildOutput\ImageProcessor\lib\x86\libwebp.dll" target="build\native\lib\x86\libwebp.dll" />
+        <file src="..\_BuildOutput\ImageProcessor\lib\x64\libwebp.dll" target="build\native\lib\x64\libwebp.dll" />
+        <file src="..\content\ImageProcessor\imageprocessor.targets" target="build\imageprocessor.targets" /> 
     </files>
 </package>
\ No newline at end of file
diff --git a/build/content/ImageProcessor/imageprocessor.targets b/build/content/ImageProcessor/imageprocessor.targets
index 6922fa306..0b161e3c5 100644
--- a/build/content/ImageProcessor/imageprocessor.targets
+++ b/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. -->
-  <Target Name="Init" BeforeTargets="BeforeBuild">
-    <ItemGroup>
-      <NativeBinaries Include="$(MSBuildThisFileDirectory)..\..\build\native\lib\**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(NativeBinaries.FullPath)" DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)" />
+  <ItemGroup>
+    <AvailableItemName Include="NativeBinaries" />
+  </ItemGroup>
+  <ItemGroup>
+ <NativeBinaries Include="$(MSBuildThisFileDirectory)native\lib\**\*" />
+  </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>
\ No newline at end of file
diff --git a/build/tools/imageprocessor.ps1 b/build/tools/imageprocessor.ps1
deleted file mode 100644
index 7b8be180f..000000000
--- a/build/tools/imageprocessor.ps1
+++ /dev/null
@@ -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`""
\ No newline at end of file
diff --git a/build/tools/install.ps1 b/build/tools/install.ps1
deleted file mode 100644
index 567ea0276..000000000
--- a/build/tools/install.ps1
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/build/tools/uninstall.ps1 b/build/tools/uninstall.ps1
deleted file mode 100644
index 4fa6c12ca..000000000
--- a/build/tools/uninstall.ps1
+++ /dev/null
@@ -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, "")