Merge branch 'rel-6.0' into issue-13408

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>6.0.0-rc.3</Version>
+    <Version>6.0.0-rc.4</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>

docs/en/Apps/VoloDocs.md

@@ -23,13 +23,13 @@ https://github.com/abpframework/abp/tree/master/modules/docs
 
 You can download the VoloDocs release from the following links:
 
-http://apps.abp.io/VoloDocs/VoloDocs.win-x64.zip - **Windows 64 bit**
+https://apps.abp.io/VoloDocs/VoloDocs.win-x64.zip - **Windows 64 bit**
 
-http://apps.abp.io/VoloDocs/VoloDocs.win-x86.zip - **Windows 32 bit**
+https://apps.abp.io/VoloDocs/VoloDocs.win-x86.zip - **Windows 32 bit**
 
-http://apps.abp.io/VoloDocs/VoloDocs.osx-x64.zip - **MacOS**
+https://apps.abp.io/VoloDocs/VoloDocs.osx-x64.zip - **MacOS**
 
-http://apps.abp.io/VoloDocs/VoloDocs.linux-x64.zip - **Linux**
+https://apps.abp.io/VoloDocs/VoloDocs.linux-x64.zip - **Linux**
 
 Notice that, all installations are self-contained deployments. It means all the required third-party dependencies along with the version of .NET Core is included. So you don't need to install any .NET Core SDK / Runtime.
 

docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md

@@ -86,7 +86,7 @@ Defining multiple connections is allowed. In this case, you can specify the conn
 
 This allows you to use multiple RabbitMQ server in your application, but select one of them for the event bus.
 
-You can use any of the [ConnectionFactry](http://rabbitmq.github.io/rabbitmq-dotnet-client/api/RabbitMQ.Client.ConnectionFactory.html#properties) properties as the connection properties.
+You can use any of the [ConnectionFactory](http://rabbitmq.github.io/rabbitmq-dotnet-client/api/RabbitMQ.Client.ConnectionFactory.html#properties) properties as the connection properties.
 
 **Example: Specify the connection port**
 
@@ -151,4 +151,4 @@ Configure<AbpRabbitMqEventBusOptions>(options =>
 });
 ````
 
-Using these options classes can be combined with the `appsettings.json` way. Configuring an option property in the code overrides the value in the configuration file.
+Using these options classes can be combined with the `appsettings.json` way. Configuring an option property in the code overrides the value in the configuration file.

docs/en/Getting-Started-Running-Solution.md

@@ -163,6 +163,8 @@ You can see the application APIs and test them here. Get [more info](https://swa
 
 ### Running the Blazor Application (Client Side)
 
+Go to the Blazor project folder, open a command line terminal, type the `abp bundle -f` command (If the project was created by ABP Cli tool, you don't need to do this).
+
 Ensure that the `.Blazor` project is the startup project and run the application.
 
 > Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.

docs/en/Migration-Guides/OpenIddict-Step-by-Step.md

@@ -76,6 +76,8 @@ Use the `abp update` command to update your existing application. See [Upgrading
 - Create a folder named *OpenIddict* under the Domain project and copy the [OpenIddictDataSeedContributor.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.Domain/OpenIddict/OpenIddictDataSeedContributor.cs) under this folder. Rename all the `Ids2OpenId` with your project name.
 - Delete *IdentityServer* folder that contains `IdentityServerDataSeedContributor.cs` which is no longer needed.
 
+You can also create a project with the same name and copy the `OpenIddict` folder of the new project into your project.
+
 ### EntityFrameworkCore Layer
 
 If you are using MongoDB, skip this step and check the *MongoDB* layer section.
@@ -226,4 +228,4 @@ for creating the host builder.
 
 ## See Also
 
-* [ABP Version 6.0 Migration Guide](Abp-6_0.md)
+* [ABP Version 6.0 Migration Guide](Abp-6_0.md)

docs/en/Modules/OpenIddict.md

@@ -330,7 +330,19 @@ public class MyClaimDestinationsProvider : IAbpOpenIddictClaimDestinationsProvid
 {
     public virtual Task SetDestinationsAsync(AbpOpenIddictClaimDestinationsProviderContext context)
     {
-		// ...
+        foreach (var claim in context.Claims)
+        {
+            if (claim.Type == MyClaims.MyClaimsType)
+            {
+                claim.SetDestinations(OpenIddictConstants.Destinations.AccessToken, OpenIddictConstants.Destinations.IdentityToken);
+            }
+	    
+	    if (claim.Type == MyClaims.MyClaimsType2)
+            {
+                claim.SetDestinations(OpenIddictConstants.Destinations.AccessToken);
+            }
+        }
+
         return Task.CompletedTask;
     }
 }

docs/en/docs-nav.json

@@ -851,6 +851,10 @@
                   "text": "Page Header",
                   "path": "UI/Blazor/Page-Header.md"
                 },
+                {
+                  "text": "Page Layout",
+                  "path": "UI/Blazor/Page-Layout.md"
+                },
                 {
                   "text": "Toolbars",
                   "path": "UI/Blazor/Toolbars.md"

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs

@@ -1,8 +1,5 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.EventBus;
 using Volo.Abp.Modularity;
-using Volo.Abp.Threading;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client;
 
@@ -12,13 +9,5 @@ namespace Volo.Abp.AspNetCore.Mvc.Client;
     )]
 public class AbpAspNetCoreMvcClientModule : AbpModule
 {
-    public override void OnApplicationInitialization(ApplicationInitializationContext context)
-    {
-        AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
-    }
-
-    public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
-    {
-        await context.ServiceProvider.GetRequiredService<MvcCachedApplicationConfigurationClient>().InitializeAsync();
-    }
+    
 }

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs

@@ -30,11 +30,6 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu
         Cache = cache;
     }
 
-    public async Task InitializeAsync()
-    {
-        await GetAsync();
-    }
-
     public async Task<ApplicationConfigurationDto> GetAsync()
     {
         var cacheKey = CreateCacheKey();
@@ -45,7 +40,6 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu
             return configuration;
         }
 
-
         configuration = await Cache.GetOrAddAsync(
             cacheKey,
             async () => await ApplicationConfigurationAppService.GetAsync(),

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Bundling;
 using Volo.Abp.Cli.Commands.Services;
 using Volo.Abp.Cli.LIbs;
 using Volo.Abp.Cli.ProjectBuilding;
@@ -26,23 +27,35 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
     
     protected TemplateProjectBuilder TemplateProjectBuilder { get; }
     public ITemplateInfoProvider TemplateInfoProvider { get; }
-
-    public NewCommand(TemplateProjectBuilder templateProjectBuilder
-        , ITemplateInfoProvider templateInfoProvider,
-        ConnectionStringProvider connectionStringProvider,
+    
+    public NewCommand(
+        ConnectionStringProvider connectionStringProvider, 
         SolutionPackageVersionFinder solutionPackageVersionFinder,
         ICmdHelper cmdHelper,
-        IInstallLibsService installLibsService,
-        AngularPwaSupportAdder angularPwaSupportAdder,
+        IInstallLibsService installLibsService, 
+        CliService cliService,
+        AngularPwaSupportAdder angularPwaSupportAdder, 
         InitialMigrationCreator initialMigrationCreator,
-        ThemePackageAdder themePackageAdder,
-        ILocalEventBus eventBus)
-    : base(connectionStringProvider, solutionPackageVersionFinder, cmdHelper, installLibsService, angularPwaSupportAdder, initialMigrationCreator, themePackageAdder, eventBus)
+        ThemePackageAdder themePackageAdder, 
+        ILocalEventBus eventBus, 
+        IBundlingService bundlingService,
+        ITemplateInfoProvider templateInfoProvider, 
+        TemplateProjectBuilder templateProjectBuilder) :
+        base(connectionStringProvider,
+            solutionPackageVersionFinder, 
+            cmdHelper, 
+            installLibsService, 
+            cliService, 
+            angularPwaSupportAdder,
+            initialMigrationCreator,
+            themePackageAdder, 
+            eventBus, 
+            bundlingService)
     {
-        TemplateProjectBuilder = templateProjectBuilder;
         TemplateInfoProvider = templateInfoProvider;
+        TemplateProjectBuilder = templateProjectBuilder;
     }
-
+    
     public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
     {
         var projectName = NamespaceHelper.NormalizeNamespace(commandLineArgs.Target);
@@ -72,7 +85,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
             Logger.LogInformation("Tiered: yes");
         }
 
-        var projectArgs = GetProjectBuildArgs(commandLineArgs, template, projectName);
+        var projectArgs = await GetProjectBuildArgsAsync(commandLineArgs, template, projectName);
 
         var result = await TemplateProjectBuilder.BuildAsync(
             projectArgs
@@ -92,6 +105,8 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
             await RunInstallLibsForWebTemplateAsync(projectArgs);
         }
         
+        await RunBundleForBlazorWasmTemplateAsync(projectArgs);
+            
         await ConfigurePwaSupportForAngular(projectArgs);
 
         OpenRelatedWebPage(projectArgs, template, isTiered, commandLineArgs);
@@ -155,5 +170,4 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
     {
         return "Generate a new solution based on the ABP startup templates.";
     }
-
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs

@@ -10,6 +10,7 @@ using NuGet.Versioning;
 using NUglify.Helpers;
 using Volo.Abp.Cli.ProjectModification;
 using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Bundling;
 using Volo.Abp.Cli.Commands.Services;
 using Volo.Abp.Cli.LIbs;
 using Volo.Abp.Cli.ProjectBuilding;
@@ -25,10 +26,12 @@ namespace Volo.Abp.Cli.Commands;
 
 public abstract class ProjectCreationCommandBase
 {
+    private readonly IBundlingService _bundlingService;
     public ConnectionStringProvider ConnectionStringProvider { get; }
     public SolutionPackageVersionFinder SolutionPackageVersionFinder { get; }
     public ICmdHelper CmdHelper { get; }
     public IInstallLibsService InstallLibsService { get; }
+    public CliService CliService { get; }
     public AngularPwaSupportAdder AngularPwaSupportAdder { get; }
     public InitialMigrationCreator InitialMigrationCreator { get; }
     public ILocalEventBus EventBus { get; }
@@ -41,15 +44,19 @@ public abstract class ProjectCreationCommandBase
         SolutionPackageVersionFinder solutionPackageVersionFinder,
         ICmdHelper cmdHelper,
         IInstallLibsService installLibsService,
+        CliService cliService,
         AngularPwaSupportAdder angularPwaSupportAdder,
         InitialMigrationCreator initialMigrationCreator,
         ThemePackageAdder themePackageAdder,
-        ILocalEventBus eventBus)
+        ILocalEventBus eventBus,
+        IBundlingService bundlingService)
     {
+        _bundlingService = bundlingService;
         ConnectionStringProvider = connectionStringProvider;
         SolutionPackageVersionFinder = solutionPackageVersionFinder;
         CmdHelper = cmdHelper;
         InstallLibsService = installLibsService;
+        CliService = cliService;
         AngularPwaSupportAdder = angularPwaSupportAdder;
         InitialMigrationCreator = initialMigrationCreator;
         EventBus = eventBus;
@@ -58,7 +65,7 @@ public abstract class ProjectCreationCommandBase
         Logger = NullLogger<NewCommand>.Instance;
     }
 
-    protected ProjectBuildArgs GetProjectBuildArgs(CommandLineArgs commandLineArgs, string template, string projectName)
+    protected async Task<ProjectBuildArgs> GetProjectBuildArgsAsync(CommandLineArgs commandLineArgs, string template, string projectName)
     {
         var version = commandLineArgs.Options.GetOrNull(Options.Version.Short, Options.Version.Long);
 
@@ -71,6 +78,15 @@ public abstract class ProjectCreationCommandBase
         if (preview)
         {
             Logger.LogInformation("Preview: yes");
+
+            var cliVersion = await CliService.GetCurrentCliVersionAsync(typeof(CliService).Assembly);
+
+            if (!cliVersion.IsPrerelease)
+            {
+                throw new CliUsageException(
+                    "You can only create a new preview solution with preview CLI version." +
+                    " Update your ABP CLI to the preview version.");
+            }
         }
 
         var pwa = commandLineArgs.Options.ContainsKey(Options.ProgressiveWebApp.Short);
@@ -392,6 +408,25 @@ public abstract class ProjectCreationCommandBase
         }
     }
 
