From c8f422c58a24dc050a4cab3695870a92a0de7f3b Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 10 Sep 2025 14:58:40 +0300 Subject: [PATCH 1/2] Add module command: added `skip-opening-documentation` option --- .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 9 ++++++++- .../ProjectModification/AngularSourceCodeAdder.cs | 4 ++-- .../Cli/ProjectModification/SolutionModuleAdder.cs | 12 ++++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index 803f208d8a..1791a5e928 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -69,6 +69,7 @@ public class AddModuleCommand : IConsoleCommand, ITransientDependency var newProTemplate = !string.IsNullOrEmpty(template) && template == ModuleProTemplate.TemplateName; var withSourceCode = newTemplate || newProTemplate || commandLineArgs.Options.ContainsKey(Options.SourceCode.Long); var addSourceCodeToSolutionFile = withSourceCode && commandLineArgs.Options.ContainsKey("add-to-solution-file"); + var skipOpeningDocumentation = commandLineArgs.Options.ContainsKey(Options.SkipOpeningDocumentation.Long); var skipDbMigrations = newTemplate || newProTemplate || commandLineArgs.Options.ContainsKey(Options.DbMigrations.Skip); var solutionFile = GetSolutionFile(commandLineArgs); @@ -98,7 +99,8 @@ public class AddModuleCommand : IConsoleCommand, ITransientDependency withSourceCode, addSourceCodeToSolutionFile, newTemplate, - newProTemplate + newProTemplate, + skipOpeningDocumentation ); _lastAddedModuleInfo = new AddModuleInfoOutput @@ -223,5 +225,10 @@ public class AddModuleCommand : IConsoleCommand, ITransientDependency public const string Short = "t"; public const string Long = "template"; } + + public class SkipOpeningDocumentation + { + public const string Long = "skip-opening-documentation"; + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index f996247217..aecc1ad222 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -14,11 +14,11 @@ namespace Volo.Abp.Cli.ProjectModification; public class AngularSourceCodeAdder : ITransientDependency { - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } public AngularSourceCodeAdder() { - Logger = NullLogger.Instance; + Logger = NullLogger.Instance; } public async Task AddFromModuleAsync(string solutionFilePath, string angularPath) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 1c6a2abd3f..8a703a8deb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -98,7 +98,8 @@ public class SolutionModuleAdder : ITransientDependency bool withSourceCode = false, bool addSourceCodeToSolutionFile = false, bool newTemplate = false, - bool newProTemplate = false) + bool newProTemplate = false, + bool skipOpeningDocumentation = false) { Check.NotNull(solutionFile, nameof(solutionFile)); Check.NotNull(moduleName, nameof(moduleName)); @@ -159,10 +160,13 @@ public class SolutionModuleAdder : ITransientDependency await SetLeptonXAbpVersionsAsync(solutionFile, Path.Combine(modulesFolderInSolution, module.Name)); } - var documentationLink = module.GetFirstDocumentationLinkOrNull(); - if (documentationLink != null) + if (!skipOpeningDocumentation) { - CmdHelper.Open(documentationLink); + var documentationLink = module.GetFirstDocumentationLinkOrNull(); + if (documentationLink != null) + { + CmdHelper.Open(documentationLink); + } } return module; From 71a3fcab80ad43a0d8f7e232d4d197887aefe7b1 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 11 Sep 2025 09:29:43 +0800 Subject: [PATCH 2/2] Update OpenIddict packages to version 7.1.0 --- Directory.Packages.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 05b99f9dd1..942d1bf884 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -128,11 +128,11 @@ - - - - - + + + + +