diff --git a/common.props b/common.props index b68580bb2a..2adcbdab77 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 6.0.0-rc.3 + 6.0.0-rc.4 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ diff --git a/docs/en/Apps/VoloDocs.md b/docs/en/Apps/VoloDocs.md index f85aa78bbd..9fe8ff2507 100644 --- a/docs/en/Apps/VoloDocs.md +++ b/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. diff --git a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md index 3d99e1e3cf..251a84510b 100644 --- a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md +++ b/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(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. \ No newline at end of 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. diff --git a/docs/en/Getting-Started-Running-Solution.md b/docs/en/Getting-Started-Running-Solution.md index 66230c7aef..44fbd3eb03 100644 --- a/docs/en/Getting-Started-Running-Solution.md +++ b/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. diff --git a/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md b/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md index e8c0f65c7c..3567ea5c06 100644 --- a/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md +++ b/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) \ No newline at end of file +* [ABP Version 6.0 Migration Guide](Abp-6_0.md) diff --git a/docs/en/Modules/OpenIddict.md b/docs/en/Modules/OpenIddict.md index 2c8ae7572e..22cb22bf55 100644 --- a/docs/en/Modules/OpenIddict.md +++ b/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; } } diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index b919955c6e..14c584d376 100644 --- a/docs/en/docs-nav.json +++ b/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" diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs index 7c21b9fe09..ae5421d947 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs +++ b/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().InitializeAsync(); - } + } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs index 59690b2d03..7bb2e67b49 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs +++ b/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 GetAsync() { var cacheKey = CreateCacheKey(); @@ -45,7 +40,6 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu return configuration; } - configuration = await Cache.GetOrAddAsync( cacheKey, async () => await ApplicationConfigurationAppService.GetAsync(), diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index cc64d73ff2..b0927cbcc9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/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."; } - } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 6bd8a78cc8..646d8d4c08 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/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.Instance; } - protected ProjectBuildArgs GetProjectBuildArgs(CommandLineArgs commandLineArgs, string template, string projectName) + protected async Task 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) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs index 97003287bb..096fe9f314 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/CommercialPackages.cs +++ b/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"); } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs index 20e4f8fca6..f0ba4044d1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs +++ b/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; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 515bb98a56..16bea2740f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/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 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 steps) { if (context.BuildArgs.ExtraProperties.ContainsKey("no-random-port")) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index c6a15389ef..319326f3d4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/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; } diff --git a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs index 7147c81271..7c73df0d51 100644 --- a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ConsumerPool.cs +++ b/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>(() => { - 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 diff --git a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs b/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs index 691a29c1d2..ac2edf31a7 100644 --- a/framework/src/Volo.Abp.Kafka/Volo/Abp/Kafka/ProducerPool.cs +++ b/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>(() => { - 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(producerConfig).Build(); diff --git a/modules/account/Volo.Abp.Account.abpmdl.json b/modules/account/Volo.Abp.Account.abpmdl.json index 6762d81f33..dabb3f2ff9 100644 --- a/modules/account/Volo.Abp.Account.abpmdl.json +++ b/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" } } diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json index 4edb52319f..8cb409b1fc 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.abppkg.analyze.json +++ b/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", diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json index db23b687a0..6f591b2e46 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg.analyze.json +++ b/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" } ] } \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json index 5fec7571fa..57bf3ed42d 100644 --- a/modules/account/src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.abppkg.analyze.json +++ b/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", diff --git a/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json index 04d48dcab0..597cca045f 100644 --- a/modules/account/src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.abppkg.analyze.json +++ b/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", diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj index 73df3c03d9..7e53ddc078 100644 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj +++ b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.abppkg.json b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json similarity index 100% rename from modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.abppkg.json rename to modules/account/src/Volo.Abp.Account.Web.OpenIddict/Volo.Abp.Account.Web.OpenIddict.abppkg.json diff --git a/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json b/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json index a5848927a4..02531fd742 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg.analyze.json +++ b/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", diff --git a/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json b/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json index 9f425bc44e..5b2cc3f54b 100644 --- a/modules/audit-logging/Volo.Abp.AuditLogging.abpmdl.json +++ b/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" } } } \ No newline at end of file diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj index 27ab25e369..b76f01e430 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj @@ -4,13 +4,13 @@ - net5.0 + net6.0 true - + diff --git a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json b/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json index 92042d254e..e3bea65da3 100644 --- a/modules/background-jobs/Volo.Abp.BackgroundJobs.abpmdl.json +++ b/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" } } } \ No newline at end of file diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json index 958aef6df3..e142ef6357 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo.Abp.BackgroundJobs.Domain.Shared.abppkg.analyze.json +++ b/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", diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json index 954692eeec..d8943cf9a5 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.abppkg.analyze.json +++ b/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, diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json index 66951427ff..48b0997dc9 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo.Abp.BackgroundJobs.EntityFrameworkCore.abppkg.analyze.json +++ b/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", diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj index 59bd54205d..0aba8c2405 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json index c1b355eb9a..708e849ca4 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.abppkg.analyze.json +++ b/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", diff --git a/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json b/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json index 4dc0a1ec83..23dcc2e243 100644 --- a/modules/basic-theme/Volo.Abp.BasicTheme.abpmdl.json +++ b/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" } } } \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.analyze.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.analyze.json new file mode 100644 index 0000000000..8bec0bacf0 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json index 9e26dfeeb6..930c4018b3 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.abppkg.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "role": "lib.mvc" +} \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj index 8a4b219092..342b9f7c64 100644 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj +++ b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json b/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json index ee3e278929..f5f118cbdc 100644 --- a/modules/blob-storing-database/Volo.Abp.BlobStoring.Database.abpmdl.json +++ b/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" } } } \ No newline at end of file diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json index e046a9e56a..6948f16562 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo.Abp.BlobStoring.Database.Domain.Shared.abppkg.analyze.json +++ b/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", diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json index cf6d7ed1b3..7f830314ef 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.abppkg.analyze.json +++ b/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, diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json index 0234edc71c..99fb06f13b 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.abppkg.analyze.json +++ b/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", diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj index a2054f574c..84be724466 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json index b6fe5277b8..96b52b98c5 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo.Abp.BlobStoring.Database.MongoDB.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/Volo.Blogging.sln b/modules/blogging/Volo.Blogging.sln index ad5c0fa895..c6cd3f41d4 100644 --- a/modules/blogging/Volo.Blogging.sln +++ b/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} diff --git a/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.analyze.json b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/Volo.BloggingTestApp.EntityFrameworkCore.abppkg.analyze.json new file mode 100644 index 0000000000..add4021907 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.analyze.json b/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..c923fe174c --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json index 66f7032ccd..6f168249f9 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo.Blogging.Admin.Application.Contracts.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json index c64f53ac74..7cee7ce2a5 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client/Volo.Blogging.Admin.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..d4444f3ee3 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json index fd6e127271..db823941d1 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo.Blogging.Admin.HttpApi.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json index fb891d09d2..b823ec813c 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json index f587083699..a4e06785ee 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json index dee8571533..50a144921c 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json index cc8cc96766..9a3ce4eaca 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json index b67fae070e..4b3197d109 100644 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.abppkg.analyze.json +++ b/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, diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json index 865476c365..33f0e4e4e2 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo.Blogging.EntityFrameworkCore.abppkg.analyze.json +++ b/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", diff --git a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..28ff008598 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json index 8d67d96d83..97d416b25b 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.abppkg.analyze.json +++ b/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", diff --git a/studio/source-codes/Volo.Abp.Account.SourceCode/FodyWeavers.xml b/modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xml similarity index 100% rename from studio/source-codes/Volo.Abp.Account.SourceCode/FodyWeavers.xml rename to modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xml diff --git a/studio/source-codes/Volo.Abp.Account.SourceCode/FodyWeavers.xsd b/modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xsd similarity index 100% rename from studio/source-codes/Volo.Abp.Account.SourceCode/FodyWeavers.xsd rename to modules/blogging/src/Volo.Blogging.Installer/FodyWeavers.xsd diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj new file mode 100644 index 0000000000..7a465c40e7 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj @@ -0,0 +1,24 @@ + + + + + + + net6.0 + true + + + + + + + + + + + + + + + + diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs b/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs new file mode 100644 index 0000000000..1820fba2b8 --- /dev/null +++ b/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(options => + { + options.FileSets.AddEmbedded(); + }); + } +} diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerPipelineBuilder.cs b/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerPipelineBuilder.cs new file mode 100644 index 0000000000..638bd4a5e3 --- /dev/null +++ b/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 BuildAsync(ModuleInstallingContext context) + { + + return GetBasePipeline(context); + } +} diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..64d1d40627 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json index e8e2e45560..06a9cd0aee 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/Volo.CmsKit.abpmdl.json b/modules/cms-kit/Volo.CmsKit.abpmdl.json index 06e86b66bb..5e0bfb9317 100644 --- a/modules/cms-kit/Volo.CmsKit.abpmdl.json +++ b/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" } } } \ No newline at end of file diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json index 1f221b30a5..d700158eff 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json index 1b928a9d2a..8fe6adf6d6 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index 801cc2dd41..0343a3bc58 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/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; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs deleted file mode 100644 index 28a1e7d992..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs +++ /dev/null @@ -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> GetWidgetsAsync(); -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json index a24b8b89cb..7a3207da51 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj index 684446b1f0..09faad6247 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs deleted file mode 100644 index 8d06586e29..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs +++ /dev/null @@ -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 options) - { - _options = options.Value; - } - - public virtual Task> GetWidgetsAsync() - { - return Task.FromResult(new ListResultDto() - { - Items = _options.WidgetConfigs - .Select(n => - new ContentWidgetDto - { - Key = n.Key, - Details = new WidgetDetailDto() { EditorComponentName = n.Value.EditorComponentName, Name = n.Value.Name }, - - }).ToList() - }); - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs deleted file mode 100644 index 30c6052af3..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.Generated.cs +++ /dev/null @@ -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 -{ - public virtual async Task> GetWidgetsAsync() - { - return await RequestAsync>(nameof(GetWidgetsAsync)); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs deleted file mode 100644 index d2caea5777..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/ContentAdminClientProxy.cs +++ /dev/null @@ -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 -{ -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json index 32a833e884..8a9e38e4f9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/ClientProxies/cms-kit-admin-generate-proxy.json +++ b/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", - "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" - }, - "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Admin.Contents.IContentAdminAppService" - } - } - }, "Volo.CmsKit.Admin.Comments.CommentAdminController": { "controllerName": "CommentAdmin", "controllerGroupName": "CommentAdmin", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json index baab75054d..67ed3e0f3b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json index 824c9d950a..8dcbb1dadd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs deleted file mode 100644 index 83bfcde600..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs +++ /dev/null @@ -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> GetWidgetsAsync() - { - return ContentAdminAppService.GetWidgetsAsync(); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs index 5b1e8e5ea7..135e9d9257 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs +++ b/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 Widgets { get; set; } = new(); - public AddWidgetModal(IContentAdminAppService contentAdminAppService) + private readonly CmsKitContentWidgetOptions _options; + + public AddWidgetModal(IOptions 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() { new(string.Empty, string.Empty) }; Widgets.AddRange(widgets - .Items .Select(w => new SelectListItem(w.Key, w.Details.Name)) .ToList()); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json index 5e9e23d74e..6fc1fc080f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js index 94017ec7e2..3a61ef6a78 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/wwwroot/client-proxies/cms-kit-admin-proxy.js +++ b/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(){ diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json index c84529efdf..0ce0a4102e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json index 91370f95df..5cfde7838f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json index 9741f09173..d93eced25a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json index cb6e64c996..ae90aece20 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi.Client/Volo.CmsKit.Common.HttpApi.Client.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json index 9fc9293fcd..342a3b3c38 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo.CmsKit.Common.HttpApi.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/CmsKitContentWidgetOptions.cs similarity index 92% rename from modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/CmsKitContentWidgetOptions.cs index 34eb41d3a0..ad643f7770 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs +++ b/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 { diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/ContentParser.cs similarity index 96% rename from modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/ContentParser.cs index 617e7d61cc..290222a376 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs +++ b/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(); + List parsedList = new(); ParseContent(content, parsedList); - var contentFragments = new List(); + List contentFragments = new(); FillContentFragment(content, parsedList, contentFragments); return Task.FromResult(contentFragments); diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/ContentWidgetConfig.cs similarity index 87% rename from modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/ContentWidgetConfig.cs index e14c1888ac..69be0703fa 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs +++ b/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 { diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json index 442b81dc19..c56f4ae15d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json index d3d3cb08a1..1af4d1a735 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json index afd65daf19..20d1bbb536 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json +++ b/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, diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json index 35e555ec1a..fa9d342f83 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json index cd62bcacf9..ee45a8e783 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json index c1ffb79749..2adf100593 100644 --- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj index 4ed4ae03fa..3dbb813339 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json index e74164abd4..f9e9fde584 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json index fda8fcbaa2..929233d3d3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.abppkg.analyze.json +++ b/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", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs index 695f50836e..8c6a6a01e9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs +++ b/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 public string ShortDescription { get; set; } - public List ContentFragments { get; set; } - public string Content { get; set; } public Guid? CoverImageMediaId { get; set; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs index a336844289..6f18787a44 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs @@ -13,8 +13,6 @@ public class PageDto : EntityDto public string Slug { get; set; } public string Content { get; set; } - - public List ContentFragments { get; set; } public string Script { get; set; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json index af31e0e774..93891adcf9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.Application", - "hash": "9b54d4165467908818b3fa241e9f273e", + "hash": "35fc84bf4ee895c703bdf1cf037afb14", "contents": [ { "namespace": "Volo.CmsKit.Public", @@ -43,6 +43,15 @@ "contentType": "applicationService", "name": "MenuItemPublicAppService" }, + { + "namespace": "Volo.CmsKit.Public.GlobalResources", + "summary": null, + "implementingInterfaces": [ + "Volo.CmsKit.Public.GlobalResources.IGlobalResourcePublicAppService" + ], + "contentType": "applicationService", + "name": "GlobalResourcePublicAppService" + }, { "namespace": "Volo.CmsKit.Public.Comments", "summary": null, diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs index ebdda3d293..5b16e41f4f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs @@ -1,11 +1,10 @@ -using JetBrains.Annotations; -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; +using JetBrains.Annotations; using Volo.Abp.Application.Dtos; using Volo.Abp.GlobalFeatures; using Volo.CmsKit.Blogs; -using Volo.CmsKit.Contents; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.Users; @@ -17,16 +16,13 @@ public class BlogPostPublicAppService : CmsKitPublicAppServiceBase, IBlogPostPub protected IBlogRepository BlogRepository { get; } protected IBlogPostRepository BlogPostRepository { get; } - protected ContentParser ContentParser { get; } public BlogPostPublicAppService( IBlogRepository blogRepository, - IBlogPostRepository blogPostRepository, - ContentParser contentParser) + IBlogPostRepository blogPostRepository) { BlogRepository = blogRepository; BlogPostRepository = blogPostRepository; - ContentParser = contentParser; } public virtual async Task GetAsync( @@ -36,10 +32,7 @@ public class BlogPostPublicAppService : CmsKitPublicAppServiceBase, IBlogPostPub var blogPost = await BlogPostRepository.GetBySlugAsync(blog.Id, blogPostSlug); - var blogPostDto = ObjectMapper.Map(blogPost); - blogPostDto.ContentFragments = await ContentParser.ParseAsync(blogPost.Content); - - return blogPostDto; + return ObjectMapper.Map(blogPost); } public virtual async Task> GetListAsync([NotNull] string blogSlug, BlogPostGetListInput input) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs index 2bae7c350f..258ef935ed 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using Volo.Abp.GlobalFeatures; -using Volo.CmsKit.Contents; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.Pages; @@ -10,12 +9,10 @@ namespace Volo.CmsKit.Public.Pages; public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppService { protected IPageRepository PageRepository { get; } - protected ContentParser ContentParser { get; } - public PagePublicAppService(IPageRepository pageRepository, ContentParser contentParser) + public PagePublicAppService(IPageRepository pageRepository) { PageRepository = pageRepository; - ContentParser = contentParser; } public virtual async Task FindBySlugAsync(string slug) @@ -27,8 +24,6 @@ public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppSe return null; } - var pageDto = ObjectMapper.Map(page); - pageDto.ContentFragments = await ContentParser.ParseAsync(page.Content); - return pageDto; + return ObjectMapper.Map(page); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs index 704a03778c..d5a1b58445 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs @@ -30,11 +30,9 @@ public class PublicApplicationAutoMapperProfile : Profile CreateMap(); - CreateMap() - .Ignore(x => x.ContentFragments); + CreateMap(); - CreateMap() - .Ignore(x => x.ContentFragments); + CreateMap(); CreateMap(); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json index 3171e78892..71cd18093e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.HttpApi.Client", - "hash": "2b8ae9a9344c5cd824c182a36d9298a1", + "hash": "60549438786408497e188a1626a25bfb", "contents": [ { "namespace": "Volo.CmsKit.Public", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json index 2e4a56e7bb..2a6f62215a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.HttpApi", - "hash": "08fec37c43e420f19636d8c301dc80f9", + "hash": "8ec175d273c21b4de197b0085c3cddb2", "contents": [ { "namespace": "Volo.CmsKit.Public", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml index d9f7ce7953..88d7398fcf 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml @@ -21,7 +21,7 @@ @{ - string dummyImageSource = "https://dummyimage.com/1280x720/a3a3a3/fff.png?text=" + Model.BlogPost.Title; + string dummyImageSource = "https://dummyimage.com/1280x720/a3a3a3/fff.png?text=" + Model.ViewModel.Title; var isScrollIndexEnabled = GlobalFeatureManager.Instance.IsEnabled() && Model.BlogPostScrollIndexFeature?.IsEnabled == true; } @@ -57,18 +57,18 @@
- +
-

@Model.BlogPost.Title

+

@Model.ViewModel.Title

- - @@@Model.BlogPost.Author?.UserName + + @@@Model.ViewModel.Author?.UserName - @Model.BlogPost.CreationTime + @Model.ViewModel.CreationTime

- @foreach (var contentFragment in Model.BlogPost.ContentFragments) + @foreach (var contentFragment in Model.ViewModel.ContentFragments) { if (contentFragment.Type == ContentConsts.Markdown) { @@ -80,9 +80,9 @@ } }

- @if (Model.BlogPost.LastModificationTime != null) + @if (Model.ViewModel.LastModificationTime != null) { - @L["LastModification"].Value : @Model.BlogPost.LastModificationTime + @L["LastModification"].Value : @Model.ViewModel.LastModificationTime }

@@ -94,7 +94,7 @@ @await Component.InvokeAsync(typeof(TagViewComponent), new { entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, - entityId = Model.BlogPost.Id.ToString(), + entityId = Model.ViewModel.Id.ToString(), urlFormat = $"/blogs/{Model.BlogSlug}?tagId={{TagId}}" }) } @@ -111,7 +111,7 @@ @await Component.InvokeAsync(typeof(ReactionSelectionViewComponent), new { entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, - entityId = Model.BlogPost.Id.ToString() + entityId = Model.ViewModel.Id.ToString() }) } } @@ -124,7 +124,7 @@ @await Component.InvokeAsync(typeof(RatingViewComponent), new { entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, - entityId = Model.BlogPost.Id.ToString() + entityId = Model.ViewModel.Id.ToString() }) } } @@ -161,7 +161,7 @@ @await Component.InvokeAsync(typeof(DefaultBlogPostCommentViewComponent), new { entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, - entityId = Model.BlogPost.Id.ToString() + entityId = Model.ViewModel.Id.ToString() }) } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs index 6227190ab8..268528c4bc 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs @@ -1,9 +1,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.GlobalFeatures; +using Volo.Abp.ObjectMapping; using Volo.CmsKit.Blogs; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.Public.Blogs; +using Volo.CmsKit.Web.Contents; namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs; @@ -15,7 +17,7 @@ public class BlogPostModel : CmsKitPublicPageModelBase [BindProperty(SupportsGet = true)] public string BlogPostSlug { get; set; } - public BlogPostPublicDto BlogPost { get; private set; } + public BlogPostViewModel ViewModel { get; private set; } public BlogFeatureDto CommentsFeature { get; private set; } @@ -24,48 +26,61 @@ public class BlogPostModel : CmsKitPublicPageModelBase public BlogFeatureDto RatingsFeature { get; private set; } public BlogFeatureDto TagsFeature { get; private set; } - + public BlogFeatureDto BlogPostScrollIndexFeature { get; private set; } protected IBlogPostPublicAppService BlogPostPublicAppService { get; } protected IBlogFeatureAppService BlogFeatureAppService { get; } + protected ContentParser ContentParser { get; } + public BlogPostModel( IBlogPostPublicAppService blogPostPublicAppService, - IBlogFeatureAppService blogFeaturePublicAppService) + IBlogFeatureAppService blogFeaturePublicAppService, + ContentParser contentParser) { BlogPostPublicAppService = blogPostPublicAppService; BlogFeatureAppService = blogFeaturePublicAppService; + ContentParser = contentParser; } - public virtual async Task OnGetAsync() + public virtual async Task OnGetAsync() { - BlogPost = await BlogPostPublicAppService.GetAsync(BlogSlug, BlogPostSlug); + var blogPostPublicDto = await BlogPostPublicAppService.GetAsync(BlogSlug, BlogPostSlug); + ViewModel = ObjectMapper.Map(blogPostPublicDto); + if (ViewModel == null) + { + return NotFound(); + } + + ViewModel.ContentFragments = await ContentParser.ParseAsync(blogPostPublicDto.Content); if (GlobalFeatureManager.Instance.IsEnabled()) { - CommentsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.CommentsFeature.Name); + CommentsFeature = await BlogFeatureAppService.GetOrDefaultAsync(ViewModel.BlogId, GlobalFeatures.CommentsFeature.Name); } if (GlobalFeatureManager.Instance.IsEnabled()) { - ReactionsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.ReactionsFeature.Name); + ReactionsFeature = await BlogFeatureAppService.GetOrDefaultAsync(ViewModel.BlogId, GlobalFeatures.ReactionsFeature.Name); } if (GlobalFeatureManager.Instance.IsEnabled()) { - RatingsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.RatingsFeature.Name); + RatingsFeature = await BlogFeatureAppService.GetOrDefaultAsync(ViewModel.BlogId, GlobalFeatures.RatingsFeature.Name); } if (GlobalFeatureManager.Instance.IsEnabled()) { - TagsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.TagsFeature.Name); + TagsFeature = await BlogFeatureAppService.GetOrDefaultAsync(ViewModel.BlogId, GlobalFeatures.TagsFeature.Name); } if (GlobalFeatureManager.Instance.IsEnabled()) { - BlogPostScrollIndexFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.BlogPostScrollIndexFeature.Name); + BlogPostScrollIndexFeature = await BlogFeatureAppService.GetOrDefaultAsync(ViewModel.BlogId, GlobalFeatures.BlogPostScrollIndexFeature.Name); } + + return Page(); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs new file mode 100644 index 0000000000..ff154b6a7b --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using AutoMapper; +using Volo.Abp.Application.Dtos; +using Volo.CmsKit.Contents; +using Volo.CmsKit.Public.Blogs; +using Volo.CmsKit.Users; + +namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs; + +[AutoMap(typeof(BlogPostPublicDto), ReverseMap = true)] +public class BlogPostViewModel : AuditedEntityDto +{ + public Guid BlogId { get; set; } + + public string Title { get; set; } + + public string Slug { get; set; } + + public string ShortDescription { get; set; } + + public string Content { get; set; } + + public List ContentFragments { get; set; } + + public Guid? CoverImageMediaId { get; set; } + + public CmsUserDto Author { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml index 4ecfa480d0..6a8b7a6742 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml @@ -18,19 +18,19 @@ } @section scripts{ } - @foreach (ContentFragment contentFragment in Model.PageDto.ContentFragments) + @foreach (ContentFragment contentFragment in Model.ViewModel.ContentFragments) { if (contentFragment.Type == ContentConsts.Markdown) { @@ -40,7 +40,6 @@ { @await Component.InvokeAsync(contentFragment.GetProperty("Type"), contentFragment.ExtraProperties.ConvertToDynamicObject()) } - } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs index 1434eccb4b..98f1fb70c4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.CmsKit.Public.Pages; +using Volo.CmsKit.Web.Contents; using Volo.CmsKit.Web.Pages; namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Pages; @@ -12,21 +13,26 @@ public class IndexModel : CommonPageModel protected IPagePublicAppService PagePublicAppService { get; } - public PageDto PageDto{ get; private set; } + protected ContentParser ContentParser { get; } -public IndexModel(IPagePublicAppService pagePublicAppService) + public PageViewModel ViewModel { get; private set; } + + public IndexModel(IPagePublicAppService pagePublicAppService, ContentParser contentParser) { PagePublicAppService = pagePublicAppService; + ContentParser = contentParser; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { - PageDto = await PagePublicAppService.FindBySlugAsync(Slug); - - if (PageDto == null) + var pageDto = await PagePublicAppService.FindBySlugAsync(Slug); + ViewModel = ObjectMapper.Map(pageDto); + if (ViewModel == null) { return NotFound(); } + + ViewModel.ContentFragments = await ContentParser.ParseAsync(pageDto.Content); return Page(); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/PageViewModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/PageViewModel.cs index 5e5df3e917..3195826093 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/PageViewModel.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/PageViewModel.cs @@ -1,9 +1,12 @@ using System; using System.Collections.Generic; +using AutoMapper; using Volo.CmsKit.Contents; +using Volo.CmsKit.Public.Pages; namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Pages; +[AutoMap(typeof(PageDto), ReverseMap = true)] public class PageViewModel { public Guid Id { get; set; } @@ -11,4 +14,8 @@ public class PageViewModel public string Title { get; set; } public List ContentFragments { get; set; } + + public string Script { get; set; } + + public string Style { get; set; } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json index 1941b5618d..25a0536d5d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Public.Web", - "hash": "4b477e78e2267c3b43a3677d5dbbdddb", + "hash": "c7feb0964cd3dafb92e2f73ac8f944b4", "contents": [ { "namespace": "Volo.CmsKit.Public.Web", diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json index af881d5fb9..e10f650a63 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json +++ b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.CmsKit.Web", - "hash": "49826349c7aaabed8c65d9a3e568423c", + "hash": "b852b82969c272b32a42d6666a7ce9f0", "contents": [ { "namespace": "Volo.CmsKit.Web", diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs deleted file mode 100644 index f338d3d7d1..0000000000 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Linq; -using System.Threading.Tasks; -using Shouldly; -using Volo.CmsKit.Admin.Contents; -using Xunit; - -namespace Volo.CmsKit.Contents; - -public class ContentAdminAppService_Tests : CmsKitApplicationTestBase -{ - private readonly IContentAdminAppService _contentAdminAppService; - - public ContentAdminAppService_Tests() - { - _contentAdminAppService = GetRequiredService(); - } - - [Fact] - public async Task ShouldGet_PagedListAsync() - { - var widgets = await _contentAdminAppService.GetWidgetsAsync(); - - widgets.Items.Count.ShouldBe(0); - widgets.Items.Any().ShouldBeFalse(); - } - -} diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentParser_Test.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentParser_Test.cs deleted file mode 100644 index b08a127111..0000000000 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentParser_Test.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using Shouldly; -using Xunit; - -namespace Volo.CmsKit.Contents; -public class ContentParser_Test : CmsKitDomainTestBase -{ - private readonly CmsKitTestData testData; - private readonly IOptions _options; - private ContentParser contentParser; - - public ContentParser_Test() - { - testData = GetRequiredService(); - _options = GetRequiredService>(); - } - - [Fact] - public async Task ParseAsync_ShouldWorkWithDifferentWidgetTypes() - { - _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); - _options.Value.AddWidget("ImageGallery", "ImageGallery", string.Empty); - contentParser = new ContentParser(_options); - - var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. - [Widget Type=""Poll"" Code=""poll-name""] - Thanks _for_ *your * feedback. - [Widget GalleryName=""Xyz"" Type=""ImageGallery"" Source=""GoogleDrive""]"; - - var widgets = await contentParser.ParseAsync(content); - - widgets.ShouldNotBeNull(); - widgets.Count.ShouldBe(4); - widgets[1].ExtraProperties.Count.ShouldBe(2); - widgets[3].ExtraProperties.Count.ShouldBe(3); - } - - [Fact] - public async Task ParseAsync_ShouldWorkWithoutConfigOptions() - { - var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. - [Widget Type= ""Poll"" Code =""poll-name""] - Thanks _for_ *your * feedback."; - - contentParser = new ContentParser(_options); - var widgets = await contentParser.ParseAsync(content); - - widgets.ShouldNotBeNull(); - widgets.Count.ShouldBe(1);//Ignored Widget - } - - [Fact] - public async Task ParseAsync_ShouldWorkWithWrongConfigOptions() - { - _options.Value.AddWidget(testData.WidgetName, testData.PollName, string.Empty); - contentParser = new ContentParser(_options); - - var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. - [Widget Type= ""Poll"" Code =""poll-name""] - Thanks _for_ *your * feedback."; - - var widgets = await contentParser.ParseAsync(content); - - widgets.ShouldNotBeNull(); - widgets.Count.ShouldBe(2); - } - - [Fact] - public async Task ParseAsync_ShouldWorkWithWrongWidgetType() - { - _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); - contentParser = new ContentParser(_options); - - var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. - [Widget Wrong Type= ""Poll"" Code =""poll-name""] - Thanks _for_ *your * feedback."; - - var widgets = await contentParser.ParseAsync(content); - - widgets.ShouldNotBeNull(); - widgets.Count.ShouldBe(2); - } - - [Fact] - public async Task ParseAsync_ShouldWorkWithWrongPollName() - { - _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); - contentParser = new ContentParser(_options); - - var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. - [Widget Type= ""Poll"" PollWrongName =""poll-name""] - Thanks _for_ *your * feedback."; - - var widgets = await contentParser.ParseAsync(content); - - widgets.ShouldNotBeNull(); - widgets.Count.ShouldBe(3); - } - - [Theory] - [MemberData(nameof(ExampleData))] - public async Task ParseAsync_ShouldWorkProperlyWithCorrectInputs(string content, int expectedLine) - { - _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); - contentParser = new ContentParser(_options); - - var widgets = await contentParser.ParseAsync(content); - - widgets.ShouldNotBeNull(); - widgets.Count.ShouldBe(expectedLine); - } - - public static IEnumerable ExampleData => - new List - { - new object[] { @"**ABP Framework** is completely open source and developed in a community-driven manner. - [Widget Type=""Poll"" Code=""poll-name""] - Thanks _for_ *your * feedback.", 3}, - - new object[] { @"**ABP Framework** is completely open source and developed in a community-driven manner. - [Widget Type=""Poll"" Code=""poll-name""] - Thanks _for_ *your * feedback. - [Widget Type=""Poll"" Code=""poll-name1""]", 4 }, - - new object[] { @"**ABP Framework** is completely open source and developed in a community-driven manner. - Thanks _for_ *your * feedback. - [Widget Type=""Poll"" Code=""poll-name""]", 2 }, - - new object[] { @"[Widget Type=""Poll"" Code=""poll-name""] gg [Widget Type=""Poll"" Code=""poll-name1""]**ABP Framework** is completely open source and developed in a community-driven manner. - Thanks _for_ *your * feedback. - Thanks _for_ *your * feedback.", 4}, - - new object[] { @"Thanks _for_ *your * feedback. - Thanks _for_ *your * feedback.", 1} - }; -} diff --git a/modules/docs/Volo.Docs.sln b/modules/docs/Volo.Docs.sln index 1c32767baa..6bb8d84d0a 100644 --- a/modules/docs/Volo.Docs.sln +++ b/modules/docs/Volo.Docs.sln @@ -61,6 +61,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.MongoDB", "src\Vo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.MongoDB.Tests", "test\Volo.Docs.MongoDB.Tests\Volo.Docs.MongoDB.Tests.csproj", "{C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Docs.Installer", "src\Volo.Docs.Installer\Volo.Docs.Installer.csproj", "{50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -159,6 +161,10 @@ Global {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD}.Release|Any CPU.Build.0 = Release|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -190,6 +196,7 @@ Global {8A5E5001-C017-44A8-ADDA-DC66C102556E} = {555508AD-F593-43E3-9354-9FA51512F181} {DBE846CD-1BED-4F2C-ABF2-94F6240BCB9B} = {A982A58E-1E92-4764-9F56-39E7AABB8556} {C5E2A2A3-D54D-4C2E-97BA-EA50A49ED7AD} = {59D430A9-AC61-4457-8338-5DA0705ABB5D} + {50B9AC1D-C03E-47AA-9ED8-E7986BCFABA1} = {A982A58E-1E92-4764-9F56-39E7AABB8556} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {13691265-2547-4FFF-B757-E8FACB05679D} diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.analyze.json b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.analyze.json new file mode 100644 index 0000000000..f57a795bed --- /dev/null +++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.abppkg.analyze.json @@ -0,0 +1,18 @@ +{ + "name": "VoloDocs.EntityFrameworkCore", + "hash": "8ac808bc478d207d2d1ed672d5f16244", + "contents": [ + { + "namespace": "VoloDocs.EntityFrameworkCore", + "contentType": "abpModule", + "name": "VoloDocsEntityFrameworkCoreModule" + }, + { + "namespace": "VoloDocs.EntityFrameworkCore", + "connectionStringName": null, + "databaseTables": [], + "contentType": "efCoreDbContext", + "name": "VoloDocsDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json index f366cff867..6ff12518c7 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Admin.Application", - "hash": "a4fd7ea711b7f38af3235eabde130328", + "hash": "1ebc44195de6a5460ff52b8b04113eda", "contents": [ { "namespace": "Volo.Docs.Admin", diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..a316aaf8ac --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Docs.Admin.HttpApi.Client", + "hash": "b89a21854479861a94321c9b9b14c1ef", + "contents": [ + { + "namespace": "Volo.Docs.Admin", + "contentType": "abpModule", + "name": "DocsAdminHttpApiClientModule" + } + ] +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json index fbaed474fc..99183af528 100644 --- a/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Admin.HttpApi/Volo.Docs.Admin.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Admin.HttpApi", - "hash": "55c63d7060a78c41b6731fc57bac2791", + "hash": "2ce1eb9b94903de99e5e94c61fecd09d", "contents": [ { "namespace": "Volo.Docs.Admin", diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json index d68eab6fbe..e4f8fe301f 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Admin.Web", - "hash": "213ccad3d288d801779462d0fb32d938", + "hash": "9bf873547c3d7a73d22281db34ccb755", "contents": [ { "namespace": "Volo.Docs.Admin", diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json index a992d2876d..abcf0ea811 100644 --- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo.Docs.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Application.Contracts", - "hash": "9d790bb2a90cf3a9617b0f6999b95db1", + "hash": "262e4f1684408074bc48fd8b516291ac", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json index aa47000fde..efcc550dc6 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Application", - "hash": "604b6ef5c6cc68a154a2a4700a711c77", + "hash": "87e3d3c4ba832643880025f927061542", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json index 2101d8e65c..1f88d13232 100644 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Domain.Shared", - "hash": "1b0b7a34c4980008c5a51453f6a147a4", + "hash": "55aba204a9318469c1df9a9a68a29f86", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json index b36bc5a8ff..8bd0e5b0a9 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Domain", - "hash": "4d8e34c525b142b8afff3b212951f70e", + "hash": "f162d16971e9084446f20fc58b84586d", "contents": [ { "namespace": "Volo.Docs", @@ -54,7 +54,7 @@ { "namespace": "Volo.Docs.Projects", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Docs.Projects", "primaryKeyType": "Guid", "summary": null, @@ -69,7 +69,7 @@ { "namespace": "Volo.Docs.Documents", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Docs.Documents", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json index ce431f5313..9ce6b08aa0 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo.Docs.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.EntityFrameworkCore", - "hash": "2da3ab87dd243fc228af9141b263a838", + "hash": "8f4f450885d4dfe7da4ab5b6c7a436de", "contents": [ { "namespace": "Volo.Docs.EntityFrameworkCore", diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.analyze.json b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.analyze.json new file mode 100644 index 0000000000..0ba065deda --- /dev/null +++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Docs.HttpApi.Client", + "hash": "50c3210eb30ae0ec2be506452e76e304", + "contents": [ + { + "namespace": "Volo.Docs", + "contentType": "abpModule", + "name": "DocsHttpApiClientModule" + } + ] +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json b/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json index 30d4f390f6..93f4d884f4 100644 --- a/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.HttpApi/Volo.Docs.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.HttpApi", - "hash": "40e275d55e049ef2430257c0dcaebf1c", + "hash": "182385cfe2cc437b662822257d7e78c7", "contents": [ { "namespace": "Volo.Docs", diff --git a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xml b/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xml similarity index 100% rename from studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xml rename to modules/docs/src/Volo.Docs.Installer/FodyWeavers.xml diff --git a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xsd b/modules/docs/src/Volo.Docs.Installer/FodyWeavers.xsd similarity index 100% rename from studio/source-codes/Volo.Abp.AuditLogging.SourceCode/FodyWeavers.xsd rename to modules/docs/src/Volo.Docs.Installer/FodyWeavers.xsd diff --git a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj new file mode 100644 index 0000000000..9720456e6c --- /dev/null +++ b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj @@ -0,0 +1,24 @@ + + + + + + + net6.0 + true + + + + + + + + + + + + + + + + diff --git a/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs new file mode 100644 index 0000000000..ea8276f5d0 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs @@ -0,0 +1,20 @@ +using Volo.Abp.Modularity; +using Volo.Abp.Studio; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Docs; + +[DependsOn( + typeof(AbpStudioModuleInstallerModule), + typeof(AbpVirtualFileSystemModule) + )] +public class DocsInstallerModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + } +} diff --git a/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerPipelineBuilder.cs b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerPipelineBuilder.cs new file mode 100644 index 0000000000..eed3cb2490 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerPipelineBuilder.cs @@ -0,0 +1,17 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Studio.ModuleInstalling; + +namespace Volo.Docs; + +[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] +[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] +public class DocsInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency +{ + public async Task BuildAsync(ModuleInstallingContext context) + { + + return GetBasePipeline(context); + } +} diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.analyze.json b/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..73c0434d13 --- /dev/null +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.abppkg.analyze.json @@ -0,0 +1,29 @@ +{ + "name": "Volo.Docs.MongoDB", + "hash": "a3746fbf103117f78e369dded9a6c7b0", + "contents": [ + { + "namespace": "Volo.Docs.MongoDB", + "contentType": "abpModule", + "name": "DocsMongoDbModule" + }, + { + "namespace": "Volo.Docs.MongoDB", + "connectionStringName": "Docs", + "databaseCollections": [ + { + "entityFullName": "Volo.Docs.Projects.Project", + "contentType": "databaseCollection", + "name": "DocsProjects" + }, + { + "entityFullName": "Volo.Docs.Documents.Document", + "contentType": "databaseCollection", + "name": "DocsDocumentS" + } + ], + "contentType": "mongoDbContext", + "name": "DocsMongoDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json index 52cddaf987..4806c71b20 100644 --- a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json +++ b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Docs.Web", - "hash": "1e9dc32233dc11c064eabd8d5470318c", + "hash": "774b48775ac310eea144c8a3182a56b2", "contents": [ { "namespace": "Volo.Docs", diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs index a969e3390a..7d20b9c1d3 100644 --- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs +++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/DocumentAdminAppService_Tests.cs @@ -22,34 +22,34 @@ namespace Volo.Docs [Fact] public async Task PullAsync() { - (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldBeNull(); + (await _documentRepository.FindAsync(_testData.ProjectId, "Part-I.md", "en", "1.0.0")).ShouldBeNull(); await _documentAdminAppService.PullAsync(new PullDocumentInput { - ProjectId = _testData.PorjectId, + ProjectId = _testData.ProjectId, Name = "Part-I.md", LanguageCode = "en", Version = "1.0.0" }); - (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldNotBeNull(); + (await _documentRepository.FindAsync(_testData.ProjectId, "Part-I.md", "en", "1.0.0")).ShouldNotBeNull(); } [Fact] public async Task PullAllAsync() { - (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldBeNull(); - (await _documentRepository.FindAsync(_testData.PorjectId, "Part-II.md", "en", "1.0.0")).ShouldBeNull(); + (await _documentRepository.FindAsync(_testData.ProjectId, "Part-I.md", "en", "1.0.0")).ShouldBeNull(); + (await _documentRepository.FindAsync(_testData.ProjectId, "Part-II.md", "en", "1.0.0")).ShouldBeNull(); await _documentAdminAppService.PullAllAsync(new PullAllDocumentInput { - ProjectId = _testData.PorjectId, + ProjectId = _testData.ProjectId, LanguageCode = "en", Version = "1.0.0" }); - (await _documentRepository.FindAsync(_testData.PorjectId, "Part-I.md", "en", "1.0.0")).ShouldNotBeNull(); - (await _documentRepository.FindAsync(_testData.PorjectId, "Part-II.md", "en", "1.0.0")).ShouldNotBeNull(); + (await _documentRepository.FindAsync(_testData.ProjectId, "Part-I.md", "en", "1.0.0")).ShouldNotBeNull(); + (await _documentRepository.FindAsync(_testData.ProjectId, "Part-II.md", "en", "1.0.0")).ShouldNotBeNull(); } } } diff --git a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/ProjectAdminAppService_Tests.cs b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/ProjectAdminAppService_Tests.cs index 442a72f18b..a64102a723 100644 --- a/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/ProjectAdminAppService_Tests.cs +++ b/modules/docs/test/Volo.Docs.Admin.Application.Tests/Volo/Docs/ProjectAdminAppService_Tests.cs @@ -34,9 +34,9 @@ namespace Volo.Docs [Fact] public async Task GetAsync() { - var project = await _projectAdminAppService.GetAsync(_testData.PorjectId); + var project = await _projectAdminAppService.GetAsync(_testData.ProjectId); project.ShouldNotBeNull(); - project.Id.ShouldBe(_testData.PorjectId); + project.Id.ShouldBe(_testData.ProjectId); } [Fact] @@ -96,7 +96,7 @@ namespace Volo.Docs }; updateProjectDto.ExtraProperties.Add("test", "test"); - var projectDto = await _projectAdminAppService.UpdateAsync(_testData.PorjectId, updateProjectDto); + var projectDto = await _projectAdminAppService.UpdateAsync(_testData.ProjectId, updateProjectDto); projectDto.ShouldNotBeNull(); @@ -114,9 +114,9 @@ namespace Volo.Docs [Fact] public async Task DeleteAsync() { - (await _projectRepository.GetAsync(_testData.PorjectId)).ShouldNotBeNull(); + (await _projectRepository.GetAsync(_testData.ProjectId)).ShouldNotBeNull(); - await _projectAdminAppService.DeleteAsync(_testData.PorjectId); + await _projectAdminAppService.DeleteAsync(_testData.ProjectId); (await _projectRepository.GetListAsync()).ShouldBeEmpty(); } diff --git a/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs b/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs index e3525ee77d..8f92c414c1 100644 --- a/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs +++ b/modules/docs/test/Volo.Docs.Application.Tests/Volo/Docs/ApplicationService_Tests.cs @@ -22,7 +22,7 @@ namespace Volo.Docs var projects = await _projectAppService.GetListAsync(); projects.ShouldNotBeNull(); projects.Items.Count.ShouldBe(1); - projects.Items.ShouldContain(x => x.Id == _testData.PorjectId); + projects.Items.ShouldContain(x => x.Id == _testData.ProjectId); } [Fact] diff --git a/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/GithubDocumentSource_Tests.cs b/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/GithubDocumentSource_Tests.cs index 1e89966518..9437475545 100644 --- a/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/GithubDocumentSource_Tests.cs +++ b/modules/docs/test/Volo.Docs.Domain.Tests/Volo/Docs/GithubDocumentSource_Tests.cs @@ -25,7 +25,7 @@ namespace Volo.Docs { var source = _documentSourceFactory.Create(GithubDocumentSource.Type); - var project = await _projectRepository.FindAsync(_testData.PorjectId); + var project = await _projectRepository.FindAsync(_testData.ProjectId); project.ShouldNotBeNull(); var document = await source.GetDocumentAsync(project, "index2", "en", "0.123.0"); @@ -42,7 +42,7 @@ namespace Volo.Docs { var source = _documentSourceFactory.Create(GithubDocumentSource.Type); - var project = await _projectRepository.FindAsync(_testData.PorjectId); + var project = await _projectRepository.FindAsync(_testData.ProjectId); project.ShouldNotBeNull(); var document = await source.GetVersionsAsync(project); @@ -57,7 +57,7 @@ namespace Volo.Docs { var source = _documentSourceFactory.Create(GithubDocumentSource.Type); - var project = await _projectRepository.FindAsync(_testData.PorjectId); + var project = await _projectRepository.FindAsync(_testData.ProjectId); project.ShouldNotBeNull(); var documentResource = await source.GetResource(project, "index.md", "en", "0.123.0"); diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs index 829195efe6..91a7e6ae37 100644 --- a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs +++ b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestData.cs @@ -5,6 +5,6 @@ namespace Volo.Docs { public class DocsTestData : ISingletonDependency { - public Guid PorjectId { get; } = Guid.NewGuid(); + public Guid ProjectId { get; } = Guid.NewGuid(); } } diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs index e7eadd7562..f93706a590 100644 --- a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs +++ b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocsTestDataBuilder.cs @@ -27,7 +27,7 @@ namespace Volo.Docs public async Task BuildAsync() { var project = new Project( - _testData.PorjectId, + _testData.ProjectId, "ABP vNext", "ABP", GithubDocumentSource.Type, diff --git a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocumentRepository_Tests.cs b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocumentRepository_Tests.cs index 68a2ebb5e6..ed0769ccc1 100644 --- a/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocumentRepository_Tests.cs +++ b/modules/docs/test/Volo.Docs.TestBase/Volo/Docs/DocumentRepository_Tests.cs @@ -21,7 +21,7 @@ namespace Volo.Docs [Fact] public async Task FindAsync() { - var document = await DocumentRepository.FindAsync(DocsTestData.PorjectId, "CLI.md", "en", "2.0.0"); + var document = await DocumentRepository.FindAsync(DocsTestData.ProjectId, "CLI.md", "en", "2.0.0"); document.ShouldNotBeNull(); } @@ -30,7 +30,7 @@ namespace Volo.Docs { (await DocumentRepository.GetListAsync()).ShouldNotBeEmpty(); - await DocumentRepository.DeleteAsync(DocsTestData.PorjectId, "CLI.md", "en", "2.0.0"); + await DocumentRepository.DeleteAsync(DocsTestData.ProjectId, "CLI.md", "en", "2.0.0"); (await DocumentRepository.GetListAsync()).ShouldBeEmpty(); } diff --git a/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json b/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json index 41f55d2ebb..4f99948bd0 100644 --- a/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json +++ b/modules/feature-management/Volo.Abp.FeatureManagement.abpmdl.json @@ -73,10 +73,6 @@ "Volo.Abp.FeatureManagement.Blazor.WebAssembly": { "path": "src/Volo.Abp.FeatureManagement.Blazor.WebAssembly/Volo.Abp.FeatureManagement.Blazor.WebAssembly.abppkg.json", "folder": "src" - }, - "Volo.Abp.FeatureManagement.Installer": { - "path": "src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json index 6893bca50d..420961153e 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Application", - "hash": "0a1e4a174a26dbb996988ce6c9964901", + "hash": "464a98075956c59482f5442b4c57c7bd", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json index 33e9856888..adccde52df 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Domain.Shared", - "hash": "a5b302399f33908142d67bce567fcba8", + "hash": "5a921dc2b9bbd17f772d55246647db55", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json index 23a0797717..170c34da44 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Domain", - "hash": "dc844bd57c080aeb4c391df420023816", + "hash": "6fe29d46ceb964bb16638d684318ef9a", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", @@ -19,7 +19,7 @@ { "namespace": "Volo.Abp.FeatureManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.FeatureManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json index ebe4eb8121..0782f662ae 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo.Abp.FeatureManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.EntityFrameworkCore", - "hash": "853d5803132c60f1e2494c1e6eccea33", + "hash": "cc5257a0b2c407388aebb23e5dc96ee0", "contents": [ { "namespace": "Volo.Abp.FeatureManagement.EntityFrameworkCore", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json index e109425cee..12e113712a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo.Abp.FeatureManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.HttpApi.Client", - "hash": "eb617711357b3b251becf562b208cff6", + "hash": "e93ac980bcfa0fbbd2f42f6f34157643", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json index 8f21302168..a390b349d4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo.Abp.FeatureManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.HttpApi", - "hash": "4f9c79b9d96c4c033c25ec12008eb07a", + "hash": "9381d1bc9af6ab1460dd76c79547e1e9", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj index de78fd2a68..6f3b4f9be4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json index a32d542b6b..49307d21e2 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo.Abp.FeatureManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.MongoDB", - "hash": "0b753d8d44423206f1e7292522638194", + "hash": "d194c87394a1950dcb728d610fba38af", "contents": [ { "namespace": "Volo.Abp.FeatureManagement.MongoDB", diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json index 22fdb85e9f..a07c88cc2a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.FeatureManagement.Web", - "hash": "54ac0a56a5e7786d63e587ccfdc62e05", + "hash": "970dcffc6a95ca8c5d403796f1e03ffa", "contents": [ { "namespace": "Volo.Abp.FeatureManagement", diff --git a/modules/identity/Volo.Abp.Identity.sln b/modules/identity/Volo.Abp.Identity.sln index bb81ccf749..6079bce031 100644 --- a/modules/identity/Volo.Abp.Identity.sln +++ b/modules/identity/Volo.Abp.Identity.sln @@ -47,6 +47,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor.Se EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor.WebAssembly", "src\Volo.Abp.Identity.Blazor.WebAssembly\Volo.Abp.Identity.Blazor.WebAssembly.csproj", "{4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Installer", "src\Volo.Abp.Identity.Installer\Volo.Abp.Identity.Installer.csproj", "{69C00922-AF2F-4E6E-A78D-65C025F83C1B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -133,6 +135,10 @@ Global {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F}.Release|Any CPU.Build.0 = Release|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69C00922-AF2F-4E6E-A78D-65C025F83C1B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -158,6 +164,7 @@ Global {3F7BB653-3F3A-4889-B73C-E463F239099A} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} {A5BAC86D-1231-4B95-918E-2011477A81E7} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} {4DB89179-EEDC-4C01-9F9E-04A7C106FA7F} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} + {69C00922-AF2F-4E6E-A78D-65C025F83C1B} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {05740D37-83CF-4041-9C2A-D89F1B3DB5A4} diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json index d461b13e37..1c5e740096 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Application", - "hash": "75bf6dcf1aede2e8a88a993d5d9e75ac", + "hash": "814ef7cd33425671dda3a5530f55a114", "contents": [ { "namespace": "Volo.Abp.Identity", @@ -12,12 +12,12 @@ "summary": null, "implementingInterfaces": [ "Volo.Abp.Identity.IIdentityRoleAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityRolesInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityRoleCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityRoleDto, Volo.Abp.Identity.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.Abp.Identity.IdentityRoleUpdateDto, Volo.Abp.Identity.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", @@ -28,12 +28,12 @@ "summary": null, "implementingInterfaces": [ "Volo.Abp.Identity.IIdentityUserAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.GetIdentityUsersInput, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.Identity.IdentityUserCreateDto, Volo.Abp.Identity.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.Identity.IdentityUserDto, Volo.Abp.Identity.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.Abp.Identity.IdentityUserUpdateDto, Volo.Abp.Identity.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", diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs index 801b77c21d..a960c051ae 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs @@ -39,6 +39,13 @@ public partial class RoleManagement ManagePermissionsPolicyName = IdentityPermissions.Roles.ManagePermissions; } + protected override ValueTask SetBreadcrumbItemsAsync() + { + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value)); + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Roles"].Value)); + return base.SetBreadcrumbItemsAsync(); + } + protected override ValueTask SetEntityActionsAsync() { EntityActions diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index f4b416a786..b8ec5cf228 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -66,6 +66,13 @@ public partial class UserManagement } } + protected override ValueTask SetBreadcrumbItemsAsync() + { + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:IdentityManagement"].Value)); + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Users"].Value)); + return base.SetBreadcrumbItemsAsync(); + } + protected virtual async Task OnSearchTextChanged(string value) { GetListInput.Filter = value; diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json index b485594d90..274ccebb1c 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Domain.Shared", - "hash": "5f9216e13f38f29ec5f66aeecd448321", + "hash": "8483bba8a84d052fe31e3d494ca190d9", "contents": [ { "namespace": "Volo.Abp.Identity", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json index 0c9ef1803e..2f42c3b1f6 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Domain", - "hash": "51a7170cfa7f0a3ede0888bd0efa1588", + "hash": "32e61cdb91088ee3abe9501c380f3073", "contents": [ { "namespace": "Volo.Abp.Identity", @@ -104,7 +104,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -119,7 +119,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -134,7 +134,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": "Represents a role in the identity system", @@ -151,7 +151,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -166,7 +166,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": null, @@ -187,7 +187,7 @@ { "namespace": "Volo.Abp.Identity", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.Identity", "primaryKeyType": "Guid", "summary": "Represents an organization unit (OU).", diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json index d4011f4fde..28f5ce4feb 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.EntityFrameworkCore", - "hash": "302d5996ef84002f4eadcb44cdaac3a5", + "hash": "a7ed00412f00238de041a53dafee4e7b", "contents": [ { "namespace": "Volo.Abp.Identity.EntityFrameworkCore", diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json index 303ecf2d99..2058f34dad 100644 --- a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.HttpApi.Client", - "hash": "dad63d5e17ea5af2f0fe08156f16b8ea", + "hash": "ac3fa34231b6537af3334707e79c4773", "contents": [ { "namespace": "Volo.Abp.Identity", diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json index 5bf7fcedd9..796ab0beba 100644 --- a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.HttpApi", - "hash": "33929bcf8a1400d4a00bbd407c345cb7", + "hash": "5609d7197a88b2b61c75da1314ead391", "contents": [ { "namespace": "Volo.Abp.Identity", diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj index 80a1b51bb0..0c0fd81d2e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json index 4901d0fd08..b3282b59b5 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.MongoDB", - "hash": "d17360bc2d0285185d2886bbcd891684", + "hash": "1c65fcf4db723d3097f3312ea1e058cd", "contents": [ { "namespace": "Volo.Abp.Identity.MongoDB", @@ -12,9 +12,9 @@ "connectionStringName": "AbpIdentity", "databaseCollections": [ { - "entityFullName": "Volo.Abp.Identity.IdentityLinkUser", + "entityFullName": "Volo.Abp.Identity.IdentitySecurityLog", "contentType": "databaseCollection", - "name": "AbpLinkUsers" + "name": "AbpSecurityLogs" }, { "entityFullName": "Volo.Abp.Identity.IdentityClaimType", @@ -22,19 +22,19 @@ "name": "AbpClaimTypes" }, { - "entityFullName": "Volo.Abp.Identity.IdentityUser", + "entityFullName": "Volo.Abp.Identity.OrganizationUnit", "contentType": "databaseCollection", - "name": "AbpUsers" + "name": "AbpOrganizationUnits" }, { - "entityFullName": "Volo.Abp.Identity.IdentitySecurityLog", + "entityFullName": "Volo.Abp.Identity.IdentityLinkUser", "contentType": "databaseCollection", - "name": "AbpSecurityLogs" + "name": "AbpLinkUsers" }, { - "entityFullName": "Volo.Abp.Identity.OrganizationUnit", + "entityFullName": "Volo.Abp.Identity.IdentityUser", "contentType": "databaseCollection", - "name": "AbpOrganizationUnits" + "name": "AbpUsers" }, { "entityFullName": "Volo.Abp.Identity.IdentityRole", diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json index 69f917f1d6..683ad94fb0 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json +++ b/modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Identity.Web", - "hash": "fbb18bece916f40b1ea7a2d1487f0028", + "hash": "28144e19882c7781eaf09b39ce8a320b", "contents": [ { "namespace": "Volo.Abp.Identity.Web", diff --git a/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json b/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json index db174c5cf1..01fe37ad9f 100644 --- a/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json +++ b/modules/identityserver/Volo.Abp.IdentityServer.abpmdl.json @@ -41,10 +41,6 @@ "Volo.Abp.PermissionManagement.Domain.IdentityServer": { "path": "src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo.Abp.PermissionManagement.Domain.IdentityServer.abppkg.json", "folder": "src" - }, - "Volo.Abp.IdentityServer.Installer": { - "path": "src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj index ca7d96ac5d..372b51398b 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj @@ -4,13 +4,13 @@ - net5.0 + net6.0 true - + diff --git a/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json b/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json new file mode 100644 index 0000000000..7cb30216ab --- /dev/null +++ b/modules/openiddict/Volo.Abp.OpenIddict.abpmdl.json @@ -0,0 +1,71 @@ +{ + "folders": { + "items": { + "src": {}, + "test": {}, + "app": {} + } + }, + "packages": { + "Volo.Abp.OpenIddict.Domain.Shared": { + "path": "src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.Domain": { + "path": "src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.EntityFrameworkCore": { + "path": "src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.MongoDB": { + "path": "src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json", + "folder": "src" + }, + "Volo.Abp.OpenIddict.TestBase": { + "path": "test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json", + "folder": "test" + }, + "Volo.Abp.OpenIddict.EntityFrameworkCore.Tests": { + "path": "test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json", + "folder": "test" + }, + "Volo.Abp.OpenIddict.MongoDB.Tests": { + "path": "test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json", + "folder": "test" + }, + "Volo.Abp.OpenIddict.Domain.Tests": { + "path": "test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json", + "folder": "test" + }, + "OpenIddict.Demo.Server": { + "path": "app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json", + "folder": "app" + }, + "OpenIddict.Demo.Client.Mvc": { + "path": "app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json", + "folder": "app" + }, + "Volo.Abp.OpenIddict.AspNetCore": { + "path": "src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json", + "folder": "src" + }, + "OpenIddict.Demo.Client.Console": { + "path": "app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json", + "folder": "app" + }, + "OpenIddict.Demo.API": { + "path": "app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json", + "folder": "app" + }, + "OpenIddict.Demo.Client.BlazorWASM": { + "path": "app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json", + "folder": "app" + }, + "Volo.Abp.PermissionManagement.Domain.OpenIddict": { + "path": "src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json", + "folder": "src" + } + } +} \ No newline at end of file diff --git a/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json b/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json new file mode 100644 index 0000000000..3e59583a9a --- /dev/null +++ b/modules/openiddict/Volo.Abp.OpenIddict.abpsln.json @@ -0,0 +1,8 @@ +{ + "template": "empty", + "modules": { + "Volo.Abp.OpenIddict": { + "path": "Volo.Abp.OpenIddict.abpmdl.json" + } + } +} \ No newline at end of file diff --git a/modules/openiddict/Volo.Abp.OpenIddict.sln b/modules/openiddict/Volo.Abp.OpenIddict.sln index c95dc5f251..8161e82a2a 100644 --- a/modules/openiddict/Volo.Abp.OpenIddict.sln +++ b/modules/openiddict/Volo.Abp.OpenIddict.sln @@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIddict.Demo.Client.Blaz EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Domain.OpenIddict", "src\Volo.Abp.PermissionManagement.Domain.OpenIddict\Volo.Abp.PermissionManagement.Domain.OpenIddict.csproj", "{674D0A62-4F7B-436C-83A9-AA8FE03F3A11}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.OpenIddict.Installer", "src\Volo.Abp.OpenIddict.Installer\Volo.Abp.OpenIddict.Installer.csproj", "{B748241A-E782-493D-8905-0C27033AB519}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,6 +107,10 @@ Global {674D0A62-4F7B-436C-83A9-AA8FE03F3A11}.Debug|Any CPU.Build.0 = Debug|Any CPU {674D0A62-4F7B-436C-83A9-AA8FE03F3A11}.Release|Any CPU.ActiveCfg = Release|Any CPU {674D0A62-4F7B-436C-83A9-AA8FE03F3A11}.Release|Any CPU.Build.0 = Release|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B748241A-E782-493D-8905-0C27033AB519}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -125,6 +131,7 @@ Global {70FD6E90-BBE8-4DA1-AE07-55064803225B} = {2B5CD179-FF7B-428F-98F6-2ADBB9538D18} {F3853F2B-72D4-496C-B59C-87E2759AD79B} = {2B5CD179-FF7B-428F-98F6-2ADBB9538D18} {674D0A62-4F7B-436C-83A9-AA8FE03F3A11} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} + {B748241A-E782-493D-8905-0C27033AB519} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C09128AF-C73F-ED7D-33F5-69BF7D934D50} diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json similarity index 100% rename from modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.abppkg.json diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json similarity index 100% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.abppkg.json diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json similarity index 100% rename from modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Client.Console/OpenIddict.Demo.Client.Console.abppkg.json diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.analyze.json b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.analyze.json new file mode 100644 index 0000000000..81b2b19298 --- /dev/null +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.analyze.json @@ -0,0 +1,5 @@ +{ + "name": "OpenIddict.Demo.Client.Mvc", + "hash": "2132c41341e3f1486a7036fbdd82d4f9", + "contents": [] +} \ No newline at end of file diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json new file mode 100644 index 0000000000..48875c29cf --- /dev/null +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "host.mvc" +} \ No newline at end of file diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json similarity index 100% rename from modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.abppkg.json rename to modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.abppkg.json diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.abppkg.json rename to modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.abppkg.json diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AbpOpenIdDictControllerBase.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AbpOpenIdDictControllerBase.cs index ff7edb3e52..d1321ad9e1 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AbpOpenIdDictControllerBase.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/AbpOpenIdDictControllerBase.cs @@ -73,4 +73,24 @@ public abstract class AbpOpenIdDictControllerBase : AbpController return false; } + + protected virtual async Task PreSignInCheckAsync(IdentityUser user) + { + if (!user.IsActive) + { + return false; + } + + if (!await SignInManager.CanSignInAsync(user)) + { + return false; + } + + if (await UserManager.IsLockedOutAsync(user)) + { + return false; + } + + return true; + } } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.AuthorizationCode.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.AuthorizationCode.cs index 26018f5423..89a00f1a8a 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.AuthorizationCode.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.AuthorizationCode.cs @@ -33,7 +33,7 @@ public partial class TokenController } // Ensure the user is still allowed to sign in. - if (!await SignInManager.CanSignInAsync(user)) + if (!await PreSignInCheckAsync(user)) { return Forbid( authenticationSchemes: OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.DeviceCode.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.DeviceCode.cs index c46ee5eef0..cbe021854c 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.DeviceCode.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.DeviceCode.cs @@ -33,7 +33,7 @@ public partial class TokenController } // Ensure the user is still allowed to sign in. - if (!await SignInManager.CanSignInAsync(user)) + if (!await PreSignInCheckAsync(user)) { return Forbid( authenticationSchemes: OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.RefreshToken.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.RefreshToken.cs index 05bf247ca5..c234ddd62e 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.RefreshToken.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.RefreshToken.cs @@ -33,7 +33,7 @@ public partial class TokenController } // Ensure the user is still allowed to sign in. - if (!await SignInManager.CanSignInAsync(user)) + if (!await PreSignInCheckAsync(user)) { return Forbid( authenticationSchemes: OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.analyze.json new file mode 100644 index 0000000000..deea8cbf36 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Abp.OpenIddict.Domain.Shared", + "hash": "bc60e65998f3b40d6651cf0a0a08a84c", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict", + "contentType": "abpModule", + "name": "AbpOpenIddictDomainSharedModule" + } + ] +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json new file mode 100644 index 0000000000..8b3de05f76 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.domain-shared" +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json new file mode 100644 index 0000000000..7b671211bd --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json @@ -0,0 +1,107 @@ +{ + "name": "Volo.Abp.OpenIddict.Domain", + "hash": "8822f98b8a1deca68b33f69126bbc669", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict", + "contentType": "abpModule", + "name": "AbpOpenIddictDomainModule" + }, + { + "namespace": "Volo.Abp.OpenIddict.Tokens", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictToken" + }, + { + "namespace": "Volo.Abp.OpenIddict.Scopes", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictScope" + }, + { + "namespace": "Volo.Abp.OpenIddict.Authorizations", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictAuthorization" + }, + { + "namespace": "Volo.Abp.OpenIddict.Applications", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "aggregateRoot", + "name": "OpenIddictApplication" + }, + { + "namespace": "Volo.Abp.OpenIddict.Tokens", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Tokens", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictToken" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictTokenRepository" + }, + { + "namespace": "Volo.Abp.OpenIddict.Scopes", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Scopes", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictScope" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictScopeRepository" + }, + { + "namespace": "Volo.Abp.OpenIddict.Authorizations", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Authorizations", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictAuthorization" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictAuthorizationRepository" + }, + { + "namespace": "Volo.Abp.OpenIddict.Applications", + "summary": null, + "entityAnalyzeModel": { + "namespace": "Volo.Abp.OpenIddict.Applications", + "primaryKeyType": "Guid", + "summary": null, + "collectionProperties": [], + "navigationProperties": [], + "contentType": "entity", + "name": "OpenIddictApplication" + }, + "contentType": "repositoryInterface", + "name": "IOpenIddictApplicationRepository" + } + ] +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json new file mode 100644 index 0000000000..1d574efe45 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.domain" +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.analyze.json new file mode 100644 index 0000000000..a769a2edd2 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.analyze.json @@ -0,0 +1,39 @@ +{ + "name": "Volo.Abp.OpenIddict.EntityFrameworkCore", + "hash": "437e716bcba4d2364e711dac86cda9f6", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict.EntityFrameworkCore", + "contentType": "abpModule", + "name": "AbpOpenIddictEntityFrameworkCoreModule" + }, + { + "namespace": "Volo.Abp.OpenIddict.EntityFrameworkCore", + "connectionStringName": "AbpOpenIddict", + "databaseTables": [ + { + "entityFullName": "Volo.Abp.OpenIddict.Applications.OpenIddictApplication", + "contentType": "databaseTable", + "name": "OpenIddictApplications" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", + "contentType": "databaseTable", + "name": "OpenIddictAuthorizations" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Scopes.OpenIddictScope", + "contentType": "databaseTable", + "name": "OpenIddictScopes" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Tokens.OpenIddictToken", + "contentType": "databaseTable", + "name": "OpenIddictTokens" + } + ], + "contentType": "efCoreDbContext", + "name": "OpenIddictDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json new file mode 100644 index 0000000000..e1c64f0175 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo.Abp.OpenIddict.EntityFrameworkCore.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.ef" +} \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/FodyWeavers.xml b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xml similarity index 100% rename from studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/FodyWeavers.xml rename to modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xml diff --git a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/FodyWeavers.xsd b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xsd similarity index 100% rename from studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/FodyWeavers.xsd rename to modules/openiddict/src/Volo.Abp.OpenIddict.Installer/FodyWeavers.xsd diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj new file mode 100644 index 0000000000..07c8c2ed10 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj @@ -0,0 +1,24 @@ + + + + + + + net6.0 + true + + + + + + + + + + + + + + + + diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs new file mode 100644 index 0000000000..fd24b25610 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs @@ -0,0 +1,20 @@ +using Volo.Abp.Modularity; +using Volo.Abp.Studio; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Abp.OpenIddict; + +[DependsOn( + typeof(AbpStudioModuleInstallerModule), + typeof(AbpVirtualFileSystemModule) +)] +public class AbpOpenIddictInstallerModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + } +} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/OpenIddictInstallerPipelineBuilder.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/OpenIddictInstallerPipelineBuilder.cs new file mode 100644 index 0000000000..67668bbae1 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/OpenIddictInstallerPipelineBuilder.cs @@ -0,0 +1,16 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Studio.ModuleInstalling; + +namespace Volo.Abp.OpenIddict; + +[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] +[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] +public class OpenIddictInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency +{ + public async Task BuildAsync(ModuleInstallingContext context) + { + return GetBasePipeline(context); + } +} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.analyze.json b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.analyze.json new file mode 100644 index 0000000000..f88d27215e --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.analyze.json @@ -0,0 +1,39 @@ +{ + "name": "Volo.Abp.OpenIddict.MongoDB", + "hash": "9306b0570c535c0a4124afc3181e8313", + "contents": [ + { + "namespace": "Volo.Abp.OpenIddict.MongoDB", + "contentType": "abpModule", + "name": "AbpOpenIddictMongoDbModule" + }, + { + "namespace": "Volo.Abp.OpenIddict.MongoDB", + "connectionStringName": "AbpOpenIddict", + "databaseCollections": [ + { + "entityFullName": "Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", + "contentType": "databaseCollection", + "name": "OpenIddictAuthorizations" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Applications.OpenIddictApplication", + "contentType": "databaseCollection", + "name": "OpenIddictApplications" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Tokens.OpenIddictToken", + "contentType": "databaseCollection", + "name": "OpenIddictTokens" + }, + { + "entityFullName": "Volo.Abp.OpenIddict.Scopes.OpenIddictScope", + "contentType": "databaseCollection", + "name": "OpenIddictScopes" + } + ], + "contentType": "mongoDbContext", + "name": "OpenIddictMongoDbContext" + } + ] +} \ No newline at end of file diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json new file mode 100644 index 0000000000..8b23fd1e69 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo.Abp.OpenIddict.MongoDB.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.mongodb" +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.abppkg.json b/modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json similarity index 100% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.abppkg.json rename to modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo.Abp.PermissionManagement.Domain.OpenIddict.abppkg.json diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.abppkg.json @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json b/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json index f40c2e27de..82dc87dade 100644 --- a/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json +++ b/modules/permission-management/Volo.Abp.PermissionManagement.abpmdl.json @@ -73,10 +73,6 @@ "Volo.Abp.PermissionManagement.Blazor.WebAssembly": { "path": "src/Volo.Abp.PermissionManagement.Blazor.WebAssembly/Volo.Abp.PermissionManagement.Blazor.WebAssembly.abppkg.json", "folder": "src" - }, - "Volo.Abp.PermissionManagement.Installer": { - "path": "src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json index 290e84f392..1d93fdf421 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo.Abp.PermissionManagement.Application.Contracts.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Application.Contracts", - "hash": "c71030d581b91d275b3dd93009c2185f", + "hash": "761a407cfc112e2c648d5c5cf50064e4", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json index 8e54490907..bb0296b33c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo.Abp.PermissionManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Application", - "hash": "111aa17278856d07dcb113e05766b739", + "hash": "f51dd864d1a9bdb42aef9b7a4220b63a", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json index 273ebd4974..f0ad0cedd4 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Domain.Shared", - "hash": "94944d94fded88942ce31c2f803b9577", + "hash": "ef0b0405da04433da55a8a4bb09bcfc6", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json index dd22c93d75..297803927a 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo.Abp.PermissionManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Domain", - "hash": "6aed5a285610c53b3714ba717d73d675", + "hash": "db626b114b15f02f09d50652c81d3bb8", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", @@ -10,7 +10,7 @@ { "namespace": "Volo.Abp.PermissionManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.PermissionManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json index d23a7ad2aa..caf446b3f3 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo.Abp.PermissionManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.EntityFrameworkCore", - "hash": "f8289209c0d9289ce4320a5a163ce631", + "hash": "9135b32df96ebabe2b2ab7710c087a20", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.EntityFrameworkCore", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json index d4fd903ed2..38e0e9e284 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/Volo.Abp.PermissionManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.HttpApi.Client", - "hash": "7000b975c242b79c82d95da010220d50", + "hash": "1b9f52d21ca5d9c7e6f7662ccc27b7c3", "contents": [ { "namespace": "Volo.Abp.PermissionManagement", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json index eb48bb597b..083e081b61 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo.Abp.PermissionManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.HttpApi", - "hash": "378c3d034d1c15192395da445181ef87", + "hash": "2eac8fbb963e8043e3a860f91b2299d9", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.HttpApi", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj index c1fa844501..7667987ab3 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json index ec315eb7f1..716bb1da98 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo.Abp.PermissionManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.MongoDB", - "hash": "56f2712fd206ad7dee9f2a2116935af1", + "hash": "7baac61b4f919f381459d4d7e606c7b9", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.MongoDB", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json index 571f627742..964e43381c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.PermissionManagement.Web", - "hash": "d92eb24e5e657f77bec981e6bb49b22c", + "hash": "ba550bdb16d700b630bdc042b35b084d", "contents": [ { "namespace": "Volo.Abp.PermissionManagement.Web", diff --git a/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json b/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json index ba8523c1ac..899d1a00ed 100644 --- a/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json +++ b/modules/setting-management/Volo.Abp.SettingManagement.abpmdl.json @@ -74,10 +74,6 @@ "Volo.Abp.SettingManagement.Blazor.WebAssembly": { "path": "src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.abppkg.json", "folder": "src" - }, - "Volo.Abp.SettingManagement.Installer": { - "path": "src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json index 37dd6381d0..059e069ce5 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo.Abp.SettingManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Application", - "hash": "90ab6555763837d82c6afbfb2ffff2b4", + "hash": "856b1289bcadda8c3e707216f30eb28d", "contents": [ { "namespace": "Volo.Abp.SettingManagement", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs index fcde862fbd..1422d67873 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs @@ -31,6 +31,8 @@ public partial class SettingManagement protected async override Task OnInitializedAsync() { + BreadcrumbItems.Add(new BreadcrumbItem(@L["Settings"])); + SettingComponentCreationContext = new SettingComponentCreationContext(ServiceProvider); foreach (var contributor in Options.Contributors) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json index f8fae91f28..cd87f53194 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Domain.Shared", - "hash": "53d686ce13a1571ce5f87cbc6b6ac477", + "hash": "02864f881f165fef01949fce1324f4ea", "contents": [ { "namespace": "Volo.Abp.SettingManagement", @@ -20,12 +20,12 @@ { "valueType": "ToggleStringValueType", "defaultValue": "false", - "displayName": "Allow tenants to change email settings.", - "description": "AllowChangingEmailSettingsDescription", + "displayName": "Allow changing email settings.", + "description": null, "isAvailableToHost": false, "isVisibleToClients": true, "contentType": "feature", "name": "SettingManagement.AllowChangingEmailSettings" } ] -} +} \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json index 476a33fd6d..26a1d8a77c 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Domain", - "hash": "ab6abd0e7049113520283a287695c165", + "hash": "37b9125f574cfb3109d423800162a2c1", "contents": [ { "namespace": "Volo.Abp.SettingManagement", @@ -19,7 +19,7 @@ { "namespace": "Volo.Abp.SettingManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.SettingManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json index 75ede070e6..e119700c43 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo.Abp.SettingManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.EntityFrameworkCore", - "hash": "5e5a522b88d7e38c08d7b2d24177c044", + "hash": "281c5814d423133456b6d0dc1b0b15f6", "contents": [ { "namespace": "Volo.Abp.SettingManagement.EntityFrameworkCore", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json index 8e2dd17e17..685d83a4e2 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi.Client/Volo.Abp.SettingManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.HttpApi.Client", - "hash": "ca14518fa6993b7549f98795d0814d4d", + "hash": "f10d64544023c35d3226a2306af07da9", "contents": [ { "namespace": "Volo.Abp.SettingManagement", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json index d20310027c..83d896dbf5 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo.Abp.SettingManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.HttpApi", - "hash": "044618bbf045094718f03b1e0c259d2b", + "hash": "59743dcbb13f1d2f74de5cd7b8c7a201", "contents": [ { "namespace": "Volo.Abp.SettingManagement", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj index dd3daf7500..025fb08a62 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json index dae06ad7b7..f39b527779 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo.Abp.SettingManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.MongoDB", - "hash": "3a6a752156846daef4c4439fd353a66d", + "hash": "3076173a94ee80efbd13cc883cc6a156", "contents": [ { "namespace": "Volo.Abp.SettingManagement.MongoDB", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json index d762d873e6..ed7adadfb8 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.SettingManagement.Web", - "hash": "d15735d7c144ce17f981b8ec57f4c12c", + "hash": "b9a83b6936769cdbfb1b0fed8653d0d2", "contents": [ { "namespace": "Volo.Abp.SettingManagement.Web", diff --git a/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json b/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json index 59d9142d58..f9094439d8 100644 --- a/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json +++ b/modules/tenant-management/Volo.Abp.TenantManagement.abpmdl.json @@ -73,10 +73,6 @@ "Volo.Abp.TenantManagement.Blazor.Server": { "path": "src/Volo.Abp.TenantManagement.Blazor.Server/Volo.Abp.TenantManagement.Blazor.Server.abppkg.json", "folder": "src" - }, - "Volo.Abp.TenantManagement.Installer": { - "path": "src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json index aafa40ff93..dbd0c8310e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo.Abp.TenantManagement.Application.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Application", - "hash": "f22443bf5a086ca029a9ed79168d496b", + "hash": "e3fb4eb7a1c4736363c87e8d2a4ae3ad", "contents": [ { "namespace": "Volo.Abp.TenantManagement", @@ -12,12 +12,12 @@ "summary": null, "implementingInterfaces": [ "Volo.Abp.TenantManagement.ITenantAppService", - "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", - "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=5.1.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`5[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICrudAppService`6[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IReadOnlyAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.GetTenantsInput, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateUpdateAppService`4[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.ICreateAppService`2[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null],[Volo.Abp.TenantManagement.TenantCreateDto, Volo.Abp.TenantManagement.Application.Contracts, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "Volo.Abp.Application.Services.IUpdateAppService`3[[Volo.Abp.TenantManagement.TenantDto, Volo.Abp.TenantManagement.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.Abp.TenantManagement.TenantUpdateDto, Volo.Abp.TenantManagement.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", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs index 0f0e689f2f..11daa3fb4a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs @@ -40,6 +40,13 @@ public partial class TenantManagement ManageFeaturesPolicyName = TenantManagementPermissions.Tenants.ManageFeatures; } + protected override ValueTask SetBreadcrumbItemsAsync() + { + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Menu:TenantManagement"])); + BreadcrumbItems.Add(new BlazoriseUI.BreadcrumbItem(L["Tenants"])); + return base.SetBreadcrumbItemsAsync(); + } + protected override async Task SetPermissionsAsync() { await base.SetPermissionsAsync(); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json index 00d40e3ca1..90d191d05b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Domain.Shared", - "hash": "e1a3dc97dda872a01da2654848372f27", + "hash": "321266e827d59b7f3da4d631cc7f1b35", "contents": [ { "namespace": "Volo.Abp.TenantManagement", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json index edfcf848b4..015339fb54 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Domain", - "hash": "d955af240e89637de32065b2e7512ba6", + "hash": "544cd2646fa5aefb1b053044cb6f05ac", "contents": [ { "namespace": "Volo.Abp.TenantManagement", @@ -27,7 +27,7 @@ { "namespace": "Volo.Abp.TenantManagement", "summary": null, - "entityModel": { + "entityAnalyzeModel": { "namespace": "Volo.Abp.TenantManagement", "primaryKeyType": "Guid", "summary": null, diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json index bdc0849d32..9dcd2ceb40 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo.Abp.TenantManagement.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.EntityFrameworkCore", - "hash": "fc2ab48e90129aee164949aa4a911c12", + "hash": "cc176b58ce26ec8ca281d7db5f8b55df", "contents": [ { "namespace": "Volo.Abp.TenantManagement.EntityFrameworkCore", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json index c46bb08a84..d0b1726536 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi.Client/Volo.Abp.TenantManagement.HttpApi.Client.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.HttpApi.Client", - "hash": "623748194a73757a698843974e2631dd", + "hash": "2fb37e3d0c9d07bcced213c49fd19560", "contents": [ { "namespace": "Volo.Abp.TenantManagement", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json index c09e5df449..3ad61aca51 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.HttpApi", - "hash": "0c2fe9349a905f12458f6fea6d44a5fc", + "hash": "c34255a325178f08298699fad7f58a4a", "contents": [ { "namespace": "Volo.Abp.TenantManagement", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj index 13fa3e195f..5c6b70856d 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json index 64353bbb7f..0a6d272621 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.MongoDB", - "hash": "d6e949817650dd34e2adbf7504c0817a", + "hash": "3f9b80d90eb20c165b93c0d785a4430f", "contents": [ { "namespace": "Volo.Abp.TenantManagement.MongoDB", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json index 1ba20f8a2f..ec7ac9a62a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.TenantManagement.Web", - "hash": "20bd21bec310cf2c54ecddc579017ce8", + "hash": "18a4ed544c2a6b718b3aa7c14c83bc43", "contents": [ { "namespace": "Volo.Abp.TenantManagement.Web", diff --git a/modules/users/Volo.Abp.Users.abpmdl.json b/modules/users/Volo.Abp.Users.abpmdl.json index b268bc96b5..f2b03eef4f 100644 --- a/modules/users/Volo.Abp.Users.abpmdl.json +++ b/modules/users/Volo.Abp.Users.abpmdl.json @@ -24,10 +24,6 @@ "Volo.Abp.Users.MongoDB": { "path": "src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.json", "folder": "src" - }, - "Volo.Abp.Users.Installer": { - "path": "src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json index 30990c83bf..a2bca85a49 100644 --- a/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.Domain.Shared/Volo.Abp.Users.Domain.Shared.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.Domain.Shared", - "hash": "598479cfdcd34503a37627c3757211ce", + "hash": "68c5010aeda2e991d673468d958ef31b", "contents": [ { "namespace": "Volo.Abp.Users", diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json index 2cfb2d0c1e..1c71e9536a 100644 --- a/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.Domain/Volo.Abp.Users.Domain.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.Domain", - "hash": "97a2a74c722bc59336bb9c6f75049e99", + "hash": "0feb223ab7c2b06a1a66bbc81a3153c0", "contents": [ { "namespace": "Volo.Abp.Users", diff --git a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json index 1e0ccb67b5..a8207b3b16 100644 --- a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo.Abp.Users.EntityFrameworkCore.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.EntityFrameworkCore", - "hash": "edd7cc214a1b8f121f773be7b88957ff", + "hash": "70a6a4e034d1b9632e7be15cb72e627b", "contents": [ { "namespace": "Volo.Abp.Users.EntityFrameworkCore", diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj index e39f1e5b6e..3e18ed33b5 100644 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj +++ b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json b/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json index e7ed443321..3b269e2be6 100644 --- a/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json +++ b/modules/users/src/Volo.Abp.Users.MongoDB/Volo.Abp.Users.MongoDB.abppkg.analyze.json @@ -1,6 +1,6 @@ { "name": "Volo.Abp.Users.MongoDB", - "hash": "827e73e5cc91bc0e666d7fc131009cb9", + "hash": "6a1684883b9a06ea9ebb22412c76f108", "contents": [ { "namespace": "Volo.Abp.Users.MongoDB", diff --git a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json index 26c00ec557..dbb8cc5c4e 100644 --- a/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json +++ b/modules/virtual-file-explorer/Volo.Abp.VirtualFileExplorer.abpmdl.json @@ -13,10 +13,6 @@ "Volo.Abp.VirtualFileExplorer.DemoApp": { "path": "app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.abppkg.json", "folder": "app" - }, - "Volo.Abp.VirtualFileExplorer.Installer": { - "path": "src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json", - "folder": "src" } } } \ No newline at end of file diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj index 6a82e34326..eb9383d4d9 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj @@ -4,19 +4,21 @@ - net5.0 + net6.0 true - + + + diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.analyze.json b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.analyze.json new file mode 100644 index 0000000000..a6340b74ff --- /dev/null +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.abppkg.analyze.json @@ -0,0 +1,11 @@ +{ + "name": "Volo.Abp.VirtualFileExplorer.Web", + "hash": "f553dc666ba87cc5e2fdc5c22546b095", + "contents": [ + { + "namespace": "Volo.Abp.VirtualFileExplorer.Web", + "contentType": "abpModule", + "name": "AbpVirtualFileExplorerWebModule" + } + ] +} \ No newline at end of file diff --git a/npm/ng-packs/packages/account/src/lib/account-routing.module.ts b/npm/ng-packs/packages/account/src/lib/account-routing.module.ts index c09dede3cb..e4b18a717b 100644 --- a/npm/ng-packs/packages/account/src/lib/account-routing.module.ts +++ b/npm/ng-packs/packages/account/src/lib/account-routing.module.ts @@ -13,6 +13,8 @@ import { RegisterComponent } from './components/register/register.component'; import { ResetPasswordComponent } from './components/reset-password/reset-password.component'; import { eAccountComponents } from './enums/components'; import { AuthenticationFlowGuard } from './guards/authentication-flow.guard'; +import { AccountExtensionsGuard } from './guards'; + const routes: Routes = [ { path: '', pathMatch: 'full', redirectTo: 'login' }, @@ -68,7 +70,7 @@ const routes: Routes = [ { path: 'manage', component: ReplaceableRouteContainerComponent, - canActivate: [AuthGuard], + canActivate: [AuthGuard, AccountExtensionsGuard], data: { replaceableComponent: { key: eAccountComponents.ManageProfile, diff --git a/npm/ng-packs/packages/account/src/lib/account.module.ts b/npm/ng-packs/packages/account/src/lib/account.module.ts index bfa37d4bfa..bdf3c39792 100644 --- a/npm/ng-packs/packages/account/src/lib/account.module.ts +++ b/npm/ng-packs/packages/account/src/lib/account.module.ts @@ -15,6 +15,10 @@ import { accountConfigOptionsFactory } from './utils/factory-utils'; import { AuthenticationFlowGuard } from './guards/authentication-flow.guard'; import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component'; import { ResetPasswordComponent } from './components/reset-password/reset-password.component'; +import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions'; +import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS } from './tokens/extensions.token'; +import { AccountExtensionsGuard } from './guards/extensions.guard'; +import { PersonalSettingsHalfRowComponent } from './components/personal-settings/personal-settings-half-row.component'; const declarations = [ LoginComponent, @@ -24,6 +28,7 @@ const declarations = [ PersonalSettingsComponent, ForgotPasswordComponent, ResetPasswordComponent, + PersonalSettingsHalfRowComponent, ]; @NgModule({ @@ -34,6 +39,7 @@ const declarations = [ ThemeSharedModule, NgbDropdownModule, NgxValidateCoreModule, + UiExtensionsModule, ], exports: [...declarations], }) @@ -49,6 +55,11 @@ export class AccountModule { useFactory: accountConfigOptionsFactory, deps: [ACCOUNT_CONFIG_OPTIONS], }, + { + provide: ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, + useValue: options.editFormPropContributors, + }, + AccountExtensionsGuard, ], }; } diff --git a/npm/ng-packs/packages/account/src/lib/components/index.ts b/npm/ng-packs/packages/account/src/lib/components/index.ts index 098ee8a202..d74263b052 100644 --- a/npm/ng-packs/packages/account/src/lib/components/index.ts +++ b/npm/ng-packs/packages/account/src/lib/components/index.ts @@ -4,4 +4,5 @@ export * from './login/login.component'; export * from './manage-profile/manage-profile.component'; export * from './register/register.component'; export * from './personal-settings/personal-settings.component'; +export * from './personal-settings/personal-settings-half-row.component'; export * from './reset-password/reset-password.component'; diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts new file mode 100644 index 0000000000..a000e353d6 --- /dev/null +++ b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts @@ -0,0 +1,37 @@ +import { Component, Inject } from '@angular/core'; +import { + EXTENSIONS_FORM_PROP, + FormProp, + EXTENSIBLE_FORM_VIEW_PROVIDER, +} from '@abp/ng.theme.shared/extensions'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'abp-personal-settings-half-row', + template: `
+
+ + +
+
`, + styles: [], + viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER], +}) +export class PersonalSettingsHalfRowComponent { + public displayName: string; + public name: string; + public id: string; + public formGroup: FormGroup; + + constructor(@Inject(EXTENSIONS_FORM_PROP) private propData: FormProp) { + this.displayName = propData.displayName; + this.name = propData.name; + this.id = propData.id; + } +} diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html index 0b70ad41e8..e166a49545 100644 --- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html +++ b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html @@ -1,55 +1,11 @@ -
-
- * -
-
-
-
- -
-
-
-
- -
-
-
-
- * -
-
- -
+ + + {{ 'AbpIdentity::Save' | abpLocalization }} diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts index d15df99878..1688ef5741 100644 --- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts @@ -1,17 +1,27 @@ -import { ProfileService } from '@abp/ng.account.core/proxy'; +import { ProfileDto, ProfileService } from '@abp/ng.account.core/proxy'; import { ToasterService } from '@abp/ng.theme.shared'; -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { Component, Injector, OnInit, ViewEncapsulation } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { finalize } from 'rxjs/operators'; import { Account } from '../../models/account'; import { ManageProfileStateService } from '../../services/manage-profile.state.service'; - -const { maxLength, required, email } = Validators; +import { + EXTENSIONS_IDENTIFIER, + FormPropData, + generateFormFromProps, +} from '@abp/ng.theme.shared/extensions'; +import { eAccountComponents } from '../../enums'; @Component({ selector: 'abp-personal-settings-form', templateUrl: './personal-settings.component.html', exportAs: 'abpPersonalSettingsForm', + providers: [ + { + provide: EXTENSIONS_IDENTIFIER, + useValue: eAccountComponents.PersonalSettings, + }, + ], }) export class PersonalSettingsComponent implements @@ -19,6 +29,8 @@ export class PersonalSettingsComponent Account.PersonalSettingsComponentInputs, Account.PersonalSettingsComponentOutputs { + selected: ProfileDto; + form: FormGroup; inProgress: boolean; @@ -28,21 +40,20 @@ export class PersonalSettingsComponent private toasterService: ToasterService, private profileService: ProfileService, private manageProfileState: ManageProfileStateService, + protected injector: Injector, ) {} - ngOnInit() { - this.buildForm(); + buildForm() { + this.selected = this.manageProfileState.getProfile(); + if (!this.selected) { + return; + } + const data = new FormPropData(this.injector, this.selected); + this.form = generateFormFromProps(data); } - buildForm() { - const profile = this.manageProfileState.getProfile(); - this.form = this.fb.group({ - userName: [profile.userName, [required, maxLength(256)]], - email: [profile.email, [required, email, maxLength(256)]], - name: [profile.name || '', [maxLength(64)]], - surname: [profile.surname || '', [maxLength(64)]], - phoneNumber: [profile.phoneNumber || '', [maxLength(16)]], - }); + ngOnInit(): void { + this.buildForm(); } submit() { diff --git a/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts b/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts new file mode 100644 index 0000000000..59c196f2bd --- /dev/null +++ b/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts @@ -0,0 +1,47 @@ +import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions'; +import { UpdateProfileDto } from '@abp/ng.account.core/proxy'; +import { Validators } from '@angular/forms'; +import { PersonalSettingsHalfRowComponent } from '../components/personal-settings/personal-settings-half-row.component'; + +const { maxLength, required, email } = Validators; +export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany([ + { + type: ePropType.String, + name: 'userName', + displayName: 'AbpIdentity::DisplayName:UserName', + id: 'username', + validators: () => [required, maxLength(256)], + }, + { + type: ePropType.String, + name: 'name', + displayName: 'AbpIdentity::DisplayName:Name', + id: 'name', + validators: () => [maxLength(64)], + template: PersonalSettingsHalfRowComponent, + className: 'd-inline-block w-50', + }, + { + type: ePropType.String, + name: 'surname', + displayName: 'AbpIdentity::DisplayName:Surname', + id: 'surname', + validators: () => [maxLength(64)], + className: 'd-inline-block w-50 ps-4', + template: PersonalSettingsHalfRowComponent, + }, + { + type: ePropType.String, + name: 'email', + displayName: 'AbpIdentity::DisplayName:Email', + id: 'email-address', + validators: () => [required, email, maxLength(256)], + }, + { + type: ePropType.String, + name: 'phoneNumber', + displayName: 'AbpIdentity::DisplayName:PhoneNumber', + id: 'phone-number', + validators: () => [maxLength(16)], + }, +]); diff --git a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts new file mode 100644 index 0000000000..7c50eadf5e --- /dev/null +++ b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts @@ -0,0 +1,46 @@ +import { Injectable, Injector } from '@angular/core'; +import { CanActivate } from '@angular/router'; +import { Observable } from 'rxjs'; +import { + ExtensionsService, + getObjectExtensionEntitiesFromStore, + mapEntitiesToContributors, + mergeWithDefaultProps, +} from '@abp/ng.theme.shared/extensions'; +import { ConfigStateService } from '@abp/ng.core'; +import { tap, map, mapTo } from 'rxjs/operators'; +import { + ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, + DEFAULT_ACCOUNT_FORM_PROPS, +} from '../tokens/extensions.token'; +import { AccountEditFormPropContributors } from '../models/config-options'; +import { eAccountComponents } from '../enums/components'; + +@Injectable() +export class AccountExtensionsGuard implements CanActivate { + constructor(private injector: Injector) {} + + canActivate(): Observable { + const extensions: ExtensionsService = this.injector.get(ExtensionsService); + + const editFormContributors: AccountEditFormPropContributors = + this.injector.get(ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, null) || {}; + + const configState = this.injector.get(ConfigStateService); + return getObjectExtensionEntitiesFromStore(configState, 'Identity').pipe( + map(entities => ({ + [eAccountComponents.PersonalSettings]: entities.User, + })), + mapEntitiesToContributors(configState, 'AbpIdentity'), + tap(objectExtensionContributors => { + mergeWithDefaultProps( + extensions.editFormProps, + DEFAULT_ACCOUNT_FORM_PROPS, + objectExtensionContributors.editForm, + editFormContributors, + ); + }), + mapTo(true), + ); + } +} diff --git a/npm/ng-packs/packages/account/src/lib/guards/index.ts b/npm/ng-packs/packages/account/src/lib/guards/index.ts index 382170b2b1..275cd2f8e8 100644 --- a/npm/ng-packs/packages/account/src/lib/guards/index.ts +++ b/npm/ng-packs/packages/account/src/lib/guards/index.ts @@ -1 +1,2 @@ export * from './authentication-flow.guard'; +export * from './extensions.guard'; diff --git a/npm/ng-packs/packages/account/src/lib/models/config-options.ts b/npm/ng-packs/packages/account/src/lib/models/config-options.ts index 898021b04e..f3af14a71e 100644 --- a/npm/ng-packs/packages/account/src/lib/models/config-options.ts +++ b/npm/ng-packs/packages/account/src/lib/models/config-options.ts @@ -1,3 +1,11 @@ +import { eAccountComponents } from '../enums'; +import { EditFormPropContributorCallback } from '@abp/ng.theme.shared/extensions'; +import { UpdateProfileDto } from '@abp/ng.account.core/proxy'; + export interface AccountConfigOptions { redirectUrl?: string; + editFormPropContributors?: AccountEditFormPropContributors; } +export type AccountEditFormPropContributors = Partial<{ + [eAccountComponents.PersonalSettings]: EditFormPropContributorCallback[]; +}>; \ No newline at end of file diff --git a/npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts b/npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts new file mode 100644 index 0000000000..78acb7feaa --- /dev/null +++ b/npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts @@ -0,0 +1,17 @@ +import { eAccountComponents } from '../enums'; +import { DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS } from '../defaults/default-personal-settings-form-props'; +import { InjectionToken } from '@angular/core'; +import { EditFormPropContributorCallback } from '@abp/ng.theme.shared/extensions'; +import { UpdateProfileDto } from '@abp/ng.account.core/proxy'; + +export const DEFAULT_ACCOUNT_FORM_PROPS = { + [eAccountComponents.PersonalSettings]: DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS, +}; + +export const ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS = new InjectionToken( + 'ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS', +); + +type EditFormPropContributors = Partial<{ + [eAccountComponents.PersonalSettings]: EditFormPropContributorCallback[]; +}>; diff --git a/npm/ng-packs/packages/account/src/lib/tokens/index.ts b/npm/ng-packs/packages/account/src/lib/tokens/index.ts index 0a88318130..4381d1bc77 100644 --- a/npm/ng-packs/packages/account/src/lib/tokens/index.ts +++ b/npm/ng-packs/packages/account/src/lib/tokens/index.ts @@ -1 +1,2 @@ export * from './config-options.token'; +export * from './extensions.token'; diff --git a/npm/ng-packs/packages/core/src/lib/utils/common-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/common-utils.ts index 31a1970fdc..b373b6c04a 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/common-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/common-utils.ts @@ -11,6 +11,10 @@ export function isNullOrUndefined(obj) { return obj === null || obj === undefined; } +export function isNullOrEmpty(obj){ + return obj === null || obj === undefined || obj === ''; +} + export function exists(obj) { return !isNullOrUndefined(obj); } diff --git a/npm/ng-packs/packages/core/src/lib/validators/index.ts b/npm/ng-packs/packages/core/src/lib/validators/index.ts index fb06e7f1d8..69880dbf84 100644 --- a/npm/ng-packs/packages/core/src/lib/validators/index.ts +++ b/npm/ng-packs/packages/core/src/lib/validators/index.ts @@ -5,6 +5,7 @@ import { validateRange } from './range.validator'; import { validateRequired } from './required.validator'; import { validateStringLength } from './string-length.validator'; import { validateUrl } from './url.validator'; +import { validateUsername } from './username.validator'; export * from './age.validator'; export * from './credit-card.validator'; export * from './range.validator'; @@ -20,4 +21,5 @@ export const AbpValidators = { required: validateRequired, stringLength: validateStringLength, url: validateUrl, + username: validateUsername, }; diff --git a/npm/ng-packs/packages/core/src/lib/validators/required.validator.ts b/npm/ng-packs/packages/core/src/lib/validators/required.validator.ts index bf2a4b47ee..4e2b1931db 100644 --- a/npm/ng-packs/packages/core/src/lib/validators/required.validator.ts +++ b/npm/ng-packs/packages/core/src/lib/validators/required.validator.ts @@ -9,9 +9,11 @@ export interface RequiredOptions { } export function validateRequired({ allowEmptyStrings }: RequiredOptions = {}): ValidatorFn { - return (control: AbstractControl): RequiredError | null => { + // note: please do not remove name of the function, it is used in function compare with type 'RequiredError' + const required = (control: AbstractControl): RequiredError | null => { return isValidRequired(control.value, allowEmptyStrings) ? null : { required: true }; }; + return required; } function isValidRequired(value: any, allowEmptyStrings: boolean): boolean { diff --git a/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts b/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts index 705d07e17a..da941aee6f 100644 --- a/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts +++ b/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts @@ -1,4 +1,5 @@ import { AbstractControl, ValidatorFn } from '@angular/forms'; +import { isNullOrUndefined } from '../utils'; export interface UrlError { url: true; @@ -6,11 +7,11 @@ export interface UrlError { export function validateUrl(): ValidatorFn { return (control: AbstractControl): UrlError | null => { - if (['', null, undefined].indexOf(control.value) > -1) return null; + if (isNullOrUndefined(control.value)) return null; return isValidUrl(control.value) ? null : { url: true }; }; -} +} function isValidUrl(value: string): boolean { if (/^http(s)?:\/\/[^/]/.test(value) || /^ftp:\/\/[^/]/.test(value)) { diff --git a/npm/ng-packs/packages/core/src/lib/validators/username.validator.ts b/npm/ng-packs/packages/core/src/lib/validators/username.validator.ts new file mode 100644 index 0000000000..4e943769d2 --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/validators/username.validator.ts @@ -0,0 +1,29 @@ +import { AbstractControl, ValidatorFn } from '@angular/forms'; +import { isNullOrEmpty } from '../utils'; + +export interface UsernamePatternError { + usernamePattern: { + actualValue: string; + }; +} + +export interface UsernameOptions { + pattern?: RegExp; +} + +const onlyLetterAndNumberRegex = /^[a-zA-Z0-9]+$/; + +export function validateUsername( + { pattern }: UsernameOptions = { pattern: onlyLetterAndNumberRegex }, +): ValidatorFn { + return (control: AbstractControl): UsernamePatternError | null => { + const isValid = isValidUserName(control.value, pattern); + return isValid ? null : { usernamePattern: { actualValue: control.value } }; + }; +} + +function isValidUserName(value: any, pattern: RegExp): boolean { + if (isNullOrEmpty(value)) return true; + + return pattern.test(value); +} diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index 99d435c891..7873adf6ea 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -39,7 +39,7 @@ >
- +
  • {{ 'AbpIdentity::UserInformations' | abpLocalization }} diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index 75065272f4..9fd6987d19 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts @@ -61,9 +61,6 @@ export class UsersComponent implements OnInit { entityDisplayName: string; - blueprints = { pattern: 'AbpIdentity::Volo.Abp.Identity:InvalidUserName[{{ actualValue }}]' }; - - trackByFn: TrackByFunction = (index, item) => Object.keys(item)[0] || index; onVisiblePermissionChange = event => { diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts index f42c761498..28c73b4320 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts +++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts @@ -1,9 +1,9 @@ import { IdentityUserDto } from '@abp/ng.identity/proxy'; import { getPasswordValidators } from '@abp/ng.theme.shared'; import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions'; -import { Validators } from '@angular/forms'; +import { Validators } from '@angular/forms' +import { AbpValidators } from '@abp/ng.core'; -const onlyLetterAndNumberRegex = /^[a-zA-Z0-9]+$/; export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany([ { @@ -11,7 +11,7 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany [Validators.required, Validators.maxLength(256), Validators.pattern(onlyLetterAndNumberRegex)], + validators: () => [Validators.required, Validators.maxLength(256), AbpValidators.username()], }, { type: ePropType.Password, diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html index 4367bd098a..a5eeffa31c 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -1,142 +1,152 @@ -
    - - - - + - - + + + - -
    +
    + + + - -
    - + - - - - + + + + + +
    + + +
    +     - - - - {{ option.key }} - - - + + + - - -
    - + + + + + + +
    + + +
    +     + + + + - -
    -     + - - - - + + + + - - - - + + + + - - - - + + + + +
    - - - - -
    + - {{ prop.displayName | abpLocalization }} {{ asterisk }} diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts index fa679d3dbd..9cb65f1b5e 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts @@ -1,3 +1,4 @@ +import { EXTENSIONS_FORM_PROP_DATA, EXTENSIONS_FORM_PROP } from './../../tokens/extensions.token'; import { ABP, AbpValidators, ConfigStateService, TrackByService } from '@abp/ng.core'; import { AfterViewInit, @@ -5,6 +6,7 @@ import { ChangeDetectorRef, Component, ElementRef, + Injector, Input, OnChanges, Optional, @@ -54,6 +56,8 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { @ViewChild('field') private fieldRef!: ElementRef; + public injectorForCustomComponent: Injector; + asterisk = ''; options$: Observable[]> = of([]); @@ -62,15 +66,15 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { readonly!: boolean; - disabledFn = (data:PropData) => false; - - get disabled() { - return this.disabledFn(this.data) - } + typeaheadModel: any; private readonly form: FormGroup; - typeaheadModel: any; + disabledFn = (data: PropData) => false; + + get disabled() { + return this.disabledFn(this.data); + } setTypeaheadValue(selectedOption: ABP.Option) { this.typeaheadModel = selectedOption || { key: null, value: null }; @@ -108,6 +112,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { public readonly track: TrackByService, protected configState: ConfigStateService, groupDirective: FormGroupDirective, + private injector: Injector, ) { this.form = groupDirective.form; } @@ -133,6 +138,9 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { } getComponent(prop: FormProp): string { + if (prop.template) { + return 'template'; + } switch (prop.type) { case ePropType.Boolean: return 'checkbox'; @@ -173,13 +181,29 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { } } - ngOnChanges({ prop }: SimpleChanges) { - const currentProp = prop?.currentValue; - const { options, readonly, disabled, validators } = currentProp || {}; + ngOnChanges({ prop, data }: SimpleChanges) { + const currentProp = prop?.currentValue as FormProp; + const { options, readonly, disabled, validators, template } = currentProp || {}; + if (template) { + this.injectorForCustomComponent = Injector.create({ + providers: [ + { + provide: EXTENSIONS_FORM_PROP, + useValue: currentProp, + }, + { + provide: EXTENSIONS_FORM_PROP_DATA, + useValue: (data?.currentValue as PropData)?.record, + }, + { provide: ControlContainer, useExisting: FormGroupDirective }, + ], + parent: this.injector, + }); + } if (options) this.options$ = options(this.data); if (readonly) this.readonly = readonly(this.data); - + if (disabled) { this.disabledFn = disabled; } @@ -195,5 +219,9 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { } function isRequired(validator: ValidatorFn) { - return validator === Validators.required || validator === AbpValidators.required; + return ( + validator === Validators.required || + validator === AbpValidators.required || + validator.name === 'required' + ); } diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html index 259538820b..69ad86da5c 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html @@ -6,11 +6,11 @@ [formGroupName]="extraPropertiesKey" *ngIf="extraProperties.controls[prop.name]; else tempDefault" > - + - implements OnChanges { value, }; if (prop.value.component) { - const injector = Injector.create( - [ + + const injector = Injector.create({ + providers: [ { provide: PROP_DATA_STREAM, useValue: value, }, ], - this.injector, - ); + parent: this.injector, + }); record[propKey].injector = injector; record[propKey].component = prop.value.component; } diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts index 44b309d0c2..bfc9f46dba 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts @@ -38,6 +38,8 @@ export class FormProp extends Prop { readonly defaultValue: boolean | number | string | Date; readonly options: PropCallback[]>> | undefined; readonly id: string | undefined; + readonly template?: Type; + readonly className?: string; constructor(options: FormPropOptions) { super( @@ -47,6 +49,8 @@ export class FormProp extends Prop { options.permission, options.visible, options.isExtra, + options.template, + options.className, ); this.asyncValidators = options.asyncValidators || (_ => []); diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts index 66fc4f2c67..3799c419a7 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts @@ -33,6 +33,8 @@ export abstract class Prop { public readonly permission: string, public readonly visible: PropPredicate = _ => true, public readonly isExtra = false, + public readonly template?: Type, + public readonly className?: string, ) { this.displayName = this.displayName || this.name; } diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts new file mode 100644 index 0000000000..9db2949731 --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts @@ -0,0 +1,3 @@ +import { ControlContainer, FormGroupDirective } from "@angular/forms"; + +export const EXTENSIBLE_FORM_VIEW_PROVIDER = { provide: ControlContainer, useExisting: FormGroupDirective } diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensions.token.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensions.token.ts index d2cbbe87bd..0a2df45a00 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensions.token.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensions.token.ts @@ -3,6 +3,7 @@ import { ActionCallback, ReadonlyActionData as ActionData } from '../models/acti import { ExtensionsService } from '../services/extensions.service'; import { Observable } from 'rxjs'; import { ePropType } from '../enums/props.enum'; +import { FormProp } from '../models/form-props'; export const EXTENSIONS_IDENTIFIER = new InjectionToken('EXTENSIONS_IDENTIFIER'); export type ActionKeys = Extract<'entityActions' | 'toolbarActions', keyof ExtensionsService>; @@ -24,3 +25,6 @@ export const ENTITY_PROP_TYPE_CLASSES = new InjectionToken( factory: () => ({} as EntityPropTypeClass), }, ); + +export const EXTENSIONS_FORM_PROP = new InjectionToken('EXTENSIONS_FORM_PROP'); +export const EXTENSIONS_FORM_PROP_DATA = new InjectionToken('EXTENSIONS_FORM_PROP_DATA'); diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts b/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts index b19f8eb0d9..f786eb4ac8 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts @@ -64,6 +64,7 @@ export { export * from './lib/pipes/create-injector.pipe'; export * from './lib/services/extensions.service'; export * from './lib/tokens/extensions.token'; +export * from './lib/tokens/extensible-form-view-provider.token'; export * from './lib/ui-extensions.module'; export * from './lib/utils/actions.util'; export * from './lib/utils/form-props.util'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts b/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts index 33c6e1741c..7822c10e36 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/constants/validation.ts @@ -17,4 +17,5 @@ export const DEFAULT_VALIDATION_BLUEPRINTS = { passwordRequiresUpper: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresUpper', passwordRequiresDigit: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresDigit', passwordRequiresNonAlphanumeric: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresNonAlphanumeric', + usernamePattern: 'AbpIdentity::Volo.Abp.Identity:InvalidUserName[{{ actualValue }}]', }; diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index f13746aed0..bb434880de 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -69,6 +69,7 @@ function Read-File { # List of solutions $solutions = ( "framework", + "../abp-studio", "modules/account", "modules/audit-logging", "modules/background-jobs", @@ -86,8 +87,7 @@ $solutions = ( "modules/users", "modules/virtual-file-explorer", "modules/blob-storing-database", - "modules/cms-kit", - "studio" + "modules/cms-kit" ) # List of projects @@ -226,6 +226,13 @@ $projects = ( "framework/src/Volo.Abp.Kafka", "framework/src/Volo.Abp.Swashbuckle", + # studio + "../abp-studio/src/Volo.Abp.Studio.Domain.Shared", + "../abp-studio/src/Volo.Abp.Studio.Domain.CommonServices", + "../abp-studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions", + "../abp-studio/src/Volo.Abp.Studio.ModuleInstaller", + "../abp-studio/src/Volo.Abp.Studio.Analyzing.Abstractions", + # modules/account "modules/account/src/Volo.Abp.Account.Application.Contracts", "modules/account/src/Volo.Abp.Account.Application", @@ -243,8 +250,8 @@ $projects = ( "modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared", "modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore", "modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB", - "modules/audit-logging/src/Volo.Abp.AuditLogging.Installer", - "studio/source-codes/Volo.Abp.AuditLogging.SourceCode", + # "modules/audit-logging/src/Volo.Abp.AuditLogging.Installer", + # "studio/source-codes/Volo.Abp.AuditLogging.SourceCode", # modules/background-jobs "modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain", @@ -278,6 +285,7 @@ $projects = ( "modules/blogging/src/Volo.Blogging.Admin.HttpApi", "modules/blogging/src/Volo.Blogging.Admin.HttpApi.Client", "modules/blogging/src/Volo.Blogging.Admin.Web", + "modules/blogging/src/Volo.Blogging.Installer", "studio/source-codes/Volo.Blogging.SourceCode", # modules/client-simulation @@ -299,6 +307,7 @@ $projects = ( "modules/docs/src/Volo.Docs.HttpApi", "modules/docs/src/Volo.Docs.MongoDB", "modules/docs/src/Volo.Docs.Web", + "modules/docs/src/Volo.Docs.Installer", "studio/source-codes/Volo.Docs.SourceCode", # modules/feature-management @@ -351,6 +360,8 @@ $projects = ( "modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore", "modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB", "modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict", + "modules/openiddict/src/Volo.Abp.OpenIddict.Installer", + "studio/source-codes/Volo.Abp.OpenIddict.SourceCode", # modules/permission-management "modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts", @@ -448,12 +459,5 @@ $projects = ( "modules/cms-kit/src/Volo.CmsKit.Public.Web", "modules/cms-kit/src/Volo.CmsKit.Web", "modules/cms-kit/src/Volo.CmsKit.Installer", - "studio/source-codes/Volo.CmsKit.SourceCode", - - # abp/studio - "studio/src/Volo.Abp.Studio.Analyzing.Abstractions", - "studio/src/Volo.Abp.Studio.Domain.CommonServices", - "studio/src/Volo.Abp.Studio.Domain.Shared", - "studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions", - "studio/src/Volo.Abp.Studio.ModuleInstaller" + "studio/source-codes/Volo.CmsKit.SourceCode" ) diff --git a/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip index cf30aa9ec3..54a837fe33 100644 Binary files a/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/studio/source-codes/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip index f82562f960..0b1dbf3956 100644 Binary files a/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/studio/source-codes/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip index 9294e0a1c8..eb51cfbccd 100644 Binary files a/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/studio/source-codes/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip index e038297de0..910f1d354c 100644 Binary files a/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip and b/studio/source-codes/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip index 4b2654023d..415a243736 100644 Binary files a/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/studio/source-codes/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip index 327a5df956..74b652b4a2 100644 Binary files a/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.Identity.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.Identity.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.Identity.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.Identity.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.Identity.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.Identity.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip index ae71114583..a8f48f46dc 100644 Binary files a/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/studio/source-codes/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip index d5121cc50f..b58c48d1c3 100644 Binary files a/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/studio/source-codes/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.Studio.Open.SourceCode/Volo.Abp.Studio.Open.SourceCode.csproj b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.csproj similarity index 74% rename from studio/source-codes/Volo.Abp.Studio.Open.SourceCode/Volo.Abp.Studio.Open.SourceCode.csproj rename to studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.csproj index e9363c3d48..e44edc4033 100644 --- a/studio/source-codes/Volo.Abp.Studio.Open.SourceCode/Volo.Abp.Studio.Open.SourceCode.csproj +++ b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.csproj @@ -8,8 +8,8 @@ - - + + true content\ diff --git a/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip new file mode 100644 index 0000000000..04b6ab1201 Binary files /dev/null and b/studio/source-codes/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip index bdac13ec56..b9df9cf686 100644 Binary files a/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip index 1dd4c00df8..e8d67697af 100644 Binary files a/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.Studio.Open.SourceCode/Volo.Abp.Studio.Open.SourceCode.zip b/studio/source-codes/Volo.Abp.Studio.Open.SourceCode/Volo.Abp.Studio.Open.SourceCode.zip deleted file mode 100644 index a7c058d457..0000000000 Binary files a/studio/source-codes/Volo.Abp.Studio.Open.SourceCode/Volo.Abp.Studio.Open.SourceCode.zip and /dev/null differ diff --git a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip index 995615e60a..c49b3572b0 100644 Binary files a/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/studio/source-codes/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.Users.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.Users.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.Users.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.Users.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.Users.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.Users.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip index 4051bd0f17..f7272c0adf 100644 Binary files a/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/studio/source-codes/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip index 96d43881d5..bd5500a0a4 100644 Binary files a/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/studio/source-codes/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Blogging.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Blogging.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Blogging.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Blogging.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Blogging.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Blogging.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip index 81871bcbb4..0ac2de98d8 100644 Binary files a/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/studio/source-codes/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ diff --git a/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.csproj b/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.csproj deleted file mode 100644 index 1a687aea73..0000000000 --- a/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - net6.0 - - - - - - true - content\ - - - diff --git a/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip b/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip deleted file mode 100644 index 51b3f65082..0000000000 Binary files a/studio/source-codes/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip and /dev/null differ diff --git a/studio/source-codes/Volo.CmsKit.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.CmsKit.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.CmsKit.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.CmsKit.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.CmsKit.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.CmsKit.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip index b144e0f18b..32e05d1f98 100644 Binary files a/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/studio/source-codes/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ diff --git a/studio/source-codes/Volo.Docs.SourceCode/FodyWeavers.xml b/studio/source-codes/Volo.Docs.SourceCode/FodyWeavers.xml deleted file mode 100644 index 00e1d9a1c1..0000000000 --- a/studio/source-codes/Volo.Docs.SourceCode/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Docs.SourceCode/FodyWeavers.xsd b/studio/source-codes/Volo.Docs.SourceCode/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/studio/source-codes/Volo.Docs.SourceCode/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip index b05c56881f..4e49d8185a 100644 Binary files a/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/studio/source-codes/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.csproj b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.csproj index 2d3577e20f..e0ef26d462 100644 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.csproj +++ b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.csproj @@ -3,7 +3,7 @@ - net5.0 + net6.0 true diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs index 23317f8aaf..429a83d562 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs @@ -198,6 +198,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) @@ -220,6 +221,12 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); } + if (grantType == OpenIddictConstants.GrantTypes.DeviceCode) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.DeviceCode); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Device); + } + if (grantType == OpenIddictConstants.GrantTypes.Implicit) { application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken); diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs index 23317f8aaf..429a83d562 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs @@ -198,6 +198,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) @@ -220,6 +221,12 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); } + if (grantType == OpenIddictConstants.GrantTypes.DeviceCode) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.DeviceCode); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Device); + } + if (grantType == OpenIddictConstants.GrantTypes.Implicit) { application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 9026bfaeaa..804e15d0f2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -281,6 +281,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) @@ -303,6 +304,12 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); } + if (grantType == OpenIddictConstants.GrantTypes.DeviceCode) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.DeviceCode); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Device); + } + if (grantType == OpenIddictConstants.GrantTypes.Implicit) { application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs index 872920cb82..7ecafc5f6a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs @@ -250,6 +250,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) @@ -272,6 +273,12 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); } + if (grantType == OpenIddictConstants.GrantTypes.DeviceCode) + { + application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.DeviceCode); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Device); + } + if (grantType == OpenIddictConstants.GrantTypes.Implicit) { application.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj index 04e01c4466..7d648864c2 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj @@ -3,13 +3,13 @@ - net5.0 + net6.0 true MyCompanyName.MyProjectName - +