Merge branch 'dev' into net7

yuan208208 · Aug 17, 2022 · b488672 · b488672
2 parents 2875cae + 92955d8
commit b488672
Show file tree

Hide file tree

Showing 126 changed files with 1,491 additions and 228 deletions.
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -10,11 +10,17 @@ on:
     branches:
       - 'rel-*'
       - 'dev'
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 permissions:
   contents: read
 
 jobs:
   build-test-lint:
+    if: ${{ !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -31,12 +31,18 @@ on:
       - 'templates/**/*.cshtml'
       - 'templates/**/*.csproj'
       - 'templates/**/*.razor'
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 permissions:
   contents: read
 
 jobs:
   build-test:
     runs-on: windows-latest
+    if: ${{ !github.event.pull_request.draft }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@master

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -9,26 +9,32 @@ on:
   push:
     branches: [dev, rel-*]
     paths:
-      - 'abp/**/*.js'
-      - 'abp/**/*.cs'
-      - 'abp/**/*.cshtml'
-      - 'abp/**/*.csproj'
-      - 'abp/**/*.razor'
+      - "abp/**/*.js"
+      - "abp/**/*.cs"
+      - "abp/**/*.cshtml"
+      - "abp/**/*.csproj"
+      - "abp/**/*.razor"
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [dev]
     paths:
-      - 'abp/**/*.js'
-      - 'abp/**/*.cs'
-      - 'abp/**/*.cshtml'
-      - 'abp/**/*.csproj'
-      - 'abp/**/*.razor'
+      - "abp/**/*.js"
+      - "abp/**/*.cs"
+      - "abp/**/*.cshtml"
+      - "abp/**/*.csproj"
+      - "abp/**/*.razor"
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 
 permissions:
   contents: read
 
 jobs:
   analyze:
+    if: ${{ !github.event.pull_request.draft }}
     permissions:
       actions: read  # for github/codeql-action/init to get workflow details
       contents: read  # for actions/checkout to fetch code
@@ -41,48 +47,48 @@ jobs:
       matrix:
         # Override automatic language detection by changing the below list
         # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['csharp', 'javascript']
+        language: ["csharp", "javascript"]
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+      - run: git checkout HEAD^2
+        if: ${{ github.event_name == 'pull_request' }}
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/image-compression.yml b/.github/workflows/image-compression.yml
@@ -1,21 +1,26 @@
-name: Compress Images
-on:
-  pull_request:
-    paths:
-      - '**.jpg'
-      - '**.jpeg'
-      - '**.png'
-      - '**.webp'
-jobs:
-  build:
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    name: calibreapp/image-actions
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-
-      - name: Compress Images
-        uses: calibreapp/image-actions@main
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
+name: Compress Images
+on:
+  pull_request:
+    paths:
+      - "**.jpg"
+      - "**.jpeg"
+      - "**.png"
+      - "**.webp"
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+jobs:
+  build:
+    if: github.event.pull_request.head.repo.full_name == github.repository && !github.event.pull_request.draft
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Compress Images
+        uses: calibreapp/image-actions@main
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json
@@ -73,6 +73,7 @@
     "DeveloperFocused": "Developer Focused",
     "ShareYourExperiences": "Share your experiences with the ABP Framework",
     "LatestPosts": "Latest Posts",
+    "LatestVideos": "Latest Videos",
     "Views": "Views",
     "LearnLatestNewsAboutABPFramework": "Get information about happenings in ABP like new releases, free sources, posts, and more.",
     "DeveloperTools": "Developer Tools",
@@ -98,6 +99,7 @@
     "Logout": "Logout",
     "Home": "Home",
     "Posts": "Posts",
+    "Videos": "Videos",
     "JoinTheABPCommunity": "Join the ABP Community",
     "SubmitYourPost": "Submit Your Post",
     "Modules": "Modules",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json
@@ -73,6 +73,7 @@
     "DeveloperFocused": "以开发者为中心",
     "ShareYourExperiences": "分享您使用 ABP 框架的经验",
     "LatestPosts": "最新的帖子",
+    "LatestVideos": "最新的视频",
     "Views": "意见",
     "LearnLatestNewsAboutABPFramework": "获取有关 ABP 的最新相关信息，例如新版本、免费资源、帖子等。",
     "DeveloperTools": "开发者工具",
@@ -98,6 +99,7 @@
     "Logout": "登出",
     "Home": "主页",
     "Posts": "帖子",
+    "Videos": "视频",
     "JoinTheABPCommunity": "加入 ABP 社区",
     "SubmitYourPost": "提交您的帖子",
     "Modules": "模块",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json
@@ -185,6 +185,7 @@
     "Layout_Title": "{0} | ABP Community",
     "Layout_MetaDescription": "ABP Community is an environment where people can share posts about ABP framework and follows the projects.",
     "Index_Page_CommunityIntroduction": "This is a hub for ABP Framework, .NET and software development. You can read the articles, watch the video tutorials, get informed about ABP’s development progress and ABP-related events, help other developers and share your expertise with the ABP community.",
-    "TagsInArticle": "Tags in article"
+    "TagsInArticle": "Tags in article",
+    "ExploreTheContentsCreatedByTheCoreABPTeamAndTheABPCommunity": "Explore the contents created by the core ABP team and the ABP community."
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json
@@ -378,6 +378,13 @@
     "IntroducingTheSolution": "Introducing the eShopOnAbp Solution",
     "RunningTheSolution": "Running the Solution",
     "UnderstandingTheAuthenticationSystem": "Understanding the Authentication System",
+    "ExploringTheApplications": "Exploring the Applications",
+    "UnderstandingTheAPIGateways": "Understanding the API Gateways",
+    "DevelopingTheMicroservices": "Developing the Microservices",
+    "UnderstandingTheInfrastructure": "Understanding the Infrastructure",
+    "DiggingInTheUseCases": "Digging in the Use Cases",
+    "DeployingTheSolution": "Deploying the Solution",
+    "ThisBookIsInDraftStageAndIsNotCompletedYet": "This book is in draft stage and is not completed yet.",
     "Authors": "Authors",
     "MicroserviceEBook": "Microservice E-Book",
     "SelectUITheme": "Select UI Theme",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/tr.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/tr.json
@@ -279,6 +279,7 @@
     "SubscribeToNewsletter": "ABP.IO Platform'u ile ilgili yeni haberler, makaleler, teklifler ve daha fazlası gibi gelişmeler hakkında bilgi almak için bültene abone olun.",
     "FirstEdition": "İlk Baskı",
     "ThankYou": "Teşekkürler!",
-    "CheckboxMandatory": "Devam etmek için bunu kontrol etmeniz gerekiyor!"
+    "CheckboxMandatory": "Devam etmek için bunu kontrol etmeniz gerekiyor!",
+    "ThisBookIsInDraftStageAndIsNotCompletedYet": "Bu kitap taslak aşamasındadır ve henüz tamamlanmamıştır."
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json
@@ -372,6 +372,7 @@
     "MasteringAbpFramework_Book_What_You_Will_Learn_8": "使用 ABP 框架编写单元、集成和 UI 测试。",
     "MasteringAbpFramework_Book_WhoIsThisBookFor": "这本书是给谁看的",
     "MasteringAbpFramework_Book_WhoIsThisBookFor_Description": "本书适用于希望学习软件架构和最佳实践的 Web 开发人员，以使用 Microsoft 技术和 ABP 框架构建\n 可维护的基于 Web 的解决方案。 C#\n 和 ASP.NET Core 的基本知识是开始阅读本书所必需的。",
-    "ComputersAndTechnology": "计算机与技术"
+    "ComputersAndTechnology": "计算机与技术",
+    "ThisBookIsInDraftStageAndIsNotCompletedYet": "这本书正在草案阶段，还没有完成。"
   }
 }
diff --git a/docs/en/CLI.md b/docs/en/CLI.md
@@ -124,7 +124,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
         * `--separate-auth-server`: The Identity Server project comes as a separate project and runs at a different endpoint. It separates the Identity Server from the API Host application. If not specified, you will have a single endpoint in the server side.
     * `--mobile` or `-m`: Specifies the mobile application framework. If not specified, no mobile application will be created. Available options:
       * `react-native`: React Native.
-      * `maui`: MAUI.
+      * `maui`: MAUI. This mobile option is only available for ABP Commercial.
     * `--database-provider` or `-d`: Specifies the database provider. Default provider is `ef`. Available providers:
         * `ef`: Entity Framework Core.
         * `mongodb`: MongoDB.
@@ -145,7 +145,8 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
         * `mongodb`: MongoDB.
     * `--theme`: Specifes the theme. Default theme is `leptonx-lite`. Available themes:
         * `leptonx-lite`: [LeptonX Lite Theme](/Themes/LeptonXLite/mvc.md).
-        * `basic`: [Basic Theme](/UI/AspNetCore/Basic-Theme.md).        
+        * `basic`: [Basic Theme](/UI/AspNetCore/Basic-Theme.md).    
+  * **`maui`**: .NET MAUI. A minimalist .NET MAUI application will be created if you specify this option.
 * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory.
 * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version.
 * `--preview`: Use latest preview version.
@@ -161,6 +162,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
   * `PostgreSQL`
 * `--local-framework-ref --abp-path`: Uses local projects references to the ABP framework instead of using the NuGet packages. This can be useful if you download the ABP Framework source code and have a local reference to the framework from your application.
 * `--no-random-port`: Uses template's default ports.
+* `--skip-installing-libs` or `-sib`: Skip installing client side packages.
 
 See some [examples for the new command](CLI-New-Command-Samples.md) here.
 
@@ -244,7 +246,7 @@ It can also create a new module for your solution and add it to your solution. S
 
 > A business module generally consists of several packages (because of layering, different database provider options or other reasons). Using `add-module` command dramatically simplifies adding a module to a solution. However, each module may require some additional configurations which is generally indicated in the documentation of the related module.
 
-Usage
+Usage:
 
 ````bash
 abp add-module <module-name> [options]
@@ -278,7 +280,7 @@ abp add-module ProductManagement --new --add-to-solution-file
 
 Lists names of open-source application modules.
 
-Usage
+Usage:
 
 ````bash
 abp list-modules [options]
@@ -294,11 +296,21 @@ abp list-modules
 
 * `--include-pro-modules`: Includes commercial (pro) modules in the output.
 
+### list-templates
+
+Lists all available templates to create a solution.
+
+Usage:
+
+```bash
+abp list-templates
+```
+
 ### get-source
 
 Downloads the source code of a module to your computer.
 
-Usage
+Usage:
 
 ````bash
 abp get-source <module-name> [options]