From fd205ae5e67b38df13fde18b5a72cd23feea0dfc Mon Sep 17 00:00:00 2001
From: James South <james_south@hotmail.com>
Date: Wed, 25 Feb 2015 00:03:41 +0000
Subject: [PATCH] Fix build

Former-commit-id: 9105190ab9948ec79d04336d512acc97a8246474
Former-commit-id: 280d791ee41b6305aaca75c6e3b32bbb340c27c9
---
 build/Build.bat                               |  4 +++-
 build/build.xml                               | 22 +++++++++----------
 .../imageprocessor/cache.config.transform     |  2 +-
 src/ImageProcessor.sln                        |  1 +
 ...rocessor.Web.Plugins.AzureBlobCache.csproj |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/build/Build.bat b/build/Build.bat
index 9fbd8906f..d0526c7a7 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -1,3 +1,5 @@
 @echo off
 
-powershell "Import-Module %~dp0\psake.psm1 ; Invoke-Psake %~dp0\build.ps1 ; exit $LASTEXITCODE"
\ No newline at end of file
+powershell "Import-Module %~dp0\psake.psm1 ; Invoke-Psake %~dp0\build.ps1 ; exit $LASTEXITCODE"
+
+pause
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
index 970865bff..9365f6474 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -22,17 +22,6 @@
     <nuspec>ImageProcessor.Web.nuspec</nuspec>
   </project>
 
-    <project>
-    <name>ImageProcessor Web Azure Blob Cache plugin</name>
-    <version>1.0.0.0</version>
-    <folder>..\src\Plugins\ImageProcessor.Web\ImageProcessor.Web.Plugins.AzureBlobCache</folder>
-    <projfile>ImageProcessor.Web.Plugins.AzureBlobCache.csproj</projfile>
-    <outputs>
-      <output folder="ImageProcessor.Web.Plugins.AzureBlobCache\lib\net45" />
-    </outputs>
-    <nuspec>ImageProcessor.Web.Plugins.AzureBlobCache.nuspec</nuspec>
-  </project>
-
   <project>
     <name>ImageProcessor Web PostProcessor</name>
     <version>1.0.2.0</version>
@@ -50,6 +39,17 @@
     <nuspec>ImageProcessor.Web.Config.nuspec</nuspec>
   </project>
 
+  <project>
+    <name>ImageProcessor Web Azure Blob Cache plugin</name>
+    <version>1.0.0.0</version>
+    <folder>..\src\Plugins\ImageProcessor.Web\ImageProcessor.Web.Plugins.AzureBlobCache</folder>
+    <projfile>ImageProcessor.Web.Plugins.AzureBlobCache.csproj</projfile>
+    <outputs>
+      <output folder="ImageProcessor.Web.Plugins.AzureBlobCache\lib\net45" />
+    </outputs>
+    <nuspec>ImageProcessor.Web.Plugins.AzureBlobCache.nuspec</nuspec>
+  </project>
+
   <project>
     <name>ImageProcessor Cair plugin</name>
     <version>1.0.0.0</version>
diff --git a/build/content/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform b/build/content/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform
index 6376f2801..5e9e45ae3 100644
--- a/build/content/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform
+++ b/build/content/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform
@@ -1,6 +1,6 @@
 <caching currentCache="AzureBlobCache">
   <caches>
-    <cache name="AzureBlobCache" type="ImageProcessor.Web.Caching.AzureBlobCache, ImageProcessor.Web.Caching.AzureBlobCache" maxDays="365">
+    <cache name="AzureBlobCache" type="ImageProcessor.Web.Plugins.AzureBlobCache.AzureBlobCache, ImageProcessor.Web.Plugins.AzureBlobCache" maxDays="365">
       <settings>
         <setting key="CachedStorageAccount" value="DefaultEndpointsProtocol=https;AccountName=[CacheAccountName];AccountKey=[CacheAccountKey]"/>
         <setting key="CachedBlobContainer" value="cache"/>
diff --git a/src/ImageProcessor.sln b/src/ImageProcessor.sln
index d2a3a39fb..34abdf893 100644
--- a/src/ImageProcessor.sln
+++ b/src/ImageProcessor.sln
@@ -207,6 +207,7 @@ Global
 		{633B1C4C-4823-47BE-9A01-A665F3118C8C} = {B5217BED-B0B7-408E-81B7-877DE2BF9036}
 		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF} = {B5217BED-B0B7-408E-81B7-877DE2BF9036}
 		{C7D1F0DD-CBD6-4127-82B4-51949EFF0BF5} = {5D12E196-FB7A-4D97-B156-56901EF8084D}
+		{7BF5274B-56A7-4B62-8105-E9BDF25BAFE7} = {B5217BED-B0B7-408E-81B7-877DE2BF9036}
 		{3C805E4C-D679-43F8-8C43-8909CDB4D4D7} = {5D12E196-FB7A-4D97-B156-56901EF8084D}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
diff --git a/src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/ImageProcessor.Web.Plugins.AzureBlobCache.csproj b/src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/ImageProcessor.Web.Plugins.AzureBlobCache.csproj
index f0c7682af..dd1e3b805 100644
--- a/src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/ImageProcessor.Web.Plugins.AzureBlobCache.csproj
+++ b/src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/ImageProcessor.Web.Plugins.AzureBlobCache.csproj
@@ -82,12 +82,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+  <!--<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
+  </Target>-->
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">