diff --git a/Storm.ImageProcessor.Web.sln b/Storm.ImageProcessor.Web.sln
index cfa07da..45cba1a 100644
--- a/Storm.ImageProcessor.Web.sln
+++ b/Storm.ImageProcessor.Web.sln
@@ -1,22 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{71828E25-3B47-42FB-ACD2-9FC542B8D91B}"
EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Storm.Config", "src\Storm.Config\Storm.Config.shproj", "{8529D8C0-C3B2-4C7E-BB94-BE8C50F56BF7}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storm.ImageProcessor.Web", "src\Storm.ImageProcessor.Web\Storm.ImageProcessor.Web.csproj", "{60C5FEE8-8901-4512-9167-70A794ED6E83}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storm.UmbracoFileSystemProviders.Azure", "src\Storm.UmbracoFileSystemProviders.Azure\Storm.UmbracoFileSystemProviders.Azure.csproj", "{B2C225A1-4F03-47FF-842B-AD3555A94FF9}"
-EndProject
Global
- GlobalSection(SharedMSBuildProjectFiles) = preSolution
- src\Storm.Config\Storm.Umbraco.Shared.projitems*{60c5fee8-8901-4512-9167-70a794ed6e83}*SharedItemsImports = 4
- src\Storm.Config\Storm.Umbraco.Shared.projitems*{8529d8c0-c3b2-4c7e-bb94-be8c50f56bf7}*SharedItemsImports = 13
- src\Storm.Config\Storm.Umbraco.Shared.projitems*{b2c225a1-4f03-47ff-842b-ad3555a94ff9}*SharedItemsImports = 4
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
@@ -26,17 +17,11 @@ Global
{60C5FEE8-8901-4512-9167-70A794ED6E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60C5FEE8-8901-4512-9167-70A794ED6E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60C5FEE8-8901-4512-9167-70A794ED6E83}.Release|Any CPU.Build.0 = Release|Any CPU
- {B2C225A1-4F03-47FF-842B-AD3555A94FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B2C225A1-4F03-47FF-842B-AD3555A94FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B2C225A1-4F03-47FF-842B-AD3555A94FF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B2C225A1-4F03-47FF-842B-AD3555A94FF9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {8529D8C0-C3B2-4C7E-BB94-BE8C50F56BF7} = {71828E25-3B47-42FB-ACD2-9FC542B8D91B}
{60C5FEE8-8901-4512-9167-70A794ED6E83} = {71828E25-3B47-42FB-ACD2-9FC542B8D91B}
- {B2C225A1-4F03-47FF-842B-AD3555A94FF9} = {71828E25-3B47-42FB-ACD2-9FC542B8D91B}
EndGlobalSection
EndGlobal
diff --git a/nuspec/Storm.ImageProcessor.Web.nuspec b/nuspec/Storm.ImageProcessor.Web.nuspec
index d4c2c5f..038b601 100644
--- a/nuspec/Storm.ImageProcessor.Web.nuspec
+++ b/nuspec/Storm.ImageProcessor.Web.nuspec
@@ -11,8 +11,9 @@
false
ImageProcessor extensions supporting configuration of azure blob storage from application settings
-
-
+
+
+
diff --git a/nuspec/Storm.UmbracoFileSystemProviders.Azure.nuspec b/nuspec/Storm.UmbracoFileSystemProviders.Azure.nuspec
deleted file mode 100644
index 3de1bc8..0000000
--- a/nuspec/Storm.UmbracoFileSystemProviders.Azure.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- Storm.UmbracoFileSystemProviders.Azure
- Storm.UmbracoFileSystemProviders.Azure
- Phil Oyston
- Phil Oyston
- http://stormid.com/media/48267/logo.jpg
- http://stormid.com
- http://stormid.com
- false
- UmbracoFileSystemProviders.Azure extensions supporting configuration of azure blob storage from application settings
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Storm.Config/Storm.Config.shproj b/src/Storm.Config/Storm.Config.shproj
deleted file mode 100644
index 36fed5e..0000000
--- a/src/Storm.Config/Storm.Config.shproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- 8529d8c0-c3b2-4c7e-bb94-be8c50f56bf7
- 14.0
-
-
-
-
-
-
-
-
diff --git a/src/Storm.Config/Storm.Umbraco.Shared.projitems b/src/Storm.Config/Storm.Umbraco.Shared.projitems
deleted file mode 100644
index d9b7678..0000000
--- a/src/Storm.Config/Storm.Umbraco.Shared.projitems
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- true
- 8529d8c0-c3b2-4c7e-bb94-be8c50f56bf7
-
-
- Storm.Umbraco.Shared
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Storm.Config/ConfigurationManagerExtensions.cs b/src/Storm.ImageProcessor.Web/Config/ConfigurationManagerExtensions.cs
similarity index 98%
rename from src/Storm.Config/ConfigurationManagerExtensions.cs
rename to src/Storm.ImageProcessor.Web/Config/ConfigurationManagerExtensions.cs
index a42808a..c6c45be 100644
--- a/src/Storm.Config/ConfigurationManagerExtensions.cs
+++ b/src/Storm.ImageProcessor.Web/Config/ConfigurationManagerExtensions.cs
@@ -1,7 +1,7 @@
using System;
using System.Configuration;
-namespace Storm.Config
+namespace Storm.ImageProcessor.Web.Config
{
internal static class ConfigurationManagerExtensions
{
diff --git a/src/Storm.ImageProcessor.Web/Plugins/AzureBlobCache/FromConfigAzureBlobCache.cs b/src/Storm.ImageProcessor.Web/Plugins/AzureBlobCache/FromConfigAzureBlobCache.cs
index cfdbcfe..f8bb290 100644
--- a/src/Storm.ImageProcessor.Web/Plugins/AzureBlobCache/FromConfigAzureBlobCache.cs
+++ b/src/Storm.ImageProcessor.Web/Plugins/AzureBlobCache/FromConfigAzureBlobCache.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
-using Storm.Config;
+using Storm.ImageProcessor.Web.Config;
using Storm.ImageProcessor.Web.Extensions;
namespace Storm.ImageProcessor.Web.Plugins.AzureBlobCache
diff --git a/src/Storm.ImageProcessor.Web/Services/FromConfigCloudImageService.cs b/src/Storm.ImageProcessor.Web/Services/FromConfigCloudImageService.cs
index 19c1ece..11a21f9 100644
--- a/src/Storm.ImageProcessor.Web/Services/FromConfigCloudImageService.cs
+++ b/src/Storm.ImageProcessor.Web/Services/FromConfigCloudImageService.cs
@@ -3,7 +3,7 @@
using System.Configuration;
using System.Linq;
using ImageProcessor.Web.Services;
-using Storm.Config;
+using Storm.ImageProcessor.Web.Config;
using Storm.ImageProcessor.Web.Extensions;
namespace Storm.ImageProcessor.Web.Services
diff --git a/src/Storm.ImageProcessor.Web/Storm.ImageProcessor.Web.csproj b/src/Storm.ImageProcessor.Web/Storm.ImageProcessor.Web.csproj
index 00536b9..3d10e7a 100644
--- a/src/Storm.ImageProcessor.Web/Storm.ImageProcessor.Web.csproj
+++ b/src/Storm.ImageProcessor.Web/Storm.ImageProcessor.Web.csproj
@@ -30,17 +30,14 @@
4
-
- ..\..\packages\ImageProcessor.2.4.4.0\lib\net45\ImageProcessor.dll
- True
+
+ ..\..\packages\ImageProcessor.2.5.4\lib\net45\ImageProcessor.dll
-
- ..\..\packages\ImageProcessor.Web.4.6.4.0\lib\net45\ImageProcessor.Web.dll
- True
+
+ ..\..\packages\ImageProcessor.Web.4.8.4\lib\net45\ImageProcessor.Web.dll
-
- ..\..\packages\ImageProcessor.Web.Plugins.AzureBlobCache.1.1.1.0\lib\net45\ImageProcessor.Web.Plugins.AzureBlobCache.dll
- True
+
+ ..\..\packages\ImageProcessor.Web.Plugins.AzureBlobCache.1.3.1\lib\net45\ImageProcessor.Web.Plugins.AzureBlobCache.dll
..\..\packages\Microsoft.Data.Edm.5.6.2\lib\net40\Microsoft.Data.Edm.dll
@@ -54,6 +51,9 @@
..\..\packages\Microsoft.Data.Services.Client.5.6.2\lib\net40\Microsoft.Data.Services.Client.dll
True
+
+ ..\..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll
+
..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll
True
@@ -84,6 +84,7 @@
Properties\VersionAssemblyInfo.cs
+
@@ -111,7 +112,6 @@
-
-
\ No newline at end of file
diff --git a/src/Storm.UmbracoFileSystemProviders.Azure/Storm.UmbracoFileSystemProviders.Azure.v2.ncrunchproject b/src/Storm.UmbracoFileSystemProviders.Azure/Storm.UmbracoFileSystemProviders.Azure.v2.ncrunchproject
deleted file mode 100644
index a3dbce6..0000000
Binary files a/src/Storm.UmbracoFileSystemProviders.Azure/Storm.UmbracoFileSystemProviders.Azure.v2.ncrunchproject and /dev/null differ
diff --git a/src/Storm.UmbracoFileSystemProviders.Azure/app.config b/src/Storm.UmbracoFileSystemProviders.Azure/app.config
deleted file mode 100644
index 4875f16..0000000
--- a/src/Storm.UmbracoFileSystemProviders.Azure/app.config
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Storm.UmbracoFileSystemProviders.Azure/content/config/FileSystemProviders.config.install.xdt b/src/Storm.UmbracoFileSystemProviders.Azure/content/config/FileSystemProviders.config.install.xdt
deleted file mode 100644
index fbf5632..0000000
--- a/src/Storm.UmbracoFileSystemProviders.Azure/content/config/FileSystemProviders.config.install.xdt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/src/Storm.UmbracoFileSystemProviders.Azure/content/config/FileSystemProviders.config.uninstall.xdt b/src/Storm.UmbracoFileSystemProviders.Azure/content/config/FileSystemProviders.config.uninstall.xdt
deleted file mode 100644
index c6184ec..0000000
--- a/src/Storm.UmbracoFileSystemProviders.Azure/content/config/FileSystemProviders.config.uninstall.xdt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/src/Storm.UmbracoFileSystemProviders.Azure/content/web.config.install.xdt b/src/Storm.UmbracoFileSystemProviders.Azure/content/web.config.install.xdt
deleted file mode 100644
index 28c26a6..0000000
--- a/src/Storm.UmbracoFileSystemProviders.Azure/content/web.config.install.xdt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Storm.UmbracoFileSystemProviders.Azure/packages.config b/src/Storm.UmbracoFileSystemProviders.Azure/packages.config
deleted file mode 100644
index f57299f..0000000
--- a/src/Storm.UmbracoFileSystemProviders.Azure/packages.config
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file