Skip to content

Commit a31f90e

Browse files
JeavonJeavon
committed
Swapping from WindowsAzure.Storage to Azure.Storage.Blobs
1 parent c668073 commit a31f90e

File tree

10 files changed

+30
-18
lines changed

10 files changed

+30
-18
lines changed

‎build/UmbracoFileSystemProviders.Azure.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686

8787
<!-- Umbraco specific -->
8888
<!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
89-
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Services.Client.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.WindowsAzure.Configuration.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.WindowsAzure.Storage.dll;$(ProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.KeyVault.Core.dll" />
89+
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Services.Client.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.WindowsAzure.Configuration.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.Storage.Blob.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.Storage.Common.dll;$(ProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.KeyVault.Core.dll" />
9090
<InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
9191
<UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
9292
<UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>

‎build/package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependencies>
1919
<dependency id="UmbracoCms.Core" version="0.0.0" />
2020
<dependency id="UmbracoCms.Web" version="0.0.0" />
21-
<dependency id="WindowsAzure.Storage" version="8.7.0" />
21+
<dependency id="Microsoft.Azure.Storage.Blob" version="10.0.3" />
2222
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" />
2323
<dependency id="Microsoft.Azure.KeyVault.Core" version="2.0.4" />
2424
<dependency id="Microsoft.Data.Services.Client" version="5.8.3" />

‎src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ namespace Our.Umbraco.FileSystemProviders.Azure.Installer
1515
using System.Web.Http;
1616
using System.Xml;
1717

18-
using Microsoft.WindowsAzure.Storage;
19-
using Microsoft.WindowsAzure.Storage.Blob;
18+
using Microsoft.Azure.Storage;
19+
using Microsoft.Azure.Storage.Blob;
2020

2121
using global::Umbraco.Core;
2222
using global::Umbraco.Core.Composing;

‎src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@
120120
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121121
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.2.0.4\lib\net45\Microsoft.Azure.KeyVault.Core.dll</HintPath>
122122
</Reference>
123+
<Reference Include="Microsoft.Azure.Storage.Blob, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124+
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.10.0.3\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
125+
</Reference>
126+
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127+
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
128+
</Reference>
123129
<Reference Include="Microsoft.Data.Edm, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124130
<HintPath>..\packages\Microsoft.Data.Edm.5.8.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
125131
</Reference>
@@ -158,9 +164,6 @@
158164
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
159165
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
160166
</Reference>
161-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
162-
<HintPath>..\packages\WindowsAzure.Storage.8.7.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
163-
</Reference>
164167
<Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
165168
<HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
166169
</Reference>

‎src/UmbracoFileSystemProviders.Azure.Installer/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
3030
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3131
<package id="Microsoft.Azure.KeyVault.Core" version="2.0.4" targetFramework="net45" />
32+
<package id="Microsoft.Azure.Storage.Blob" version="10.0.3" targetFramework="net472" />
33+
<package id="Microsoft.Azure.Storage.Common" version="10.0.3" targetFramework="net472" />
3234
<package id="Microsoft.Data.Edm" version="5.8.3" targetFramework="net45" />
3335
<package id="Microsoft.Data.OData" version="5.8.3" targetFramework="net45" />
3436
<package id="Microsoft.Data.Services.Client" version="5.8.3" targetFramework="net45" />
@@ -73,6 +75,5 @@
7375
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
7476
<package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
7577
<package id="UmbracoCms.Web" version="8.1.0" targetFramework="net472" />
76-
<package id="WindowsAzure.Storage" version="8.7.0" targetFramework="net45" />
7778
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
7879
</packages>

‎src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@
120120
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121121
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.2.0.4\lib\net45\Microsoft.Azure.KeyVault.Core.dll</HintPath>
122122
</Reference>
123+
<Reference Include="Microsoft.Azure.Storage.Blob, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124+
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.10.0.3\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
125+
</Reference>
126+
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127+
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
128+
</Reference>
123129
<Reference Include="Microsoft.Data.Edm, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124130
<HintPath>..\packages\Microsoft.Data.Edm.5.8.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
125131
</Reference>
@@ -154,9 +160,6 @@
154160
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
155161
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
156162
</Reference>
157-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
158-
<HintPath>..\packages\WindowsAzure.Storage.8.7.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
159-
</Reference>
160163
<Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
161164
<HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
162165
</Reference>

‎src/UmbracoFileSystemProviders.Azure.Tests/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
2929
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3030
<package id="Microsoft.Azure.KeyVault.Core" version="2.0.4" targetFramework="net45" />
31+
<package id="Microsoft.Azure.Storage.Blob" version="10.0.3" targetFramework="net472" />
32+
<package id="Microsoft.Azure.Storage.Common" version="10.0.3" targetFramework="net472" />
3133
<package id="Microsoft.Data.Edm" version="5.8.3" targetFramework="net45" />
3234
<package id="Microsoft.Data.OData" version="5.8.3" targetFramework="net45" />
3335
<package id="Microsoft.Data.Services.Client" version="5.8.3" targetFramework="net45" />
@@ -74,6 +76,5 @@
7476
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
7577
<package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
7678
<package id="UmbracoCms.Web" version="8.1.0" targetFramework="net472" />
77-
<package id="WindowsAzure.Storage" version="8.7.0" targetFramework="net45" />
7879
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
7980
</packages>

‎src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ namespace Our.Umbraco.FileSystemProviders.Azure
2222
using global::Umbraco.Core.Configuration;
2323
using global::Umbraco.Core.IO;
2424
using global::Umbraco.Core.Logging;
25-
using Microsoft.WindowsAzure.Storage;
26-
using Microsoft.WindowsAzure.Storage.Blob;
25+
using Microsoft.Azure.Storage;
26+
using Microsoft.Azure.Storage.Blob;
2727

2828
/// <summary>
2929
/// A class for communicating with Azure Blob Storage.

‎src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@
121121
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122122
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.2.0.4\lib\net45\Microsoft.Azure.KeyVault.Core.dll</HintPath>
123123
</Reference>
124+
<Reference Include="Microsoft.Azure.Storage.Blob, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125+
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.10.0.3\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
126+
</Reference>
127+
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
129+
</Reference>
124130
<Reference Include="Microsoft.Data.Edm, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125131
<HintPath>..\packages\Microsoft.Data.Edm.5.8.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
126132
</Reference>
@@ -155,9 +161,6 @@
155161
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
156162
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
157163
</Reference>
158-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
159-
<HintPath>..\packages\WindowsAzure.Storage.8.7.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
160-
</Reference>
161164
<Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
162165
<HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
163166
</Reference>

‎src/UmbracoFileSystemProviders.Azure/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
2929
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3030
<package id="Microsoft.Azure.KeyVault.Core" version="2.0.4" targetFramework="net45" />
31+
<package id="Microsoft.Azure.Storage.Blob" version="10.0.3" targetFramework="net472" />
32+
<package id="Microsoft.Azure.Storage.Common" version="10.0.3" targetFramework="net472" />
3133
<package id="Microsoft.Data.Edm" version="5.8.3" targetFramework="net45" />
3234
<package id="Microsoft.Data.OData" version="5.8.3" targetFramework="net45" />
3335
<package id="Microsoft.Data.Services.Client" version="5.8.3" targetFramework="net45" />
@@ -71,6 +73,5 @@
7173
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
7274
<package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
7375
<package id="UmbracoCms.Web" version="8.1.0" targetFramework="net472" />
74-
<package id="WindowsAzure.Storage" version="8.7.0" targetFramework="net45" />
7576
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
7677
</packages>

0 commit comments

Comments
 (0)