Merge pull request #7841 from abpframework/cotur/cms-kit/general

Added serializable attribute to all cms-kit dtos and fix namespaces

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogDto.cs

@@ -6,6 +6,7 @@ using Volo.CmsKit.Blogs;
 
 namespace Volo.CmsKit.Admin.Blogs
 {
+    [Serializable]
     public class BlogDto : EntityDto<Guid>
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogFeatureInputDto.cs

@@ -1,11 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Volo.CmsKit.Admin.Blogs
 {
+    [Serializable]
     public class BlogFeatureInputDto
     {
         [Required]
         public string FeatureName { get; set; }
+        
         public bool IsEnabled { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogGetListInput.cs

@@ -1,7 +1,9 @@
-using Volo.Abp.Application.Dtos;
+using System;
+using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Blogs
 {
+    [Serializable]
     public class BlogGetListInput : PagedAndSortedResultRequestDto
     {
         public string Filter { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogPostDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Blogs
 {
+    [Serializable]
     public class BlogPostDto : EntityDto<Guid>
     {
         public Guid BlogId { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateBlogPostDto.cs

@@ -5,6 +5,7 @@ using Volo.CmsKit.Blogs;
 
 namespace Volo.CmsKit.Admin.Blogs
 {
+    [Serializable]
     public class CreateBlogPostDto
     {
         [Required]
@@ -15,10 +16,7 @@ namespace Volo.CmsKit.Admin.Blogs
         public string Title { get; set; }
 
         [Required]
-        [DynamicStringLength(
+        [DynamicStringLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxSlugLength), nameof(BlogPostConsts.MinSlugLength))]
-            typeof(BlogPostConsts),
-            nameof(BlogPostConsts.MaxSlugLength),
-            nameof(BlogPostConsts.MinSlugLength))]
         public string Slug { get; set; }
 
         [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxShortDescriptionLength))]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/UpdateBlogPostDto.cs

@@ -1,9 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Blogs;
 
 namespace Volo.CmsKit.Admin.Blogs
 {
+    [Serializable]
     public class UpdateBlogPostDto
     {
         [Required]
@@ -11,10 +13,7 @@ namespace Volo.CmsKit.Admin.Blogs
         public string Title { get; set; }
 
         [Required]
-        [DynamicStringLength(
+        [DynamicStringLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxSlugLength), nameof(BlogPostConsts.MinSlugLength))]
-            typeof(BlogPostConsts),
-            nameof(BlogPostConsts.MaxSlugLength),
-            nameof(BlogPostConsts.MinSlugLength))]
         public string Slug { get; set; }
 
         [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxShortDescriptionLength))]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CmsUserDto.cs

@@ -2,6 +2,7 @@
 
 namespace Volo.CmsKit.Admin.Comments
 {
+    [Serializable]
     public class CmsUserDto
     {
         public Guid Id { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentDto.cs

@@ -2,6 +2,7 @@
 
 namespace Volo.CmsKit.Admin.Comments
 {
+    [Serializable]
     public class CommentDto
     {
         public Guid Id { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentGetListInput.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Comments
 {
+    [Serializable]
     public class CommentGetListInput : PagedAndSortedResultRequestDto
     {
         public string EntityType { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/CommentWithAuthorDto.cs

@@ -4,6 +4,7 @@ using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.Admin.Comments
 {
+    [Serializable]
     public class CommentWithAuthorDto
     {
         public Guid Id { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentCreateDto.cs

@@ -1,9 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Contents;
 
 namespace Volo.CmsKit.Admin.Contents
 {
+    [Serializable]
     public class ContentCreateDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Contents
 {
+    [Serializable]
     public class ContentDto : EntityDto<Guid>
     {
         public string EntityType { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentGetListDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Contents
 {
+    [Serializable]
     public class ContentGetListDto : EntityDto<Guid>
     {
         public string EntityType { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentGetListInput.cs

@@ -1,7 +1,9 @@
-using Volo.Abp.Application.Dtos;
+using System;
+using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Contents
 {
+    [Serializable]
     public class ContentGetListInput : PagedAndSortedResultRequestDto
     {
     }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentUpdateDto.cs

@@ -1,9 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Contents;
 
 namespace Volo.CmsKit.Admin.Contents
 {
+    [Serializable]
     public class ContentUpdateDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.MediaDescriptors
 {
+    [Serializable]
     public class MediaDescriptorDto : EntityDto<Guid>
     {
         public string Name { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs

@@ -1,10 +1,12 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Contents;
 using Volo.CmsKit.Pages;
 
 namespace Volo.CmsKit.Admin.Pages
 {
+    [Serializable]
     public class CreatePageInputDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/GetPagesInputDto.cs

@@ -1,7 +1,9 @@
-using Volo.Abp.Application.Dtos;
+using System;
+using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Pages
 {
+    [Serializable]
     public class GetPagesInputDto : PagedAndSortedResultRequestDto
     {
         public string Filter { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Pages
 {
+    [Serializable]
     public class PageDto : AuditedEntityDto<Guid>
     {
         public string Title { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs

@@ -1,10 +1,12 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Contents;
 using Volo.CmsKit.Pages;
 
 namespace Volo.CmsKit.Admin.Pages
 {
+    [Serializable]
     public class UpdatePageInputDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagCreateDto.cs

@@ -1,7 +1,9 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Volo.CmsKit.Admin.Tags
 {
+    [Serializable]
     public class EntityTagCreateDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagRemoveDto.cs

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Volo.CmsKit.Admin.Tags
 {
+    [Serializable]
     public class EntityTagRemoveDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagSetDto.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 
 namespace Volo.CmsKit.Admin.Tags
 {
+    [Serializable]
     public class EntityTagSetDto
     {
         public string EntityId { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagCreateDto.cs

@@ -1,9 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Tags;
 
 namespace Volo.CmsKit.Admin.Tags
 {
+    [Serializable]
     public class TagCreateDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagDefinitionDto.cs

@@ -1,16 +1,10 @@
-namespace Volo.CmsKit.Admin.Tags
+using System;
+
+namespace Volo.CmsKit.Admin.Tags
 {
+    [Serializable]
     public class TagDefinitionDto
     {
-        public TagDefinitionDto()
-        {
-        }
-        public TagDefinitionDto(string entityType, string displayName)
-        {
-            EntityType = entityType;
-            DisplayName = displayName;
-        }
-
         public string EntityType { get; set; }
 
         public string DisplayName { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagGetListInput.cs

@@ -1,7 +1,9 @@
-using Volo.Abp.Application.Dtos;
+using System;
+using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Admin.Tags
 {
+    [Serializable]
     public class TagGetListInput : PagedAndSortedResultRequestDto
     {
         public string Filter { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagUpdateDto.cs

@@ -1,9 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Tags;
 
 namespace Volo.CmsKit.Admin.Tags
 {
+    [Serializable]
     public class TagUpdateDto
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs

@@ -78,9 +78,11 @@ namespace Volo.CmsKit.Admin.Tags
 
             return definitions
                         .Select(s => 
-                            new TagDefinitionDto(
+                            new TagDefinitionDto
-                                s.EntityType, 
+                            {
-                                s.DisplayName?.Localize(StringLocalizerFactory) ?? s.EntityType))
+                                EntityType = s.EntityType, 
+                                DisplayName = s.DisplayName?.Localize(StringLocalizerFactory) ?? s.EntityType
+                            })
                         .ToList();
         }
     }

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Blogs/BlogFeatureDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Blogs
 {
+    [Serializable]
     public class BlogFeatureDto : EntityDto<Guid>
     {
         public string FeatureName { get; set; }

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Tags/TagDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Tags
 {
+    [Serializable]
     public class TagDto : EntityDto<Guid>
     {
         public string EntityType { get; set; }

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Users/CmsUserDto.cs

@@ -7,6 +7,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Users
 {
+    [Serializable]
     public class CmsUserDto : EntityDto<Guid>
     {
         public virtual Guid? TenantId { get; protected set; }

modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitUiCommentOptions.cs

@@ -1,4 +1,4 @@
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Web
 {
     public class CmsKitUiCommentOptions
     {

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/PolicySpecifiedDefinition.cs

@@ -1,8 +1,6 @@
 using JetBrains.Annotations;
-using Volo.Abp;
-using Volo.Abp.Localization;
 
-namespace Volo.CmsKit.Domain.Volo.CmsKit
+namespace Volo.CmsKit
 {
     public abstract class PolicySpecifiedDefinition
     {

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagEntityTypeDefiniton.cs

@@ -2,7 +2,6 @@
 using System;
 using Volo.Abp;
 using Volo.Abp.Localization;
-using Volo.CmsKit.Domain.Volo.CmsKit;
 
 namespace Volo.CmsKit.Tags
 {

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs

@@ -3,7 +3,8 @@ using Volo.Abp.Application.Dtos;
 using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.Public.Blogs
-{
+{    
+    [Serializable]
     public class BlogPostPublicDto : AuditedEntityWithUserDto<Guid, CmsUserDto>
     {
         public Guid BlogId { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/GetBlogFeatureInput.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Volo.CmsKit.Public.Blogs
 {
+    [Serializable]
     public class GetBlogFeatureInput
     {
         public List<string> FeatureNames { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CmsUserDto.cs

@@ -2,6 +2,7 @@
 
 namespace Volo.CmsKit.Public.Comments
 {
+    [Serializable]
     public class CmsUserDto
     {
         public Guid Id { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentDto.cs

@@ -2,6 +2,7 @@
 
 namespace Volo.CmsKit.Public.Comments
 {
+    [Serializable]
     public class CommentDto
     {
         public Guid Id { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentWithDetailsDto.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 
 namespace Volo.CmsKit.Public.Comments
 {
+    [Serializable]
     public class CommentWithDetailsDto
     {
         public Guid Id { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CreateCommentInput.cs

@@ -5,6 +5,7 @@ using Volo.CmsKit.Comments;
 
 namespace Volo.CmsKit.Public.Comments
 {
+    [Serializable]
     public class CreateCommentInput
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/UpdateCommentInput.cs

@@ -1,9 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Comments;
 
 namespace Volo.CmsKit.Public.Comments
 {
+    [Serializable]
     public class UpdateCommentInput
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Contents/ContentDto.cs

@@ -1,8 +1,9 @@
 using System;
 using Volo.Abp.Application.Dtos;
 
-namespace Volo.CmsKit.Contents
+namespace Volo.CmsKit.Public.Contents
 {
+    [Serializable]
     public class ContentDto : EntityDto<Guid>
     {
         public string Value { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Contents/GetContentInput.cs

@@ -1,8 +1,12 @@
-namespace Volo.CmsKit.Public.Contents
+using System;
+
+namespace Volo.CmsKit.Public.Contents
 {
+    [Serializable]
     public class GetContentInput
     {
         public string EntityType { get; set; }
+        
         public string EntityId { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs

@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Volo.CmsKit.Public.Pages
 {
+    [Serializable]
     public class PageDto : EntityDto<Guid>
     {
         public string Title { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs

@@ -1,9 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Ratings;
 
 namespace Volo.CmsKit.Public.Ratings
 {
+    [Serializable]
     public class CreateUpdateRatingInput
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingDto.cs

@@ -2,6 +2,7 @@
 
 namespace Volo.CmsKit.Public.Ratings
 {
+    [Serializable]
     public class RatingDto
     {
         public Guid Id { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs

@@ -1,5 +1,8 @@
-namespace Volo.CmsKit.Public.Ratings
+using System;
+
+namespace Volo.CmsKit.Public.Ratings
 {
+    [Serializable]
     public class RatingWithStarCountDto
     {
         public short StarCount { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/ReactionDto.cs

@@ -1,7 +1,9 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 
 namespace Volo.CmsKit.Public.Reactions
 {
+    [Serializable]
     public class ReactionDto
     {
         [NotNull]

modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestBaseModule.cs

@@ -8,7 +8,6 @@ using Volo.Abp.Data;
 using Volo.Abp.GlobalFeatures;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
-using Volo.FileManagement;
 
 namespace Volo.CmsKit
 {

modules/cms-kit/test/Volo.CmsKit.TestBase/FakeBlobProvider.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.BlobStoring;
 
-namespace Volo.FileManagement
+namespace Volo.CmsKit
 {
     public class FakeBlobProvider : IBlobProvider
     {