Merge pull request #20592 from abpframework/auto-merge/rel-8-3/2930

Merge branch dev with rel-8.3
abpframework · Aug 22, 2024 · 86af937 · 86af937
2 parents fa8b368 + d3a8175
commit 86af937
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/docs/en/cli/index.md b/docs/en/cli/index.md
@@ -796,12 +796,19 @@ Examples:
 
 ````bash
 abp upgrade -t app
+abp upgrade -t app --language-management --gdpr --audit-logging-ui --text-template-management --openiddict-pro
+abp upgrade -t app-nolayers --audit-logging-ui
 abp upgrade -t app-nolayers -p D:\MyProjects\MyProject
 ````
 
 #### Options
 
 * `--path` or `-p`: Specifies the module path. The module should be in that directory. If not specified, the default is the current directory.
+* `--gdpr`: Installs GDPR module too.
+* `--language-management`: Installs Language Management module too.
+* `--audit-logging-ui`: Installs Audit Logging Pro (UI) module too.
+* `--text-template-management`: Installs Text Template Management module too.
+* `--openiddict-pro`: Installs OpenIddict Pro (UI) module too.
 
 ### translate
 

diff --git a/docs/en/guides/migrating-from-open-source.md b/docs/en/guides/migrating-from-open-source.md
@@ -9,12 +9,14 @@ ABP Studio provides a way for users, who already started the development before
 * Alternatively, you can use the following ABP Studio CLI command to achieve the same functionality:
 
   ```bash
-  abp upgrade [-t <template-name>]
+  abp upgrade [-t <template-name>] [options]
 
   Examples:
 
   abp upgrade -t app
-  abp upgrade -t app-nolayers
+  abp upgrade -t app --language-management --gdpr --audit-logging-ui --text-template-management --openiddict-pro
+  abp upgrade -t app-nolayers --audit-logging-ui
+  abp upgrade -t app-nolayers -p D:\MyProjects\MyProject
   ```
 
 ## Changes in the solution
@@ -31,15 +33,14 @@ This command will remove the following modules from your solution:
 And install the following modules to your solution:
 
 - Volo.Abp.Account.Pro
-- Volo.Abp.AuditLogging.Pro
 - Volo.Abp.Identity.Pro
-- Volo.Abp.OpenIddict.Pro
-- Volo.Saas
-- Volo.Abp.LanguageManagement
-- Volo.Abp.TextTemplateManagement
-- Volo.FileManagement
-- Volo.Abp.Gdpr
 - Volo.Abp.LeptonXTheme
+- Volo.Saas
+- Volo.Abp.OpenIddict.Pro (*Optional*)
+- Volo.Abp.AuditLogging.Pro  (*Optional*)
+- Volo.Abp.LanguageManagement  (*Optional*)
+- Volo.Abp.TextTemplateManagement  (*Optional*)
+- Volo.Abp.Gdpr  (*Optional*)
 
 ### Other changes