+    protected async Task RunBundleForBlazorWasmTemplateAsync(ProjectBuildArgs projectArgs)
+    {
+        if (AppTemplateBase.IsAppTemplate(projectArgs.TemplateName) && projectArgs.UiFramework == UiFramework.Blazor)
+        {
+            Logger.LogInformation("Generating bundles for Blazor Wasm...");
+
+            await EventBus.PublishAsync(new ProjectCreationProgressEvent
+            {
+                Message = "Generating bundles for Blazor Wasm"
+            }, false);
+
+            var directory = Path.GetDirectoryName(
+                Directory.GetFiles(projectArgs.OutputFolder, "*.Blazor.csproj", SearchOption.AllDirectories).First()
+                );
+            
+            await _bundlingService.BundleAsync(directory, true);
+        }
+    }
+
     protected async Task CreateInitialMigrationsAsync(ProjectBuildArgs projectArgs)
     {
         if (projectArgs.DatabaseProvider == DatabaseProvider.MongoDb)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs

@@ -14,6 +14,16 @@ internal static class CommercialPackages
 
     public static bool IsCommercial(string packageId)
     {
-        return Packages.Contains(packageId.ToLowerInvariant());
+        return Packages.Contains(packageId.ToLowerInvariant()) || IsLeptonXPackage(packageId);
+    }
+
+    private static bool IsLeptonXPackage(string packageId)
+    {
+        return !IsLeptonXLitePackage(packageId) && packageId.Contains("LeptonX");
+    }
+
+    private static bool IsLeptonXLitePackage(string packageId)
+    {
+        return packageId.Contains("LeptonXLite");
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs

@@ -11,7 +11,7 @@ public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep
     public override void Execute(ProjectBuildContext context)
     {
         var appSettingsFiles = context.Files
-            .Where(x => x.Name.EndsWith(CliConsts.AppSettingsJsonFileName) && NotBlazorWasmProject(x.Name))
+            .Where(x => x.Name.EndsWith(CliConsts.AppSettingsJsonFileName) && NotBlazorWasmProject(x.Name) && NotInDockerFiles(x.Name))
             .ToList();
 
         if (!appSettingsFiles.Any())
@@ -66,6 +66,11 @@ public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep
         return !fileName.Contains("Blazor/wwwroot") && !fileName.Contains("Blazor.Host/wwwroot");
     }
 
+    private static bool NotInDockerFiles(string fileName)
+    {
+        return !fileName.Contains("etc/docker/");
+    }
+
     private static string ReplaceAppSettingsSecretsPlaceholder(string content)
     {
         var path = string.Empty;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -37,6 +37,7 @@ public abstract class AppTemplateBase : TemplateInfo
         ConfigureTieredArchitecture(context, steps);
         ConfigurePublicWebSite(context, steps);
         ConfigureTheme(context, steps);
+        ConfigureVersion(context, steps);
         RemoveUnnecessaryPorts(context, steps);
         RandomizeSslPorts(context, steps);
         RandomizeStringEncryption(context, steps);
@@ -193,12 +194,16 @@ public abstract class AppTemplateBase : TemplateInfo
             return;
         }
 
+        if (context.BuildArgs.Theme != Theme.NotSpecified)
+        {
+            context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper());
+        }
+
         if (context.BuildArgs.Theme == Theme.LeptonX)
         {
-            context.Symbols.Add("LEPTONX");
             steps.Add(new ChangeThemeStyleStep());
         }
-
+        
         if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value))
         {
             return;
@@ -489,6 +494,14 @@ public abstract class AppTemplateBase : TemplateInfo
         steps.Add(new RemoveUnnecessaryPortsStep());
     }
 
