Merge branch 'prerel-9.0' into pr/20539

.github/ISSUE_TEMPLATE/04_article_request.yml

@@ -6,7 +6,7 @@ body:
     id: searched
     attributes:
       label: Is there an existing article or article request for this?
-      description: Please search to see if there is an article or article request related to your article request ([community.abp.io](https://community.abp.io/posts), [abp/issues](https://github.com/abpframework/abp/issues?q=is%3Aopen+is%3Aissue+label%3Acommunity-article-request))
+      description: Please search to see if there is an article or article request related to your article request ([abp.io/community](https://abp.io/community/articles), [abp/issues](https://github.com/abpframework/abp/issues?q=is%3Aopen+is%3Aissue+label%3Acommunity-article-request))
       options:
       - label: I have searched the existing resources
         required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
   - name: Issue with ABP Commercial
-    url:  https://support.abp.io/QA/Questions
-    about: Please open ABP Commercial related issues at https://support.abp.io.
+    url:  https://abp.io/support/questions
+    about: Please open ABP Commercial related issues at https://abp.io/support/questions.
   - name: Ask a question (community support)
     url:  https://stackoverflow.com/questions/tagged/abp
     about: Ask a question that will be answered by the ABP community

.github/workflows/auto-pr.yml

@@ -1,13 +1,13 @@
-name: Merge branch dev with rel-8.3
+name: Merge branch dev with prerel-9.0
 on:
   push:
     branches:
-      - rel-8.3
+      - prerel-9.0
 permissions:
   contents: read
 
 jobs:
-  merge-dev-with-rel-8-3:
+  merge-dev-with-prerel-9-0:
     permissions:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
@@ -18,19 +18,19 @@ jobs:
           ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-8.3:rel-8.3
-          git reset --hard rel-8.3
+          git fetch origin prerel-9.0:prerel-9.0
+          git reset --hard prerel-9.0
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-8-3/${{github.run_number}}
-          title: Merge branch dev with rel-8.3
-          body: This PR generated automatically to merge dev with rel-8.3. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/prerel-9-0/${{github.run_number}}
+          title: Merge branch dev with prerel-9.0
+          body: This PR generated automatically to merge dev with prerel-9.0. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: maliming
           token: ${{ github.token }}
       - name: Merge Pull Request
         env:
           GH_TOKEN: ${{ secrets.BOT_SECRET }}
         run: |
-          gh pr review auto-merge/rel-8-3/${{github.run_number}} --approve
-          gh pr merge auto-merge/rel-8-3/${{github.run_number}} --merge --auto --delete-branch
+          gh pr review auto-merge/prerel-9-0/${{github.run_number}} --approve
+          gh pr merge auto-merge/prerel-9-0/${{github.run_number}} --merge --auto --delete-branch

.github/workflows/build-and-test.yml

@@ -51,7 +51,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@master
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.0.100-rc.2.24474.11
 
     - name: chown
       run: |

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 ## Contribution
 
-See the [contribution guide](docs/en/Contribution/Index.md).
+The contribution guide is available at [contribution guide](docs/en/contribution/index.md).

NuGet.md

@@ -11,21 +11,21 @@ ABP offers an opinionated architecture to build enterprise software solutions wi
 
 🔗GitHub Repository: https://github.com/abpframework/abp
 
-🔗Samples: https://docs.abp.io/en/abp/latest/Samples/Index
+🔗Samples: https://abp.io/docs/latest/samples/
 
 🔗Official Theme: https://www.LeptonTheme.com
 
-🔗Documentation: https://docs.abp.io
+🔗Documentation: https://abp.io/docs/latest/
 
-🔗Community: https://community.abp.io
+🔗Community: https://abp.io/community/
 
-🔗Blog: https://blog.abp.io
+🔗Blog: https://abp.io/blog/
 
 🔗Books: https://abp.io/books
 
 🔗Twitter: https://twitter.com/abpframework
 
-🔗Discord: https://community.abp.io/discord
+🔗Discord: https://abp.io/community/discord
 
 🔗Stackoverflow: https://stackoverflow.com/questions/tagged/abp
 
@@ -124,8 +124,8 @@ Support for open-source ABP Framework client-side packages is available at [GitH
 
 If you are building an enterprise-level application with pro support, extra tools like a code generator, fancy themes and a microservice template, time to invest in the commercial version! 
 
-To understand how it works, see [How it Works]( https://commercial.abp.io/how-it-works) page.
+To understand how it works, see [How it Works]( https://abp.io/how-it-works) page.
 
-If you wonder why you should choose ABP Commercial, check out [Why ABP.IO Platform](https://docs.abp.io/en/commercial/latest/why-abp-io-platform) page.
+If you wonder why you should choose ABP, check out [Why ABP.IO Platform](https://abp.io/docs/latest/others/why-abp-platform) page.
 
-Official website:  [https://commercial.abp.io](https://commercial.abp.io/)
+Official website:  [https://abp.io](https://abp.io/)

README.md

@@ -3,92 +3,79 @@
 ![build and test](https://img.shields.io/github/actions/workflow/status/abpframework/abp/build-and-test.yml?branch=dev&style=flat-square) 🔹 [![codecov](https://codecov.io/gh/abpframework/abp/branch/dev/graph/badge.svg?token=jUKLCxa6HF)](https://codecov.io/gh/abpframework/abp) 🔹 [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://abp.io/docs/latest/release-info/nightly-builds) 🔹 
 [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![Code of Conduct](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/abpframework/abp/blob/dev/CODE_OF_CONDUCT.md) 🔹 [![CLA Signed](https://cla-assistant.io/readme/badge/abpframework/abp)](https://cla-assistant.io/abpframework/abp) 🔹 [![Discord Shield](https://discord.com/api/guilds/951497912645476422/widget.png?style=shield)](https://discord.gg/abp)
 
-ABP Framework is a complete **infrastructure** based on **ASP.NET Core** that creates **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**.
+[ABP](https://abp.io/) offers an **opinionated architecture** to build enterprise software solutions with **best practices** on top of the **.NET** and the **ASP.NET Core** platforms. It provides the fundamental infrastructure, production-ready startup templates, pre-built application modules, UI themes, tooling, guides and documentation to implement that architecture properly and **automate the details** and repetitive works as much as possible.
 
 [![ABP Platform](https://github.com/user-attachments/assets/200653c0-0e69-4b47-b76a-3a83460aaab6)](https://abp.io) 
 
 ## Getting Started
 
+- [The Getting Started guide](https://abp.io/docs/latest/get-started) can be used to create and run ABP-based solutions with different options and details.
 - [Quick Start](https://abp.io/docs/latest/tutorials/todo) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to understand how ABP works quickly.
-- [Getting Started guide](https://abp.io/docs/latest/get-started) can be used to create and run ABP-based solutions with different options and details.
 - [Web Application Development Tutorial](https://abp.io/docs/latest/tutorials/book-store) is a complete tutorial on developing a full-stack web application with all aspects of a real-life solution.
-
-### Quick Start
-
-Install the ABP CLI:
-
-````bash
-> dotnet tool install -g Volo.Abp.Cli
-````
-
-Create a new solution:
-
-````bash
-> abp new BookStore -u mvc -d ef
-````
-
-> See the [CLI documentation](https://abp.io/docs/latest/cli) for all available options.
-
-
-
-### UI Framework Options
-
-<img width="500" src="docs/en/images/ui-options.png">
-
-
-
-### Database Provider Options
-
-<img width="500" src="docs/en/images/db-options.png">
-
-
+- [Modular Monolith Application](https://abp.io/docs/latest/tutorials/modular-crm/index): A multi-part tutorial that demonstrates how to create application modules, compose and communicate them to build a monolith modular web application.
 
 ## What ABP Provides?
 
-ABP provides a **full stack developer experience**.
+ABP bridges the gap between ASP.NET Core and real-world business application requirements, and makes you focus on your own business code.
 
+The following diagram contains the core components of the **ABP Platform** and shows how ABP sits between **ASP.NET Core** and **Your Application**:
 
+![abp-overall-diagram](docs/en/images/abp-overall-diagram.png)
 
 ### Architecture
 
-<img src="docs/en/images/ddd-microservice-simple.png">
+ABP offers a complete architectural model to build modern enterprise software solutions. Here, the fundamental architectural structures offered and first-class supported by ABP:
 
-ABP offers a complete, **modular** and **layered** software architecture based on **[Domain Driven Design](https://abp.io/docs/latest/framework/architecture/domain-driven-design)** principles and patterns. It also provides the necessary infrastructure and guidance to [implement this architecture](https://abp.io/books/implementing-domain-driven-design).
+* [Domain Driven Design](https://abp.io/docs/latest/framework/architecture/domain-driven-design)
+* [Microservices](https://abp.io/docs/latest/framework/architecture/microservices)
+* [Modularity](https://abp.io/docs/latest/framework/architecture/modularity/basics)
+* [Multi-Tenancy](https://abp.io/docs/latest/framework/architecture/multi-tenancy)
 
-ABP Framework is suitable for **[microservice solutions](https://abp.io/docs/latest/framework/architecture/microservices)** as well as monolithic applications.
+### Infrastructure
 
+There are a lot of infrastructure features provided by the ABP Framework to achieve real-world scenarios easier, like [Event Bus](https://abp.io/docs/latest/framework/infrastructure/event-bus), [Background Job System](https://abp.io/docs/latest/framework/infrastructure/background-jobs), [Audit Logging](https://abp.io/docs/latest/framework/infrastructure/audit-logging), [BLOB Storing](https://abp.io/docs/latest/framework/infrastructure/blob-storing), [Data Seeding](https://abp.io/docs/latest/framework/infrastructure/data-seeding), [Data Filtering](https://abp.io/docs/latest/framework/infrastructure/data-filtering), and much more.
 
+[See ABP Framework features](https://abp.io/framework)
 
-### Infrastructure
+#### Cross-Cutting Concerns
 
-There are a lot of features provided by the ABP Framework to achieve real-world scenarios easier, like [Event Bus](https://abp.io/docs/latest/framework/infrastructure/event-bus), [Background Job System](https://abp.io/docs/latest/framework/infrastructure/background-jobs), [Audit Logging](https://abp.io/docs/latest/framework/infrastructure/audit-logging), [BLOB Storing](https://abp.io/docs/latest/framework/infrastructure/blob-storing), [Data Seeding](https://abp.io/docs/latest/framework/infrastructure/data-seeding), [Data Filtering](https://abp.io/docs/latest/framework/infrastructure/data-filtering), etc.
+ABP also simplifies (and even automates wherever possible) cross-cutting concerns and common non-functional requirements like [Exception Handling](https://abp.io/docs/latest/framework/fundamentals/exception-handling), [Validation](https://abp.io/docs/latest/framework/fundamentals/validation), [Authorization](https://abp.io/docs/latest/framework/fundamentals/authorizationn), [Localization](https://abp.io/docs/latest/framework/fundamentals/localization), [Caching](https://abp.io/docs/latest/framework/fundamentals/caching), [Dependency Injection](https://abp.io/docs/latest/framework/fundamentals/dependency-injection), [Setting Management](https://abp.io/docs/latest/framework/infrastructure/settings), etc.
 
+### Application Modules
 
+ABP is a modular framework and the [application modules](https://abp.io/modules) provide **pre-built application functionalities**. 
 
-### Cross-Cutting Concerns
+Some examples:
 
-ABP also simplifies (and even automates wherever possible) cross-cutting concerns and common non-functional requirements like [Exception Handling](https://abp.io/docs/latest/framework/fundamentals/exception-handling), [Validation](https://abp.io/docs/latest/framework/fundamentals/validation), [Authorization](https://abp.io/docs/latest/framework/fundamentals/authorizationn), [Localization](https://abp.io/docs/latest/framework/fundamentals/localization), [Caching](https://abp.io/docs/latest/framework/fundamentals/caching), [Dependency Injection](https://abp.io/docs/latest/framework/fundamentals/dependency-injection), [Setting Management](https://abp.io/docs/latest/framework/infrastructure/settings), etc.
+- [**Account**](https://abp.io/modules/Volo.Account.Pro): Provides UI for the account management and allows user to login/register to the application.
+- [CMS Kit](https://abp.io/modules/Volo.CmsKit):  Brings CMS (Content Management System) capabilities to your application.
+- **[Identity](https://abp.io/modules/Volo.Identity.Pro)**: Manages organization units, roles, users and their permissions based on the Microsoft Identity library.
+- [**OpenIddict**](https://abp.io/modules/Volo.OpenIddict.Pro): Integrates to OpenIddict library and provides a management UI.
+- [**SaaS**](https://abp.io/modules/Volo.Saas): Manages tenants and editions for a [multi-tenant](https://abp.io/docs/latest/framework/architecture/multi-tenancy) (SaaS) application.
 
+See [all official modules](https://abp.io/modules).
 
+### Startup Templates
 
-### Application Modules
+The [Startup templates](https://abp.io/docs/latest/solution-templates) are pre-built Visual Studio solution templates. You can create your own solution based on these templates to **immediately start your development**.
 
-ABP is a modular framework and the Application Modules provide **pre-built application functionalities**;
+### Tooling
 
-- [**Account**](https://abp.io/docs/latest/modules/account): Provides UI for the account management and allows user to login/register to the application.
-- **[Identity](https://abp.io/docs/latest/modules/identity)**: Manages organization units, roles, users and their permissions based on the Microsoft Identity library.
-- [**OpenIddict**](https://abp.io/docs/latest/modules/openiddict): Integrates to OpenIddict.
-- [**Tenant Management**](https://abp.io/docs/latest/modules/tenant-management): Manages tenants for a [multi-tenant](https://abp.io/docs/latest/framework/architecture/multi-tenancy) (SaaS) application.
+ABP provides CLI and UI tools to simplify your daily development work flows.
 
-See the [Application Modules](https://abp.io/docs/latest/modules) document for all pre-built modules.
+#### ABP Studio
 
+[ABP Studio](https://abp.io/studio) is a cross-platform desktop application for ABP developers.
 
+It is well integrated to the ABP Framework and aims to provide a comfortable development environment for you by automating things, providing insights about your solution, making develop, run and deploy your solutions much easier.
 
-### Startup Templates
+#### ABP Suite
 
-The [Startup templates](https://abp.io/docs/latest/solution-templates) are pre-built Visual Studio solution templates. You can create your own solution based on these templates to **immediately start your development**.
+[ABP Suite](https://abp.io/suite) allows you to automatically generate web pages in a matter of minutes.
 
+#### ABP CLI
 
+[ABP CLI](https://abp.io/cli) is a command line tool to perform common operations for ABP based solutions.
 
 ## Mastering ABP Framework Book
 
@@ -102,7 +89,7 @@ This book will help you to gain a complete understanding of the ABP Framework an
 
 ### ABP Community Web Site
 
-The [ABP Community](https://abp.io/community) is a website to publish **articles** and share **knowledge** about the ABP Framework. You can also create content for the community!
+The [ABP Community](https://abp.io/community) is a central hub to publish **articles** and share **knowledge** about the ABP Framework.
 
 ### Blog
 
@@ -116,8 +103,6 @@ See the [sample projects](https://abp.io/docs/latest/samples) built with the ABP
 
 ABP is a community-driven open-source project. See [the contribution guide](https://abp.io/docs/latest/contribution) if you want to participate in this project.
 
-
-
 ## Official Links
 
 * [Home Website](https://abp.io)
@@ -130,15 +115,10 @@ ABP is a community-driven open-source project. See [the contribution guide](http
 * [Stackoverflow](https://stackoverflow.com/questions/tagged/abp)
 * [Twitter](https://twitter.com/abpframework)
 
-
-
 ## Support ABP
 
 GitHub repository stars are an important indicator of popularity and the size of the community. If you like ABP Framework, support us by clicking the star :star: on the repository.
 
-
-
 ## Discord Server
 
 We have a Discord server where you can chat with other ABP users. Share your ideas, report technical issues, showcase your creations, share the tips that worked for you and catch up with the latest news and announcements about ABP Framework. Join 👉 https://discord.gg/abp.
-

abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalization.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en-GB.json

@@ -33,12 +33,15 @@
     "Name": "Name",
     "DisplayName": "Display name",
     "ShortDescription": "Short description",
+    "LongDescription": "Long description",
     "NameFilter": "Name",
     "CreationTime": "Creation time",
-    "IsPro": "Is pro",
+    "IsPro": "Pro package",
     "ShowOnModuleList": "Show in module list",
     "EfCoreConfigureMethodName": "Configure method name",
     "IsProFilter": "Is pro",
+    "ShowOnModuleFilter": "Show on module list",
+    "ShowOnModuleListFilter": "Show on module list",
     "ApplicationType": "Application type",
     "Target": "Target",
     "TargetFilter": "Target",
@@ -57,8 +60,10 @@
     "Refresh": "Refresh",
     "NpmPackages": "NPM Packages",
     "NugetPackages": "Nuget Packages",
+    "NuGetPackages": "NuGet Packages",
     "NpmPackageCount": "NPM Package Count",
     "NugetPackageCount": "Nuget Package Count",
+    "NuGetPackageCount": "NuGet Package Count",
     "Module": "Modules",
     "ModuleInfo": "Module info",
     "CreateANpmPackage": "Create a NPM package",