Skip to content

Commit aed3b77

Browse files
nzdevnzdev
committed
Updated to SDK V12. Tests pass. SAS token support not implemented
1 parent d7d422d commit aed3b77

File tree

12 files changed

+422
-202
lines changed

12 files changed

+422
-202
lines changed

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

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

18-
using Microsoft.Azure.Storage;
19-
using Microsoft.Azure.Storage.Blob;
20-
2118
using global::Umbraco.Core;
2219
using global::Umbraco.Core.Composing;
2320
using global::Umbraco.Core.Logging;
@@ -27,6 +24,8 @@ namespace Our.Umbraco.FileSystemProviders.Azure.Installer
2724

2825
using Enums;
2926
using Models;
27+
using global::Azure.Storage.Blobs;
28+
using global::Azure.Storage.Blobs.Models;
3029

3130
/// <summary>
3231
/// The installer controller for managing installer logic.
@@ -84,7 +83,7 @@ public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)
8483
bool usePrivateContainer = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "UsePrivateContainer").Value);
8584
string rootUrl = newParameters.SingleOrDefault(k => k.Key == "RootUrl").Value;
8685

87-
BlobContainerPublicAccessType blobContainerPublicAccessType = usePrivateContainer ? BlobContainerPublicAccessType.Off : BlobContainerPublicAccessType.Blob;
86+
var blobContainerPublicAccessType = usePrivateContainer ? PublicAccessType.None : PublicAccessType.Blob;
8887

8988
if (!TestAzureCredentials(connection, containerName, blobContainerPublicAccessType))
9089
{
@@ -445,19 +444,18 @@ private static bool ExecuteImageProcessorSecurityConfigTransform()
445444
return true;
446445
}
447446

448-
private static bool TestAzureCredentials(string connectionString, string containerName, BlobContainerPublicAccessType accessType)
447+
private static bool TestAzureCredentials(string connectionString, string containerName, PublicAccessType accessType)
449448
{
450449
bool useEmulator = ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey] != null
451450
&& ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey]
452451
.Equals("true", StringComparison.InvariantCultureIgnoreCase);
453452
try
454453
{
455-
CloudStorageAccount cloudStorageAccount = useEmulator ? CloudStorageAccount.DevelopmentStorageAccount : CloudStorageAccount.Parse(connectionString);
456-
457-
CloudBlobClient cloudBlobClient = cloudStorageAccount.CreateCloudBlobClient();
454+
var cloudStorageAccount = connectionString;
458455

459456
// This should fully check that the connection works.
460-
var testContainer = AzureFileSystem.CreateContainer(cloudBlobClient, containerName, accessType);
457+
var azf = AzureFileSystem.GetInstance(containerName, "", connectionString, "", "", "");
458+
var testContainer = azf.CreateContainer( containerName, accessType);
461459

462460
if (testContainer.Exists())
463461
{

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

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@
5757
<Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5858
<HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
5959
</Reference>
60+
<Reference Include="Azure.Core, Version=1.6.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Azure.Core.1.6.0\lib\net461\Azure.Core.dll</HintPath>
62+
</Reference>
63+
<Reference Include="Azure.Storage.Blobs, Version=12.7.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Azure.Storage.Blobs.12.7.0\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
65+
</Reference>
66+
<Reference Include="Azure.Storage.Common, Version=12.6.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Azure.Storage.Common.12.6.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
68+
</Reference>
6069
<Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
6170
<HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
6271
</Reference>
@@ -123,11 +132,8 @@
123132
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124133
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
125134
</Reference>
126-
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127-
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
128-
</Reference>
129-
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
135+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
136+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
131137
</Reference>
132138
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133139
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
@@ -219,6 +225,9 @@
219225
<HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
220226
</Reference>
221227
<Reference Include="System" />
228+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
229+
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
230+
</Reference>
222231
<Reference Include="System.ComponentModel" />
223232
<Reference Include="System.ComponentModel.DataAnnotations" />
224233
<Reference Include="System.Configuration" />
@@ -231,29 +240,48 @@
231240
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
232241
<HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
233242
</Reference>
234-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
235-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
243+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
244+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
236245
</Reference>
237246
<Reference Include="System.Drawing" />
238247
<Reference Include="System.Drawing.Design" />
239248
<Reference Include="System.IO" />
240249
<Reference Include="System.Linq.Expressions" />
241250
<Reference Include="System.Management" />
251+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
252+
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
253+
</Reference>
242254
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
243255
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
244256
</Reference>
245257
<Reference Include="System.Net.Http.WebRequest" />
258+
<Reference Include="System.Numerics" />
259+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
260+
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
261+
</Reference>
246262
<Reference Include="System.Runtime" />
247263
<Reference Include="System.Runtime.Caching" />
264+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
265+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
266+
</Reference>
248267
<Reference Include="System.Runtime.Serialization" />
249268
<Reference Include="System.Security" />
250269
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
251270
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
252271
</Reference>
272+
<Reference Include="System.Text.Encodings.Web, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
273+
<HintPath>..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
274+
</Reference>
275+
<Reference Include="System.Text.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
276+
<HintPath>..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll</HintPath>
277+
</Reference>
253278
<Reference Include="System.Threading.Tasks" />
254279
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
255280
<HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
256281
</Reference>
282+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
283+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
284+
</Reference>
257285
<Reference Include="System.Transactions" />
258286
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
259287
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,30 @@
7070
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7171
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
7272
</dependentAssembly>
73+
<dependentAssembly>
74+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
75+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
76+
</dependentAssembly>
77+
<dependentAssembly>
78+
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
79+
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
80+
</dependentAssembly>
81+
<dependentAssembly>
82+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
83+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
84+
</dependentAssembly>
85+
<dependentAssembly>
86+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
87+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
88+
</dependentAssembly>
89+
<dependentAssembly>
90+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
91+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
92+
</dependentAssembly>
93+
<dependentAssembly>
94+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
95+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
96+
</dependentAssembly>
7397
</assemblyBinding>
7498
</runtime>
7599
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AutoMapper" version="8.0.0" targetFramework="net472" />
4+
<package id="Azure.Core" version="1.6.0" targetFramework="net472" />
5+
<package id="Azure.Storage.Blobs" version="12.7.0" targetFramework="net472" />
6+
<package id="Azure.Storage.Common" version="12.6.0" targetFramework="net472" />
47
<package id="ClientDependency" version="1.9.7" targetFramework="net472" />
58
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
69
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
@@ -30,8 +33,7 @@
3033
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3134
<package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
3235
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
33-
<package id="Microsoft.Azure.Storage.Blob" version="11.1.2" targetFramework="net472" />
34-
<package id="Microsoft.Azure.Storage.Common" version="11.1.2" targetFramework="net472" />
36+
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
3537
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
3638
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
3739
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
@@ -64,13 +66,20 @@
6466
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
6567
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
6668
<package id="Superpower" version="2.0.0" targetFramework="net472" />
69+
<package id="System.Buffers" version="4.5.0" targetFramework="net472" />
6770
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />
68-
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
71+
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net472" />
6972
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
7073
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
74+
<package id="System.Memory" version="4.5.3" targetFramework="net472" />
7175
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
76+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
77+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
7278
<package id="System.Spatial" version="5.8.4" targetFramework="net472" />
79+
<package id="System.Text.Encodings.Web" version="4.6.0" targetFramework="net472" />
80+
<package id="System.Text.Json" version="4.6.0" targetFramework="net472" />
7381
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
82+
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net472" />
7483
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
7584
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
7685
<package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />

0 commit comments

Comments
 (0)