+    protected void ConfigureVersion(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+    {
+        if (context.BuildArgs.Version == null || SemanticVersion.Parse(context.BuildArgs.Version) >= SemanticVersion.Parse("6.0.0-rc.1"))
+        {
+            context.Symbols.Add("newer-than-6.0");
+        }
+    }
+
     protected void RandomizeSslPorts(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (context.BuildArgs.ExtraProperties.ContainsKey("no-random-port"))

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs

@@ -35,10 +35,14 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
         {
             return;
         }
+        
+        if (context.BuildArgs.Theme != Theme.NotSpecified)
+        {
+            context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper());
+        }
 
         if (context.BuildArgs.Theme == Theme.LeptonX)
         {
-            context.Symbols.Add("LEPTONX");
             steps.Add(new ChangeThemeStyleStep());
             return;
         }

framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs

@@ -37,7 +37,7 @@ public class ConsumerPool : IConsumerPool, ISingletonDependency
         return Consumers.GetOrAdd(
             connectionName, connection => new Lazy<IConsumer<string, byte[]>>(() =>
             {
-                var config = new ConsumerConfig(Options.Connections.GetOrDefault(connection))
+                var config = new ConsumerConfig(Options.Connections.GetOrDefault(connection).ToDictionary(k => k.Key, v => v.Value))
                 {
                     GroupId = groupId,
                     EnableAutoCommit = false

framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs

@@ -39,7 +39,7 @@ public class ProducerPool : IProducerPool, ISingletonDependency
         return Producers.GetOrAdd(
             connectionName, connection => new Lazy<IProducer<string, byte[]>>(() =>
             {
-                var producerConfig = new ProducerConfig(Options.Connections.GetOrDefault(connection));
+                var producerConfig = new ProducerConfig(Options.Connections.GetOrDefault(connection).ToDictionary(k => k.Key, v => v.Value));
                 Options.ConfigureProducer?.Invoke(producerConfig);
                 return new ProducerBuilder<string, byte[]>(producerConfig).Build();
                 

modules/account/Volo.Abp.Account.abpmdl.json

@@ -38,8 +38,8 @@
       "path": "src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.abppkg.json",
       "folder": "src"
     },
-    "Volo.Abp.Account.Installer": {
-      "path": "src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.abppkg.json",
+    "Volo.Abp.Account.Web.OpenIddict": {
+      "path": "src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json",
       "folder": "src"
     }
   }

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.Account.Application.Contracts",
-  "hash": "eda5b3412f7e1dd8dc07761a04f3a064",
+  "hash": "63eee204db33a361b137b2cff508e53f",
   "contents": [
     {
       "namespace": "Volo.Abp.Account",

modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.Account.Application",
-  "hash": "7fb9c3f35b18f2e9a0577d571fccf9df",
+  "hash": "9607ce81498fab564ea4a3681c15f72d",
   "contents": [
     {
       "namespace": "Volo.Abp.Account",
@@ -24,26 +24,6 @@
       ],
       "contentType": "applicationService",
       "name": "ProfileAppService"
-    },
-    {
-      "defaultValue": "true",
-      "displayName": "Is self-registration enabled",
-      "description": "Whether a user can register the account by him or herself.",
-      "isVisibleToClient": true,
-      "isInherited": true,
-      "isEncrypted": false,
-      "contentType": "setting",
-      "name": "Abp.Account.IsSelfRegistrationEnabled"
-    },
-    {
-      "defaultValue": "true",
-      "displayName": "Authenticate with a local account",
-      "description": "Indicates if the server will allow users to authenticate with a local account.",
-      "isVisibleToClient": true,
-      "isInherited": true,
-      "isEncrypted": false,
-      "contentType": "setting",
-      "name": "Abp.Account.EnableLocalLogin"
     }
   ]
 }

modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.Account.HttpApi.Client",
-  "hash": "ca67872e6cd8c25508461f7d171a8f04",
+  "hash": "62165afd5965b8041a9ac1f1356ad2e8",
   "contents": [
     {
       "namespace": "Volo.Abp.Account",

modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.Account.HttpApi",
-  "hash": "b178895fe2a7f470f36c4fd121b7c07a",
+  "hash": "c789b459a83b26349ca6f0fcab82a244",
   "contents": [
     {
       "namespace": "Volo.Abp.Account",

modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj

@@ -4,19 +4,21 @@
     <Import Project="..\..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\..\abp-studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.Account.abpmdl.json" />
       <EmbeddedResource Include="..\..\Volo.Abp.Account.abpmdl.json" />
+      <None Remove="..\..\**\*.abppkg*.json" />
+      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
     </ItemGroup>
 
 </Project>

modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.Account.Web",
-  "hash": "5fb2aa05261d4febe7ea7083d80fea74",
+  "hash": "56ee8c43448399a621216b5e54008a54",
   "contents": [
     {
       "namespace": "Volo.Abp.Account.Web",

modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json

@@ -37,10 +37,6 @@
     "Volo.Abp.AuditLogging.MongoDB.Tests": {
       "path": "test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo.Abp.AuditLogging.MongoDB.Tests.abppkg.json",
       "folder": "test"
-    },
-    "Volo.Abp.AuditLogging.Installer": {
-      "path": "src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.abppkg.json",
-      "folder": "src"
     }
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj

@@ -4,13 +4,13 @@
     <Import Project="..\..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\..\abp-studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
     </ItemGroup>
 

modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json

@@ -58,10 +58,6 @@
     "Volo.Abp.BackgroundJobs.DemoApp.Quartz": {
       "path": "app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.abppkg.json",
       "folder": "app"
-    },
-    "Volo.Abp.BackgroundJobs.Installer": {
-      "path": "src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.abppkg.json",
-      "folder": "src"
     }
   }
 }

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BackgroundJobs.Domain.Shared",
-  "hash": "d48277ec610b23392edcb12ae3e29175",
+  "hash": "7be6cb28ee9246d901e9801978a44149",
   "contents": [
     {
       "namespace": "Volo.Abp.BackgroundJobs",

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BackgroundJobs.Domain",
-  "hash": "1398bbe3f228b2bfd0baec6a64c03b43",
+  "hash": "edcb98cb920b6d3805b6ff82d280b1bd",
   "contents": [
     {
       "namespace": "Volo.Abp.BackgroundJobs",
@@ -19,7 +19,7 @@
     {
       "namespace": "Volo.Abp.BackgroundJobs",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Abp.BackgroundJobs",
         "primaryKeyType": "Guid",
         "summary": null,

modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BackgroundJobs.EntityFrameworkCore",
-  "hash": "f3bf7c7db2ab764d6421df0b88ea535b",
+  "hash": "47c087243281aea34d16f03acf5254cd",
   "contents": [
     {
       "namespace": "Volo.Abp.BackgroundJobs.EntityFrameworkCore",

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj

@@ -4,19 +4,21 @@
     <Import Project="..\..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\..\abp-studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.BackgroundJobs.abpmdl.json" />
       <EmbeddedResource Include="..\..\Volo.Abp.BackgroundJobs.abpmdl.json" />
+      <None Remove="..\..\**\*.abppkg*.json" />
+      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
     </ItemGroup>
 
 </Project>

modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BackgroundJobs.MongoDB",
-  "hash": "def047f007cc2f8c9a74459f1df01330",
+  "hash": "0a592222ebb3efef215734b1617f8548",
   "contents": [
     {
       "namespace": "Volo.Abp.BackgroundJobs.MongoDB",

modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json

@@ -33,10 +33,6 @@
     "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests": {
       "path": "test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.abppkg.json",
       "folder": "test"
-    },
-    "Volo.Abp.BasicTheme.Installer": {
-      "path": "src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.abppkg.json",
-      "folder": "src"
     }
   }
 }

modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.analyze.json

@@ -0,0 +1,11 @@
+{
+  "name": "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+  "hash": "ce73ef1b1d433a5bd99fce51d9c76697",
+  "contents": [
+    {
+      "namespace": "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+      "contentType": "abpModule",
+      "name": "AbpAspNetCoreMvcUiBasicThemeModule"
+    }
+  ]
+}

modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json

@@ -1 +1,3 @@
-{}
+{
+  "role": "lib.mvc"
+}

modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj

@@ -4,19 +4,21 @@
     <Import Project="..\..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\..\abp-studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.BasicTheme.abpmdl.json" />
       <EmbeddedResource Include="..\..\Volo.Abp.BasicTheme.abpmdl.json" />
+      <None Remove="..\..\**\*.abppkg*.json" />
+      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
     </ItemGroup>
 
 </Project>

modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json

@@ -50,10 +50,6 @@
     "BlobStoring.Database.Host.ConsoleApp.ConsoleApp": {
       "path": "host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.abppkg.json",
       "folder": "host/BlobStoring.Database.Host.ConsoleApp/src"
-    },
-    "Volo.Abp.BlobStoring.Database.Installer": {
-      "path": "src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json",
-      "folder": "src"
     }
   }
 }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BlobStoring.Database.Domain.Shared",
-  "hash": "eed9ff456824aac8ba0fe73baa6cf288",
+  "hash": "a6127aa423bcf90505fde453d6852fd5",
   "contents": [
     {
       "namespace": "Volo.Abp.BlobStoring.Database",

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BlobStoring.Database.Domain",
-  "hash": "744c78df1c9addf5e9f6657295f0529c",
+  "hash": "35614e1fa8f4e0214b7f456228ba7565",
   "contents": [
     {
       "namespace": "Volo.Abp.BlobStoring.Database",
@@ -28,7 +28,7 @@
     {
       "namespace": "Volo.Abp.BlobStoring.Database",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Abp.BlobStoring.Database",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -43,7 +43,7 @@
     {
       "namespace": "Volo.Abp.BlobStoring.Database",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Abp.BlobStoring.Database",
         "primaryKeyType": "Guid",
         "summary": null,

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BlobStoring.Database.EntityFrameworkCore",
-  "hash": "91e3a724f35375f79d9505ca0e950b9e",
+  "hash": "cdddb35c205079b70e3b1e8010482930",
   "contents": [
     {
       "namespace": "Volo.Abp.BlobStoring.Database.EntityFrameworkCore",

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj

@@ -4,19 +4,21 @@
     <Import Project="..\..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\..\abp-studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.BlobStoring.Database.abpmdl.json" />
       <EmbeddedResource Include="..\..\Volo.Abp.BlobStoring.Database.abpmdl.json" />
+      <None Remove="..\..\**\*.abppkg*.json" />
+      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
     </ItemGroup>
 
 </Project>

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Abp.BlobStoring.Database.MongoDB",
-  "hash": "4c911e5e8a2e8c4630d12f394a157819",
+  "hash": "9732b597f54df4ab73a8ad8aab7743d2",
   "contents": [
     {
       "namespace": "Volo.Abp.BlobStoring.Database.MongoDB",

modules/blogging/Volo.Blogging.sln

@@ -63,6 +63,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9FAD5B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Blogging.Application.Contracts.Shared", "src\Volo.Blogging.Application.Contracts.Shared\Volo.Blogging.Application.Contracts.Shared.csproj", "{E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Blogging.Installer", "src\Volo.Blogging.Installer\Volo.Blogging.Installer.csproj", "{C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -161,6 +163,10 @@ Global
 		{E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -193,6 +199,7 @@ Global
 		{DB75CA32-96A5-4D10-8DD0-E62A3D0DDBCB} = {BE2A423C-271E-469A-AD90-5640DEBEE9C1}
 		{9FAD5B78-0577-4500-92D5-DC86E05F773C} = {42BF26EF-B8C7-42DC-9FFB-3653109B7776}
 		{E28EBBE0-8EB7-4FC1-9267-E6D30993EAE4} = {9FAD5B78-0577-4500-92D5-DC86E05F773C}
+		{C5EAF1A4-F1DE-44B4-9F8F-3602EC2575B5} = {9FAD5B78-0577-4500-92D5-DC86E05F773C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F2BAE819-78D4-407A-9201-22473B2850B0}

modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.analyze.json

@@ -0,0 +1,18 @@
+{
+  "name": "Volo.BloggingTestApp.EntityFrameworkCore",
+  "hash": "9bca59fa99494d82517715624e8b4974",
+  "contents": [
+    {
+      "namespace": "Volo.BloggingTestApp.EntityFrameworkCore",
+      "contentType": "abpModule",
+      "name": "BloggingTestAppEntityFrameworkCoreModule"
+    },
+    {
+      "namespace": "Volo.BloggingTestApp.EntityFrameworkCore",
+      "connectionStringName": null,
+      "databaseTables": [],
+      "contentType": "efCoreDbContext",
+      "name": "BloggingTestAppDbContext"
+    }
+  ]
+}

modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.analyze.json

@@ -0,0 +1,11 @@
+{
+  "name": "Volo.BloggingTestApp.MongoDB",
+  "hash": "fad6ecadd947f85cb1e3da6b87211432",
+  "contents": [
+    {
+      "namespace": "Volo.BloggingTestApp.MongoDB",
+      "contentType": "abpModule",
+      "name": "BloggingTestAppMongoDbModule"
+    }
+  ]
+}

modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Admin.Application.Contracts",
-  "hash": "bc5b2c34e2c42cadb2a10a82348aa2b7",
+  "hash": "be484343bc0b862114e22ee45c9027e3",
   "contents": [
     {
       "namespace": "Volo.Blogging.Admin",

modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Admin.Application",
-  "hash": "7b36c95fbcf2605d9ea2614cba9ed2b6",
+  "hash": "da2cac72c4199b60197f4b57b5e7c9e6",
   "contents": [
     {
       "namespace": "Volo.Blogging.Admin",

modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.analyze.json

@@ -0,0 +1,11 @@
+{
+  "name": "Volo.Blogging.Admin.HttpApi.Client",
+  "hash": "a721bcce141abe86ecb9c0d1c29350c1",
+  "contents": [
+    {
+      "namespace": "Volo.Blogging.Admin",
+      "contentType": "abpModule",
+      "name": "BloggingAdminHttpApiClientModule"
+    }
+  ]
+}

modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Admin.HttpApi",
-  "hash": "4397a28b60e20715a0d7559a882c7070",
+  "hash": "5a7f1b44c7977fc9ae74a04688a1f012",
   "contents": [
     {
       "namespace": "Volo.Blogging.Admin",

modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Admin.Web",
-  "hash": "faf036383d0b2be635023b8f9627038d",
+  "hash": "038f0c3d57f5f4bc8e0e773b1f0c3b3a",
   "contents": [
     {
       "namespace": "Volo.Blogging.Admin",

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Application.Contracts",
-  "hash": "2f9db4cac9c4fdbbbacb91565e42a287",
+  "hash": "f2feafeeb5d85cc3f76512948097381d",
   "contents": [
     {
       "namespace": "Volo.Blogging",

modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Application",
-  "hash": "cb199201deb38a1dbd87df36e993c999",
+  "hash": "47a4bc61ba0c33ebe3b888158ee679f6",
   "contents": [
     {
       "namespace": "Volo.Blogging",

modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Domain.Shared",
-  "hash": "071426a5a0990afe3cd051a9f1c1513c",
+  "hash": "5c72d38b48fd549c1e4d37eb5f4a5f8e",
   "contents": [
     {
       "namespace": "Volo.Blogging",

modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Domain",
-  "hash": "a04c90c3913af092e8990a27cb72e208",
+  "hash": "bf1806736d7d435af015acb0aac2eab2",
   "contents": [
     {
       "namespace": "Volo.Blogging",
@@ -57,7 +57,7 @@
     {
       "namespace": "Volo.Blogging.Users",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Blogging.Users",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -72,7 +72,7 @@
     {
       "namespace": "Volo.Blogging.Tagging",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Blogging.Tagging",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -87,7 +87,7 @@
     {
       "namespace": "Volo.Blogging.Posts",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Blogging.Posts",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -104,7 +104,7 @@
     {
       "namespace": "Volo.Blogging.Comments",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Blogging.Comments",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -119,7 +119,7 @@
     {
       "namespace": "Volo.Blogging.Blogs",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.Blogging.Blogs",
         "primaryKeyType": "Guid",
         "summary": null,

modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.EntityFrameworkCore",
-  "hash": "2e7dd0b9baf54f79d100f8b439b43449",
+  "hash": "28d4b0828f47b8b4e6cef70a5879915f",
   "contents": [
     {
       "namespace": "Volo.Blogging.EntityFrameworkCore",

modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.analyze.json

@@ -0,0 +1,11 @@
+{
+  "name": "Volo.Blogging.HttpApi.Client",
+  "hash": "81cf265f097ded223f74972a77367635",
+  "contents": [
+    {
+      "namespace": "Volo.Blogging",
+      "contentType": "abpModule",
+      "name": "BloggingHttpApiClientModule"
+    }
+  ]
+}

modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.HttpApi",
-  "hash": "7e01f3bdcf88041ab5d7632be87716a5",
+  "hash": "185146640ff70ee3bc3e49c2ae9cbe23",
   "contents": [
     {
       "namespace": "Volo.Blogging",

modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\..\abp-studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Remove="..\..\Volo.Blogging.abpmdl.json" />
+        <EmbeddedResource Include="..\..\Volo.Blogging.abpmdl.json" />
+        <None Remove="..\..\**\*.abppkg*.json" />
+        <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+    </ItemGroup>
+
+</Project>

modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs

@@ -0,0 +1,20 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Studio;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Blogging;
+
+[DependsOn(
+    typeof(AbpStudioModuleInstallerModule),
+    typeof(AbpVirtualFileSystemModule)
+    )]
+public class BloggingInstallerModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpVirtualFileSystemOptions>(options =>
+        {
+            options.FileSets.AddEmbedded<BloggingInstallerModule>();
+        });
+    }
+}

modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerPipelineBuilder.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Studio.ModuleInstalling;
+
+namespace Volo.Blogging;
+
+[Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
+[ExposeServices(typeof(IModuleInstallingPipelineBuilder))]
+public class BloggingInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency
+{
+    public async Task<ModuleInstallingPipeline> BuildAsync(ModuleInstallingContext context)
+    {
+
+        return GetBasePipeline(context);
+    }
+}

modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.analyze.json

@@ -0,0 +1,44 @@
+{
+  "name": "Volo.Blogging.MongoDB",
+  "hash": "6837c014507cf952197f4b5ae3cafb97",
+  "contents": [
+    {
+      "namespace": "Volo.Blogging.MongoDB",
+      "contentType": "abpModule",
+      "name": "BloggingMongoDbModule"
+    },
+    {
+      "namespace": "Volo.Blogging.MongoDB",
+      "connectionStringName": "Blogging",
+      "databaseCollections": [
+        {
+          "entityFullName": "Volo.Blogging.Comments.Comment",
+          "contentType": "databaseCollection",
+          "name": "BlgComments"
+        },
+        {
+          "entityFullName": "Volo.Blogging.Posts.Post",
+          "contentType": "databaseCollection",
+          "name": "BlgPosts"
+        },
+        {
+          "entityFullName": "Volo.Blogging.Blogs.Blog",
+          "contentType": "databaseCollection",
+          "name": "BlgBlogs"
+        },
+        {
+          "entityFullName": "Volo.Blogging.Tagging.Tag",
+          "contentType": "databaseCollection",
+          "name": "BlgTags"
+        },
+        {
+          "entityFullName": "Volo.Blogging.Users.BlogUser",
+          "contentType": "databaseCollection",
+          "name": "BlgUsers"
+        }
+      ],
+      "contentType": "mongoDbContext",
+      "name": "BloggingMongoDbContext"
+    }
+  ]
+}

modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.Blogging.Web",
-  "hash": "daa60f34c9198bebe6d9f659595dbbea",
+  "hash": "1e34d5e0718fb581ffbca20cbf71f4f6",
   "contents": [
     {
       "namespace": "Volo.Blogging",

modules/cms-kit/Volo.CmsKit.abpmdl.json

@@ -146,10 +146,6 @@
     "Volo.CmsKit.Common.HttpApi.Client": {
       "path": "src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.json",
       "folder": "src"
-    },
-    "Volo.CmsKit.Installer": {
-      "path": "src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.abppkg.json",
-      "folder": "src"
     }
   }
 }

modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.HttpApi.Host",
-  "hash": "a94f87ec06a48733eb72887f12c6a3e2",
+  "hash": "da40e46c3889c8e7a250a070a7366fac",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Web.Host",
-  "hash": "cc4d27ed5d3b15d46c68449fc409a9ea",
+  "hash": "b8c7f8a05e4ae2f56af72d7c331242d7",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs

@@ -36,7 +36,6 @@ using Volo.Abp.Threading;
 using Volo.Abp.VirtualFileSystem;
 using Volo.CmsKit.Admin.Web;
 using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.EntityFrameworkCore;
 using Volo.CmsKit.MediaDescriptors;
 using Volo.CmsKit.MultiTenancy;
@@ -45,6 +44,7 @@ using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Tags;
 using Volo.CmsKit.Web;
+using Volo.CmsKit.Web.Contents;
 
 namespace Volo.CmsKit;
 

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

@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-namespace Volo.CmsKit.Admin.Contents;
-public interface IContentAdminAppService : IApplicationService
-{
-    Task<ListResultDto<ContentWidgetDto>> GetWidgetsAsync();
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Admin.Application",
-  "hash": "26aaaf7203b92c171ba27f811f10b409",
+  "hash": "d397763f02ef471e9dd35eb1f819db29",
   "contents": [
     {
       "namespace": "Volo.CmsKit.Admin",
@@ -21,12 +21,12 @@
       "summary": null,
       "implementingInterfaces": [
         "Volo.CmsKit.Admin.Tags.ITagAdminAppService",
-        "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Tags.TagCreateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Tags.TagDto, Volo.CmsKit.Common.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Tags.TagUpdateDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
         "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]"
       ],
       "contentType": "applicationService",
@@ -37,11 +37,11 @@
       "summary": null,
       "implementingInterfaces": [
         "Volo.CmsKit.Admin.Pages.IPageAdminAppService",
-        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.GetPagesInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Pages.CreatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Pages.PageDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Pages.UpdatePageInputDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
         "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]"
       ],
       "contentType": "applicationService",
@@ -65,6 +65,15 @@
       "contentType": "applicationService",
       "name": "MediaDescriptorAdminAppService"
     },
+    {
+      "namespace": "Volo.CmsKit.Admin.GlobalResources",
+      "summary": null,
+      "implementingInterfaces": [
+        "Volo.CmsKit.Admin.GlobalResources.IGlobalResourceAdminAppService"
+      ],
+      "contentType": "applicationService",
+      "name": "GlobalResourceAdminAppService"
+    },
     {
       "namespace": "Volo.CmsKit.Admin.Comments",
       "summary": null,
@@ -79,12 +88,12 @@
       "summary": null,
       "implementingInterfaces": [
         "Volo.CmsKit.Admin.Blogs.IBlogAdminAppService",
-        "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
         "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]"
       ],
       "contentType": "applicationService",
@@ -104,11 +113,11 @@
       "summary": null,
       "implementingInterfaces": [
         "Volo.CmsKit.Admin.Blogs.IBlogPostAdminAppService",
-        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.BlogPostListDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.BlogPostGetListInput, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.CmsKit.Admin.Blogs.CreateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
+        "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.CmsKit.Admin.Blogs.BlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Volo.CmsKit.Admin.Blogs.UpdateBlogPostDto, Volo.CmsKit.Admin.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]",
         "Volo.Abp.Application.Services.IDeleteAppService`1[[System.Guid, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]"
       ],
       "contentType": "applicationService",

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj

@@ -13,4 +13,8 @@
     <ProjectReference Include="..\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Volo\CmsKit\Admin\Contents\" />
+  </ItemGroup>
+
 </Project>

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

@@ -1,32 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Options;
-using Volo.Abp.Application.Dtos;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.Admin.Contents;
-
-public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAppService
-{
-    private readonly CmsKitContentWidgetOptions _options;
-
-    public ContentAdminAppService(IOptions<CmsKitContentWidgetOptions> options)
-    {
-        _options = options.Value;
-    }
-
-    public virtual Task<ListResultDto<ContentWidgetDto>> GetWidgetsAsync()
-    {
-        return Task.FromResult(new ListResultDto<ContentWidgetDto>()
-        {
-            Items = _options.WidgetConfigs
-                .Select(n =>
-                    new ContentWidgetDto
-                    {
-                        Key = n.Key,
-                        Details = new WidgetDetailDto() { EditorComponentName = n.Value.EditorComponentName, Name = n.Value.Name },
-
-                    }).ToList()
-        });
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs

@@ -1,22 +0,0 @@
-// This file is automatically generated by ABP framework to use MVC Controllers from CSharp
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Http.Modeling;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Http.Client.ClientProxying;
-using Volo.CmsKit.Admin.Contents;
-
-// ReSharper disable once CheckNamespace
-namespace Volo.CmsKit.Admin.Contents.ClientProxies;
-
-[Dependency(ReplaceServices = true)]
-[ExposeServices(typeof(IContentAdminAppService), typeof(ContentAdminClientProxy))]
-public partial class ContentAdminClientProxy : ClientProxyBase<IContentAdminAppService>, IContentAdminAppService
-{
-    public virtual async Task<ListResultDto<ContentWidgetDto>> GetWidgetsAsync()
-    {
-        return await RequestAsync<ListResultDto<ContentWidgetDto>>(nameof(GetWidgetsAsync));
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs

@@ -1,7 +0,0 @@
-// This file is part of ContentAdminClientProxy, you can customize it here
-// ReSharper disable once CheckNamespace
-namespace Volo.CmsKit.Admin.Contents.ClientProxies;
-
-public partial class ContentAdminClientProxy
-{
-}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json

@@ -1191,35 +1191,6 @@
             }
           }
         },
-        "Volo.CmsKit.Admin.Contents.ContentAdminController": {
-          "controllerName": "ContentAdmin",
-          "controllerGroupName": "ContentAdmin",
-          "isRemoteService": true,
-          "apiVersion": null,
-          "type": "Volo.CmsKit.Admin.Contents.ContentAdminController",
-          "interfaces": [
-            {
-              "type": "Volo.CmsKit.Admin.Contents.IContentAdminAppService"
-            }
-          ],
-          "actions": {
-            "GetWidgetsAsync": {
-              "uniqueName": "GetWidgetsAsync",
-              "name": "GetWidgetsAsync",
-              "httpMethod": "GET",
-              "url": "api/cms-kit-admin/contents",
-              "supportedVersions": [],
-              "parametersOnMethod": [],
-              "parameters": [],
-              "returnValue": {
-                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.CmsKit.Admin.Contents.ContentWidgetDto>",
-                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.CmsKit.Admin.Contents.ContentWidgetDto>"
-              },
-              "allowAnonymous": null,
-              "implementFrom": "Volo.CmsKit.Admin.Contents.IContentAdminAppService"
-            }
-          }
-        },
         "Volo.CmsKit.Admin.Comments.CommentAdminController": {
           "controllerName": "CommentAdmin",
           "controllerGroupName": "CommentAdmin",

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Admin.HttpApi.Client",
-  "hash": "d3e74606dde1a5099e9f02c0384b9057",
+  "hash": "e9b74f85924bb2ea21d651612c337c8d",
   "contents": [
     {
       "namespace": "Volo.CmsKit.Admin",

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Admin.HttpApi",
-  "hash": "2db77730b823b6adecfe095f7a8a4449",
+  "hash": "613b16275c5d464aa927a53ca452f7ab",
   "contents": [
     {
       "namespace": "Volo.CmsKit.Admin",

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs

@@ -1,25 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-
-namespace Volo.CmsKit.Admin.Contents;
-
-[RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-[Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
-[Route("api/cms-kit-admin/contents")]
-public class ContentAdminController : CmsKitAdminController, IContentAdminAppService
-{
-    protected IContentAdminAppService ContentAdminAppService { get; }
-
-    public ContentAdminController(IContentAdminAppService contentAdminAppService)
-    {
-        ContentAdminAppService = contentAdminAppService;
-    }
-
-    [HttpGet]
-    public virtual Task<ListResultDto<ContentWidgetDto>> GetWidgetsAsync()
-    {
-        return ContentAdminAppService.GetWidgetsAsync();
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs

@@ -3,38 +3,48 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.CmsKit.Admin.Contents;
 using Volo.CmsKit.Contents;
+using Volo.CmsKit.Web.Contents;
 
 namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents;
 
 public class AddWidgetModal : AbpPageModel
 {
-    protected IContentAdminAppService ContentAdminAppService { get; }
 
     [BindProperty]
     public ContentViewModel ViewModel { get; set; }
 
     public List<SelectListItem> Widgets { get; set; } = new();
 
-    public AddWidgetModal(IContentAdminAppService contentAdminAppService)
+    private readonly CmsKitContentWidgetOptions _options;
+
+    public AddWidgetModal(IOptions<CmsKitContentWidgetOptions> options)
     {
-        ContentAdminAppService = contentAdminAppService;
+        _options = options.Value;
     }
 
     public async Task OnGetAsync()
     {
-        var widgets = await ContentAdminAppService.GetWidgetsAsync();
+        var widgets = _options.WidgetConfigs
+                .Select(n =>
+                    new ContentWidgetDto
+                    {
+                        Key = n.Key,
+                        Details = new WidgetDetailDto() { EditorComponentName = n.Value.EditorComponentName, Name = n.Value.Name },
+
+                    }).ToList();
+        
         ViewModel = new ContentViewModel()
         {
-            Details = widgets.Items.Select(p => p.Details).ToList()
+            Details = widgets.Select(p => p.Details).ToList()
         };
 
         Widgets = new List<SelectListItem>() { new(string.Empty, string.Empty) };
         Widgets.AddRange(widgets
-            .Items
             .Select(w => new SelectListItem(w.Key, w.Details.Name))
             .ToList());
     }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Admin.Web",
-  "hash": "3f95d9795d85d7afbd3311ce13806594",
+  "hash": "5f85ca165f250e4965434f76a73f0d24",
   "contents": [
     {
       "namespace": "Volo.CmsKit.Admin.Web",

modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js

@@ -247,21 +247,6 @@
 
   })();
 
-  // controller volo.cmsKit.admin.contents.contentAdmin
-
-  (function(){
-
-    abp.utils.createNamespace(window, 'volo.cmsKit.admin.contents.contentAdmin');
-
-    volo.cmsKit.admin.contents.contentAdmin.getWidgets = function(ajaxParams) {
-      return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/cms-kit-admin/contents',
-        type: 'GET'
-      }, ajaxParams));
-    };
-
-  })();
-
   // controller volo.cmsKit.admin.comments.commentAdmin
 
   (function(){

modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Application.Contracts",
-  "hash": "a30e3d8764aeafd628434d7773d25dc2",
+  "hash": "66221b0ded80b705e67d327260d7d58e",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Application",
-  "hash": "a8ce451337675e03f5fb68c1965a3ded",
+  "hash": "d248c6d5c1b031c459ad8814fd734a18",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Common.Application",
-  "hash": "8c5b6af4aae1a9199e8ed2a8481cf201",
+  "hash": "07abca3b46e8b2c5233c0d9b1a803f02",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Common.HttpApi.Client",
-  "hash": "4563bb2a82a6f3c4c49fbbac9e12a622",
+  "hash": "047466e6fe6a292e3cf8d1f334303f42",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Common.HttpApi",
-  "hash": "a14749de61debbd45eac761d91707413",
+  "hash": "9120a59e9639dcaec305df9314b55b02",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs → modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/CmsKitContentWidgetOptions.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Volo.CmsKit.Contents;
+namespace Volo.CmsKit.Web.Contents;
 
 public class CmsKitContentWidgetOptions
 {

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs → modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/ContentParser.cs

@@ -5,9 +5,10 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
+using Volo.CmsKit.Contents;
 using static Volo.CmsKit.Contents.ContentConsts;
 
-namespace Volo.CmsKit.Contents;
+namespace Volo.CmsKit.Web.Contents;
 
 public class ContentParser : ITransientDependency
 {
@@ -28,10 +29,10 @@ public class ContentParser : ITransientDependency
             });
         }
 
-        var parsedList = new List<string>();
+        List<string> parsedList = new();
         ParseContent(content, parsedList);
 
-        var contentFragments = new List<ContentFragment>();
+        List<ContentFragment> contentFragments = new();
         FillContentFragment(content, parsedList, contentFragments);
 
         return Task.FromResult(contentFragments);

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs → modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/ContentWidgetConfig.cs

@@ -1,4 +1,4 @@
-namespace Volo.CmsKit.Contents;
+namespace Volo.CmsKit.Web.Contents;
 
 public class ContentWidgetConfig
 {

modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Common.Web",
-  "hash": "3c0628c43dbbcfb430af79992fd6fd3f",
+  "hash": "2540b0ef97a790d3999d72c87961397e",
   "contents": [
     {
       "namespace": "Volo.CmsKit.Web",

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Domain.Shared",
-  "hash": "515d3328db0b4ded3a5076a582f00053",
+  "hash": "dd817fe9197c1b28242920e4238da6ee",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Domain",
-  "hash": "6e431ab37f61b3f7bb7ca8517a1543d6",
+  "hash": "1e318a63acb08c17193414845709b752",
   "contents": [
     {
       "namespace": "Volo.CmsKit",
@@ -70,6 +70,15 @@
       "contentType": "aggregateRoot",
       "name": "MediaDescriptor"
     },
+    {
+      "namespace": "Volo.CmsKit.GlobalResources",
+      "primaryKeyType": "Guid",
+      "summary": null,
+      "collectionProperties": [],
+      "navigationProperties": [],
+      "contentType": "aggregateRoot",
+      "name": "GlobalResource"
+    },
     {
       "namespace": "Volo.CmsKit.Comments",
       "primaryKeyType": "Guid",
@@ -150,6 +159,12 @@
       "contentType": "domainService",
       "name": "MediaDescriptorManager"
     },
+    {
+      "namespace": "Volo.CmsKit.GlobalResources",
+      "summary": null,
+      "contentType": "domainService",
+      "name": "GlobalResourceManager"
+    },
     {
       "namespace": "Volo.CmsKit.Comments",
       "summary": null,
@@ -177,7 +192,7 @@
     {
       "namespace": "Volo.CmsKit.Users",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Users",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -192,7 +207,7 @@
     {
       "namespace": "Volo.CmsKit.Tags",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Tags",
         "primaryKeyType": null,
         "summary": null,
@@ -207,7 +222,7 @@
     {
       "namespace": "Volo.CmsKit.Tags",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Tags",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -222,7 +237,7 @@
     {
       "namespace": "Volo.CmsKit.Reactions",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Reactions",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -237,7 +252,7 @@
     {
       "namespace": "Volo.CmsKit.Ratings",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Ratings",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -252,7 +267,7 @@
     {
       "namespace": "Volo.CmsKit.Pages",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Pages",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -267,7 +282,7 @@
     {
       "namespace": "Volo.CmsKit.Menus",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Menus",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -282,7 +297,7 @@
     {
       "namespace": "Volo.CmsKit.MediaDescriptors",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.MediaDescriptors",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -294,10 +309,25 @@
       "contentType": "repositoryInterface",
       "name": "IMediaDescriptorRepository"
     },
+    {
+      "namespace": "Volo.CmsKit.GlobalResources",
+      "summary": null,
+      "entityAnalyzeModel": {
+        "namespace": "Volo.CmsKit.GlobalResources",
+        "primaryKeyType": "Guid",
+        "summary": null,
+        "collectionProperties": [],
+        "navigationProperties": [],
+        "contentType": "entity",
+        "name": "GlobalResource"
+      },
+      "contentType": "repositoryInterface",
+      "name": "IGlobalResourceRepository"
+    },
     {
       "namespace": "Volo.CmsKit.Comments",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Comments",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -312,7 +342,7 @@
     {
       "namespace": "Volo.CmsKit.Blogs",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Blogs",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -327,7 +357,7 @@
     {
       "namespace": "Volo.CmsKit.Blogs",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Blogs",
         "primaryKeyType": "Guid",
         "summary": null,
@@ -344,7 +374,7 @@
     {
       "namespace": "Volo.CmsKit.Blogs",
       "summary": null,
-      "entityModel": {
+      "entityAnalyzeModel": {
         "namespace": "Volo.CmsKit.Blogs",
         "primaryKeyType": "Guid",
         "summary": null,

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.EntityFrameworkCore",
-  "hash": "f0cfc503a962ac59adb8d27be83a20a1",
+  "hash": "b7aab122bf55ecff3063a1b65efe0642",
   "contents": [
     {
       "namespace": "Volo.CmsKit.EntityFrameworkCore",

modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.HttpApi.Client",
-  "hash": "6471d04d18e68f42e54afa8e98035ca5",
+  "hash": "dac3747019bc31633a80784616bdbe61",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.HttpApi",
-  "hash": "396cfcff38fbee04def6feee7d1cfec8",
+  "hash": "35d6b578e63adb4e4fe8876bfdba83c8",
   "contents": [
     {
       "namespace": "Volo.CmsKit",

modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj

@@ -4,19 +4,21 @@
     <Import Project="..\..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
+        <ProjectReference Include="..\..\..\..\..\abp-studio\src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <None Remove="..\..\Volo.CmsKit.abpmdl.json" />
       <EmbeddedResource Include="..\..\Volo.CmsKit.abpmdl.json" />
+      <None Remove="..\..\**\*.abppkg*.json" />
+      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
     </ItemGroup>
 
 </Project>

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.MongoDB",
-  "hash": "8c2fac3aaa67ccfc101938cf7e0e6ba3",
+  "hash": "6ab237cd16e1bd42d96b93f76b992622",
   "contents": [
     {
       "namespace": "Volo.CmsKit.MongoDB",
@@ -12,24 +12,34 @@
       "connectionStringName": "CmsKit",
       "databaseCollections": [
         {
-          "entityFullName": "Volo.CmsKit.Comments.Comment",
+          "entityFullName": "Volo.CmsKit.Users.CmsUser",
           "contentType": "databaseCollection",
-          "name": "CmsComments"
+          "name": "CmsUsers"
         },
         {
-          "entityFullName": "Volo.CmsKit.Tags.Tag",
+          "entityFullName": "Volo.CmsKit.Reactions.UserReaction",
           "contentType": "databaseCollection",
-          "name": "CmsTags"
+          "name": "CmsUserReactions"
         },
         {
-          "entityFullName": "Volo.CmsKit.Reactions.UserReaction",
+          "entityFullName": "Volo.CmsKit.Blogs.BlogPost",
           "contentType": "databaseCollection",
-          "name": "CmsUserReactions"
+          "name": "CmsBlogPosts"
         },
         {
-          "entityFullName": "Volo.CmsKit.Tags.EntityTag",
+          "entityFullName": "Volo.CmsKit.MediaDescriptors.MediaDescriptor",
           "contentType": "databaseCollection",
-          "name": "CmsEntityTags"
+          "name": "CmsMediaDescriptors"
+        },
+        {
+          "entityFullName": "Volo.CmsKit.Pages.Page",
+          "contentType": "databaseCollection",
+          "name": "CmsPages"
+        },
+        {
+          "entityFullName": "Volo.CmsKit.Tags.Tag",
+          "contentType": "databaseCollection",
+          "name": "CmsTags"
         },
         {
           "entityFullName": "Volo.CmsKit.Blogs.BlogFeature",
@@ -37,19 +47,19 @@
           "name": "CmsBlogFeatures"
         },
         {
-          "entityFullName": "Volo.CmsKit.Menus.MenuItem",
+          "entityFullName": "Volo.CmsKit.Blogs.Blog",
           "contentType": "databaseCollection",
-          "name": "CmsMenuItems"
+          "name": "CmsBlogs"
         },
         {
-          "entityFullName": "Volo.CmsKit.MediaDescriptors.MediaDescriptor",
+          "entityFullName": "Volo.CmsKit.Comments.Comment",
           "contentType": "databaseCollection",
-          "name": "CmsMediaDescriptors"
+          "name": "CmsComments"
         },
         {
-          "entityFullName": "Volo.CmsKit.Pages.Page",
+          "entityFullName": "Volo.CmsKit.GlobalResources.GlobalResource",
           "contentType": "databaseCollection",
-          "name": "CmsPages"
+          "name": "CmsGlobalResources"
         },
         {
           "entityFullName": "Volo.CmsKit.Ratings.Rating",
@@ -57,19 +67,14 @@
           "name": "CmsRatings"
         },
         {
-          "entityFullName": "Volo.CmsKit.Blogs.BlogPost",
-          "contentType": "databaseCollection",
-          "name": "CmsBlogPosts"
-        },
-        {
-          "entityFullName": "Volo.CmsKit.Blogs.Blog",
+          "entityFullName": "Volo.CmsKit.Menus.MenuItem",
           "contentType": "databaseCollection",
-          "name": "CmsBlogs"
+          "name": "CmsMenuItems"
         },
         {
-          "entityFullName": "Volo.CmsKit.Users.CmsUser",
+          "entityFullName": "Volo.CmsKit.Tags.EntityTag",
           "contentType": "databaseCollection",
-          "name": "CmsUsers"
+          "name": "CmsEntityTags"
         }
       ],
       "contentType": "mongoDbContext",

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json

@@ -1,6 +1,6 @@
 {
   "name": "Volo.CmsKit.Public.Application.Contracts",
-  "hash": "308c90693f153360adbe46dcecaab560",
+  "hash": "dadad9e526e7b82b280e75a06e1456fc",
   "contents": [
     {
       "namespace": "Volo.CmsKit.Public",

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

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.Public.Blogs;
@@ -17,8 +15,6 @@ public class BlogPostPublicDto : AuditedEntityDto<Guid>
 
     public string ShortDescription { get; set; }
 
-    public List<ContentFragment> ContentFragments { get; set; }
-
     public string Content { get; set; }
 
     public Guid? CoverImageMediaId { get; set; }