diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 7c1ff15cc8..44499f6a64 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -33,12 +33,12 @@
-
-
+
+
-
+
@@ -103,4 +103,4 @@
-
\ No newline at end of file
+
diff --git a/build/NuSpecs/tools/install.core.ps1 b/build/NuSpecs/tools/install.core.ps1
index c4f213ba01..e2230e0c32 100644
--- a/build/NuSpecs/tools/install.core.ps1
+++ b/build/NuSpecs/tools/install.core.ps1
@@ -71,6 +71,7 @@ if ($project) {
if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
+ if(Test-Path $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll) { Remove-Item $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll -Force -Confirm:$false }
diff --git a/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
index 86796e1dd7..0689a7a7d4 100644
--- a/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
+++ b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
@@ -49,13 +49,9 @@
..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll
- False
- False
..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll
- False
- False
diff --git a/src/Umbraco.Core/Logging/ImageProcessorLogger.cs b/src/Umbraco.Core/Logging/ImageProcessorLogger.cs
index 02ca9c2949..015aced101 100644
--- a/src/Umbraco.Core/Logging/ImageProcessorLogger.cs
+++ b/src/Umbraco.Core/Logging/ImageProcessorLogger.cs
@@ -1,9 +1,9 @@
-namespace Umbraco.Core.Logging
-{
- using System;
- using System.Runtime.CompilerServices;
+using System;
+using System.Runtime.CompilerServices;
+using ImageProcessor.Common.Exceptions;
- using ImageProcessor.Common.Exceptions;
+namespace Umbraco.Core.Logging
+{
///
/// A logger for explicitly logging ImageProcessor exceptions.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e0eb63b265..d23c71a247 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -21,7 +21,7 @@
full
false
bin\Debug\
- DEBUG;TRACE
+ TRACE;DEBUG
prompt
4
false
@@ -39,67 +39,54 @@
..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll
- True
..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll
- True
- False
..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll
-
+
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
-
- ..\packages\ImageProcessor.2.4.5.0\lib\net45\ImageProcessor.dll
- True
+
+ ..\packages\ImageProcessor.2.5.0\lib\net45\ImageProcessor.dll
- False
..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll
- False
..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll
- False
..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll
- False
..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll
-
+
..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll
- True
- False
..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll
- False
..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll
- False
..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll
-
- False
+
..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll
..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll
True
-
+
..\packages\Owin.1.0\lib\net40\Owin.dll
-
+
..\packages\semver.1.1.2\lib\net45\Semver.dll
@@ -107,11 +94,9 @@
- False
..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll
- False
..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll
@@ -1440,9 +1425,7 @@
-
- Designer
-
+
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 35d78437e7..e132059da8 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -2,8 +2,8 @@
-
-
+
+
@@ -15,6 +15,6 @@
-
+
\ No newline at end of file
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 697b6a10c6..9f6d4e799f 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -39,31 +39,24 @@
..\packages\BenchmarkDotNet.0.9.9\lib\net45\BenchmarkDotNet.dll
- True
..\packages\BenchmarkDotNet.Core.0.9.9\lib\net45\BenchmarkDotNet.Core.dll
- True
..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.9\lib\net45\BenchmarkDotNet.Diagnostics.Windows.dll
- True
..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.9.9\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll
- True
..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll
- True
..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll
- True
..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll
- True
@@ -73,20 +66,16 @@
..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll
- True
..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll
- True
..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
- True
..\packages\System.Threading.Tasks.Extensions.4.0.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll
- True
@@ -106,10 +95,6 @@
-
-
-
-
{31785bc3-256c-4613-b2f5-a1b0bdded8c1}
@@ -120,7 +105,22 @@
Umbraco.Tests
+
+
+
+
+
+
+ if not exist "$(TargetDir)x86" md "$(TargetDir)x86"
+ xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.1\NativeBinaries\x86\*.*" "$(TargetDir)x86"
+ if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
+ xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"
+
+
+ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
+xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D
+
@@ -128,14 +128,6 @@
-
-
-
-
-
- xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
-xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D
-