Skip to content

v12: Add support for ImageSharp 2 #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

v12: Add support for ImageSharp 2 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7acb41e
Add UmbracoCmsPackageVersion property to manage global CMS dependency…
ronaldbarendse Jun 29, 2023
ac4f75c
Add ImageSharp2 project
ronaldbarendse Jun 29, 2023
3d319e4
Merge branch 'develop' into feature/imagesharp2
ronaldbarendse Mar 11, 2024
2089797
Remove packages.lock.json file
ronaldbarendse Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.1.0" />
<PackageVersion Include="Umbraco.Cms.Imaging.ImageSharp" Version="$(UmbracoCmsPackageVersion)" />
<PackageVersion Include="Umbraco.Cms.Imaging.ImageSharp2" Version="$(UmbracoCmsPackageVersion)" />
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="$(UmbracoCmsPackageVersion)" />
</ItemGroup>
</Project>
14 changes: 14 additions & 0 deletions Umbraco.StorageProviders.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.StorageProviders",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.StorageProviders.AzureBlob.ImageSharp", "src\Umbraco.StorageProviders.AzureBlob.ImageSharp\Umbraco.StorageProviders.AzureBlob.ImageSharp.csproj", "{D88EAD61-5596-415D-B8B2-CBE83B35DC68}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.StorageProviders.AzureBlob.ImageSharp2", "src\Umbraco.StorageProviders.AzureBlob.ImageSharp2\Umbraco.StorageProviders.AzureBlob.ImageSharp2.csproj", "{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umbraco Marketplace", "Umbraco Marketplace", "{52E66DE4-F70B-4E6C-B8BE-91D8873CBE95}"
ProjectSection(SolutionItems) = preProject
umbraco-marketplace-readme-umbraco.storageproviders.azureblob.imagesharp.md = umbraco-marketplace-readme-umbraco.storageproviders.azureblob.imagesharp.md
Expand Down Expand Up @@ -90,6 +92,18 @@ Global
{D88EAD61-5596-415D-B8B2-CBE83B35DC68}.Release|x64.Build.0 = Release|Any CPU
{D88EAD61-5596-415D-B8B2-CBE83B35DC68}.Release|x86.ActiveCfg = Release|Any CPU
{D88EAD61-5596-415D-B8B2-CBE83B35DC68}.Release|x86.Build.0 = Release|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Debug|x64.ActiveCfg = Debug|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Debug|x64.Build.0 = Debug|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Debug|x86.ActiveCfg = Debug|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Debug|x86.Build.0 = Debug|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Release|Any CPU.Build.0 = Release|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Release|x64.ActiveCfg = Release|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Release|x64.Build.0 = Release|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Release|x86.ActiveCfg = Release|Any CPU
{CBFE3322-4B5F-453A-AF68-E67F7CC80FEC}.Release|x86.Build.0 = Release|Any CPU
{9B1140ED-9F17-44B0-80CF-FA50F949B65B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B1140ED-9F17-44B0-80CF-FA50F949B65B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B1140ED-9F17-44B0-80CF-FA50F949B65B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
18 changes: 18 additions & 0 deletions ...rageProviders.AzureBlob.ImageSharp2/Umbraco.StorageProviders.AzureBlob.ImageSharp2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Title>Umbraco Storage Providers - Azure Blob Storage - ImageSharp 2</Title>
<Description>Adds ImageSharp version 2 support using the Azure Blob Storage provider for Umbraco CMS.</Description>
<PackageTags>umbraco storage azure blob imagesharp</PackageTags>
<!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
<EnablePackageValidation>false</EnablePackageValidation>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp.Web.Providers.Azure" VersionOverride="2.0.2" />
<PackageReference Include="Umbraco.Cms.Imaging.ImageSharp2" />
<ProjectReference Include="..\Umbraco.StorageProviders.AzureBlob\Umbraco.StorageProviders.AzureBlob.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Umbraco.StorageProviders.AzureBlob.ImageSharp\DependencyInjection\AddAzureBlobImageSharpCacheExtensions.cs" />
<Compile Include="..\Umbraco.StorageProviders.AzureBlob.ImageSharp\AzureBlobFileSystemImageCache.cs" />
</ItemGroup>
</Project>