diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index ad51ac5532..bc4b3b383f 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -439,13 +439,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ldap.Abstractions" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Domain.Shared", "src\Volo.Abp.Ddd.Domain.Shared\Volo.Abp.Ddd.Domain.Shared.csproj", "{0858571B-CE73-4AD6-BD06-EC9F0714D8E9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Image.Abstractions", "src\Volo.Abp.Image.Abstractions\Volo.Abp.Image.Abstractions.csproj", "{32F3E84B-D02E-42BD-BC5C-0D211564EF30}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Imaging.Abstractions", "src\Volo.Abp.Imaging.Abstractions\Volo.Abp.Imaging.Abstractions.csproj", "{32F3E84B-D02E-42BD-BC5C-0D211564EF30}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Image.AspNetCore", "src\Volo.Abp.Image.AspNetCore\Volo.Abp.Image.AspNetCore.csproj", "{78340A37-219E-4F2D-9AC6-40A7B467EEEC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Imaging.AspNetCore", "src\Volo.Abp.Imaging.AspNetCore\Volo.Abp.Imaging.AspNetCore.csproj", "{78340A37-219E-4F2D-9AC6-40A7B467EEEC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Image.ImageSharp", "src\Volo.Abp.Image.ImageSharp\Volo.Abp.Image.ImageSharp.csproj", "{44467427-E0BE-492C-B9B4-82B362C183C3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Imaging.ImageSharp", "src\Volo.Abp.Imaging.ImageSharp\Volo.Abp.Imaging.ImageSharp.csproj", "{44467427-E0BE-492C-B9B4-82B362C183C3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Image.MagickNet", "src\Volo.Abp.Image.MagickNet\Volo.Abp.Image.MagickNet.csproj", "{F701EDA5-D7EA-4AA7-9C57-83ED50CE72EC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Imaging.MagickNet", "src\Volo.Abp.Imaging.MagickNet\Volo.Abp.Imaging.MagickNet.csproj", "{F701EDA5-D7EA-4AA7-9C57-83ED50CE72EC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/AbpImageAbstractionsModule.cs b/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/AbpImageAbstractionsModule.cs deleted file mode 100644 index 16d4ddfd6f..0000000000 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/AbpImageAbstractionsModule.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Volo.Abp.Modularity; - -namespace Volo.Abp.Image; - -public class AbpImageAbstractionsModule : AbpModule -{ -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/AbpImageAspNetCoreModule.cs b/framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/AbpImageAspNetCoreModule.cs deleted file mode 100644 index a7374bf098..0000000000 --- a/framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/AbpImageAspNetCoreModule.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp.Modularity; - -namespace Volo.Abp.Image; - -[DependsOn(typeof(AbpImageAbstractionsModule))] -public class AbpImageAspNetCoreModule : AbpModule -{ - -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/AbpImageSharpModule.cs b/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/AbpImageSharpModule.cs deleted file mode 100644 index d148f64f4f..0000000000 --- a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/AbpImageSharpModule.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Volo.Abp.Modularity; - -namespace Volo.Abp.Image; - -[DependsOn(typeof(AbpImageAbstractionsModule))] -public class AbpImageSharpModule : AbpModule -{ -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/AbpImageMagickNetModule.cs b/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/AbpImageMagickNetModule.cs deleted file mode 100644 index 15e17f2954..0000000000 --- a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/AbpImageMagickNetModule.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Volo.Abp.Modularity; - -namespace Volo.Abp.Image; - -[DependsOn(typeof(AbpImageAbstractionsModule))] -public class AbpImageMagickNetModule : AbpModule -{ -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.Abstractions/FodyWeavers.xml b/framework/src/Volo.Abp.Imaging.Abstractions/FodyWeavers.xml similarity index 100% rename from framework/src/Volo.Abp.Image.Abstractions/FodyWeavers.xml rename to framework/src/Volo.Abp.Imaging.Abstractions/FodyWeavers.xml diff --git a/framework/src/Volo.Abp.Image.Abstractions/FodyWeavers.xsd b/framework/src/Volo.Abp.Imaging.Abstractions/FodyWeavers.xsd similarity index 100% rename from framework/src/Volo.Abp.Image.Abstractions/FodyWeavers.xsd rename to framework/src/Volo.Abp.Imaging.Abstractions/FodyWeavers.xsd diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo.Abp.Image.Abstractions.csproj b/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.csproj similarity index 92% rename from framework/src/Volo.Abp.Image.Abstractions/Volo.Abp.Image.Abstractions.csproj rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.csproj index 2a6a0000e9..bb08e101d3 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo.Abp.Image.Abstractions.csproj +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Imaging.Abstractions.csproj @@ -5,7 +5,7 @@ netstandard2.0;netstandard2.1;net7.0 - Volo.Abp.Image.Abstractions + Volo.Abp.Imaging.Abstractions $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo.Abp.Json.abppkg.json b/framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Json.abppkg.json similarity index 100% rename from framework/src/Volo.Abp.Image.Abstractions/Volo.Abp.Json.abppkg.json rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo.Abp.Json.abppkg.json diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/AbpImagingAbstractionsModule.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/AbpImagingAbstractionsModule.cs new file mode 100644 index 0000000000..fffad2c273 --- /dev/null +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/AbpImagingAbstractionsModule.cs @@ -0,0 +1,7 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Imaging; + +public class AbpImagingAbstractionsModule : AbpModule +{ +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageCompressor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressor.cs similarity index 95% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageCompressor.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressor.cs index 40a2357570..931e0fe3ae 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageCompressor.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressor.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public interface IImageCompressor { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressorContributor.cs similarity index 93% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageCompressorContributor.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressorContributor.cs index bac2d8e0c9..8d487b9b8e 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageCompressorContributor.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageCompressorContributor.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public interface IImageCompressorContributor { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageResizer.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizer.cs similarity index 94% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageResizer.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizer.cs index d177ceb983..f6b7225bab 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageResizer.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizer.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public interface IImageResizer { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizerContributor.cs similarity index 94% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageResizerContributor.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizerContributor.cs index 583afb3132..089fb7409e 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/IImageResizerContributor.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/IImageResizerContributor.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public interface IImageResizerContributor { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageCompressor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs similarity index 98% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageCompressor.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs index f5be0aeb25..ec71db2447 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageCompressor.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; using Volo.Abp.DependencyInjection; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageCompressor : IImageCompressor, ITransientDependency { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageContributorResult.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageContributorResult.cs similarity index 93% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageContributorResult.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageContributorResult.cs index 5d6e016ad5..2f17e93e5b 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageContributorResult.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageContributorResult.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageContributorResult { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageProcessResult.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessResult.cs similarity index 87% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageProcessResult.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessResult.cs index a4bc9cfde2..6a6da60a69 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageProcessResult.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessResult.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageProcessResult { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeArgs.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeArgs.cs similarity index 96% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeArgs.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeArgs.cs index b3e9b5428c..354a5b7285 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeArgs.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageResizeArgs { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeMode.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeMode.cs similarity index 79% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeMode.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeMode.cs index ab6a6c961a..0c0a854992 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeMode.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeMode.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public enum ImageResizeMode { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeOptions.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeOptions.cs similarity index 78% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeOptions.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeOptions.cs index 8f8bf432df..a2d92d131b 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizeOptions.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeOptions.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageResizeOptions { diff --git a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizer.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs similarity index 98% rename from framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizer.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs index 36df46b506..8045693417 100644 --- a/framework/src/Volo.Abp.Image.Abstractions/Volo/Abp/Image/ImageResizer.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageResizer : IImageResizer, ITransientDependency { diff --git a/framework/src/Volo.Abp.Image.AspNetCore/FodyWeavers.xml b/framework/src/Volo.Abp.Imaging.AspNetCore/FodyWeavers.xml similarity index 100% rename from framework/src/Volo.Abp.Image.AspNetCore/FodyWeavers.xml rename to framework/src/Volo.Abp.Imaging.AspNetCore/FodyWeavers.xml diff --git a/framework/src/Volo.Abp.Image.AspNetCore/FodyWeavers.xsd b/framework/src/Volo.Abp.Imaging.AspNetCore/FodyWeavers.xsd similarity index 100% rename from framework/src/Volo.Abp.Image.AspNetCore/FodyWeavers.xsd rename to framework/src/Volo.Abp.Imaging.AspNetCore/FodyWeavers.xsd diff --git a/framework/src/Volo.Abp.Image.AspNetCore/Volo.Abp.Image.AspNetCore.csproj b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.csproj similarity index 83% rename from framework/src/Volo.Abp.Image.AspNetCore/Volo.Abp.Image.AspNetCore.csproj rename to framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.csproj index c6b8286e1a..d727d99a7c 100644 --- a/framework/src/Volo.Abp.Image.AspNetCore/Volo.Abp.Image.AspNetCore.csproj +++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Imaging.AspNetCore.csproj @@ -5,7 +5,7 @@ net7.0 - Volo.Abp.Image.AspNetCore + Volo.Abp.Imaging.AspNetCore $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false @@ -17,7 +17,7 @@ - + diff --git a/framework/src/Volo.Abp.Image.AspNetCore/Volo.Abp.Json.abppkg.json b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Json.abppkg.json similarity index 100% rename from framework/src/Volo.Abp.Image.AspNetCore/Volo.Abp.Json.abppkg.json rename to framework/src/Volo.Abp.Imaging.AspNetCore/Volo.Abp.Json.abppkg.json diff --git a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/AbpImagingAspNetCoreModule.cs b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/AbpImagingAspNetCoreModule.cs new file mode 100644 index 0000000000..abc6b27d8b --- /dev/null +++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/AbpImagingAspNetCoreModule.cs @@ -0,0 +1,9 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Imaging; + +[DependsOn(typeof(AbpImagingAbstractionsModule))] +public class AbpImagingAspNetCoreModule : AbpModule +{ + +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/CompressImageAttribute.cs b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs similarity index 99% rename from framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/CompressImageAttribute.cs rename to framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs index 018d85c6a2..b5fb1f7028 100644 --- a/framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/CompressImageAttribute.cs +++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Content; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class CompressImageAttribute : ActionFilterAttribute { diff --git a/framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/ResizeImageAttribute.cs b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs similarity index 99% rename from framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/ResizeImageAttribute.cs rename to framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs index de7108c75e..cbbb11dc5e 100644 --- a/framework/src/Volo.Abp.Image.AspNetCore/Volo/Abp/Image/ResizeImageAttribute.cs +++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Content; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ResizeImageAttribute : ActionFilterAttribute { diff --git a/framework/src/Volo.Abp.Image.ImageSharp/FodyWeavers.xml b/framework/src/Volo.Abp.Imaging.ImageSharp/FodyWeavers.xml similarity index 100% rename from framework/src/Volo.Abp.Image.ImageSharp/FodyWeavers.xml rename to framework/src/Volo.Abp.Imaging.ImageSharp/FodyWeavers.xml diff --git a/framework/src/Volo.Abp.Image.ImageSharp/FodyWeavers.xsd b/framework/src/Volo.Abp.Imaging.ImageSharp/FodyWeavers.xsd similarity index 100% rename from framework/src/Volo.Abp.Image.ImageSharp/FodyWeavers.xsd rename to framework/src/Volo.Abp.Imaging.ImageSharp/FodyWeavers.xsd diff --git a/framework/src/Volo.Abp.Image.ImageSharp/Volo.Abp.Image.ImageSharp.csproj b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj similarity index 81% rename from framework/src/Volo.Abp.Image.ImageSharp/Volo.Abp.Image.ImageSharp.csproj rename to framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj index c167eb558b..d523a292ba 100644 --- a/framework/src/Volo.Abp.Image.ImageSharp/Volo.Abp.Image.ImageSharp.csproj +++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj @@ -5,7 +5,7 @@ netstandard2.0; - Volo.Abp.Image.ImageSharp + Volo.Abp.Imaging.ImageSharp $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false @@ -14,7 +14,7 @@ - + diff --git a/framework/src/Volo.Abp.Image.ImageSharp/Volo.Abp.Json.abppkg.json b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Json.abppkg.json similarity index 100% rename from framework/src/Volo.Abp.Image.ImageSharp/Volo.Abp.Json.abppkg.json rename to framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Json.abppkg.json diff --git a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/AbpImagingSharpModule.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/AbpImagingSharpModule.cs new file mode 100644 index 0000000000..4048c101c1 --- /dev/null +++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/AbpImagingSharpModule.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Imaging; + +[DependsOn(typeof(AbpImagingAbstractionsModule))] +public class AbpImagingSharpModule : AbpModule +{ +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpCompressOptions.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpCompressOptions.cs similarity index 92% rename from framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpCompressOptions.cs rename to framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpCompressOptions.cs index 4244bfb772..efdb497a52 100644 --- a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpCompressOptions.cs +++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpCompressOptions.cs @@ -1,6 +1,6 @@ using SixLabors.ImageSharp.Formats.Png; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageSharpCompressOptions { diff --git a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs similarity index 99% rename from framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpImageCompressorContributor.cs rename to framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs index 3ddfcce2ab..c80f64713e 100644 --- a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpImageCompressorContributor.cs +++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs @@ -10,7 +10,7 @@ using SixLabors.ImageSharp.Formats.Webp; using Volo.Abp.DependencyInjection; using Volo.Abp.Http; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageSharpImageCompressorContributor : IImageCompressorContributor, ITransientDependency { diff --git a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs similarity index 98% rename from framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpImageResizerContributor.cs rename to framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs index 5e27549b52..45cb01672a 100644 --- a/framework/src/Volo.Abp.Image.ImageSharp/Volo/Abp/Image/ImageSharpImageResizerContributor.cs +++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs @@ -4,12 +4,11 @@ using System.IO; using System.Threading; using System.Threading.Tasks; using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using Volo.Abp.DependencyInjection; using Volo.Abp.Http; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class ImageSharpImageResizerContributor : IImageResizerContributor, ITransientDependency { diff --git a/framework/src/Volo.Abp.Image.MagickNet/FodyWeavers.xml b/framework/src/Volo.Abp.Imaging.MagickNet/FodyWeavers.xml similarity index 100% rename from framework/src/Volo.Abp.Image.MagickNet/FodyWeavers.xml rename to framework/src/Volo.Abp.Imaging.MagickNet/FodyWeavers.xml diff --git a/framework/src/Volo.Abp.Image.MagickNet/FodyWeavers.xsd b/framework/src/Volo.Abp.Imaging.MagickNet/FodyWeavers.xsd similarity index 100% rename from framework/src/Volo.Abp.Image.MagickNet/FodyWeavers.xsd rename to framework/src/Volo.Abp.Imaging.MagickNet/FodyWeavers.xsd diff --git a/framework/src/Volo.Abp.Image.MagickNet/Volo.Abp.Image.MagickNet.csproj b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj similarity index 81% rename from framework/src/Volo.Abp.Image.MagickNet/Volo.Abp.Image.MagickNet.csproj rename to framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj index af614bf983..c44b326027 100644 --- a/framework/src/Volo.Abp.Image.MagickNet/Volo.Abp.Image.MagickNet.csproj +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Imaging.MagickNet.csproj @@ -5,7 +5,7 @@ netstandard2.0;netstandard2.1;net7.0 - Volo.Abp.Image.MagicNet + Volo.Abp.Imaging.MagicNet $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false @@ -14,7 +14,7 @@ - + diff --git a/framework/src/Volo.Abp.Image.MagickNet/Volo.Abp.Json.abppkg.json b/framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Json.abppkg.json similarity index 100% rename from framework/src/Volo.Abp.Image.MagickNet/Volo.Abp.Json.abppkg.json rename to framework/src/Volo.Abp.Imaging.MagickNet/Volo.Abp.Json.abppkg.json diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/AbpImagingMagickNetModule.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/AbpImagingMagickNetModule.cs new file mode 100644 index 0000000000..acef65889e --- /dev/null +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/AbpImagingMagickNetModule.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Imaging; + +[DependsOn(typeof(AbpImagingAbstractionsModule))] +public class AbpImagingMagickNetModule : AbpModule +{ +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs similarity index 99% rename from framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickImageCompressorContributor.cs rename to framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs index c801e29ee2..e974d7360f 100644 --- a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickImageCompressorContributor.cs +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; using Volo.Abp.Http; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class MagickImageCompressorContributor : IImageCompressorContributor, ITransientDependency { diff --git a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs similarity index 99% rename from framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickImageResizerContributor.cs rename to framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs index ae3ebfabc4..c2a4b938bd 100644 --- a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickImageResizerContributor.cs +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs @@ -6,7 +6,7 @@ using ImageMagick; using Volo.Abp.DependencyInjection; using Volo.Abp.Http; -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class MagickImageResizerContributor : IImageResizerContributor, ITransientDependency { diff --git a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickNetCompressOptions.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickNetCompressOptions.cs similarity index 85% rename from framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickNetCompressOptions.cs rename to framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickNetCompressOptions.cs index ab2a2b244d..2b3c9875f6 100644 --- a/framework/src/Volo.Abp.Image.MagickNet/Volo/Abp/Image/MagickNetCompressOptions.cs +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickNetCompressOptions.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.Image; +namespace Volo.Abp.Imaging; public class MagickNetCompressOptions {