Skip to content

Commit cbf53f7

Browse files
Update to 11.0.0-rc1 and decouple ImageSharp dependency
1 parent bbd1d7b commit cbf53f7

File tree

9 files changed

+2901
-608
lines changed

9 files changed

+2901
-608
lines changed

Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob" Version="10.0.0" />
6+
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob" Version="11.0.0-rc1" />
7+
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob.ImageSharp" Version="11.0.0-rc1" />
78
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
89
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.113" />
910
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />

NuGet.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
</packageSource>
1313
<packageSource key="Umbraco Prereleases">
1414
<package pattern="Umbraco.Cms.*" />
15+
<package pattern="Umbraco.StorageProviders" />
16+
<package pattern="Umbraco.StorageProviders.*" />
1517
</packageSource>
16-
<packageSource key="Umbraco Nightly">
18+
<packageSource key="Umbraco Nightly">
1719
<package pattern="Umbraco.Cms.*" />
20+
<package pattern="Umbraco.StorageProviders" />
21+
<package pattern="Umbraco.StorageProviders.*" />
1822
</packageSource>
1923
</packageSourceMapping>
2024
</configuration>

Umbraco.Cloud.StorageProviders.AzureBlob.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2222
version.json = version.json
2323
EndProjectSection
2424
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cloud.StorageProviders.AzureBlob.ImageSharp", "src\Umbraco.Cloud.StorageProviders.AzureBlob.ImageSharp\Umbraco.Cloud.StorageProviders.AzureBlob.ImageSharp.csproj", "{1FC945A0-6C88-48E7-B23B-BB2665106EA7}"
26+
EndProject
2527
Global
2628
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2729
Debug|Any CPU = Debug|Any CPU
@@ -44,6 +46,18 @@ Global
4446
{DD4F5091-4EAB-4863-95EB-6143FD3A241C}.Release|x64.Build.0 = Release|Any CPU
4547
{DD4F5091-4EAB-4863-95EB-6143FD3A241C}.Release|x86.ActiveCfg = Release|Any CPU
4648
{DD4F5091-4EAB-4863-95EB-6143FD3A241C}.Release|x86.Build.0 = Release|Any CPU
49+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Debug|x64.ActiveCfg = Debug|Any CPU
52+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Debug|x64.Build.0 = Debug|Any CPU
53+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Debug|x86.ActiveCfg = Debug|Any CPU
54+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Debug|x86.Build.0 = Debug|Any CPU
55+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Release|x64.ActiveCfg = Release|Any CPU
58+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Release|x64.Build.0 = Release|Any CPU
59+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Release|x86.ActiveCfg = Release|Any CPU
60+
{1FC945A0-6C88-48E7-B23B-BB2665106EA7}.Release|x86.Build.0 = Release|Any CPU
4761
EndGlobalSection
4862
GlobalSection(SolutionProperties) = preSolution
4963
HideSolutionNode = FALSE
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using Umbraco.Cms.Core.Composing;
2+
using Umbraco.Cms.Core.DependencyInjection;
3+
using Umbraco.StorageProviders.AzureBlob.IO;
4+
5+
namespace Umbraco.Cloud.StorageProviders.AzureBlob;
6+
7+
/// <summary>
8+
/// Automatically configures ImageSharp support using the Azure Blob Storage for use on Umbraco Cloud.
9+
/// </summary>
10+
/// <seealso cref="Umbraco.Cms.Core.Composing.IComposer" />
11+
[ComposeAfter(typeof(AzureBlobComposer))]
12+
public sealed class AzureBlobImageSharpComposer : IComposer
13+
{
14+
/// <inheritdoc />
15+
public void Compose(IUmbracoBuilder builder)
16+
{
17+
ArgumentNullException.ThrowIfNull(builder);
18+
19+
if (builder.Services.Any(x => x.ServiceType == typeof(IAzureBlobFileSystemProvider)))
20+
{
21+
// Configure ImageSharp support using Azure Blob Storage
22+
builder.AddAzureBlobImageSharpCache();
23+
}
24+
}
25+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<Title>Umbraco Cloud Storage Providers - Azure Blob Storage - ImageSharp</Title>
4+
<Description>Adds ImageSharp support using the Azure Blob Storage provider for Umbraco Cloud.</Description>
5+
<PackageTags>umbraco cloud storage azure blob imagesharp</PackageTags>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageReference Include="Umbraco.StorageProviders.AzureBlob.ImageSharp" />
9+
<ProjectReference Include="..\Umbraco.Cloud.StorageProviders.AzureBlob\Umbraco.Cloud.StorageProviders.AzureBlob.csproj" />
10+
</ItemGroup>
11+
</Project>

0 commit comments

Comments
 (0)