From 2e7f6a336211eb81b8a24e400a3899bacf1b75ba Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Tue, 31 Aug 2021 13:08:04 +0100
Subject: [PATCH 1/3] Merge pull request #199 from Shazwazza/patch-1

Makes GetBlockBlobReference public just like v2

(cherry picked from commit 157a29eb362c78c8236d42808ffe941eb93b7534)
---
 src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
index a59e88b..a686a93 100644
--- a/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
+++ b/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
@@ -809,7 +809,7 @@ private static bool SasCredentialHasContainerCreatePermission()
         /// <returns>
         /// The <see cref="BlobClient"/> reference.
         /// </returns>
-        private BlobClient GetBlockBlobReference(string path)
+        public BlobClient GetBlockBlobReference(string path)
         {
             Current.Logger.Debug<AzureBlobFileSystem>($"GetBlockBlobReference(path) method executed with path:{path}");
 

From 06198a465b7604f2c9c2833ba209efd90440f096 Mon Sep 17 00:00:00 2001
From: Jeavon Leopold <jeavon@crumpled-dog.com>
Date: Tue, 31 Aug 2021 13:26:18 +0100
Subject: [PATCH 2/3] Removed Microsoft.Data.Services.Client

---
 build/UmbracoFileSystemProviders.Azure.Media.proj           | 2 +-
 build/UmbracoFileSystemProviders.Azure.nuspec               | 1 -
 build/transforms/umbpak-web.config.install.xdt              | 6 ------
 build/transforms/umbpak-web.config.uninstall.xdt            | 2 --
 .../UmbracoFileSystemProviders.Azure.Installer.csproj       | 3 ---
 .../packages.config                                         | 1 -
 .../UmbracoFileSystemProviders.Azure.Tests.csproj           | 3 ---
 src/UmbracoFileSystemProviders.Azure.Tests/packages.config  | 1 -
 .../UmbracoFileSystemProviders.Azure.csproj                 | 3 ---
 src/UmbracoFileSystemProviders.Azure/packages.config        | 1 -
 10 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/build/UmbracoFileSystemProviders.Azure.Media.proj b/build/UmbracoFileSystemProviders.Azure.Media.proj
index 9d76712..7f2aec0 100644
--- a/build/UmbracoFileSystemProviders.Azure.Media.proj
+++ b/build/UmbracoFileSystemProviders.Azure.Media.proj
@@ -88,7 +88,7 @@
       <!-- Umbraco specific -->
       <!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
       <CoreBinFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
-      <UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Services.Client.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.ConfigurationManager.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Blobs.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Core.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.KeyVault.Core.dll" />
+      <UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.ConfigurationManager.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Blobs.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Core.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.KeyVault.Core.dll" />
       <InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
       <UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
       <UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>
diff --git a/build/UmbracoFileSystemProviders.Azure.nuspec b/build/UmbracoFileSystemProviders.Azure.nuspec
index d04165d..d705446 100644
--- a/build/UmbracoFileSystemProviders.Azure.nuspec
+++ b/build/UmbracoFileSystemProviders.Azure.nuspec
@@ -23,7 +23,6 @@
             <dependency id="Azure.Core" version="1.14.0" />
             <dependency id="Microsoft.Azure.ConfigurationManager" version="4.0.0" />
             <dependency id="Microsoft.Azure.KeyVault.Core" version="3.0.3" />
-            <dependency id="Microsoft.Data.Services.Client" version="5.8.4" />
     </dependencies>
     </metadata>
 </package>
\ No newline at end of file
diff --git a/build/transforms/umbpak-web.config.install.xdt b/build/transforms/umbpak-web.config.install.xdt
index 12627eb..716a716 100644
--- a/build/transforms/umbpak-web.config.install.xdt
+++ b/build/transforms/umbpak-web.config.install.xdt
@@ -2,8 +2,6 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing">
-            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
-            </dependentAssembly>
             <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
             </dependentAssembly>
             <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
@@ -11,10 +9,6 @@
             <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
             </dependentAssembly>
 
-            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
-                <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
-            </dependentAssembly>
             <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
                 <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
diff --git a/build/transforms/umbpak-web.config.uninstall.xdt b/build/transforms/umbpak-web.config.uninstall.xdt
index 4d2396d..c57cdbb 100644
--- a/build/transforms/umbpak-web.config.uninstall.xdt
+++ b/build/transforms/umbpak-web.config.uninstall.xdt
@@ -2,8 +2,6 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
-            </dependentAssembly>
             <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
             </dependentAssembly>
             <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj b/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
index f5651fc..11e4fc7 100644
--- a/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
+++ b/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
@@ -134,9 +134,6 @@
     <Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/packages.config b/src/UmbracoFileSystemProviders.Azure.Installer/packages.config
index 1260e3e..2e04666 100644
--- a/src/UmbracoFileSystemProviders.Azure.Installer/packages.config
+++ b/src/UmbracoFileSystemProviders.Azure.Installer/packages.config
@@ -35,7 +35,6 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
-  <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj b/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj
index 451b6ab..852de27 100644
--- a/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj
+++ b/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj
@@ -135,9 +135,6 @@
     <Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/packages.config b/src/UmbracoFileSystemProviders.Azure.Tests/packages.config
index db08f50..9820aa2 100644
--- a/src/UmbracoFileSystemProviders.Azure.Tests/packages.config
+++ b/src/UmbracoFileSystemProviders.Azure.Tests/packages.config
@@ -34,7 +34,6 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
-  <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
diff --git a/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj b/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj
index bccb1e1..cbc9c1e 100644
--- a/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj
+++ b/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj
@@ -135,9 +135,6 @@
     <Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
diff --git a/src/UmbracoFileSystemProviders.Azure/packages.config b/src/UmbracoFileSystemProviders.Azure/packages.config
index de73cfc..011d0e9 100644
--- a/src/UmbracoFileSystemProviders.Azure/packages.config
+++ b/src/UmbracoFileSystemProviders.Azure/packages.config
@@ -34,7 +34,6 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
-  <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />

From cea66217d92f94ab772fba2eaf580bd911d28a17 Mon Sep 17 00:00:00 2001
From: Jeavon Leopold <jeavon@crumpled-dog.com>
Date: Tue, 31 Aug 2021 13:45:39 +0100
Subject: [PATCH 3/3] Removed some old dependencies and upgraded current Azure
 packages

---
 ...UmbracoFileSystemProviders.Azure.Media.proj |  2 +-
 build/UmbracoFileSystemProviders.Azure.nuspec  |  8 +++-----
 build/transforms/umbpak-web.config.install.xdt |  4 ----
 .../transforms/umbpak-web.config.uninstall.xdt |  2 --
 ...oFileSystemProviders.Azure.Installer.csproj | 18 ++++++------------
 .../app.config                                 |  2 +-
 .../packages.config                            |  8 +++-----
 ...bracoFileSystemProviders.Azure.Tests.csproj | 18 ++++++------------
 .../app.config                                 |  2 +-
 .../packages.config                            |  8 +++-----
 .../UmbracoFileSystemProviders.Azure.csproj    | 18 ++++++------------
 .../app.config                                 |  2 +-
 .../packages.config                            |  8 +++-----
 13 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/build/UmbracoFileSystemProviders.Azure.Media.proj b/build/UmbracoFileSystemProviders.Azure.Media.proj
index 7f2aec0..73c49a0 100644
--- a/build/UmbracoFileSystemProviders.Azure.Media.proj
+++ b/build/UmbracoFileSystemProviders.Azure.Media.proj
@@ -88,7 +88,7 @@
       <!-- Umbraco specific -->
       <!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
       <CoreBinFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
-      <UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.ConfigurationManager.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Blobs.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Core.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.KeyVault.Core.dll" />
+      <UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Blobs.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Core.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll" />
       <InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
       <UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
       <UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>
diff --git a/build/UmbracoFileSystemProviders.Azure.nuspec b/build/UmbracoFileSystemProviders.Azure.nuspec
index d705446..af9fad0 100644
--- a/build/UmbracoFileSystemProviders.Azure.nuspec
+++ b/build/UmbracoFileSystemProviders.Azure.nuspec
@@ -18,11 +18,9 @@
         <dependencies>
             <dependency id="UmbracoCms.Core" version="0.0.0" />
             <dependency id="UmbracoCms.Web" version="0.0.0" />
-            <dependency id="Azure.Storage.Blobs" version="12.8.3" />
-            <dependency id="Azure.Storage.Common" version="12.7.2" />
-            <dependency id="Azure.Core" version="1.14.0" />
-            <dependency id="Microsoft.Azure.ConfigurationManager" version="4.0.0" />
-            <dependency id="Microsoft.Azure.KeyVault.Core" version="3.0.3" />
+            <dependency id="Azure.Storage.Blobs" version="12.9.1" />
+            <dependency id="Azure.Storage.Common" version="12.8.0" />
+            <dependency id="Azure.Core" version="1.18.0" />
     </dependencies>
     </metadata>
 </package>
\ No newline at end of file
diff --git a/build/transforms/umbpak-web.config.install.xdt b/build/transforms/umbpak-web.config.install.xdt
index 716a716..9a3a88e 100644
--- a/build/transforms/umbpak-web.config.install.xdt
+++ b/build/transforms/umbpak-web.config.install.xdt
@@ -17,10 +17,6 @@
                 <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
             </dependentAssembly>
-            <dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
-                <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" xdt:Transform="SetAttributes" />
-            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 </configuration>
\ No newline at end of file
diff --git a/build/transforms/umbpak-web.config.uninstall.xdt b/build/transforms/umbpak-web.config.uninstall.xdt
index c57cdbb..cd8725c 100644
--- a/build/transforms/umbpak-web.config.uninstall.xdt
+++ b/build/transforms/umbpak-web.config.uninstall.xdt
@@ -6,8 +6,6 @@
             </dependentAssembly>
             <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
             </dependentAssembly>
-            <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
-            </dependentAssembly>
         </assemblyBinding>
     </runtime>	
 </configuration>
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj b/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
index 11e4fc7..fbdfc58 100644
--- a/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
+++ b/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
@@ -54,14 +54,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Azure.Core, Version=1.14.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Core.1.14.0\lib\net461\Azure.Core.dll</HintPath>
+    <Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Azure.Storage.Blobs, Version=12.8.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Storage.Blobs.12.8.3\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
+    <Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
     </Reference>
-    <Reference Include="Azure.Storage.Common, Version=12.7.2.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Storage.Common.12.7.2\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
+    <Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
     </Reference>
     <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
@@ -119,12 +119,6 @@
     <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.ConfigurationManager.4.0.0\lib\net452\Microsoft.Azure.ConfigurationManager.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/app.config b/src/UmbracoFileSystemProviders.Azure.Installer/app.config
index 97c37cf..c5806ea 100644
--- a/src/UmbracoFileSystemProviders.Azure.Installer/app.config
+++ b/src/UmbracoFileSystemProviders.Azure.Installer/app.config
@@ -100,7 +100,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.14.0.0" newVersion="1.14.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/packages.config b/src/UmbracoFileSystemProviders.Azure.Installer/packages.config
index 2e04666..5b0c333 100644
--- a/src/UmbracoFileSystemProviders.Azure.Installer/packages.config
+++ b/src/UmbracoFileSystemProviders.Azure.Installer/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Azure.Core" version="1.14.0" targetFramework="net472" />
-  <package id="Azure.Storage.Blobs" version="12.8.3" targetFramework="net472" />
-  <package id="Azure.Storage.Common" version="12.7.2" targetFramework="net472" />
+  <package id="Azure.Core" version="1.18.0" targetFramework="net472" />
+  <package id="Azure.Storage.Blobs" version="12.9.1" targetFramework="net472" />
+  <package id="Azure.Storage.Common" version="12.8.0" targetFramework="net472" />
   <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
   <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
@@ -30,8 +30,6 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
-  <package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
-  <package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj b/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj
index 852de27..9ac7ca4 100644
--- a/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj
+++ b/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj
@@ -56,14 +56,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Azure.Core, Version=1.14.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Core.1.14.0\lib\net461\Azure.Core.dll</HintPath>
+    <Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Azure.Storage.Blobs, Version=12.8.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Storage.Blobs.12.8.3\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
+    <Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
     </Reference>
-    <Reference Include="Azure.Storage.Common, Version=12.7.2.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Storage.Common.12.7.2\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
+    <Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
     </Reference>
     <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
@@ -120,12 +120,6 @@
     <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.ConfigurationManager.4.0.0\lib\net452\Microsoft.Azure.ConfigurationManager.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/app.config b/src/UmbracoFileSystemProviders.Azure.Tests/app.config
index 99df905..2ab61d5 100644
--- a/src/UmbracoFileSystemProviders.Azure.Tests/app.config
+++ b/src/UmbracoFileSystemProviders.Azure.Tests/app.config
@@ -132,7 +132,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.14.0.0" newVersion="1.14.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/packages.config b/src/UmbracoFileSystemProviders.Azure.Tests/packages.config
index 9820aa2..6f66ebf 100644
--- a/src/UmbracoFileSystemProviders.Azure.Tests/packages.config
+++ b/src/UmbracoFileSystemProviders.Azure.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Azure.Core" version="1.14.0" targetFramework="net472" />
-  <package id="Azure.Storage.Blobs" version="12.8.3" targetFramework="net472" />
-  <package id="Azure.Storage.Common" version="12.7.2" targetFramework="net472" />
+  <package id="Azure.Core" version="1.18.0" targetFramework="net472" />
+  <package id="Azure.Storage.Blobs" version="12.9.1" targetFramework="net472" />
+  <package id="Azure.Storage.Common" version="12.8.0" targetFramework="net472" />
   <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
   <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
@@ -29,8 +29,6 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
-  <package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
-  <package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
diff --git a/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj b/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj
index cbc9c1e..26794f1 100644
--- a/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj
+++ b/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj
@@ -56,14 +56,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Azure.Core, Version=1.14.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Core.1.14.0\lib\net461\Azure.Core.dll</HintPath>
+    <Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Azure.Storage.Blobs, Version=12.8.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Storage.Blobs.12.8.3\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
+    <Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
     </Reference>
-    <Reference Include="Azure.Storage.Common, Version=12.7.2.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Storage.Common.12.7.2\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
+    <Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
     </Reference>
     <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
@@ -120,12 +120,6 @@
     <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.ConfigurationManager.4.0.0\lib\net452\Microsoft.Azure.ConfigurationManager.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
diff --git a/src/UmbracoFileSystemProviders.Azure/app.config b/src/UmbracoFileSystemProviders.Azure/app.config
index 3d9e3f8..9240a30 100644
--- a/src/UmbracoFileSystemProviders.Azure/app.config
+++ b/src/UmbracoFileSystemProviders.Azure/app.config
@@ -92,7 +92,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.14.0.0" newVersion="1.14.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/src/UmbracoFileSystemProviders.Azure/packages.config b/src/UmbracoFileSystemProviders.Azure/packages.config
index 011d0e9..5b6bce7 100644
--- a/src/UmbracoFileSystemProviders.Azure/packages.config
+++ b/src/UmbracoFileSystemProviders.Azure/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Azure.Core" version="1.14.0" targetFramework="net472" />
-  <package id="Azure.Storage.Blobs" version="12.8.3" targetFramework="net472" />
-  <package id="Azure.Storage.Common" version="12.7.2" targetFramework="net472" />
+  <package id="Azure.Core" version="1.18.0" targetFramework="net472" />
+  <package id="Azure.Storage.Blobs" version="12.9.1" targetFramework="net472" />
+  <package id="Azure.Storage.Common" version="12.8.0" targetFramework="net472" />
   <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
   <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
@@ -29,8 +29,6 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
-  <package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
-  <package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />