From b0d19bf9d281f35194b96773ba1bb5b12adf9604 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 11 May 2023 11:01:59 +0200 Subject: [PATCH] v12: Rename V2 to Umbraco.Cms.Imaging.ImageSharp2 (#14223) * Rename Umbraco.Cms.Imaging.ImageSharp.V2 to Umbraco.Cms.Imaging.ImageSharp2 * Rename Umbraco.Cms.Imaging.ImageSharp to Umbraco.Cms.Imaging.ImageSharp3 * Rename Umbraco.Cms.Imaging.ImageSharp3 back to Umbraco.Cms.Imaging.ImageSharp --- .../Umbraco.Cms.Imaging.ImageSharp.csproj | 1 - .../ConfigureImageSharpMiddlewareOptions.cs | 2 +- .../ConfigurePhysicalFileSystemCacheOptions.cs | 2 +- .../ImageProcessors/CropWebProcessor.cs | 2 +- .../ImageSharpComposer.cs | 2 +- .../Media/ImageSharpDimensionExtractor.cs | 2 +- .../Media/ImageSharpImageUrlGenerator.cs | 4 ++-- .../Umbraco.Cms.Imaging.ImageSharp2.csproj} | 4 ++-- .../UmbracoBuilderExtensions.cs | 6 +++--- umbraco.sln | 8 ++++---- 10 files changed, 16 insertions(+), 17 deletions(-) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2 => Umbraco.Cms.Imaging.ImageSharp2}/ConfigureImageSharpMiddlewareOptions.cs (98%) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2 => Umbraco.Cms.Imaging.ImageSharp2}/ConfigurePhysicalFileSystemCacheOptions.cs (96%) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2 => Umbraco.Cms.Imaging.ImageSharp2}/ImageProcessors/CropWebProcessor.cs (98%) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2 => Umbraco.Cms.Imaging.ImageSharp2}/ImageSharpComposer.cs (90%) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2 => Umbraco.Cms.Imaging.ImageSharp2}/Media/ImageSharpDimensionExtractor.cs (97%) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2 => Umbraco.Cms.Imaging.ImageSharp2}/Media/ImageSharpImageUrlGenerator.cs (97%) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2/Umbraco.Cms.Imaging.ImageSharp.V2.csproj => Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj} (88%) rename src/{Umbraco.Cms.Imaging.ImageSharp.V2 => Umbraco.Cms.Imaging.ImageSharp2}/UmbracoBuilderExtensions.cs (93%) diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj b/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj index e4eb1cd938..c34595576f 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj +++ b/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj @@ -2,7 +2,6 @@ Umbraco CMS - Imaging - ImageSharp Adds imaging support using ImageSharp/ImageSharp.Web to Umbraco CMS. - true diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ConfigureImageSharpMiddlewareOptions.cs b/src/Umbraco.Cms.Imaging.ImageSharp2/ConfigureImageSharpMiddlewareOptions.cs similarity index 98% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/ConfigureImageSharpMiddlewareOptions.cs rename to src/Umbraco.Cms.Imaging.ImageSharp2/ConfigureImageSharpMiddlewareOptions.cs index 17b735891c..8daa1b689b 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ConfigureImageSharpMiddlewareOptions.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/ConfigureImageSharpMiddlewareOptions.cs @@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Web.Middleware; using SixLabors.ImageSharp.Web.Processors; using Umbraco.Cms.Core.Configuration.Models; -namespace Umbraco.Cms.Imaging.ImageSharp.V2; +namespace Umbraco.Cms.Imaging.ImageSharp; /// /// Configures the ImageSharp middleware options. diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ConfigurePhysicalFileSystemCacheOptions.cs b/src/Umbraco.Cms.Imaging.ImageSharp2/ConfigurePhysicalFileSystemCacheOptions.cs similarity index 96% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/ConfigurePhysicalFileSystemCacheOptions.cs rename to src/Umbraco.Cms.Imaging.ImageSharp2/ConfigurePhysicalFileSystemCacheOptions.cs index 2c70afc3bc..3b2cd7f867 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ConfigurePhysicalFileSystemCacheOptions.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/ConfigurePhysicalFileSystemCacheOptions.cs @@ -4,7 +4,7 @@ using SixLabors.ImageSharp.Web.Caching; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Extensions; -namespace Umbraco.Cms.Imaging.ImageSharp.V2; +namespace Umbraco.Cms.Imaging.ImageSharp; /// /// Configures the ImageSharp physical file system cache options. diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ImageProcessors/CropWebProcessor.cs b/src/Umbraco.Cms.Imaging.ImageSharp2/ImageProcessors/CropWebProcessor.cs similarity index 98% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/ImageProcessors/CropWebProcessor.cs rename to src/Umbraco.Cms.Imaging.ImageSharp2/ImageProcessors/CropWebProcessor.cs index a02f497af2..eda49fa9d0 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ImageProcessors/CropWebProcessor.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/ImageProcessors/CropWebProcessor.cs @@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Web; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Processors; -namespace Umbraco.Cms.Imaging.ImageSharp.V2.ImageProcessors; +namespace Umbraco.Cms.Imaging.ImageSharp.ImageProcessors; /// /// Allows the cropping of images. diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ImageSharpComposer.cs b/src/Umbraco.Cms.Imaging.ImageSharp2/ImageSharpComposer.cs similarity index 90% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/ImageSharpComposer.cs rename to src/Umbraco.Cms.Imaging.ImageSharp2/ImageSharpComposer.cs index 5ec2a1f120..9a77bc28b2 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/ImageSharpComposer.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/ImageSharpComposer.cs @@ -2,7 +2,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Extensions; -namespace Umbraco.Cms.Imaging.ImageSharp.V2; +namespace Umbraco.Cms.Imaging.ImageSharp; /// /// Adds imaging support using ImageSharp/ImageSharp.Web. diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/Media/ImageSharpDimensionExtractor.cs b/src/Umbraco.Cms.Imaging.ImageSharp2/Media/ImageSharpDimensionExtractor.cs similarity index 97% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/Media/ImageSharpDimensionExtractor.cs rename to src/Umbraco.Cms.Imaging.ImageSharp2/Media/ImageSharpDimensionExtractor.cs index d96f4f7f32..409b6e2726 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/Media/ImageSharpDimensionExtractor.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/Media/ImageSharpDimensionExtractor.cs @@ -3,7 +3,7 @@ using SixLabors.ImageSharp.Metadata.Profiles.Exif; using Umbraco.Cms.Core.Media; using Size = System.Drawing.Size; -namespace Umbraco.Cms.Imaging.ImageSharp.V2.Media; +namespace Umbraco.Cms.Imaging.ImageSharp.Media; public sealed class ImageSharpDimensionExtractor : IImageDimensionExtractor { diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/Media/ImageSharpImageUrlGenerator.cs b/src/Umbraco.Cms.Imaging.ImageSharp2/Media/ImageSharpImageUrlGenerator.cs similarity index 97% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/Media/ImageSharpImageUrlGenerator.cs rename to src/Umbraco.Cms.Imaging.ImageSharp2/Media/ImageSharpImageUrlGenerator.cs index 0bcd9ad749..ad76603187 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/Media/ImageSharpImageUrlGenerator.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/Media/ImageSharpImageUrlGenerator.cs @@ -5,10 +5,10 @@ using SixLabors.ImageSharp; using SixLabors.ImageSharp.Web.Processors; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; -using Umbraco.Cms.Imaging.ImageSharp.V2.ImageProcessors; +using Umbraco.Cms.Imaging.ImageSharp.ImageProcessors; using static Umbraco.Cms.Core.Models.ImageUrlGenerationOptions; -namespace Umbraco.Cms.Imaging.ImageSharp.V2.Media; +namespace Umbraco.Cms.Imaging.ImageSharp.Media; /// /// Exposes a method that generates an image URL based on the specified options that can be processed by ImageSharp. diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/Umbraco.Cms.Imaging.ImageSharp.V2.csproj b/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj similarity index 88% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/Umbraco.Cms.Imaging.ImageSharp.V2.csproj rename to src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj index 0eb87fbda7..dc0299defd 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/Umbraco.Cms.Imaging.ImageSharp.V2.csproj +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj @@ -1,7 +1,7 @@ - Umbraco CMS - Imaging - ImageSharp - Adds imaging support using ImageSharp/ImageSharp.Web to Umbraco CMS. + Umbraco CMS - Imaging - ImageSharp 2 + Adds imaging support using ImageSharp/ImageSharp.Web version 2 to Umbraco CMS. false diff --git a/src/Umbraco.Cms.Imaging.ImageSharp.V2/UmbracoBuilderExtensions.cs b/src/Umbraco.Cms.Imaging.ImageSharp2/UmbracoBuilderExtensions.cs similarity index 93% rename from src/Umbraco.Cms.Imaging.ImageSharp.V2/UmbracoBuilderExtensions.cs rename to src/Umbraco.Cms.Imaging.ImageSharp2/UmbracoBuilderExtensions.cs index 078a5b61d6..4bd50034ab 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp.V2/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/UmbracoBuilderExtensions.cs @@ -7,12 +7,12 @@ using SixLabors.ImageSharp.Web.Middleware; using SixLabors.ImageSharp.Web.Providers; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Media; -using Umbraco.Cms.Imaging.ImageSharp.V2.ImageProcessors; -using Umbraco.Cms.Imaging.ImageSharp.V2.Media; +using Umbraco.Cms.Imaging.ImageSharp.ImageProcessors; +using Umbraco.Cms.Imaging.ImageSharp.Media; using Umbraco.Cms.Web.Common.ApplicationBuilder; using Umbraco.Extensions; -namespace Umbraco.Cms.Imaging.ImageSharp.V2; +namespace Umbraco.Cms.Imaging.ImageSharp; public static class UmbracoBuilderExtensions { diff --git a/umbraco.sln b/umbraco.sln index b90c7d5ea2..c382c480f7 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -141,15 +141,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styles", "styles", "{EA628A build\csharp-docs\umbracotemplate\styles\main.css = build\csharp-docs\umbracotemplate\styles\main.css EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Imaging.ImageSharp.V2", "src\Umbraco.Cms.Imaging.ImageSharp.V2\Umbraco.Cms.Imaging.ImageSharp.V2.csproj", "{C280181E-597B-4AA5-82E7-D7017E928749}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Imaging.ImageSharp2", "src\Umbraco.Cms.Imaging.ImageSharp2\Umbraco.Cms.Imaging.ImageSharp2.csproj", "{C280181E-597B-4AA5-82E7-D7017E928749}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{05878304-40EB-4F84-B40B-91BDB70DE094}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Api.Delivery", "src\Umbraco.Cms.Api.Delivery\Umbraco.Cms.Api.Delivery.csproj", "{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Api.Delivery", "src\Umbraco.Cms.Api.Delivery\Umbraco.Cms.Api.Delivery.csproj", "{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Api.Common", "src\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj", "{D48B5D6B-82FF-4235-986C-CDE646F41DEC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Api.Common", "src\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj", "{D48B5D6B-82FF-4235-986C-CDE646F41DEC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Imaging.ImageSharp", "src\Umbraco.Cms.Imaging.ImageSharp\Umbraco.Cms.Imaging.ImageSharp.csproj", "{35E3DA10-5549-41DE-B7ED-CC29355BA9FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Imaging.ImageSharp", "src\Umbraco.Cms.Imaging.ImageSharp\Umbraco.Cms.Imaging.ImageSharp.csproj", "{35E3DA10-5549-41DE-B7ED-CC29355BA9FD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution