(options =>
+{
+ // How long to keep exported files before cleanup
+ options.FileRetentionHours = 48;
+
+ // Base URL for download links in notification emails
+ options.DownloadBaseUrl = "https://yourdomain.com";
+
+ // Configure the cleanup worker schedule
+ options.ExcelFileCleanupOptions.Period = (int)TimeSpan.FromHours(24).TotalMilliseconds;
+
+ // Use cron expression for more advanced scheduling (requires Hangfire or Quartz)
+ options.ExcelFileCleanupOptions.CronExpression = "0 2 * * *"; // Run at 2 AM daily
+});
+```
+
+The module includes pre-configured email templates for notifications about completed or failed exports, ensuring users are always informed about the status of their export requests.
+
+> **Note**: This feature requires a configured BLOB storage provider to store the generated Excel files. See the [BLOB Storing documentation](https://abp.io/docs/9.3/framework/infrastructure/blob-storing) for more information.
+
+For more details about the Audit Logging Module and its Excel export capabilities, please refer to the [official documentation](https://abp.io/docs/9.3/modules/audit-logging-pro).
+
+## Community News
+
+### Announcing ABP Studio 1.0 General Availability 🚀
+
+
+
+We are thrilled to announce that ABP Studio has reached version 1.0 and is now generally available! This marks a significant milestone for our integrated development environment designed specifically for ABP developers. The stable release brings several powerful features including:
+
+* Enhanced Solution Runner with health monitoring capabilities
+* Theme style selection during project creation (Basic, LeptonX Lite, and LeptonX Themes)
+* New "Container" application type for better Docker container management
+* Improved handling of multiple DbContexts for migration operations
+
+> For a detailed overview of these features and to learn more about what's coming next, check out our [announcement post](https://abp.io/community/articles/announcing-abp-studio-1-0-general-availability-82yw62bt).
+
+### ABP Community Talks 2025.05: Empower Elsa Workflows with AI in .NET + ABP Framework
+
+In this episode of ABP Community Talks, 2025.05, we are thrilled to host [**Sipke Schoorstra**](https://github.com/sfmskywalker), the creator of the [Elsa Workflows](https://docs.elsaworkflows.io/) library! This month's session is all about **"Empower Elsa Workflows with AI in .NET + ABP Framework"**.
+
+
+
+Sipke will join us to demonstrate how you can leverage AI within Elsa Workflows using .NET and the ABP Framework. The session will explore practical techniques and showcase how to integrate AI capabilities to enhance and automate your business processes within the Elsa workflow engine.
+
+> 👉 Don't miss this opportunity to learn directly from the creator of Elsa and see real-world examples of building intelligent, automated workflows! You can register from [here](https://kommunity.com/volosoft/events/abp-community-talks-202505empower-elsa-workflows-with-ai-in-netabp-framework-3965dd32).
+
+### ABP Bootcamp: Mastering Infrastructure & Features
+
+We are excited to announce the very first **ABP Bootcamp: Mastering Infrastructure & Features**! This is a live training program designed to give you hands-on, practical experience with ABP's core infrastructure and features.
+
+
+
+Join the ABP Bootcamp to learn directly from the core team in a focused, hands-on program designed for busy developers. Over four days, you'll gain a deep understanding of ABP's infrastructure, best practices, and practical skills you can immediately apply to your projects.
+
+> **Seats are limited!** Don't miss this opportunity to level up your ABP skills with direct guidance from the experts.
+>
+> 👉 [See full details and reserve your seat!](https://abp.io/bootcamp)
+
+### New ABP Community Articles
+
+There are exciting articles contributed by the ABP community as always. I will highlight some of them here:
+
+* [Prabhjot Singh](https://abp.io/community/members/prabhjot) has published 3 new articles:
+ * [Accessing Multiple Remote ABP based Backends Using HttpApi.Client](https://abp.io/community/articles/consume-multi-backends-using-clients-6f4vcggh)
+ * [Adopting the new .slnx format to organize applications and services](https://abp.io/community/articles/adopting-the-new-.slnx-format-to-organize-applications-6cm3vl8k)
+ * [Replacing Dynamic client proxies with Static client proxies](https://abp.io/community/articles/replacing-dynamic-client-proxies-with-static-client-proxies-g30lf0vx)
+* [Liming Ma](https://github.com/maliming) has published 2 new articles:
+ * [Resolving Tenant from Route in ABP Framework](https://abp.io/community/articles/resolving-tenant-from-route-in-abp-framework-ah7oru97)
+ * [Integrating .NET AI Chat Template with ABP Framework](https://abp.io/community/articles/integrating-.net-ai-chat-template-with-abp-framework-qavb5p2j)
+* [Engincan Veske](https://engincanveske.substack.com/) has published 2 new articles:
+ * [Understanding HttpApi.Client Project & Remote Services in an ABP Based Application](https://abp.io/community/articles/http-api-client-and-remote-services-in-abp-based-application-xkknsp6m)
+ * [Using Elsa 3 with the ABP Framework: A Comprehensive Guide](https://abp.io/community/articles/using-elsa-3-workflow-with-abp-framework-usqk8afg)
+* [Enis Necipoğlu](https://github.com/enisn) has published 2 new articles:
+ * [White Labeling in ABP Framework](https://abp.io/community/articles/white-labeling-in-abp-framework-5trwmrfm) by [Enis Necipoğlu](https://github.com/enisn)
+ * [You do it wrong! Customizing ABP Login Page Correctly](https://abp.io/community/articles/you-do-it-wrong-customizing-abp-login-page-correctly-bna7wzt5)
+* [New in ABP Studio: Docker Container Management](https://abp.io/community/articles/abp-studio-docker-container-management-ex7r27y8) by [Yunus Emre Kalkan](https://github.com/yekalkan)
+* [Solving MongoDB GUID Issues After an ABP Framework Upgrade](https://abp.io/community/articles/solving-mongodb-guid-issues-after-an-abp-framework-upgrade-tv8waw1n) by [Burak Demir](https://abp.io/community/members/burakdemir)
+
+
+Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://abp.io/community/posts/create) to the ABP Community.
+
+## Conclusion
+
+This version comes with some new features and a lot of enhancements to the existing features. You can see the [Road Map](https://abp.io/docs/9.3/release-info/road-map) documentation to learn about the release schedule and planned features for the next releases. Please try ABP v9.3 RC and provide feedback to help us release a more stable version.
+
+Thanks for being a part of this community!
\ No newline at end of file
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/abp-studio.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/abp-studio.png
new file mode 100644
index 0000000000..76b24a8573
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/abp-studio.png differ
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/audit-logs-export-to-excel.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/audit-logs-export-to-excel.png
new file mode 100644
index 0000000000..4c10f516db
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/audit-logs-export-to-excel.png differ
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/bootcamp.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/bootcamp.png
new file mode 100644
index 0000000000..e07293c13c
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/bootcamp.png differ
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/community-talk-2025-5.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/community-talk-2025-5.png
new file mode 100644
index 0000000000..3989dde47a
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/community-talk-2025-5.png differ
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/cover-image.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/cover-image.png
new file mode 100644
index 0000000000..291da0d04f
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/cover-image.png differ
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/download-pdf-on-docs.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/download-pdf-on-docs.png
new file mode 100644
index 0000000000..ce5b1b3727
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/download-pdf-on-docs.png differ
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/generate-pdf-docs.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/generate-pdf-docs.png
new file mode 100644
index 0000000000..2a1de4398d
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/generate-pdf-docs.png differ
diff --git a/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/studio-switch-to-preview.png b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/studio-switch-to-preview.png
new file mode 100644
index 0000000000..32f6d01edb
Binary files /dev/null and b/docs/en/Blog-Posts/2025-06-18 v9_3_Preview/studio-switch-to-preview.png differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/1752664190317-min.jpeg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/1752664190317-min.jpeg
new file mode 100644
index 0000000000..de317b4647
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/1752664190317-min.jpeg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15924-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15924-min.jpg
new file mode 100644
index 0000000000..3730feed30
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15924-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15933-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15933-min.jpg
new file mode 100644
index 0000000000..5c4348c2a6
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15933-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15934-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15934-min.jpg
new file mode 100644
index 0000000000..bfaec7bc9d
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15934-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15941-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15941-min.jpg
new file mode 100644
index 0000000000..fe52494de8
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15941-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15944-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15944-min.jpg
new file mode 100644
index 0000000000..2692dd576d
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15944-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15946-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15946-min.jpg
new file mode 100644
index 0000000000..da423629c7
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15946-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15947-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15947-min.jpg
new file mode 100644
index 0000000000..f3f6350c09
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15947-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15948-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15948-min.jpg
new file mode 100644
index 0000000000..c875ad61e3
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15948-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15949-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15949-min.jpg
new file mode 100644
index 0000000000..69840520e0
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15949-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15956-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15956-min.jpg
new file mode 100644
index 0000000000..73ef867711
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15956-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15959-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15959-min.jpg
new file mode 100644
index 0000000000..fb6d3f520c
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15959-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15963-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15963-min.jpg
new file mode 100644
index 0000000000..a9595acaa9
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15963-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15964-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15964-min.jpg
new file mode 100644
index 0000000000..4ed6c26b33
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15964-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15966-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15966-min.jpg
new file mode 100644
index 0000000000..80296b7ead
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15966-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15968-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15968-min.jpg
new file mode 100644
index 0000000000..6f915ee94c
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15968-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15969-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15969-min.jpg
new file mode 100644
index 0000000000..de112a11ea
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15969-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15970-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15970-min.jpg
new file mode 100644
index 0000000000..acdd4bb0b0
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15970-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15971-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15971-min.JPG
new file mode 100644
index 0000000000..5fd55d58e1
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15971-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15972-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15972-min.JPG
new file mode 100644
index 0000000000..c1956daebd
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15972-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15973-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15973-min.JPG
new file mode 100644
index 0000000000..3d1a5b0789
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15973-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15974-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15974-min.JPG
new file mode 100644
index 0000000000..147f7ef967
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15974-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15975-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15975-min.JPG
new file mode 100644
index 0000000000..173610a7ec
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15975-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15976-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15976-min.JPG
new file mode 100644
index 0000000000..c48a7944d6
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15976-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15977-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15977-min.JPG
new file mode 100644
index 0000000000..6f5cb19831
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15977-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15979-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15979-min.JPG
new file mode 100644
index 0000000000..9ca4140717
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15979-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15980-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15980-min.JPG
new file mode 100644
index 0000000000..0ebf59d8b8
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15980-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15981-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15981-min.JPG
new file mode 100644
index 0000000000..10e02621cf
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15981-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15982-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15982-min.JPG
new file mode 100644
index 0000000000..63bc90cc76
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15982-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15983-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15983-min.JPG
new file mode 100644
index 0000000000..14e1f16c9a
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15983-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15984-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15984-min.jpg
new file mode 100644
index 0000000000..0984be8e2e
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15984-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15985-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15985-min.JPG
new file mode 100644
index 0000000000..8d30f62cd3
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15985-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15986-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15986-min.JPG
new file mode 100644
index 0000000000..55f48e13a9
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15986-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15987-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15987-min.JPG
new file mode 100644
index 0000000000..9cbd57efaa
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15987-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15989-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15989-min.jpg
new file mode 100644
index 0000000000..f4c0bb2cfc
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15989-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15994-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15994-min.jpg
new file mode 100644
index 0000000000..35201fee15
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15994-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15995-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15995-min.jpg
new file mode 100644
index 0000000000..60546b5c9f
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15995-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15996-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15996-min.jpg
new file mode 100644
index 0000000000..147babb883
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15996-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15998-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15998-min.jpg
new file mode 100644
index 0000000000..7c2d080da7
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15998-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15999-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15999-min.jpg
new file mode 100644
index 0000000000..0cf89bc0e4
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_15999-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16001-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16001-min.jpg
new file mode 100644
index 0000000000..1f8a500948
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16001-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16002-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16002-min.jpg
new file mode 100644
index 0000000000..8753a09cfe
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16002-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16003-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16003-min.jpg
new file mode 100644
index 0000000000..4f4eec7b54
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16003-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16006-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16006-min.JPG
new file mode 100644
index 0000000000..eef991dd38
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16006-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16007-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16007-min.jpg
new file mode 100644
index 0000000000..48cb26cd40
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16007-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16008-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16008-min.jpg
new file mode 100644
index 0000000000..3eadec4490
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16008-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16009-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16009-min.jpg
new file mode 100644
index 0000000000..0e8387065d
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16009-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16011-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16011-min.jpg
new file mode 100644
index 0000000000..c96d3a8d37
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16011-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16012-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16012-min.jpg
new file mode 100644
index 0000000000..62a16ac428
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16012-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16013-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16013-min.jpg
new file mode 100644
index 0000000000..256c2bc22c
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16013-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16019-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16019-min.JPG
new file mode 100644
index 0000000000..e657a682ad
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16019-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16021-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16021-min.JPG
new file mode 100644
index 0000000000..5a81fddee1
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16021-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16022-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16022-min.JPG
new file mode 100644
index 0000000000..ed8660fdbd
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16022-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16023-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16023-min.JPG
new file mode 100644
index 0000000000..05b2040d18
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16023-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16024-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16024-min.JPG
new file mode 100644
index 0000000000..2cc6f9fbee
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16024-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16025-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16025-min.JPG
new file mode 100644
index 0000000000..0ede12db76
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16025-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16026-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16026-min.JPG
new file mode 100644
index 0000000000..268e4a4454
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16026-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16027-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16027-min.JPG
new file mode 100644
index 0000000000..68d288fc19
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16027-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16028-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16028-min.JPG
new file mode 100644
index 0000000000..72d060a6e1
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16028-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16029-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16029-min.JPG
new file mode 100644
index 0000000000..47bc5a910c
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16029-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16030-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16030-min.JPG
new file mode 100644
index 0000000000..5180e62195
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16030-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16031-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16031-min.JPG
new file mode 100644
index 0000000000..3085d54f3d
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16031-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16032-min.jpg b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16032-min.jpg
new file mode 100644
index 0000000000..26ddb2dc75
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16032-min.jpg differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16040-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16040-min.JPG
new file mode 100644
index 0000000000..4bf5c04712
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16040-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16041-min.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16041-min.JPG
new file mode 100644
index 0000000000..3b38f0c487
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/IMG_16041-min.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/cover.png b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/cover.png
new file mode 100644
index 0000000000..946fdc2ab0
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/cover.png differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/image-20250722203102576.png b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/image-20250722203102576.png
new file mode 100644
index 0000000000..175fd45289
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/image-20250722203102576.png differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-1.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-1.JPG
new file mode 100644
index 0000000000..6be6b041d3
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-1.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-2.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-2.JPG
new file mode 100644
index 0000000000..b05c488c4d
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-2.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-3.JPG b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-3.JPG
new file mode 100644
index 0000000000..51dd5e7e57
Binary files /dev/null and b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/my-talk-3.JPG differ
diff --git a/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/post.md b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/post.md
new file mode 100644
index 0000000000..1b996e4867
--- /dev/null
+++ b/docs/en/Blog-Posts/2025-07-22-My-Impressionf-at-WeAreDevelopers/post.md
@@ -0,0 +1,101 @@
+# WeAreDevelopers 2025: A Speaker’s Impressions
+
+
+
+After speaking at DotNext Moscow, I had high expectations for WeAreDevelopers 2025—and the event delivered on all fronts. Held in Berlin / Germany, it brought together a truly global crowd of developers, tech leaders, and innovators. As a speaker and software architect , I’m sharing my first-hand highlights, favorite moments, and candid scenes from this 2025’s conference.
+
+## 🗣 My Talk
+
+We have a good experience on multi-tenancy topic in SaaS development. My talk's topic was "Building Multi-Tenant ASP.NET Core Applications: Best Practices and Real-World Solutions". It was on the stage 4, 11 July Friday 10:20 am - 10:50 am and [this my presentation file](https://github.com/ebicoglu/presentations/blob/main/multi-tenancy-wearedevelopers-2025_30mins.pptx).
+
+
+
+
+
+
+
+
+## 🏛 Huge Venue
+
+
+*The image is credited to WeAreDevelopers organization*
+
+First of all, I had been in numerous software conferences, I must say that I've never seen such a big software event. The event spanned **500+ sessions across 20+ stages**, including the HR Leaders Summit for **2 full days**.
+
+
+
+
+------
+
+## 🎤 Opening Keynote from GitHub
+
+GitHub CEO Thomas Dohmke initiated the conference on the main stage with a talk on *“Agents for the Sake of Happiness”*. Having introduced Copilot three years ago here, he now launched bold predictions about autonomous AI—a fascinating evolution... He demonstrated GitHub Co-Pilot's AI and created a snake game. Altough it didn't work as he planned, we're developers we know live coding is hard. Actually that's because we shouldn't rely on AI. AI is not deterministic even though we set all those temperature, TopP, TopK parameters to minimum.
+
+> AI is a good but not trustable friend!
+
+
+
+------
+
+## 🧭 11 Parallel Stages: Rush
+
+There were 11 stages where 11 different topics were being explained. And the sessions were 30 minutes. Actually that's the downside of this event. Because there were so nice talks that needs to be minimum 40 minutes. But anyway I understand the organization team because there are many smart speakers whose needs to be included in this event. So as a attendee I was on a hurry to pick the next talk even when I was listening to a talk :)
+
+The venue consists of 3 buildings. So if you pick a talk on another building, you have 10 mins to go to toilet or drink something and catch the next session on that far building...
+
+There was HR track with **3 stages and 2 full days** of HR/Talent Acquisition programming, it attracted a notable overlap of developers and HR pros. Themes included AI‑powered recruiting, remote work culture, mental health, diversity & inclusion, and building AI agents
+
+
+
+
+
+------
+
+## 🤖 AI & AI & AI & Others...
+
+I'm one of those AI lovers. I love learning cutting-edge information. And as I see AI is being more trendy everyday. That's why most of the talks were about AI. Everything related to AI. I generaly attended AI related talks because I'm also working on some AI topics in Volosoft at the moment.
+
+
+------
+
+## 🤝 Expo Floor & Networking
+
+The expo was a developer’s playground—cloud services, open‑source tools, startups, and enterprise platforms. I found new partners and reconnected with peers in a buzzing atmosphere. Everywhere was full of talking's even outside. If you want to get fresh air and drink coffee, you can go out and listen to the outside talks.
+
+
+
+
+
+
+Networking wasn't just daytime chatter—hallway meetups and evening socials were unforgettable.
+
+
+
+
+------
+
+## 😂 Candid & Fun Moments
+
+Swag stations, sponsor games, “developer selfies”—these lighter moments kept the vibe upbeat and human.
+
+
+
+
+------
+
+## ✅ Final Thoughts & Looking Ahead
+
+WeAreDevelopers 2025 was an unforgettable three-day ride: **15,000 tech minds**, **500+ sessions**, and a true **bridge between developers and HR**
+I’m leaving with:
+
+- Fresh strategies in GenAI and SaaS growth
+- Stronger HR-tech understanding and crossover potential
+- New professional connections—and fun memories
+
+
+------
+
+
+
+
+
diff --git a/docs/en/Community-Articles/2022-04-18-abp-community-talks-20223/post.md b/docs/en/Community-Articles/2022-04-18-abp-community-talks-20223/post.md
index fcd7043594..5d9c9e0d3e 100644
--- a/docs/en/Community-Articles/2022-04-18-abp-community-talks-20223/post.md
+++ b/docs/en/Community-Articles/2022-04-18-abp-community-talks-20223/post.md
@@ -6,7 +6,7 @@
* ABP Community Talks are scheduled to be held on a monthly basis.
* ABP Community Talks are and always will be completely free to attend. Everyone is welcome to join, ask questions and make suggestions before, during and after the event.
* ABP Community Talks are created and announced on [Kommunity](https://kommunity.com/volosoft/events).
- * ABP Community Talks are announced regularly on [ABP Framework Twitter Account](https://twitter.com/abpframework), [Volosoft LinkedIn account](https://www.linkedin.com/company/volosoft), [Volosoft Facebook Account](https://www.facebook.com/volosoftcompany), [ABP Community Discord Server](https://discord.gg/CrYrd5vcGh). We highly encourage everyone to follow us and make suggestions.
+ * ABP Community Talks are announced regularly on [ABP Framework Twitter Account](https://twitter.com/abpframework), [Volosoft LinkedIn account](https://www.linkedin.com/company/volosoft), [Volosoft Facebook Account](https://www.facebook.com/volosoftcompany), [ABP Community Discord Server](https://abp.io/join-discord). We highly encourage everyone to follow us and make suggestions.
* ABP Community Talks are available to watch after the event on YouTube. See [ABP Community Talks YouTube Playlist](https://www.youtube.com/playlist?list=PLsNclT2aHJcOsPustEkzG6DywiO8eh0lB).
# ABP Community Talks 2022.3
diff --git a/docs/en/Community-Articles/2022-04-19-official-abp-discord-server-is-here/post.md b/docs/en/Community-Articles/2022-04-19-official-abp-discord-server-is-here/post.md
index 5d099cc1c3..ca765a5860 100644
--- a/docs/en/Community-Articles/2022-04-19-official-abp-discord-server-is-here/post.md
+++ b/docs/en/Community-Articles/2022-04-19-official-abp-discord-server-is-here/post.md
@@ -1,9 +1,9 @@
- We are excited to announce Official ABP Discord Server is created! You can join the ABP Discord Community by clicking [here](https://discord.gg/wbcQAsUrs9).
+ We are excited to announce Official ABP Discord Server is created! You can join the ABP Discord Community by clicking [here](https://abp.io/join-discord).
In the first week of opening ABP Discord Server, member amount reached more than 500. We are grateful to and blessed by your interest. Thanks to all of you! This also made us sure that an ABP Discord Server was actually a need for the community members to interact with each other.
ABP Community is growing by the second, and we are grateful for all your contributions towards ABP Framework. We noticed that ABP Community’s communication were significant on ABP Framework’s GitHub, we wanted to take it to the next level and have an area where all of us can easily chat with each other.
-> [Join ABP Discord Server Now](https://discord.gg/wbcQAsUrs9)
+> [Join ABP Discord Server Now](https://abp.io/join-discord)
# What Can You Do on ABP Community Discord Server?
@@ -42,11 +42,11 @@
# How Can You Join To ABP Discord Server?
- You can join ABP Discord Server by simply clicking to [https://discord.gg/abp](https://discord.gg/wbcQAsUrs9).
+ You can join ABP Discord Server by simply clicking to [https://abp.io/join-discord](https://abp.io/join-discord).
We are excited to welcome you in ABP Discord Server!
-> [Click Here to Join ABP Discord Server Now](https://discord.gg/wbcQAsUrs9)
+> [Click Here to Join ABP Discord Server Now](https://abp.io/join-discord)
### What is Discord?
@@ -62,4 +62,4 @@
In Discord Servers, users communicate with each other in a way that is convenient for them. Discord allows people to make voice calls, video chats, or simply text messages. Communities are created by wether fans of a specific topic(games, open-source frameworks, NFT, etc.) or by the official authorities of that specific topic(game creator, framework core team, creator of a token, etc).
- In ABP Community Discord Server’s case, it is a server created by official authorities with core team being present in the server along with the community members. Even though it is created for the framework community members to communicate with each other easily, everyone who is interested in following the latest news about ABP Platform are welcome to [join ABP Discord Server](https://discord.gg/wbcQAsUrs9)!
\ No newline at end of file
+ In ABP Community Discord Server’s case, it is a server created by official authorities with core team being present in the server along with the community members. Even though it is created for the framework community members to communicate with each other easily, everyone who is interested in following the latest news about ABP Platform are welcome to [join ABP Discord Server](https://abp.io/join-discord)!
\ No newline at end of file
diff --git a/docs/en/Community-Articles/2022-05-10-abpio-platform-53-rc-has-been-published/post.md b/docs/en/Community-Articles/2022-05-10-abpio-platform-53-rc-has-been-published/post.md
index eb157010b8..cc0e57db93 100644
--- a/docs/en/Community-Articles/2022-05-10-abpio-platform-53-rc-has-been-published/post.md
+++ b/docs/en/Community-Articles/2022-05-10-abpio-platform-53-rc-has-been-published/post.md
@@ -254,4 +254,4 @@ We've created an official ABP Discord server so the ABP Community can interact w
Thanks to the ABP Community, **700+** people joined our Discord Server so far and it grows every day.
-You can join our Discord Server from [here](https://discord.gg/abp), if you haven't yet.
\ No newline at end of file
+You can join our Discord Server from [here](https://abp.io/join-discord), if you haven't yet.
\ No newline at end of file
diff --git a/docs/en/Community-Articles/2023-02-21-abp-year-review-2022-wrap-up/post.md b/docs/en/Community-Articles/2023-02-21-abp-year-review-2022-wrap-up/post.md
index 6abf2f3d12..a27aeb9f2c 100644
--- a/docs/en/Community-Articles/2023-02-21-abp-year-review-2022-wrap-up/post.md
+++ b/docs/en/Community-Articles/2023-02-21-abp-year-review-2022-wrap-up/post.md
@@ -1,100 +1,200 @@
- ABP Framework is an open source infrastructure that enables developers to create modern web applications by following the best practices and conventions of software development. In 2022, ABP Framework continued to thrive, achieving significant milestones and making waves in the software development community. With more than 9K GitHub stars and over 10 millions of downloads on NuGet, ABP Framework has become a go-to framework for developers seeking a reliable and efficient way to build web applications.
-
-As ABP Team, we owe our success to our vibrant community, and we are immensely grateful for the support and contributions of each and every member. With your help, we achieved a lot in 2022. We remained committed to our values of transparency, openness, and collaboration, engaging with our community members as much as possible to ensure that we are creating a framework that meets their needs.
-
-One of the major highlights of 2022 was the release of .NET Core 7, which provided a powerful platform for ABP Framework to build upon. Additionally, ABP Commercial and our training programs continued to help developers and businesses to leverage the power of the ABP Framework, enabling them to build modern web applications more efficiently and effectively than ever before.
-
-In this article, we'll take a closer look at the key highlights of 2022 for ABP Framework, from major updates to achivements and the community insights. We are excited to share our progress with you and provide insights into how ABP Framework is continuing to shape the future of software development. So, let's dive in!
-
-
-
-
- NuGet Downloads
- NuGet is a package manager designed specifically for the .NET ecosystem. It simplifies the process of creating and consuming packages, thanks to the NuGet client tools. By using these tools, developers can easily manage their project dependencies and improve their workflow.
- In 2022, ABP Core NuGet package reached more than 10 million of downloads!
- On the other hand, overall Volosoft NuGet Packages reached more than half a billion downloads!
- Thank you all for your interest and support towards Volosoft and ABP packages.
-
-
- E-Books
- Our published e-book amount is reached 3! This year, with our founder Halil İbrahim Kalkan's contributions we now have 3 published e-books.
-
-
-
- Tutorial Videos
- In 2022, we tried to be as much active as we could. To give you more insight and let you understand ABP Framework with short videos according to your interests, we published 48 tutorial videos. Though the videos were created by overall team members of ABP Framework, someone deserves a special mention here. Shout out to our ABP Core Team member Hamza Albreem for his hard work.
-
-
- GitHub Stars
- ABP Framework GitHub repository reached more than 9K stars. We appreciate your interest and support for ABP Framework GitHub repository. We are working hard to be worthy of your interest and reach out to more people to simplify and streamline their development processes.
-
- Community Talks
-ABP Community Talks is our monthly event that brings together members of the ABP Framework community to discuss and exchange ideas. Prior to each event, we collect suggestions from our contributors, monitor trending topics in the industry, and review updates and news related to the ABP Platform to curate the topics for discussion. Once the topics are finalized, we announce them through our social media and community channels to ensure everyone is aware and can join in on the conversation.
- We did 10 ABP Community Talks Episodes of and 1 ABP Suite webinar. You can take a look at them and check out our videos we have on Volosoft YouTube Channel.
-
- ABP Community Contributions
- The ABP Community is a hub that offers resources such as articles, video tutorials, and updates on ABP's development progress and events for ABP Framework, .NET, and software development. Developers can also connect with others, help each other, and share their expertise in ABP Community.
- You can check out each source from the list below.
- - ABP Community Events: You can reach them from here.
- - ABP Community Posts: You can reach them from here
- - ABP Community Videos: You can reach them from here.
- - ABP Community Stackoverflow: You can reach them from here.
-
- In 2022, the community's contribution reached a point where more than 100 resources. Thank you for all your effort! Please keep it going! It is becoming a more and more rich resource thanks to your variety of contributions and help.
-
-
- ABP Community Discord Server
- To take community interaction to the next level, we created the official ABP Discord server, providing a platform for the ABP Community to connect and communicate instantly through chatting.
- We were so excited announcing the official ABP Discord Server. In the first week of announcing it, the server quickly attracted over 500 members. We're grateful for your interest and support, which confirms the need for a dedicated platform for community interaction.
-> Join ABP Discord Server Now
-
-
- ABP Framework GitHub Contributions
- In 2022, ABP Core Team worked hard to achieve milestones and give the best value with ABP Framework so users can benefit from its features. Additional to our team's work, ABP Framework is perfected in 2022 with ABP Community members' contributions, 3157 commits pushed from 48 different contributors.
- We appreciate your hard work and effort you put into making ABP Framework better and improved.
-
-
- Events/Summits
- We try to contribute to the developers community as much as we can since day 1. This year was no different. We tried to give value through sponsorships for developer communities. Especially with us leaving the pandemic behind every day, we try to keep up with the in-person events as well as online events. We plan to do more in next year. So, stay tuned!
- This year, we sponsored to 4 events. They were, DevNot
-Designing Monolith First for Microservice Architecture event, DNF Summit 2022, Developer Summit 2022, and .NET Conference 2022.
-
-
-
ABP Releases
- ABP Framework released 4 versions from 5.1 to 7.1 in 2022. You can check the release logs from ABP Framework Release Logs.
- The most important milestone in these releases is that we upgraded ABP Framework to .NET 7.0 in ABP v7.0.
- Additionally, we switched to OpenIddict for the startup templates in ABP v6.0.
-
-
- ABP Commercial
- It has been a successful year for ABP Commercial as well as ABP Framework. We have already reached to more than 100 countries over the years of ABP Commercial's release. This year, we continued to be streamline businesses' development processes with ABP Commercial.
-
- - We have served to different sizes of businesses from more than 50 countries and more than 40 industries .
-- We performed 286 hours of training to simplify users' learning curve of ABP Framework.
-- 1771 support tickets resolved in the premium support forum in which ABP Commercial users can ask their questions directly to ABP Core Team members via ABP Commercial Support Center in addition to community support we provide for ABP Framework users/developers.
-- We received 39 new testimonials, all from satisfied customers which led us to the other headline, Gartner Badges.
-
-
-
- LeptonX Theme
-The Lepton Theme is a module that offers a theme for abp.io-based applications, featuring an Admin Dashboard designed by the ABP Platform. We released a version we called LeptonX Theme which is an upgraded version of Lepton Theme. You can view a live preview of the LeptonX Theme. While the LeptonX theme is currently exclusive to ABP Commercial users, ABP Framework users can still access the Lite version. You can see the documentation for ABP LeptonX Theme light from here.
-
-
- Gartner Badges
- Gartner badges are given as an award to the listed softwares within their software review/suggestion platforms. To be able to get these awards, certain criterias have to be met such as ease of use, likelihood of recommend, functionality, etc. and they are calculated completely according to the users' real reviews.
- In 2022, ABP Commercial reached to such success thanks to its users' support on Gartner, it has been recognized with 2 badges in Application Development category.
-
- Thank you all for all these recognition you deemed us worthy of.
+ ABP Framework is an open source infrastructure that enables developers to create modern web applications by following the best practices and conventions of software development. In 2022, ABP Framework continued to thrive, achieving significant milestones and making waves in the software development community. With more than 9K GitHub stars and over 10 millions of downloads on NuGet, ABP Framework has become a go-to framework for developers seeking a reliable and efficient way to build web applications.
+
+
+
+As ABP Team, we owe our success to our vibrant community, and we are immensely grateful for the support and contributions of each and every member. With your help, we achieved a lot in 2022. We remained committed to our values of transparency, openness, and collaboration, engaging with our community members as much as possible to ensure that we are creating a framework that meets their needs.
+
+
+
+One of the major highlights of 2022 was the release of .NET Core 7, which provided a powerful platform for ABP Framework to build upon. Additionally, ABP Commercial and our training programs continued to help developers and businesses to leverage the power of the ABP Framework, enabling them to build modern web applications more efficiently and effectively than ever before.
+
+
+
+In this article, we'll take a closer look at the key highlights of 2022 for ABP Framework, from major updates to achivements and the community insights. We are excited to share our progress with you and provide insights into how ABP Framework is continuing to shape the future of software development. So, let's dive in!
+
+
+
+
+
+
+
+
+
+ NuGet Downloads
+
+ NuGet is a package manager designed specifically for the .NET ecosystem. It simplifies the process of creating and consuming packages, thanks to the NuGet client tools. By using these tools, developers can easily manage their project dependencies and improve their workflow.
+
+ In 2022, ABP Core NuGet package reached more than 10 million of downloads!
+
+ On the other hand, overall Volosoft NuGet Packages reached more than half a billion downloads!
+
+ Thank you all for your interest and support towards Volosoft and ABP packages.
+
+
+
+
+
+ E-Books
+
+ Our published e-book amount is reached 3! This year, with our founder Halil İbrahim Kalkan's contributions we now have 3 published e-books.
+
+
+
+
+
+
+
+ Tutorial Videos
+
+ In 2022, we tried to be as much active as we could. To give you more insight and let you understand ABP Framework with short videos according to your interests, we published 48 tutorial videos. Though the videos were created by overall team members of ABP Framework, someone deserves a special mention here. Shout out to our ABP Core Team member Hamza Albreem for his hard work.
+
+
+
+
+
+ GitHub Stars
+
+ ABP Framework GitHub repository reached more than 9K stars. We appreciate your interest and support for ABP Framework GitHub repository. We are working hard to be worthy of your interest and reach out to more people to simplify and streamline their development processes.
+
+
+
+ Community Talks
+
+ABP Community Talks is our monthly event that brings together members of the ABP Framework community to discuss and exchange ideas. Prior to each event, we collect suggestions from our contributors, monitor trending topics in the industry, and review updates and news related to the ABP Platform to curate the topics for discussion. Once the topics are finalized, we announce them through our social media and community channels to ensure everyone is aware and can join in on the conversation.
+
+ We did 10 ABP Community Talks Episodes of and 1 ABP Suite webinar. You can take a look at them and check out our videos we have on Volosoft YouTube Channel.
+
+
+
+ ABP Community Contributions
+
+ The ABP Community is a hub that offers resources such as articles, video tutorials, and updates on ABP's development progress and events for ABP Framework, .NET, and software development. Developers can also connect with others, help each other, and share their expertise in ABP Community.
+
+ You can check out each source from the list below.
+
+ - ABP Community Events: You can reach them from here.
+
+ - ABP Community Posts: You can reach them from here
+
+ - ABP Community Videos: You can reach them from here.
+
+ - ABP Community Stackoverflow: You can reach them from here.
+
+
+
+ In 2022, the community's contribution reached a point where more than 100 resources. Thank you for all your effort! Please keep it going! It is becoming a more and more rich resource thanks to your variety of contributions and help.
+
+
+
+
+
+ ABP Community Discord Server
+
+ To take community interaction to the next level, we created the official ABP Discord server, providing a platform for the ABP Community to connect and communicate instantly through chatting.
+
+ We were so excited announcing the official ABP Discord Server. In the first week of announcing it, the server quickly attracted over 500 members. We're grateful for your interest and support, which confirms the need for a dedicated platform for community interaction.
+
+> Join ABP Discord Server Now
+
+
+
+
+
+ ABP Framework GitHub Contributions
+
+ In 2022, ABP Core Team worked hard to achieve milestones and give the best value with ABP Framework so users can benefit from its features. Additional to our team's work, ABP Framework is perfected in 2022 with ABP Community members' contributions, 3157 commits pushed from 48 different contributors.
+
+ We appreciate your hard work and effort you put into making ABP Framework better and improved.
+
+
+
+
+
+ Events/Summits
+
+ We try to contribute to the developers community as much as we can since day 1. This year was no different. We tried to give value through sponsorships for developer communities. Especially with us leaving the pandemic behind every day, we try to keep up with the in-person events as well as online events. We plan to do more in next year. So, stay tuned!
+
+ This year, we sponsored to 4 events. They were, DevNot
+
+Designing Monolith First for Microservice Architecture event, DNF Summit 2022, Developer Summit 2022, and .NET Conference 2022.
+
+
+
+
+
+
ABP Releases
+
+ ABP Framework released 4 versions from 5.1 to 7.1 in 2022. You can check the release logs from ABP Framework Release Logs.
+
+ The most important milestone in these releases is that we upgraded ABP Framework to .NET 7.0 in ABP v7.0.
+
+ Additionally, we switched to OpenIddict for the startup templates in ABP v6.0.
+
+
+
+
+
+ ABP Commercial
+
+ It has been a successful year for ABP Commercial as well as ABP Framework. We have already reached to more than 100 countries over the years of ABP Commercial's release. This year, we continued to be streamline businesses' development processes with ABP Commercial.
+
+
+
+ - We have served to different sizes of businesses from more than 50 countries and more than 40 industries .
+
+- We performed 286 hours of training to simplify users' learning curve of ABP Framework.
+
+- 1771 support tickets resolved in the premium support forum in which ABP Commercial users can ask their questions directly to ABP Core Team members via ABP Commercial Support Center in addition to community support we provide for ABP Framework users/developers.
+
+- We received 39 new testimonials, all from satisfied customers which led us to the other headline, Gartner Badges.
+
+
+
+
+
+
+
+ LeptonX Theme
+
+The Lepton Theme is a module that offers a theme for abp.io-based applications, featuring an Admin Dashboard designed by the ABP Platform. We released a version we called LeptonX Theme which is an upgraded version of Lepton Theme. You can view a live preview of the LeptonX Theme. While the LeptonX theme is currently exclusive to ABP Commercial users, ABP Framework users can still access the Lite version. You can see the documentation for ABP LeptonX Theme light from here.
+
+
+
+
+
+ Gartner Badges
+
+ Gartner badges are given as an award to the listed softwares within their software review/suggestion platforms. To be able to get these awards, certain criterias have to be met such as ease of use, likelihood of recommend, functionality, etc. and they are calculated completely according to the users' real reviews.
+
+ In 2022, ABP Commercial reached to such success thanks to its users' support on Gartner, it has been recognized with 2 badges in Application Development category.
+
+
+
+ Thank you all for all these recognition you deemed us worthy of.
+
diff --git a/docs/en/Community-Articles/2024-11-25-Global-Assets/POST.md b/docs/en/Community-Articles/2024-11-25-Global-Assets/POST.md
index 33dd9eb292..e5196dde34 100644
--- a/docs/en/Community-Articles/2024-11-25-Global-Assets/POST.md
+++ b/docs/en/Community-Articles/2024-11-25-Global-Assets/POST.md
@@ -51,7 +51,7 @@ public class MyBlazorWebAssemblyBundlingModule : AbpModule
options.ScriptBundles.Get(BlazorWebAssemblyStandardBundles.Scripts.Global).AddContributors(typeof(MyModuleBundleScriptContributor));
// Style Bundles
- options.ScriptBundles.Get(BlazorWebAssemblyStandardBundles.Scripts.Global).AddContributors(typeof(MyModuleBundleStyleBundleContributor));
+ options.StyleBundles.Get(BlazorWebAssemblyStandardBundles.Styles.Global).AddContributors(typeof(MyModuleBundleStyleBundleContributor));
});
}
}
diff --git a/docs/en/Community-Articles/2025-06-20-Using-Hangfire-Dashboard-in-ABP-API-website/POST.md b/docs/en/Community-Articles/2025-06-20-Using-Hangfire-Dashboard-in-ABP-API-website/POST.md
new file mode 100644
index 0000000000..4fcb9860bc
--- /dev/null
+++ b/docs/en/Community-Articles/2025-06-20-Using-Hangfire-Dashboard-in-ABP-API-website/POST.md
@@ -0,0 +1,250 @@
+# Using Hangfire Dashboard in ABP API Website 🚀
+
+## Introduction
+
+In this article, I'll show you how to integrate and use the Hangfire Dashboard in an ABP API website.
+
+Typically, API websites use `JWT Bearer` authentication, but the Hangfire Dashboard isn't compatible with `JWT Bearer` authentication. Therefore, we need to implement `Cookies` and `OpenIdConnect` authentication for the Hangfire Dashboard access.
+
+## Creating a New ABP Demo Project 🛠️
+
+We'll create a new ABP Demo `Tiered` project that includes `AuthServer`, `API`, and `Web` projects.
+
+```bash
+abp new AbpHangfireDemoApp -t app --tiered
+```
+
+Now let's add the Hangfire Dashboard to the `API` project and configure it to use `Cookies` and `OpenIdConnect` authentication for accessing the dashboard.
+
+## Adding a New Hangfire Application 🔧
+
+We need to add a new Hangfire application to the `appsettings.json` file in the `DbMigrator` project:
+
+> **Note:** Replace `44371` with your `API` project's port.
+
+```json
+"OpenIddict": {
+ "Applications": {
+ //...
+ "AbpHangfireDemoApp_Hangfire": {
+ "ClientId": "AbpHangfireDemoApp_Hangfire",
+ "RootUrl": "https://localhost:44371/"
+ }
+ //...
+ }
+}
+```
+
+2. Update the `OpenIddictDataSeedContributor`'s `CreateApplicationsAsync` method in the `Domain` project to seed the new Hangfire application.
+
+```csharp
+ //Hangfire Client
+var hangfireClientId = configurationSection["AbpHangfireDemoApp_Hangfire:ClientId"];
+if (!hangfireClientId.IsNullOrWhiteSpace())
+{
+ var hangfireClientRootUrl = configurationSection["AbpHangfireDemoApp_Hangfire:RootUrl"]!.EnsureEndsWith('/');
+
+ await CreateApplicationAsync(
+ applicationType: OpenIddictConstants.ApplicationTypes.Web,
+ name: hangfireClientId!,
+ type: OpenIddictConstants.ClientTypes.Confidential,
+ consentType: OpenIddictConstants.ConsentTypes.Implicit,
+ displayName: "Hangfire Application",
+ secret: configurationSection["AbpHangfireDemoApp_Hangfire:ClientSecret"] ?? "1q2w3e*",
+ grantTypes: new List //Hybrid flow
+ {
+ OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.Implicit
+ },
+ scopes: commonScopes,
+ redirectUris: new List { $"{hangfireClientRootUrl}signin-oidc" },
+ postLogoutRedirectUris: new List { $"{hangfireClientRootUrl}signout-callback-oidc" },
+ clientUri: hangfireClientRootUrl,
+ logoUri: "/images/clients/aspnetcore.svg"
+ );
+}
+```
+
+3. Run the `DbMigrator` project to seed the new Hangfire application.
+
+### Adding Hangfire Dashboard to the `API` Project 📦
+
+1. Add the following packages and modules dependencies to the `API` project:
+
+```bash
+
+
+
+```
+
+```cs
+typeof(AbpBackgroundJobsHangfireModule),
+typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule)
+```
+
+2. Add the `HangfireClientId` and `HangfireClientSecret` to the `appsettings.json` file in the `API` project:
+
+```csharp
+"AuthServer": {
+ "Authority": "https://localhost:44358",
+ "RequireHttpsMetadata": true,
+ "MetaAddress": "https://localhost:44358",
+ "SwaggerClientId": "AbpHangfireDemoApp_Swagger",
+ "HangfireClientId": "AbpHangfireDemoApp_Hangfire",
+ "HangfireClientSecret": "1q2w3e*"
+}
+```
+
+3. Add the `ConfigureHangfire` method to the `API` project to configure Hangfire:
+
+```csharp
+public override void ConfigureServices(ServiceConfigurationContext context)
+{
+ var configuration = context.Services.GetConfiguration();
+ var hostingEnvironment = context.Services.GetHostingEnvironment();
+
+ //...
+
+ //Add Hangfire
+ ConfigureHangfire(context, configuration);
+ //...
+}
+
+private void ConfigureHangfire(ServiceConfigurationContext context, IConfiguration configuration)
+{
+ context.Services.AddHangfire(config =>
+ {
+ config.UseSqlServerStorage(configuration.GetConnectionString("Default"));
+ });
+}
+```
+
+4. Modify the `ConfigureAuthentication` method to add new `Cookies` and `OpenIdConnect` authentication schemes:
+
+```csharp
+private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+{
+ context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+ .AddAbpJwtBearer(options =>
+ {
+ options.Authority = configuration["AuthServer:Authority"];
+ options.RequireHttpsMetadata = configuration.GetValue("AuthServer:RequireHttpsMetadata");
+ options.Audience = "AbpHangfireDemoApp";
+
+ options.ForwardDefaultSelector = httpContext => httpContext.Request.Path.StartsWithSegments("/hangfire", StringComparison.OrdinalIgnoreCase)
+ ? CookieAuthenticationDefaults.AuthenticationScheme
+ : null;
+ })
+ .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme)
+ .AddAbpOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, options =>
+ {
+ options.Authority = configuration["AuthServer:Authority"];
+ options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]);
+ options.ResponseType = OpenIdConnectResponseType.Code;
+
+ options.ClientId = configuration["AuthServer:HangfireClientId"];
+ options.ClientSecret = configuration["AuthServer:HangfireClientSecret"];
+
+ options.UsePkce = true;
+ options.SaveTokens = true;
+ options.GetClaimsFromUserInfoEndpoint = true;
+
+ options.Scope.Add("roles");
+ options.Scope.Add("email");
+ options.Scope.Add("phone");
+ options.Scope.Add("AbpHangfireDemoApp");
+
+ options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+ });
+
+ //...
+}
+```
+
+5. Add a custom middleware and `UseAbpHangfireDashboard` after `UseAuthorization` in the `OnApplicationInitialization` method:
+
+```csharp
+//...
+app.UseAuthorization();
+
+app.Use(async (httpContext, next) =>
+{
+ if (httpContext.Request.Path.StartsWithSegments("/hangfire", StringComparison.OrdinalIgnoreCase))
+ {
+ var authenticateResult = await httpContext.AuthenticateAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+ if (!authenticateResult.Succeeded)
+ {
+ await httpContext.ChallengeAsync(
+ OpenIdConnectDefaults.AuthenticationScheme,
+ new AuthenticationProperties
+ {
+ RedirectUri = httpContext.Request.Path + httpContext.Request.QueryString
+ });
+ return;
+ }
+ }
+ await next.Invoke();
+});
+app.UseAbpHangfireDashboard("/hangfire", options =>
+{
+ options.AsyncAuthorization = new[]
+ {
+ new AbpHangfireAuthorizationFilter()
+ };
+});
+
+//...
+```
+
+Perfect! 🎉 Now you can run the `AuthServer` and `API` projects and access the Hangfire Dashboard at `https://localhost:44371/hangfire`.
+
+> **Note:** Replace `44371` with your `API` project's port.
+
+The first time you access the Hangfire Dashboard, you'll be redirected to the login page of the `AuthServer` project. After you log in, you'll be redirected back to the Hangfire Dashboard.
+
+
+
+## Key Points 🔑
+
+### 1. Authentication Scheme Selection
+
+The default authentication scheme in API websites is `JWT Bearer`. We've implemented `Cookies` and `OpenIdConnect` specifically for the Hangfire Dashboard.
+
+We've configured the `JwtBearerOptions`'s `ForwardDefaultSelector` to use `CookieAuthenticationDefaults.AuthenticationScheme` for Hangfire Dashboard requests.
+
+This means that if the request path starts with `/hangfire`, the request will be authenticated using the `Cookies` authentication scheme; otherwise, it will use the `JwtBearer` authentication scheme.
+
+```csharp
+options.ForwardDefaultSelector = httpContext => httpContext.Request.Path.StartsWithSegments("/hangfire", StringComparison.OrdinalIgnoreCase)
+ ? CookieAuthenticationDefaults.AuthenticationScheme
+ : null;
+```
+
+### 2. Custom Middleware for Authentication
+
+We've also implemented a custom middleware to handle `Cookies` authentication for the Hangfire Dashboard. If the current request isn't authenticated with the `Cookies` authentication scheme, it will be redirected to the login page.
+
+```csharp
+app.Use(async (httpContext, next) =>
+{
+ if (httpContext.Request.Path.StartsWithSegments("/hangfire", StringComparison.OrdinalIgnoreCase))
+ {
+ var authenticateResult = await httpContext.AuthenticateAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+ if (!authenticateResult.Succeeded)
+ {
+ await httpContext.ChallengeAsync(
+ OpenIdConnectDefaults.AuthenticationScheme,
+ new AuthenticationProperties
+ {
+ RedirectUri = httpContext.Request.Path + httpContext.Request.QueryString
+ });
+ return;
+ }
+ }
+ await next.Invoke();
+});
+```
+
+## References 📚
+
+- [ABP Hangfire Background Job Manager](https://abp.io/docs/latest/framework/infrastructure/background-jobs/hangfire)
+- [Use cookie authentication in ASP.NET Core](https://learn.microsoft.com/en-us/aspnet/core/security/authentication/cookie?view=aspnetcore-9.0)
diff --git a/docs/en/Community-Articles/2025-06-20-Using-Hangfire-Dashboard-in-ABP-API-website/gif.gif b/docs/en/Community-Articles/2025-06-20-Using-Hangfire-Dashboard-in-ABP-API-website/gif.gif
new file mode 100644
index 0000000000..e4fa879eb4
Binary files /dev/null and b/docs/en/Community-Articles/2025-06-20-Using-Hangfire-Dashboard-in-ABP-API-website/gif.gif differ
diff --git a/docs/en/Community-Articles/2025-07-17-summar-campaign/post.md b/docs/en/Community-Articles/2025-07-17-summar-campaign/post.md
new file mode 100644
index 0000000000..d1ac596c29
--- /dev/null
+++ b/docs/en/Community-Articles/2025-07-17-summar-campaign/post.md
@@ -0,0 +1,28 @@
+**It is going to get hotter with ABP’s Summer Campaign!**
+
+Since it’s summer time, we wanted to make it even hotter by announcing a summer campaign! From July 21 to 31 we are offering a 20% discount on all ABP licenses. Now is the best time to invest in ABP and start developing asp net applications faster without wasting your time with repetitive tasks.
+
+## Summer Campaign Terms
+
+Please review the following terms and conditions carefully.
+
+* This offer is available for extensions and new purchases.
+* Developer seat purchases are also included to the campaign.
+* Campaign is available from July 21st to July 31st.
+* Discounts are valid on selected licenses only.
+* This offer cannot be combined with other promotions or discounts.
+
+**Why Choose ABP?**
+
+ABP offers a powerful infrastructure, simplifying modern ASP.NET core development. It helps develop modern ASP.NET applications, including ASP.NET core MVC web applications, blazor front-end projects, and angular .NET Core solutions.
+
+-The core framework and pre-built modules are designed with microservice architecture in mind.
+-ABP provides a module system that allows you to develop reusable application modules.
+-Helps implement a DDD based layered architecture and build a maintainable code base.
+-Easily manage SaaS applications with integrated multi-tenancy, from database to UI.
+
+**This Offer Ends July 31, So Hurry Up!**
+
+This summer campaign is running from July 21 to July 31, so don’t miss your chance. Now is the perfect opportunity to enhance your asp net web development with ABP and benefit from our exclusive features.
+
+Get Your Discount Now: [https://abp.io/pricing?utm_source=abpwebsite&utm_medium=referral&utm_campaign=summer25_blog](https://abp.io/pricing?utm_source=abpwebsite&utm_medium=referral&utm_campaign=summer25_blog)
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/Drawings.pptx b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/Drawings.pptx
new file mode 100644
index 0000000000..7a59c08c25
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/Drawings.pptx differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/POST.md b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/POST.md
new file mode 100644
index 0000000000..e63db935a5
--- /dev/null
+++ b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/POST.md
@@ -0,0 +1,480 @@
+# Multi-Tenancy with Separate Databases in .NET and ABP Framework
+
+[Multi-tenancy](https://abp.io/architecture/multi-tenancy) is a common architectural concept for modern SaaS applications, enabling a single application to serve multiple customers (each known as a tenant) while maintaining data isolation, scalability, and operational efficiency. The "Separate database per tenant" approach offers the highest level of data isolation, making it ideal for scenarios with strict data privacy, security, and performance requirements.
+
+In this article, we’ll explore how to use this advanced multi-tenancy model using the powerful capabilities of the ABP Framework and the .NET platform.
+
+> In this article, I will use [ABP Studio](https://abp.io/studio) for creating the application. ABP Studio allows to select "separate database per tenant" option only for [commercial licenses](https://abp.io/pricing).
+
+## Understanding Database Models for a Multi-Tenant Application
+
+In the next sections, I will explain various models for database models of a multi-tenant solution:
+
+* Single (shared) Database Model
+* Separate Tenant Databases Model
+* Hybrid Multi-Tenant Database Model
+
+Let's start with the first one...
+
+### Single (shared) Database Model
+
+In the shared database model, all the application data stored in a single physical database. In the following diagram, you see different kind of users use the application, and the application stored their data in a main database:
+
+
+
+This is the default behavior when you [create a new ABP application](https://abp.io/docs/latest/get-started), because it is simple to begin with and proper for most applications.
+
+In this model, a single database table may contain data of multiple tenants. Each row in these tables have a `TenantId` field which is used to distinguish the tenant data and isolate a tenant's data from other tenant users. To make your entities multi-tenant aware, all you have to do is to implement the `IMultiTenant` interface provided by the ABP Framework.
+
+Here, is an example `Product` entity that should support multi-tenancy:
+
+````csharp
+using System;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
+
+namespace MtDemoApp
+{
+ public class Product : AggregateRoot, IMultiTenant //Implementing the interface
+ {
+ public Guid? TenantId { get; set; } //Defined by the IMultiTenant interface
+ public string Name { get; set; }
+ public float Price { get; set; }
+ }
+}
+````
+
+In this way, ABP Framework automatically isolates data using the `TenantId` property. You don't need to care about how to set `TenantId` or filter data when you need to query from database - all automated.
+
+### Separate Tenant Databases Model
+
+In the separate tenant database model, each tenant has a dedicated physical database (with a separate connection string), as shown below:
+
+
+
+ABP Framework can automatically select the right database from the current user's tenant context. Again, it is completely automated. You just need to set a connection string for a tenant, as we will do later in this article.
+
+Even each tenant has a separate database, we still need to a main database to store host-side data, like a table of tenants, their connection strings and some other management data for tenants. Also, tenant-independent (or tenant-shared) application data is stored in the main database.
+
+### Hybrid Multi-Tenant Database Model
+
+Lastly, you may want to have a hybrid model, where some tenants shares a single database (they don't have separate databases) but some of them have dedicated databases. In the following figure, Tenant C has its own physical database, but all other tenants data stored in the main database of the application.
+
+
+
+ABP Framework handles the complexity: If a tenant has a separate database it uses that tenant's database, otherwise it filters the tenant data by the `TenantId` field in shared tables.
+
+## Understanding the Separate Tenant Schema Approach
+
+When you create a new ABP solution, it has a single `DbContext` class (for Entity Framework Core) by default. It also includes the necessary EF Core code-first database migrations to create and update the database. As a result of this approach, the main database schema (tables and their fields) will be identical with a tenant database schema. As a drawback of that, tenant databases have some tables that are not meaningful and not used. For example, Tenants table (a list of tenants) will be created in the tenant database, but will never be used (because tenant list is stored in the main database).
+
+As a solution to that problem, ABP Studio provides a "Use separate tenant schema" option on the Multi-Tenancy step of the solution creation wizard:
+
+
+
+This option is only available for the [Layered Monolith (optionally Modular) Solution Template](https://abp.io/docs/latest/get-started/layered-web-application). We don't provide that option in other templates, because:
+
+* [Single-Layer](https://abp.io/docs/latest/get-started/single-layer-web-application) template is recommended for more simpler applications with an easy-to-understand architecture. We don't want to add these kind of complications in that template.
+* [Microservice](https://abp.io/docs/latest/get-started/microservice) template already has a separate database for each service. Having multiple database schema (and multiple `DbContext` classes) for each service makes it over complicated without bringing much value.
+
+While you can manually convert your applications so they support separate database schema approach (ABP is flexible), it is not recommended to do it for these solution types.
+
+> Note that "Separate database per tenant" approach is already supported by default for the Single-Layer template too. "Separate tenant schema" is something different as I explained in this section.
+
+## Creating a new Application
+
+Follow the *[Get Started tutorial](https://abp.io/docs/latest/get-started/layered-web-application)* to create a new ABP application. Remember to select the "*Use separate tenant schema*" option since I want to demonstrate it in this article.
+
+## Understanding the DbContext Structure
+
+When you open the solution in your IDE, you will see the following structure under the `.EntityFrameworkCore` project:
+
+
+
+There are 3 DbContext-related classes here (MtDemoApp is your application name):
+
+* `MtDemoAppDbContext` class is used to map entities for the main (host + shared) database.
+* `MtDemoAppTenantDbContext` class is used to map entities for tenant that have separate physical databases.
+* `MtDemoAppDbContextBase` is an abstract base class for the classes explained above. In this way, you can configure common mapping logic here.
+
+Let's see these classes a bit closer...
+
+### The Main `DbContext` Class
+
+Here the main `DbContext` class:
+
+````csharp
+public class MtDemoAppDbContext : MtDemoAppDbContextBase
+{
+ public MtDemoAppDbContext(DbContextOptions options)
+ : base(options)
+ {
+ }
+
+ protected override void OnModelCreating(ModelBuilder builder)
+ {
+ builder.SetMultiTenancySide(MultiTenancySides.Both);
+
+ base.OnModelCreating(builder);
+ }
+}
+````
+
+* It inherits from the `MtDemoAppDbContextBase` as I mentioned before. So, any configuration made in the base class is also valid here.
+* `OnModelCreating` overrides the base method and sets the multi-tenancy side as `MultiTenancySides.Both`. `Both` means this database can store host data as well as tenant data. This is needed because we store data in this database for the tenants who don't have a separate database.
+
+### The Tenant `DbContext` class
+
+Here is the tenant-specific `DbContext` class:
+
+````csharp
+public class MtDemoAppTenantDbContext : MtDemoAppDbContextBase
+{
+ public MtDemoAppTenantDbContext(DbContextOptions options)
+ : base(options)
+ {
+ }
+
+ protected override void OnModelCreating(ModelBuilder builder)
+ {
+ builder.SetMultiTenancySide(MultiTenancySides.Tenant);
+
+ base.OnModelCreating(builder);
+ }
+}
+````
+
+The only difference is that we used `MultiTenancySides.Tenant` as the multi-tenancy side here, since this `DbContext` will only have entities/tables for tenants that have separate databases.
+
+### The Base `DbContext` Class
+
+Here is the base `DbContext` class:
+
+````csharp
+public abstract class MtDemoAppDbContextBase : AbpDbContext
+ where TDbContext : DbContext
+{
+
+ public MtDemoAppDbContextBase(DbContextOptions options)
+ : base(options)
+ {
+
+ }
+
+ protected override void OnModelCreating(ModelBuilder builder)
+ {
+ base.OnModelCreating(builder);
+
+ /* Include modules to your migration db context */
+
+ builder.ConfigurePermissionManagement();
+ builder.ConfigureSettingManagement();
+ builder.ConfigureBackgroundJobs();
+ builder.ConfigureAuditLogging();
+ builder.ConfigureIdentityPro();
+ builder.ConfigureOpenIddictPro();
+ builder.ConfigureFeatureManagement();
+ builder.ConfigureLanguageManagement();
+ builder.ConfigureSaas();
+ builder.ConfigureTextTemplateManagement();
+ builder.ConfigureBlobStoring();
+ builder.ConfigureGdpr();
+
+ /* Configure your own tables/entities inside here */
+
+ //builder.Entity(b =>
+ //{
+ // b.ToTable(MtDemoAppConsts.DbTablePrefix + "YourEntities", MtDemoAppConsts.DbSchema);
+ // b.ConfigureByConvention(); //auto configure for the base class props
+ // //...
+ //});
+
+ //if (builder.IsHostDatabase())
+ //{
+ // /* Tip: Configure mappings like that for the entities only
+ * available in the host side,
+ // * but should not be in the tenant databases. */
+ //}
+ }
+}
+````
+
+This `DbContext` class configures database mappings for all the [application modules](https://abp.io/docs/latest/modules) used by this application by calling their extension methods, like `builder.ConfigureBackgroundJobs()`. Each of these extension methods are defined as multi-tenancy aware and care about what you've set for the multi-tenancy side.
+
+### Where to Configure Your Entities?
+
+You can configure your entity mappings in the `OnModelCreating` method in any of the `DbContext` classes that was explained:
+
+* If you configure in the main `DbContext` class, these configuration will be valid only for the main database. So, don't configure tenant-related configuration here, otherwise, it won't be applied for the tenants who have separate databases.
+* If you configure in the tenant `DbContext` class, it will be valid only for the tenants with separate databases. You rarely need to do that. You typically want to make same configuration in the base `DbContext` to support hybrid scenarios (some tenants use the main (shared) database and some tenants have separate databases).
+* If you configure in the base `DbContext` class, it will be valid for the main database and tenant databases. You typically define tenant-related configuration here. That means, if you have a multi-tenant `Product` entity, then you should define its EF Core database mapping configuration here, so the Products table is created in the main database as well as in the tenant databases.
+
+The recommended approach is to configure all the mapping in the base class, but add controls like `builder.IsHostDatabase()` and `builder.IsTenantDatabase()` to conditionally configure the mappings:
+
+
+
+## Adding Database Migrations
+
+In this section, I will show how to configure your entity mappings, generate database migrations and apply to the database.
+
+### Defining an Entity
+
+Let's define a `Product` entity in the `.Domain` layer of your application:
+
+````csharp
+using System;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
+
+namespace MtDemoApp
+{
+ public class Product : AggregateRoot, IMultiTenant
+ {
+ public Guid? TenantId { get; set; }
+ public string Name { get; set; }
+ public float Price { get; set; }
+ }
+}
+````
+
+### Configuring the Database Mapping
+
+Open the `MtDemoAppDbContextBase` class and add the following property to the class:
+
+````csharp
+public DbSet Products { get; set; }
+````
+
+Then add the following mapping code inside the `OnModelCreating` method (after all other existing code):
+
+````csharp
+builder.Entity(b =>
+{
+ b.ToTable(MtDemoAppConsts.DbTablePrefix + "Products", MtDemoAppConsts.DbSchema);
+ b.ConfigureByConvention(); //auto-configure for the base class props
+ b.Property(x => x.Name).IsRequired().HasMaxLength(100);
+});
+````
+
+We made the configuration in the base class since the `Products` table should be created in all databases, not only in the main database.
+
+>`DbTablePrefix` and `DbSchema` are optional and configurable in your application. You can change or remove them.
+
+### Add a New Database Migration for the Main Database
+
+To add a new EF Core database migration, we can use ABP Studio UI or EF Core command-line commands. I will show both of these approaches here.
+
+#### Using the ABP Studio "Add Migrations" UI
+
+You can right-click the `.EntityFrameworkCore` package in the ABP Studio's *Solution Explorer* panel and select *EF Core CLI* -> *Add Migration* command as shown below:
+
+
+
+You set a migration name on the opened dialog:
+
+
+
+If you select the *Update Database* checkbox it will apply changes to the database after generating the migration code.
+
+Lastly, select the main DbContext class for this migration:
+
+
+
+This dialog is shown when your application has multiple `DbContext` classes. Once you click the *OK* button, a new migration class is added under the `Migrations` folder of the `.EntityFrameworkCore` project (you can see in your coding editor):
+
+
+
+Since we selected the *Update Database* option, the database table is also created. The following screenshot shows the `AppProducts` table (`App` is the default prefix for your tables, but you can change or remove it) in Microsoft SQL Server Management Studio:
+
+
+
+#### Using a Command-Line Terminal
+
+If you prefer to use the command-line terminal (instead of ABP Studio UI), open a command-line terminal in the directory of the `.EntityFrameworkCore` project. As a shortcut, you can right-click the `.EntityFrameworkCore` project in ABP Studio, then select *Open with* -> *Terminal* command as shown in the following figure:
+
+
+
+Then you can use the [EF Core command-line tool](https://learn.microsoft.com/en-us/ef/core/cli/dotnet) to add a new database migration:
+
+````bash
+dotnet ef migrations add "Added_Product_Entity" --context MtDemoAppDbContext
+````
+
+It is important to set the `--context` parameter since we have two DbContext classes in the same project.
+
+After adding the migration, you can update the database:
+
+````bash
+dotnet ef database update "Added_Product_Entity" --context MtDemoAppDbContext
+````
+
+> If you are using Visual Studio, you can also use the [Package Manager Console](https://learn.microsoft.com/en-us/ef/core/cli/powershell) inside your IDE to add migrations and update the database.
+
+### Add a New Database Migration for the Tenant Database
+
+We added a database migration for the main (shared) database. We also need to add a new database migration for tenants who have separate databases.
+
+This time, no need to configure the DbContext since we did it in the base DbContext class, so it is valid for both of the DbContext classes. Just right-click the `.EntityFrameworkCore` package in the ABP Studio's *Solution Explorer* panel and select *EF Core CLI* -> *Add Migration* command as shown below:
+
+
+
+You can set the same or a different migration name here:
+
+
+
+The important part is to select the Tenant DbContext in the next dialog, because we want to change the tenant database this time:
+
+
+
+After clicking the *OK* button, it will add a new database migration class, but this time to the `TenantMigrations` folder:
+
+
+
+ABP Studio is smart enough to select the right folder name for the new migration by mapping with the DbContext name. However, you could manually type `TenantMigrations` in the *Output directory* textbox.
+
+Since we selected the *Update Database* option, it also applied changes to the database. But, which database? Interestingly, it automatically creates a second database for tenants with the project name + `_Tenant` suffix:
+
+
+
+> This new database is never used on runtime or production. It is only created to allow you to see the schema (tables and their fields) on development time to be sure that everything is as expected. As you see, some tables (like `Saas*` and `OpenIddict*`) are not available in that database, since they are used on the host side and only necessary to be in the main database.
+>
+> So, where is the real tenant database? If a tenant's database is dedicated (separate), it is created on runtime as I will explain in the *Managing Tenant Databases and Connection Strings* section later.
+
+You can see that database's connection string in the `appsettings.development.json` file of the `.DbMigrator` project in the solution. If you want to understand how it works, you can check source code of the `DbContextFactory` classes in the `.EntityFrameworkCore` project:
+
+
+
+These factory classes are used to create `DbContext` instances when you execute *Add Migration* and *Update Database* commands.
+
+## Managing Tenant Databases and Connection Strings
+
+Until now, we even didn't run the application. It is the time to do it.
+
+### Running the Application with ABP Studio
+
+You can run the `.Web` project in your IDE. But I prefer to use ABP Studio's *[Solution Runner](https://abp.io/docs/latest/studio/running-applications)* feature here. You can open the *Solution Runner* panel in *ABP Studio* and click the play icon near to the solution root (`MyDemoApp`):
+
+
+
+Once the application runs (and you see the blue link icon near to it), right click and select the *Browse* command:
+
+
+
+It will open the application's UI in the built-in browser of ABP Studio. You can Login the application (with `admin` as user name and `1q2w3E*` as the default password) and navigate to the *Saas* -> *Tenants* page.
+
+### Creating a New Tenant with the Shared Database
+
+The *Tenants* page of the [SaaS module](https://abp.io/modules/Volo.SaaS) is shown below:
+
+
+
+As you see, there is no tenant at the beginning. I can click the *+ New tenant* button to create the first tenant:
+
+
+
+On this screen, we can set the base tenant information. If you click the *Database connection strings* tab, you can see the following UI:
+
+
+
+For this first tenant, I will keep it as default and use the shared (main) database for this tenant's data. After clicking the *Save* button, the tenant is created and an initial [data seed](https://abp.io/docs/latest/framework/infrastructure/data-seeding) operation is automatically performed for us. To see an example, you can open the database, show rows of the `AbpUsers` table:
+
+
+
+As you see, a new `admin` user has been created with a `TenantId`. The first row is the `admin` user of the host side. So, ABP allows to define same user name in different tenants, because their data (users in this example) are completely isolated from each other.
+
+### Sign in with the new Tenant
+
+We created a new tenant. In this step, we will sign in with the new tenant's `admin` user to see the application UI by that new tenant. To do that, we should logout from the host admin user first. Click the user name (`admin`) on the top right area of the application and select the *Log out* command:
+
+
+
+Click the *Login* button again, which redirects you to the *Login* page:
+
+
+
+In this page, click the *switch* button near to the *TENANT* selection area and type `acme` as *Name*:
+
+
+
+Once you click the *Save* button, you are now in the acme tenant's context. You can see it on the *TENANT* selection area:
+
+
+
+> This kind of tenant switch feature is very useful in development to quickly change tenants to test your application. However, in production, you typically want to use subdomain/domain names or another mechanism to determine tenants automatically. When you configure domain based resolution, the tenant selection area is automatically disappears from the login page. You can check the [multi-tenant document](https://abp.io/docs/latest/framework/architecture/multi-tenancy) to learn how to configure it.
+
+After switching to the `acme` tenant, we can use `admin` as user name and the password you set during the tenant creation (I had set it as `1q2w3E*`) to login to the application.
+
+Here a screenshot from the *Roles* page after signing in as the `acme` tenant's `admin` user:
+
+
+
+> Notice that each tenant has its own roles, users, permissions, and other data. If you change roles here, it doesn't affect other tenants or the host side.
+>
+> Also, you can see that there are less menu items compared to host side. For example, tenant management page is not available for tenants as you can expect.
+
+### Switch Back to the Host Side
+
+To switch back to the host side to add a new tenant, logout from the application, click the *Login* button again to open the login page and then again click the *switch* button to change the current tenant context:
+
+
+
+In this dialog, clear the *Name* field and then *Save* the dialog to switch back to the host side. Then you can use the standard `admin` user name with `1q2w3E*` password to login to the application as the host administrator.
+
+### Creating a New Tenant with a Separate Database
+
+Finally, we came to the point that we will create a new tenant with a separate, dedicated database. Open the *Tenants* page of the SaaS module and click the *+ New tenant* button:
+
+
+
+Just fill these information as you wish, then open the *Database connection strings* tab:
+
+
+
+Uncheck the *Use the shared database* option and set a connection string to the *Default connection string* for this tenant. I used `Server=(LocalDb)\MSSQLLocalDB;Database=MtDemoApp_Volosoft;Trusted_Connection=True;TrustServerCertificate=true` as the connection string value. The database name is `MtDemoApp_Volosoft`. You can Test the connection string to be sure that it is a valid connection string.
+
+Once you click the *Save* button, the new tenant is created, a new database is created on the fly, all the database migrations are applied and the initial data seed is performed. You can open the SQL Server Management Studio to see the new database:
+
+
+
+You can check the tables (e.g. `AbpUsers`) to see that only this new tenant's data is stored in this database. To test the application, switch to the Volosoft tenant (as like explained in the *Sign in with the new Tenant* section before), create a new role or user and check the database.
+
+## Migrating Existing Tenant Databases
+
+In the previous section, we've seen that a tenant database is automatically created on runtime if you set a connection string for that tenant. Also, all the current migrations are automatically applied to the database, so it becomes up to date.
+
+But what about existing tenant databases when a new migration is added to the application? Maybe you have a few tenants with their separate databases, or you may have thousands of tenants with separate databases. How will you apply database schema changes to all of these databases?
+
+The startup template comes with a solution to this problem. There is a `.DbMigrator` console application in the solution that is responsible to apply schema (table and their fields) changes to all of the databases in the system (the main database and all the separate tenant databases). It also executes the data seeding if seed data is available. All you need to do is to execute this application on your production environment while deploying a new version of your application (of course, it is also very useful in the development environment). It checks and upgrades all the databases before the new version of your application is deployed.
+
+Here is the console log screen when I run the `.DbMigrator` application on my development environment:
+
+
+
+As you can see in the logs, it first migrates for the main (host) database, then migrates the tenant databases one by one. It doesn't make schema migration for the `acme` tenant since it has not a separate database, but uses the main database.
+
+In brief, when you make changes on your entity classes;
+
+1) Add a new migration for the main DbContext class as I explained in this article.
+2) Add a new migration for the tenant DbContext class as I explained in this article.
+3) Run the `.DbMigrator` application in your development environment to ensure all the databases are up to date.
+4) When you deploy your application to production or test environments, remember to run the `.DbMigrator` application first, then update your application. Or better, setup a CI/CD pipeline that automates this process. You can run the `.DbMigrator` every time while deploying the application, regardless of whether there is a schema change or not.
+
+> If you have too many tenants with separate database, then the migration process may take too much time. `.DbMigrator` provides the fundamental solution. But for more advanced scenarios or bigger systems, you can always develop your own solution. Just check the `.DbMigrator` application to understand how it was implemented. All the necessary code located in your solution, so you can easily understand and freely customize.
+
+## Conclusion
+
+In this article, I covered two important aspects of multi-tenant application development:
+
+* How ABP startup templates provide a multi-tenant application setup, so some tenants may store their data in a single (main, shared) database while some others may have their own dedicated database.
+* Demonstrate how it can manage database migration process on the fly for multiple databases.
+
+I started by defining different database models for multi-tenant applications (Single database, separate databases, and hybrid), showed how to create an ABP application that supports hybrid model, explained the DbContext structure that is coming with the solution template, demonstrated how to define entities, create and apply database migrations in such an application.
+
+I hope this article gives you a good understanding the problem and the solution provided by the ABP Framework. Please write your questions or comments under this article.
+
+Enjoy coding! :)
+
+## Further Reading
+
+* [ABP Multi-Tenancy document](https://abp.io/docs/latest/framework/architecture/multi-tenancy)
+* [Multi-Tenancy Architecture with .NET](https://abp.io/architecture/multi-tenancy)
\ No newline at end of file
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-saas-tenants-page.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-saas-tenants-page.png
new file mode 100644
index 0000000000..5b67b21bd1
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-saas-tenants-page.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration-select-dbcontext.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration-select-dbcontext.png
new file mode 100644
index 0000000000..38c18c1221
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration-select-dbcontext.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration-set-name.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration-set-name.png
new file mode 100644
index 0000000000..f3f48c8e39
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration-set-name.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration.png
new file mode 100644
index 0000000000..c509020c10
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-add-migration.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-browse.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-browse.png
new file mode 100644
index 0000000000..7ea0ae2116
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-browse.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-context-selection.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-context-selection.png
new file mode 100644
index 0000000000..af47462005
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-context-selection.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-open-with-terminal.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-open-with-terminal.png
new file mode 100644
index 0000000000..03cd29c3e1
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-open-with-terminal.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-solution-runner.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-solution-runner.png
new file mode 100644
index 0000000000..b965356dab
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/abp-studio-solution-runner.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/acme-tenant-screen.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/acme-tenant-screen.png
new file mode 100644
index 0000000000..1274c7e415
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/acme-tenant-screen.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/added-product-entity-migration-main-context.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/added-product-entity-migration-main-context.png
new file mode 100644
index 0000000000..b6da1d9e58
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/added-product-entity-migration-main-context.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/added-product-entity-migration-tenant-context.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/added-product-entity-migration-tenant-context.png
new file mode 100644
index 0000000000..b214b13f8c
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/added-product-entity-migration-tenant-context.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/builder-check-tenant-side.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/builder-check-tenant-side.png
new file mode 100644
index 0000000000..bfc89e9dda
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/builder-check-tenant-side.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/dbcontext-factories.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/dbcontext-factories.png
new file mode 100644
index 0000000000..17b7272435
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/dbcontext-factories.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/dbmigrator-logs.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/dbmigrator-logs.png
new file mode 100644
index 0000000000..2fdfbcb45c
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/dbmigrator-logs.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/hybrid-database-multi-tenancy.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/hybrid-database-multi-tenancy.png
new file mode 100644
index 0000000000..e5e5364302
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/hybrid-database-multi-tenancy.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/multi-tenancy-dbcontext-structure.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/multi-tenancy-dbcontext-structure.png
new file mode 100644
index 0000000000..0bd76b7d59
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/multi-tenancy-dbcontext-structure.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-1.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-1.png
new file mode 100644
index 0000000000..cc2e7b1975
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-1.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-2.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-2.png
new file mode 100644
index 0000000000..0c002b8718
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-2.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-conn-string-1.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-conn-string-1.png
new file mode 100644
index 0000000000..bb1327fc34
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-conn-string-1.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-conn-string-2.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-conn-string-2.png
new file mode 100644
index 0000000000..1f68b3d76b
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/new-tenant-dialog-conn-string-2.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/product-database-table.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/product-database-table.png
new file mode 100644
index 0000000000..cb5a1967f9
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/product-database-table.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-database.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-database.png
new file mode 100644
index 0000000000..26a3bb3064
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-database.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-tenant-database-multi-tenancy.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-tenant-database-multi-tenancy.png
new file mode 100644
index 0000000000..4df29f02ae
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-tenant-database-multi-tenancy.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-tenant-schema-option.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-tenant-schema-option.png
new file mode 100644
index 0000000000..bd7d86ce45
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/separate-tenant-schema-option.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/single-shared-database.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/single-shared-database.png
new file mode 100644
index 0000000000..af51e1d423
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/single-shared-database.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/switch-host-side.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/switch-host-side.png
new file mode 100644
index 0000000000..46c185901c
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/switch-host-side.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/switch-tenant-dialog.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/switch-tenant-dialog.png
new file mode 100644
index 0000000000..36dd1c9a19
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/switch-tenant-dialog.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/tenant-acme-name.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/tenant-acme-name.png
new file mode 100644
index 0000000000..94f159ed53
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/tenant-acme-name.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/tenant-database.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/tenant-database.png
new file mode 100644
index 0000000000..492c6a00cb
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/tenant-database.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/user-login.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/user-login.png
new file mode 100644
index 0000000000..425ed5cc5f
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/user-login.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/user-logout.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/user-logout.png
new file mode 100644
index 0000000000..4b9d8e9e05
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/user-logout.png differ
diff --git a/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/users-table-new-tenant.png b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/users-table-new-tenant.png
new file mode 100644
index 0000000000..0fc5eecda9
Binary files /dev/null and b/docs/en/Community-Articles/2025-07-26-Separate-Tenant-Schema/users-table-new-tenant.png differ
diff --git a/docs/en/Community-Articles/2025-07-31-How-to-build-persistent-background-jobs-with-abp-framework-and-quartz/Post.md b/docs/en/Community-Articles/2025-07-31-How-to-build-persistent-background-jobs-with-abp-framework-and-quartz/Post.md
new file mode 100644
index 0000000000..1c50a56c8f
--- /dev/null
+++ b/docs/en/Community-Articles/2025-07-31-How-to-build-persistent-background-jobs-with-abp-framework-and-quartz/Post.md
@@ -0,0 +1,546 @@
+
+# How to Build Persistent Background Jobs with ABP Framework and Quartz
+
+## Introduction
+
+In modern SaaS applications, automated background processing is essential for delivering reliable user experiences. Whether you're sending subscription reminders, processing payments, or generating reports, background jobs ensure critical tasks happen on schedule without blocking your main application flow.
+
+### What is `Quartz.NET`?
+
+`Quartz.NET` is a powerful, open-source job scheduling library for .NET applications that provides cron-based scheduling for complex time patterns, job persistence across application restarts, clustering support for high-availability scenarios, flexible trigger types, and the ability to pass parameters to jobs through job data maps. It's the de facto standard for enterprise-grade job scheduling in the .NET ecosystem.
+
+### Quartz Storage Options: In-Memory vs Persistent
+
+When configuring **Quartz**, you have two primary storage options, each with significant implications for how your application behaves:
+
+### 🧠 In-Memory Storage (`RAMJobStore`)
+- Keeps all job information in application memory.
+- **Very fast** – no database overhead.
+- **Volatile** – all jobs, triggers, and schedules are lost when the application stops or restarts.
+- Best suited for:
+ - Development environments.
+ - Scenarios where job loss is acceptable.
+
+### 🗃️ Persistent Storage (`JobStoreTX` or similar)
+- Stores all job information in a database.
+- **Reliable** – schedules persist across:
+ - Application restarts
+ - Server crashes
+ - Deployments
+- **Supports horizontal scaling** – multiple application instances can share the same job queue.
+- **Slight performance overhead** due to database I/O.
+- Best choice for:
+ - Production systems.
+ - Any scenario where **business continuity and reliability** are critical.
+
+### How ABP Simplifies Quartz Integration
+
+ABP handles Quartz configuration, dependency injection, and lifecycle management automatically. Developers define jobs using `QuartzBackgroundWorkerBase` and access services via `ICachedServiceProvider`, following ABP's standard conventions and leveraging optimal service caching for background job scenarios.
+
+### Benefits of the Integration
+
+- Full support for ABP’s cross-cutting concerns (e.g., multi-tenancy, localization)
+- Robust scheduling powered by Quartz
+- Built-in logging, error handling, and performance monitoring
+- Scales easily without modifying business logic
+
+### Real-World Use Case: Subscription Reminders
+
+In this tutorial, we'll build a subscription reminder system that monitors client subscriptions, identifies those nearing expiration, sends professional email reminders seven days before expiration, tracks reminder history to prevent duplicates, and runs automatically every day at 9:00 AM using Quartz scheduling with PostgreSQL persistence. This system demonstrates how ABP and Quartz work together to solve real business problems with clean, maintainable code that follows enterprise-grade patterns.
+
+## Installing and Configuring Quartz
+
+Getting Quartz up and running in an ABP application is straightforward thanks to ABP's dedicated integration package. We'll replace the default background job system with Quartz for persistent job storage and robust scheduling capabilities.
+
+### Adding the Quartz Package
+
+The easiest way to add Quartz support to your ABP application is using the ABP CLI. Open a terminal in your project directory and run:
+
+```bash
+abp add-package Volo.Abp.BackgroundWorkers.Quartz
+```
+
+This command automatically adds the necessary NuGet package reference and updates your module dependencies. The ABP CLI handles all the heavy lifting, ensuring you get the correct version that matches your ABP Framework version.
+
+### Configuring Quartz for Persistent Storage
+
+Once the package is installed, you need to configure Quartz to use your database (in my case it is PostgreSQL) for job persistence. This configuration goes in your main module's `PreConfigureServices` method:
+
+```csharp
+[DependsOn(
+ // ... other dependencies
+ typeof(AbpBackgroundJobsQuartzModule),
+ typeof(AbpBackgroundWorkersQuartzModule)
+)]
+public class MySaaSApplicationModule : AbpModule
+{
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ var hostingEnvironment = context.Services.GetHostingEnvironment();
+ var configuration = context.Services.GetConfiguration();
+
+ ConfigureAuthentication(context, configuration);
+ ConfigureUrls(configuration);
+ ConfigureImpersonation(context, configuration);
+ ConfigureQuartz(); // Add this line
+ }
+
+ private void ConfigureQuartz()
+ {
+ PreConfigure(options =>
+ {
+ options.Properties = new NameValueCollection
+ {
+ ["quartz.scheduler.instanceName"] = "QuartzScheduler",
+ ["quartz.jobStore.type"] = "Quartz.Impl.AdoJobStore.JobStoreTX, Quartz",
+ ["quartz.jobStore.tablePrefix"] = "qrtz_",
+ ["quartz.jobStore.dataSource"] = "myDS",
+ ["quartz.dataSource.myDS.connectionString"] = _configuration.GetConnectionString("Default"),
+ ["quartz.dataSource.myDS.provider"] = "Npgsql",
+ ["quartz.serializer.type"] = "json"
+ };
+ });
+ }
+}
+```
+
+This configuration tells Quartz to store all job information in your PostgreSQL database using tables prefixed with "qrtz_". The key points are:
+
+- **Job Store Type**: Uses ADO.NET with transaction support for reliable job persistence
+- **Connection String**: Shares your application's existing database connection
+- **Table Prefix**: Keeps Quartz tables separate with the "qrtz_" prefix
+- **JSON Serialization**: Makes job data readable and debuggable
+- **PostgreSQL Provider**: Uses Npgsql for optimal PostgreSQL integration
+
+When your application starts, ABP automatically initializes the Quartz scheduler with these settings. Any background workers you create will be registered and scheduled automatically, with their state persisted to the database for reliability across application restarts.
+
+For detailed installation options and advanced configuration scenarios, check the official [ABP documentation.](https://abp.io/docs/latest/framework/infrastructure/background-workers/quartz)
+
+
+## Database Setup for Quartz
+
+With Quartz configured for persistent storage, we need to create the necessary database tables where Quartz will store job definitions, triggers, and execution history. Rather than running SQL scripts directly against the database, we'll use Entity Framework migrations to maintain consistency with ABP's database management approach.
+
+### Creating an Empty Migration for Quartz Tables
+
+Instead of executing raw SQL scripts against the database, we created an empty Entity Framework migration and populated it with the required Quartz table definitions. This approach keeps all database changes within the migration system, ensuring they're version-controlled, repeatable, and consistent across different environments.
+
+To create the empty migration, we used the standard Entity Framework CLI command:
+
+```bash
+dotnet ef migrations add AddQuartzTables
+```
+
+This generates a new migration file with empty `Up` and `Down` methods that we can populate with the Quartz table creation scripts.
+
+### Adding Quartz SQL Schema to Migration
+
+Once the empty migration was created, we populated it with the PostgreSQL-specific SQL needed to create all Quartz tables. The SQL scripts were obtained from the official Quartz repository, which provides database schema scripts for various database providers:
+
+```csharp
+public partial class AddQuartzTables : Migration
+{
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.Sql(@"
+ CREATE TABLE qrtz_job_details (
+ sched_name VARCHAR(120) NOT NULL,
+ job_name VARCHAR(200) NOT NULL,
+ job_group VARCHAR(200) NOT NULL,
+ description VARCHAR(250) NULL,
+ job_class_name VARCHAR(250) NOT NULL,
+ is_durable BOOLEAN NOT NULL,
+ is_nonconcurrent BOOLEAN NOT NULL,
+ is_update_data BOOLEAN NOT NULL,
+ requests_recovery BOOLEAN NOT NULL,
+ job_data BYTEA NULL,
+ PRIMARY KEY (sched_name, job_name, job_group)
+ );
+
+ CREATE TABLE qrtz_triggers (
+ sched_name VARCHAR(120) NOT NULL,
+ trigger_name VARCHAR(200) NOT NULL,
+ trigger_group VARCHAR(200) NOT NULL,
+ job_name VARCHAR(200) NOT NULL,
+ job_group VARCHAR(200) NOT NULL,
+ -- ... additional columns and constraints
+ PRIMARY KEY (sched_name, trigger_name, trigger_group),
+ FOREIGN KEY (sched_name, job_name, job_group) REFERENCES qrtz_job_details(sched_name, job_name, job_group)
+ );
+
+ -- Additional tables: qrtz_simple_triggers, qrtz_cron_triggers,
+ -- qrtz_simprop_triggers, qrtz_blob_triggers, qrtz_calendars,
+ -- qrtz_paused_trigger_grps, qrtz_fired_triggers, qrtz_scheduler_state, qrtz_locks
+ ");
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.Sql(@"
+ DROP TABLE IF EXISTS qrtz_locks;
+ DROP TABLE IF EXISTS qrtz_scheduler_state;
+ -- ... drop all other Quartz tables in reverse order
+ DROP TABLE IF EXISTS qrtz_triggers;
+ DROP TABLE IF EXISTS qrtz_job_details;
+ ");
+ }
+}
+```
+
+The complete SQL scripts for all supported database providers, including PostgreSQL, MySQL, SQL Server, and others, can be found in the official `Quartz.NET` repository. You should use the script that matches your specific database provider and version requirements.
+
+### Why Use Migrations Instead of Direct SQL Scripts?
+
+This migration-based approach offers several important advantages over running SQL scripts directly:
+
+**Version Control Integration**: The migration becomes part of your codebase, tracked in source control alongside your application changes. This means every developer and deployment environment gets the exact same database schema.
+
+**Rollback Capability**: The `Down` method provides a clean way to remove Quartz tables if needed, something that's much harder to manage with standalone SQL scripts.
+
+**Environment Consistency**: Whether you're setting up a development machine, staging server, or production deployment, running DBMigrator or `dotnet ef database update` command ensures the same schema is created everywhere.
+
+**Integration with ABP's Database Management**: This approach aligns perfectly with how ABP manages all other database changes, keeping your database evolution strategy consistent.
+
+The Quartz tables created by this migration handle all aspects of job persistence - from storing job definitions and triggers to tracking execution history and managing scheduler state. With these tables in place, your Quartz scheduler can reliably persist jobs across application restarts and coordinate work across multiple application instances if needed.
+
+After creating this migration, running DBMigrator `dotnet ef database update` will create all the necessary Quartz infrastructure in your PostgreSQL database, ready to store and manage your background jobs.
+
+For complete SQL scripts for your specific database provider, visit the official [Quartz documentation.](https://www.quartz-scheduler.net/documentation/quartz-3.x/quick-start.html#creating-and-initializing-database)
+## Building the Business Logic
+
+Before implementing our Quartz background job, we needed to create the essential business entities and services that our subscription reminder system would work with. Since this article focuses on Quartz integration rather than general ABP development patterns, we'll keep this section brief and move quickly to the background job implementation.
+
+### Core Entities and Services
+
+For our subscription reminder system, we created the following core components:
+
+**Entities:**
+- **`Client`**: Represents customers with subscription information (Name, Email, SubscriptionEnd, IsActive)
+- **`ReminderLog`**: Tracks when reminder emails have been sent to prevent duplicates
+
+**Application Services:**
+- **`ClientAppService`**: Handles CRUD operations and provides methods to find clients with expiring subscriptions
+- **`ReminderLogAppService`**: Manages reminder history and prevents duplicate notifications
+- **`EmailService`**: Sends professional HTML reminder emails via SMTP
+
+**Data Transfer Objects (DTOs):**
+- Complete set of DTOs for both entities following ABP conventions
+- Input/output DTOs for all service operations
+
+### Business Logic Overview
+
+The system follows standard ABP patterns with entities inheriting from `FullAuditedAggregateRoot`, services implementing `ICrudAppService` interfaces, and proper AutoMapper configurations for entity-DTO mapping. We also included a data seeder to create sample clients for testing purposes.
+
+The key business methods our background job will use are:
+- `GetExpiringClientsAsync()` - Finds clients whose subscriptions expire in the next 7 days
+- `CreateAsync()` - Logs when a reminder has been sent
+- `SendSubscriptionExpiryReminderAsync()` - Sends professional email reminders
+
+### Focus on Background Operations
+
+Rather than diving deep into ABP entity creation, repository patterns, or service layer implementation details, we'll move directly to the heart of this article: implementing robust background jobs with Quartz. The entities and services we created simply provide the business context for our background job to operate within.
+
+The real value of this tutorial lies in showing how ABP's `QuartzBackgroundWorkerBase` integrates seamlessly with your business logic to create reliable, persistent background operations that survive application restarts and scale across multiple instances.
+
+Let's now implement the background job that ties everything together and demonstrates the power of ABP + Quartz integration.
+
+
+## Implementing the Background Job (The ABP Way)
+
+This is where the magic happens. ABP's integration with Quartz provides a clean, powerful way to create background jobs that follow framework conventions while leveraging Quartz's robust scheduling capabilities. Let's dive into how we implemented our subscription reminder job and explore the advanced features ABP provides.
+
+### Creating a QuartzBackgroundWorkerBase Job
+
+Instead of implementing Quartz's raw `IJob` interface, ABP provides `QuartzBackgroundWorkerBase`, which integrates seamlessly with ABP's dependency injection, logging, and lifecycle management systems:
+
+```csharp
+public class SubscriptionExpiryNotifierJob : QuartzBackgroundWorkerBase
+{
+ public SubscriptionExpiryNotifierJob()
+ {
+ // Configure the job to run daily at 9:00 AM
+ JobDetail = JobBuilder.Create()
+ .WithIdentity(nameof(SubscriptionExpiryNotifierJob))
+ .Build();
+
+ Trigger = TriggerBuilder.Create()
+ .WithIdentity(nameof(SubscriptionExpiryNotifierJob))
+ .WithCronSchedule("0 0 9 * * ?") // Every day at 9:00 AM
+ .Build();
+
+ ScheduleJob = async scheduler =>
+ {
+ if (!await scheduler.CheckExists(JobDetail.Key))
+ {
+ await scheduler.ScheduleJob(JobDetail, Trigger);
+ }
+ };
+ }
+
+ public override async Task Execute(IJobExecutionContext context)
+ {
+ // Use ICachedServiceProvider for better performance and proper scoping
+ var serviceProvider = ServiceProvider.GetRequiredService();
+
+ // These services will be cached and reused throughout the job execution
+ var clientAppService = serviceProvider.GetRequiredService();
+ var reminderLogAppService = serviceProvider.GetRequiredService();
+ var emailService = serviceProvider.GetRequiredService();
+
+ Logger.LogInformation("🔄 Starting subscription expiry notification job...");
+
+ // 1. Get clients expiring in 7 days
+ var expiringClients = await clientAppService.GetExpiringClientsAsync(7);
+
+ Logger.LogInformation("📋 Found {Count} clients with expiring subscriptions", expiringClients.Count);
+
+ // 2. Process each client
+ foreach (var client in expiringClients)
+ {
+ await ProcessClientAsync(client, emailService, reminderLogAppService);
+ }
+
+ Logger.LogInformation("✅ Job completed successfully");
+ }
+}
+```
+
+### Key Implementation Features
+
+**Constructor-Based Configuration**: Unlike traditional Quartz jobs that require external scheduling code, ABP's approach lets you define both the job and its schedule directly in the constructor. This keeps related configuration together and makes the job self-contained.
+
+**ABP Service Integration**: The `ICachedServiceProvider` gives you access to any service in ABP's dependency injection container, enabling you to use application services, repositories, domain services, or any other ABP component with optimized caching and proper scoping.
+
+**Built-in Logging**: The `Logger` property provides access to ABP's logging infrastructure, automatically including context like correlation IDs and tenant information in multi-tenant applications.
+
+**Custom Scheduling Logic**: The `ScheduleJob` property allows you to customize how the job gets registered with Quartz. In our example, we check if the job already exists before scheduling it, preventing duplicate registrations during application restarts.
+
+### Understanding Quartz Trigger Types
+
+Quartz provides several trigger types to handle different scheduling requirements. Choosing the right trigger type is crucial for your job's behavior and performance.
+
+#### CronTrigger - Complex Time-Based Scheduling
+
+CronTrigger uses cron expressions for sophisticated scheduling patterns. This is what we used for our daily subscription reminders:
+
+```csharp
+// Daily at 9:00 AM
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("DailyReminder")
+ .WithCronSchedule("0 0 9 * * ?")
+ .Build();
+
+// Every weekday at 2:30 PM
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("WeekdayReport")
+ .WithCronSchedule("0 30 14 ? * MON-FRI")
+ .Build();
+
+// First day of every month at midnight
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("MonthlyCleanup")
+ .WithCronSchedule("0 0 0 1 * ?")
+ .Build();
+```
+
+**Cron Expression Format**: `Seconds Minutes Hours Day-of-Month Month Day-of-Week Year(optional)`
+- `0 0 9 * * ?` = 9:00 AM every day
+- `0 */15 * * * ?` = Every 15 minutes
+- `0 0 12 ? * SUN` = Every Sunday at noon
+
+#### SimpleTrigger - Interval-Based Scheduling
+
+SimpleTrigger is perfect for jobs that need to run at regular intervals or a specific number of times:
+
+```csharp
+// Run every 30 seconds indefinitely
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("HealthCheck")
+ .StartNow()
+ .WithSimpleSchedule(x => x
+ .WithIntervalInSeconds(30)
+ .RepeatForever())
+ .Build();
+
+// Run every 5 minutes, but only 10 times
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("LimitedRetry")
+ .StartNow()
+ .WithSimpleSchedule(x => x
+ .WithIntervalInMinutes(5)
+ .WithRepeatCount(9)) // 0-based, so 9 = 10 executions
+ .Build();
+
+// One-time execution after 1 hour delay
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("DelayedCleanup")
+ .StartAt(DateTimeOffset.UtcNow.AddHours(1))
+ .Build();
+```
+
+#### CalendarIntervalTrigger - Calendar-Aware Intervals
+
+CalendarIntervalTrigger handles intervals that need to respect calendar boundaries:
+
+```csharp
+// Every month on the same day (handles varying month lengths)
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("MonthlyBilling")
+ .WithCalendarIntervalSchedule(x => x
+ .WithIntervalInMonths(1))
+ .Build();
+
+// Every week, starting Monday
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("WeeklyReport")
+ .WithCalendarIntervalSchedule(x => x
+ .WithIntervalInWeeks(1))
+ .Build();
+```
+
+#### DailyTimeIntervalTrigger - Time Windows
+
+DailyTimeIntervalTrigger runs jobs within specific time windows on certain days:
+
+```csharp
+// Every 2 hours between 8 AM and 6 PM, Monday through Friday
+Trigger = TriggerBuilder.Create()
+ .WithIdentity("BusinessHoursSync")
+ .WithDailyTimeIntervalSchedule(x => x
+ .OnMondayThroughFriday()
+ .StartingDailyAt(TimeOfDay.HourAndMinuteOfDay(8, 0))
+ .EndingDailyAt(TimeOfDay.HourAndMinuteOfDay(18, 0))
+ .WithIntervalInHours(2))
+ .Build();
+```
+
+### Choosing the Right Trigger Type
+
+For different scenarios, you'd choose different trigger types:
+
+- **Daily/Weekly/Monthly Operations**: Use **CronTrigger** for maximum flexibility
+- **High-Frequency Tasks**: Use **SimpleTrigger** for performance (every few seconds/minutes)
+- **Business Calendar Operations**: Use **CalendarIntervalTrigger** for month-end reports, quarterly tasks
+- **Business Hours Operations**: Use **DailyTimeIntervalTrigger** for operations that should only run during specific hours
+
+### Automatic Job Registration
+
+One of ABP's most powerful features is automatic job discovery and registration. When your application starts, ABP automatically:
+
+1. **Scans for Background Workers**: ABP discovers all classes inheriting from `QuartzBackgroundWorkerBase`
+2. **Registers with DI Container**: Each job is registered as a service in the dependency injection container
+3. **Schedules with Quartz**: ABP calls the `ScheduleJob` delegate to register the job with the Quartz scheduler
+4. **Handles Lifecycle**: ABP manages starting and stopping jobs with the application lifecycle
+
+This means you simply create your job class, and ABP handles everything else. No manual registration, no startup code, no configuration files - it just works.
+
+### Understanding Misfire Handling
+
+Misfires occur when a scheduled job cannot execute at its intended time, typically due to system downtime, resource constraints, or the scheduler being paused. Quartz provides several misfire instructions to handle these scenarios:
+
+#### CronTrigger Misfire Instructions
+
+For cron-based schedules like our daily reminder job, Quartz offers these misfire behaviors:
+
+**`MisfireInstruction.DoNothing`** (Default):
+```csharp
+Trigger = TriggerBuilder.Create()
+ .WithIdentity(nameof(SubscriptionExpiryNotifierJob))
+ .WithCronSchedule("0 0 9 * * ?", x => x.WithMisfireHandlingInstructionDoNothing())
+ .Build();
+```
+- Skips all missed executions
+- Waits for the next naturally scheduled time
+- Best for jobs where missing executions is acceptable
+
+**`MisfireInstruction.FireOnceNow`**:
+```csharp
+.WithCronSchedule("0 0 9 * * ?", x => x.WithMisfireHandlingInstructionFireAndProceed())
+```
+- Immediately executes one missed job upon recovery
+- Then continues with the normal schedule
+- Useful when you need to catch up on missed work
+
+**`MisfireInstruction.IgnoreMisfires`**:
+```csharp
+.WithCronSchedule("0 0 9 * * ?", x => x.WithMisfireHandlingInstructionIgnoreMisfires())
+```
+- Executes all missed jobs immediately upon recovery
+- Can cause a burst of executions after extended downtime
+- Use carefully to avoid overwhelming the system
+
+#### SimpleTrigger Misfire Instructions
+
+Simple triggers have their own set of misfire behaviors:
+
+**`MisfireInstruction.FireNow`**: Execute immediately when recovered
+**`MisfireInstruction.RescheduleNowWithExistingRepeatCount`**: Start over with remaining repeat count
+**`MisfireInstruction.RescheduleNowWithRemainingRepeatCount`**: Continue as if no misfire occurred
+**`MisfireInstruction.RescheduleNextWithExistingCount`**: Wait for next interval, keep original repeat count
+
+### Real-World Misfire Considerations
+
+For our subscription reminder system, we chose the default `DoNothing` behavior because:
+
+- **Business Logic**: Sending yesterday's reminder today might confuse customers
+- **Duplicate Prevention**: Our job checks for existing reminders, so running late won't cause duplicate emails
+- **Resource Management**: We avoid overwhelming the email system after extended downtime
+
+However, for other scenarios you might choose differently:
+- **Financial reporting**: Use `FireOnceNow` to ensure reports are always generated
+- **Data synchronization**: Use `IgnoreMisfires` to process all missed sync operations
+- **Cache warming**: Use `DoNothing` since stale cache warming provides no value
+
+### Advanced Job Features
+
+**Error Handling and Resilience**: Our job implementation includes comprehensive error handling for individual client processing, ensuring one failed email doesn't stop the entire batch:
+
+```csharp
+try
+{
+ await emailService.SendSubscriptionExpiryReminderAsync(/*...*/);
+ await LogReminderAsync(client.Id, client.SubscriptionEnd, "Email sent successfully", reminderLogAppService);
+}
+catch (Exception ex)
+{
+ Logger.LogError(ex, "❌ Failed to send reminder to {ClientName}", client.Name);
+ await LogReminderAsync(client.Id, client.SubscriptionEnd, $"Failed: {ex.Message}", reminderLogAppService);
+}
+```
+
+**Duplicate Prevention**: The job checks for existing reminders to prevent sending multiple emails on the same day, even if the job runs multiple times:
+
+```csharp
+private async Task AlreadySentTodayAsync(Guid clientId, IReminderLogAppService reminderLogAppService)
+{
+ var todayReminders = await reminderLogAppService.GetByClientIdAsync(clientId);
+ var today = DateTime.UtcNow.Date;
+
+ return todayReminders.Any(r => r.ReminderDate.Date == today);
+}
+```
+
+This implementation demonstrates how ABP's `QuartzBackgroundWorkerBase` provides a clean, powerful foundation for building robust background jobs that integrate seamlessly with your business logic while leveraging Quartz's enterprise-grade scheduling capabilities.
+
+## Conclusion
+
+You've successfully built a production-ready subscription reminder system that demonstrates the powerful synergy between ABP Framework and `Quartz.NET`. This isn't just a tutorial example - it's a robust, enterprise-grade solution that handles real business requirements.
+
+### What We Accomplished
+
+**✅ Enterprise-Grade Reliability**: PostgreSQL persistence ensures jobs survive restarts and deployments
+**✅ ABP Best Practices**: Used `QuartzBackgroundWorkerBase`, `ICachedServiceProvider`, and ABP's logging infrastructure
+**✅ Real Business Value**: Automated subscription reminders with duplicate prevention and audit logging
+**✅ Flexible Scheduling**: Explored cron expressions, trigger types, and misfire handling strategies
+
+### The Power of ABP + Quartz Integration
+
+The combination delivers exceptional value through automatic job discovery, persistent scheduling, built-in dependency injection, and seamless framework integration. You get enterprise reliability with developer-friendly simplicity.
+
+### Final Thoughts
+
+Complex background processing doesn't have to be complicated to implement. ABP's thoughtful abstractions combined with Quartz's proven engine create a development experience that's both powerful and enjoyable.
+
+Whether you're building subscription management, financial reporting, or data synchronization, these patterns provide a solid foundation for reliable, maintainable solutions.
+
+**Happy coding, and may your background jobs never miss a beat!** 🚀
diff --git a/docs/en/framework/architecture/modularity/installer-projects.md b/docs/en/framework/architecture/modularity/installer-projects.md
new file mode 100644
index 0000000000..81c75ab015
--- /dev/null
+++ b/docs/en/framework/architecture/modularity/installer-projects.md
@@ -0,0 +1,221 @@
+# Module Installer Projects
+
+Each ABP module includes an `.Installer` project (e.g., `Volo.Abp.Account.Installer`) that serves as a **Virtual File System container** for module installation and resource management. These projects are essential for the ABP CLI to understand and install modules properly.
+
+## Purpose of Installer Projects
+
+Installer projects have three main purposes:
+
+1. **Virtual File System Integration**: Register the module's embedded resources with ABP's Virtual File System
+2. **Resource Packaging**: Package module metadata files (`.abpmdl` and `.abppkg`) as embedded resources
+3. **CLI Integration**: Enable the ABP CLI to understand module structure and install modules automatically
+
+## Structure of Installer Projects
+
+### Project Files
+
+- **`{ModuleName}.Installer.csproj`**: References `Volo.Abp.VirtualFileSystem` and embeds module metadata files
+- **`InstallationNotes.md`**: Documentation for the module
+- **`Volo/Abp/{ModuleName}/Abp{ModuleName}InstallerModule.cs`**: The core module class that registers embedded resources
+
+### Example Installer Module
+
+```csharp
+using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.Account;
+
+[DependsOn(typeof(AbpVirtualFileSystemModule))]
+public class AbpAccountInstallerModule : AbpModule
+{
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ Configure(options =>
+ {
+ options.FileSets.AddEmbedded();
+ });
+ }
+}
+```
+
+### Project Configuration
+
+The `.csproj` file embeds module metadata as content:
+
+```xml
+
+
+ net9.0
+ true
+
+
+
+
+
+
+
+
+
+
+ true
+ content\
+
+
+
+
+ true
+ content\
+
+
+
+```
+
+## Module Metadata Files
+
+### `.abpmdl` (Module Definition)
+
+The module definition file describes the module's structure and packages:
+
+```json
+{
+ "folders": {
+ "items": {
+ "src": {},
+ "test": {}
+ }
+ },
+ "packages": {
+ "Volo.Abp.Account.Web": {
+ "path": "src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.abppkg",
+ "folder": "src"
+ },
+ "Volo.Abp.Account.Application": {
+ "path": "src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.abppkg",
+ "folder": "src"
+ }
+ }
+}
+```
+
+### `.abppkg` (Package Definition)
+
+Each package has a definition file that specifies its role:
+
+```json
+{
+ "role": "lib.application"
+}
+```
+
+Common roles:
+- `lib.application`: Application layer package
+- `lib.mvc`: MVC/Web layer package
+- `lib.domain`: Domain layer package
+- `lib.domain-shared`: Shared domain layer package
+- `lib.efcore`: Entity Framework Core package
+
+## How Installer Projects Work
+
+### 1. CLI Installation Process
+
+When you run `abp add-module Volo.Abp.Account`:
+
+1. **Download Installer Package**: CLI downloads `Volo.Abp.Account.Installer` from NuGet
+2. **Read Module Definition**: CLI reads the embedded `.abpmdl` file to understand module structure
+3. **Read Package Definitions**: CLI reads `.abppkg` files to understand package roles
+4. **Install Packages**: CLI installs appropriate packages to correct project types based on roles
+5. **Add Dependencies**: CLI adds module dependencies to project module classes
+
+### 2. Virtual File System Integration
+
+The `InstallerModule` registers itself with the Virtual File System:
+
+```csharp
+options.FileSets.AddEmbedded();
+```
+
+This makes embedded resources available at runtime and enables:
+- Access to module metadata
+- Resource file management
+- Module configuration
+
+## Creating Installer Projects for New Modules
+
+### Required Files
+
+1. **Project File**: `{ModuleName}.Installer.csproj`
+2. **Module Class**: `Abp{ModuleName}InstallerModule.cs`
+3. **Documentation**: `InstallationNotes.md`
+4. **Module Definition**: `{ModuleName}.abpmdl` (in module root)
+5. **Package Definitions**: `{PackageName}.abppkg` (in each package)
+
+### Template Structure
+
+```
+modules/your-module/
+├── src/
+│ ├── Volo.Abp.YourModule.Installer/
+│ │ ├── Volo.Abp.YourModule.Installer.csproj
+│ │ ├── InstallationNotes.md
+│ │ └── Volo/
+│ │ └── Abp/
+│ │ └── YourModule/
+│ │ └── AbpYourModuleInstallerModule.cs
+│ └── [other packages]/
+├── Volo.Abp.YourModule.abpmdl
+└── [other module files]
+```
+
+### Package Definition Examples
+
+For different package types:
+
+```json
+// Application package
+{ "role": "lib.application" }
+
+// MVC package
+{ "role": "lib.mvc" }
+
+// Domain package
+{ "role": "lib.domain" }
+
+// EF Core package
+{ "role": "lib.efcore" }
+```
+
+## Why Installer Projects Appear "Empty"
+
+Installer projects appear minimal because their primary function is infrastructure, not business logic:
+
+- **No Business Logic**: Business logic belongs in the actual module packages
+- **Pure Infrastructure**: They only handle module installation and resource management
+- **CLI Integration**: They enable automated module installation through the ABP CLI
+- **Resource Management**: They package and distribute module metadata
+
+## Best Practices
+
+1. **Follow Naming Convention**: Use `{ModuleName}.Installer` for the project name
+2. **Include Documentation**: Always provide `InstallationNotes.md` with module information
+3. **Proper Dependencies**: Only depend on `Volo.Abp.VirtualFileSystem`
+4. **Embed All Metadata**: Include both `.abpmdl` and `.abppkg` files
+5. **Test Installation**: Verify your installer works with `abp add-module` command
+
+## Troubleshooting
+
+### Common Issues
+
+1. **Missing .abpmdl file**: Ensure the module definition file exists in the module root
+2. **Missing .abppkg files**: Each package needs a definition file
+3. **Incorrect roles**: Use appropriate roles for each package type
+4. **CLI not finding module**: Verify the installer package is published to NuGet
+
+### Verification Steps
+
+1. Build the installer project: `dotnet build`
+2. Check embedded resources: Verify `.abpmdl` and `.abppkg` files are embedded
+3. Test CLI installation: `abp add-module YourModule`
+4. Verify dependencies: Check that module dependencies are added correctly
+
+This installer system enables ABP's sophisticated module architecture, allowing for automated installation with proper dependency resolution and project type matching.
\ No newline at end of file
diff --git a/docs/en/framework/architecture/multi-tenancy/index.md b/docs/en/framework/architecture/multi-tenancy/index.md
index 7a5017b369..1bc151bddf 100644
--- a/docs/en/framework/architecture/multi-tenancy/index.md
+++ b/docs/en/framework/architecture/multi-tenancy/index.md
@@ -382,6 +382,19 @@ namespace MultiTenancyDemo.Web
* A tenant resolver should set `context.TenantIdOrName` if it can determine it. If not, just leave it as is to allow the next resolver to determine it.
* `context.ServiceProvider` can be used if you need to additional services to resolve from the [dependency injection](../../fundamentals/dependency-injection.md) system.
+##### The Fallback Tenant
+
+If you want to always fallback to a tenant (in case of no tenant was found by the tenant resolution logic), you can set the `AbpTenantResolveOptions.FallbackTenant` option:
+
+```csharp
+Configure(options =>
+{
+ options.FallbackTenant = "acme";
+});
+```
+
+The `FallbackTenant` value can be a tenant name or tenant's Id. This option can be helpful on development time or some specific scenarios to set a constant tenant for the application. It is a simple and consistent way to ensure that a tenant context is always available when needed. However, when you do that, no way to switch to the host side. It is not something you will need it most of the time, but here if you need such a resolution logic.
+
#### Multi-Tenancy Middleware
Multi-Tenancy middleware is an ASP.NET Core request pipeline [middleware](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/middleware) that determines the current tenant from the HTTP request and sets the `ICurrentTenant` properties.
diff --git a/docs/en/framework/fundamentals/object-extensions.md b/docs/en/framework/fundamentals/object-extensions.md
index b12be63dc0..87ece27f75 100644
--- a/docs/en/framework/fundamentals/object-extensions.md
+++ b/docs/en/framework/fundamentals/object-extensions.md
@@ -394,6 +394,22 @@ public class MyProfile : Profile
It has the same parameters with the `MapExtraPropertiesTo` method.
+#### Mapperly Integration
+
+If you're using the [Mapperly](https://github.com/riok/mapperly) library, the ABP also provides an extension method to utilize the `MapExtraPropertiesTo` method defined above.
+
+You can use the `MapExtraProperties` attribute to Mapperly class:
+
+````csharp
+[Mapper]
+[MapExtraProperties]
+public partial class IdentityUserToProfileDtoMapper : MapperBase
+{
+ public override partial IdentityUserDto Map(IdentityUser source);
+ public override partial void Map(IdentityUser source, IdentityUserDto destination);
+}
+````
+
## Entity Framework Core Database Mapping
If you're using the EF Core, you can map an extra property to a table field in the database. Example:
diff --git a/docs/en/framework/infrastructure/background-jobs/hangfire.md b/docs/en/framework/infrastructure/background-jobs/hangfire.md
index f5991ee19b..8377f001c0 100644
--- a/docs/en/framework/infrastructure/background-jobs/hangfire.md
+++ b/docs/en/framework/infrastructure/background-jobs/hangfire.md
@@ -159,14 +159,24 @@ app.UseAbpHangfireDashboard("/hangfire", options =>
`AbpHangfireAuthorizationFilter` class has the following fields:
* **`enableTenant` (`bool`, default: `false`):** Enables/disables accessing the Hangfire dashboard on tenant users.
-* **`requiredPermissionName` (`string`, default: `null`):** Hangfire dashboard is accessible only if the current user has the specified permission. In this case, if we specify a permission name, we don't need to set `enableTenant` `true` because the permission system already does it.
+* **`requiredPermissionName` (`string`, default: `null`):** Hangfire dashboard is accessible only if the current user has the specified permission.
+* **`requiredRoleNames` (`string[]`, default: `[]`):** Hangfire dashboard is accessible only if the current user has one of the specified roles.
-If you want to require an additional permission, you can pass it into the constructor as below:
+If you want to require more policies, you can use the `PolicyBuilder` property of the `AbpHangfireAuthorizationFilter` class.
```csharp
app.UseAbpHangfireDashboard("/hangfire", options =>
{
- options.AsyncAuthorization = new[] { new AbpHangfireAuthorizationFilter(requiredPermissionName: "MyHangFireDashboardPermissionName") };
+ var hangfireAuthorizationFilter = new AbpHangfireAuthorizationFilter(requiredPermissionName: "MyHangFireDashboardPermissionName");
+
+ //hangfireAuthorizationFilter.PolicyBuilder.AddRequirements(new PermissionRequirement("YourPermissionName"));
+ //hangfireAuthorizationFilter.PolicyBuilder.RequireRole("YourCustomRole");
+ //hangfireAuthorizationFilter.PolicyBuilder.Requirements.Add(new YourCustomRequirement());
+
+ options.AsyncAuthorization = new[]
+ {
+ hangfireAuthorizationFilter
+ };
});
```
@@ -190,18 +200,20 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
options.Authority = configuration["AuthServer:Authority"];
options.RequireHttpsMetadata = configuration.GetValue("AuthServer:RequireHttpsMetadata");
options.Audience = "MyProjectName";
- });
- context.Services.AddAuthentication()
- .AddCookie("Cookies")
- .AddOpenIdConnect("oidc", options =>
+ options.ForwardDefaultSelector = httpContext => httpContext.Request.Path.StartsWithSegments("/hangfire", StringComparison.OrdinalIgnoreCase)
+ ? CookieAuthenticationDefaults.AuthenticationScheme
+ : null;
+ })
+ .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme)
+ .AddAbpOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, options =>
{
options.Authority = configuration["AuthServer:Authority"];
- options.RequireHttpsMetadata = configuration.GetValue("AuthServer:RequireHttpsMetadata");
- options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+ options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]);
+ options.ResponseType = OpenIdConnectResponseType.Code;
- options.ClientId = configuration["AuthServer:ClientId"];
- options.ClientSecret = configuration["AuthServer:ClientSecret"];
+ options.ClientId = configuration["AuthServer:HangfireClientId"];
+ options.ClientSecret = configuration["AuthServer:HangfireClientSecret"];
options.UsePkce = true;
options.SaveTokens = true;
@@ -211,6 +223,8 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
options.Scope.Add("email");
options.Scope.Add("phone");
options.Scope.Add("MyProjectName");
+
+ options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
});
}
```
@@ -218,26 +232,27 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
```csharp
app.Use(async (httpContext, next) =>
{
- if (httpContext.Request.Path.StartsWithSegments("/hangfire"))
+ if (httpContext.Request.Path.StartsWithSegments("/hangfire", StringComparison.OrdinalIgnoreCase))
{
- var result = await httpContext.AuthenticateAsync("Cookies");
- if (result.Succeeded)
+ var authenticateResult = await httpContext.AuthenticateAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+ if (!authenticateResult.Succeeded)
{
- httpContext.User = result.Principal;
- await next(httpContext);
+ await httpContext.ChallengeAsync(
+ OpenIdConnectDefaults.AuthenticationScheme,
+ new AuthenticationProperties
+ {
+ RedirectUri = httpContext.Request.Path + httpContext.Request.QueryString
+ });
return;
}
-
- await httpContext.ChallengeAsync("oidc");
- }
- else
- {
- await next(httpContext);
}
+ await next.Invoke();
});
-
app.UseAbpHangfireDashboard("/hangfire", options =>
{
- options.AsyncAuthorization = new[] {new AbpHangfireAuthorizationFilter()};
+ options.AsyncAuthorization = new[]
+ {
+ new AbpHangfireAuthorizationFilter()
+ };
});
```
diff --git a/docs/en/framework/infrastructure/object-to-object-mapping.md b/docs/en/framework/infrastructure/object-to-object-mapping.md
index 8961d804c7..5a9ea5f82a 100644
--- a/docs/en/framework/infrastructure/object-to-object-mapping.md
+++ b/docs/en/framework/infrastructure/object-to-object-mapping.md
@@ -84,7 +84,7 @@ public class UserAppService : ApplicationService
}
````
-You should have defined the mappings before to be able to map objects. See the AutoMapper integration section to learn how to define mappings.
+You should have defined the mappings before to be able to map objects. See the AutoMapper/Mapperly integration section to learn how to define mappings.
## AutoMapper Integration
@@ -217,13 +217,120 @@ public class MyProfile : Profile
}
````
+## Mapperly Integration
+
+[Mapperly](https://github.com/riok/mapperly) is a .NET source generator for generating object mappings. [Volo.Abp.Mapperly](https://www.nuget.org/packages/Volo.Abp.Mapperly) package defines the Mapperly integration for the `IObjectMapper`.
+
+Once you define mappings class as below, you can use the `IObjectMapper` interface just like explained before.
+
+### Define Mapping Classes
+
+You can define a mapper class by using the `Mapper` attribute. The class and methods must be `partial` to allow the Mapperly to generate the implementation during the build process:
+
+````csharp
+[Mapper]
+public partial class UserToUserDtoMapper : MapperBase
+{
+ public override partial UserDto Map(User source);
+ public override partial void Map(User source, UserDto destination);
+}
+````
+
+If you also want to map `UserDto` to `User`, you can inherit from the `TwoWayMapperBase` class:
+
+````csharp
+[Mapper]
+public partial class UserToUserDtoMapper : TwoWayMapperBase
+{
+ public override partial UserDto Map(User source);
+ public override partial void Map(User source, UserDto destination);
+
+ public override partial User ReverseMap(UserDto destination);
+ public override partial void ReverseMap(UserDto destination, User source);
+}
+````
+
+### Before and After Mapping Methods
+
+The base class provides `BeforeMap` and `AfterMap` methods that can be overridden to perform actions before and after the mapping:
+
+````csharp
+[Mapper]
+public partial class UserToUserDtoMapper : TwoWayMapperBase
+{
+ public override partial UserDto Map(User source);
+ public override partial void Map(User source, UserDto destination);
+
+ public override partial void BeforeMap(User source)
+ {
+ //TODO: Perform actions before the mapping
+ }
+
+ public override partial void AfterMap(User source, UserDto destination)
+ {
+ //TODO: Perform actions after the mapping
+ }
+
+ public override partial User ReverseMap(UserDto destination);
+ public override partial void ReverseMap(UserDto destination, User source);
+
+ public override partial void BeforeReverseMap(UserDto destination)
+ {
+ //TODO: Perform actions before the reverse mapping
+ }
+
+ public override partial void AfterReverseMap(UserDto destination, User source)
+ {
+ //TODO: Perform actions after the reverse mapping
+ }
+}
+````
+
+### Mapping the Object Extensions
+
+[Object extension system](../fundamentals/object-extensions.md) allows to define extra properties for existing classes. ABP provides a mapping definition extension to properly map extra properties of two objects:
+
+````csharp
+[Mapper]
+[MapExtraProperties]
+public partial class UserToUserDtoMapper : MapperBase
+{
+ public override partial UserDto Map(User source);
+ public override partial void Map(User source, UserDto destination);
+}
+````
+
+It is suggested to use the `MapExtraPropertiesAttribute` attribute if both classes are extensible objects (implement the `IHasExtraProperties` interface). See the [object extension document](../fundamentals/object-extensions.md) for more.
+
+### Lists and Arrays Support
+
+ABP Mapperly integration also supports mapping lists and arrays as explained in the [IObjectMapper Interface](#iobjectmappertsource-tdestination-interface) section.
+
+**Example**:
+
+````csharp
+[Mapper]
+public partial class UserToUserDtoMapper : MapperBase
+{
+ public override partial UserDto Map(User source);
+ public override partial void Map(User source, UserDto destination);
+}
+
+var users = await _userRepository.GetListAsync(); // returns List
+var dtos = ObjectMapper.Map, List>(users); // creates List
+````
+
+### More Mapperly Features
+
+Most of Mapperly's features such as `Ignore` can be configured through its attributes. See the [Mapperly documentation](https://mapperly.riok.app/docs/intro/) for more details.
+
## Advanced Topics
### IObjectMapper Interface
-Assume that you have created a **reusable module** which defines AutoMapper profiles and uses `IObjectMapper` when it needs to map objects. Your module then can be used in different applications, by nature of the [modularity](../architecture/modularity/basics.md).
+Assume that you have created a **reusable module** which defines AutoMapper/Mapperly profiles and uses `IObjectMapper` when it needs to map objects. Your module then can be used in different applications, by nature of the [modularity](../architecture/modularity/basics.md).
-`IObjectMapper` is an abstraction and can be replaced by the final application to use another mapping library. The problem here that your reusable module is designed to use the AutoMapper library, because it only defines mappings for it. In such a case, you will want to guarantee that your module always uses AutoMapper even if the final application uses another default object mapping library.
+`IObjectMapper` is an abstraction and can be replaced by the final application to use another mapping library. The problem here that your reusable module is designed to use the AutoMapper/Mapperly library, because it only defines mappings for it. In such a case, you will want to guarantee that your module always uses AutoMapper/Mapperly even if the final application uses another default object mapping library.
`IObjectMapper` is used to contextualize the object mapper, so you can use different libraries for different modules/contexts.
@@ -281,6 +388,8 @@ public class UserAppService : ApplicationService
While using the contextualized object mapper is same as the normal object mapper, you should register the contextualized mapper in your module's `ConfigureServices` method:
+When using AutoMapper:
+
````csharp
[DependsOn(typeof(AbpAutoMapperModule))]
public class MyModule : AbpModule
@@ -298,6 +407,20 @@ public class MyModule : AbpModule
}
````
+When using Mapperly:
+
+````csharp
+[DependsOn(typeof(AbpMapperlyModule))]
+public class MyModule : AbpModule
+{
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ //Use Mapperly for MyModule
+ context.Services.AddMapperlyObjectMapper();
+ }
+}
+````
+
`IObjectMapper` is an essential feature for a reusable module where it can be used in multiple applications each may use a different library for object to object mapping. All pre-built ABP modules are using it. But, for the final application, you can ignore this interface and always use the default `IObjectMapper` interface.
### IObjectMapper Interface
diff --git a/docs/en/release-info/migration-guides/AutoMapper-To-Mapperly.md b/docs/en/release-info/migration-guides/AutoMapper-To-Mapperly.md
new file mode 100644
index 0000000000..11112e2bc6
--- /dev/null
+++ b/docs/en/release-info/migration-guides/AutoMapper-To-Mapperly.md
@@ -0,0 +1,211 @@
+# Migrating from AutoMapper to Mapperly
+
+## Introduction
+
+The AutoMapper library is **no longer free for commercial use**. For more details, you can refer to [this announcement post](https://www.jimmybogard.com/automapper-and-mediatr-going-commercial/).
+
+ABP Framework provides both AutoMapper and Mapperly integrations. If your project currently uses AutoMapper and you don't have a commercial license, you can switch to Mapperly by following the steps outlined below.
+
+## Migration Steps
+
+Please open your project in an IDE(`Visual Studio`, `VS Code` or `JetBrains Rider`), then perform the following global search and replace operations:
+
+1. Replace `Volo.Abp.AutoMapper` with `Volo.Abp.Mapperly` in all `*.csproj` files.
+2. Replace `using Volo.Abp.AutoMapper;` with `using Volo.Abp.Mapperly;` in all `*.cs` files.
+3. Replace `AbpAutoMapperModule` with `AbpMapperlyModule` in all `*.cs` files.
+4. Replace `AddAutoMapperObjectMapper` with `AddMapperlyObjectMapper` in all `*.cs` files.
+5. Remove any code sections that configure `Configure`.
+6. Review any existing AutoMapper `Profile` classes and ensure all newly created Mapperly mapping classes are registered appropriately. (You can refer to the example below for guidance)
+
+**Example:**
+
+Here is an AutoMapper's `Profile` class:
+
+```csharp
+public class ExampleAutoMapper : Profile
+{
+ public AbpIdentityApplicationModuleAutoMapperProfile()
+ {
+ CreateMap()
+ .MapExtraProperties()
+ .Ignore(x => x.IsLockedOut)
+ .Ignore(x => x.SupportTwoFactor)
+ .Ignore(x => x.RoleNames);
+
+ CreateMap();
+
+ CreateMap()
+ .MapExtraProperties();
+
+ CreateMap()
+ .ReverseMap();
+
+ CreateMap()
+ .ForMember(dest => dest.RoleId, src => src.MapFrom(r => r.Id));
+
+ CreateMap()
+ .ForMember(dest => dest.Active, src => src.MapFrom(r => r.IsActive ? "Yes" : "No"))
+ .ForMember(dest => dest.EmailConfirmed, src => src.MapFrom(r => r.EmailConfirmed ? "Yes" : "No"))
+ .ForMember(dest => dest.TwoFactorEnabled, src => src.MapFrom(r => r.TwoFactorEnabled ? "Yes" : "No"))
+ .ForMember(dest => dest.AccountLookout, src => src.MapFrom(r => r.LockoutEnd != null && r.LockoutEnd > DateTime.UtcNow ? "Yes" : "No"))
+ .Ignore(x => x.Roles);
+ }
+}
+```
+
+And the Mapperly mapping class:
+
+```csharp
+[Mapper]
+[MapExtraProperties]
+public partial class IdentityUserToIdentityUserDtoMapper : MapperBase
+{
+ [MapperIgnoreTarget(nameof(IdentityUserDto.IsLockedOut))]
+ [MapperIgnoreTarget(nameof(IdentityUserDto.SupportTwoFactor))]
+ [MapperIgnoreTarget(nameof(IdentityUserDto.RoleNames))]
+ public override partial IdentityUserDto Map(IdentityUser source);
+
+ [MapperIgnoreTarget(nameof(IdentityUserDto.IsLockedOut))]
+ [MapperIgnoreTarget(nameof(IdentityUserDto.SupportTwoFactor))]
+ [MapperIgnoreTarget(nameof(IdentityUserDto.RoleNames))]
+ public override partial void Map(IdentityUser source, IdentityUserDto destination);
+}
+
+[Mapper]
+public partial class IdentityUserClaimToIdentityUserClaimDtoMapper : MapperBase
+{
+ public override partial IdentityUserClaimDto Map(IdentityUserClaim source);
+
+ public override partial void Map(IdentityUserClaim source, IdentityUserClaimDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class OrganizationUnitToOrganizationUnitDtoMapper : MapperBase
+{
+ public override partial OrganizationUnitDto Map(OrganizationUnit source);
+ public override partial void Map(OrganizationUnit source, OrganizationUnitDto destination);
+}
+
+[Mapper]
+public partial class OrganizationUnitRoleToOrganizationUnitRoleDtoMapper : TwoWayMapperBase
+{
+ public override partial OrganizationUnitRoleDto Map(OrganizationUnitRole source);
+ public override partial void Map(OrganizationUnitRole source, OrganizationUnitRoleDto destination);
+
+ public override partial OrganizationUnitRole ReverseMap(OrganizationUnitRoleDto destination);
+ public override partial void ReverseMap(OrganizationUnitRoleDto destination, OrganizationUnitRole source);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class OrganizationUnitToOrganizationUnitWithDetailsDtoMapper : MapperBase
+{
+ [MapperIgnoreTarget(nameof(OrganizationUnitWithDetailsDto.Roles))]
+ [MapperIgnoreTarget(nameof(OrganizationUnitWithDetailsDto.UserCount))]
+ public override partial OrganizationUnitWithDetailsDto Map(OrganizationUnit source);
+
+ [MapperIgnoreTarget(nameof(OrganizationUnitWithDetailsDto.Roles))]
+ [MapperIgnoreTarget(nameof(OrganizationUnitWithDetailsDto.UserCount))]
+ public override partial void Map(OrganizationUnit source, OrganizationUnitWithDetailsDto destination);
+}
+
+[Mapper]
+public partial class IdentityRoleToOrganizationUnitRoleDtoMapper : MapperBase
+{
+ [MapProperty(nameof(IdentityRole.Id), nameof(OrganizationUnitRoleDto.RoleId))]
+ public override partial OrganizationUnitRoleDto Map(IdentityRole source);
+
+ [MapProperty(nameof(IdentityRole.Id), nameof(OrganizationUnitRoleDto.RoleId))]
+ public override partial void Map(IdentityRole source, OrganizationUnitRoleDto destination);
+}
+
+[Mapper]
+public partial class IdentityUserToIdentityUserExportDtoMapper : MapperBase
+{
+ [MapperIgnoreTarget(nameof(IdentityUserExportDto.Roles))]
+ public override partial IdentityUserExportDto Map(IdentityUser source);
+
+ [MapperIgnoreTarget(nameof(IdentityUserExportDto.Roles))]
+ public override partial void Map(IdentityUser source, IdentityUserExportDto destination);
+
+ public override void AfterMap(IdentityUser source, IdentityUserExportDto destination)
+ {
+ destination.Active = source.IsActive ? "Yes" : "No";
+ destination.EmailConfirmed = source.EmailConfirmed ? "Yes" : "No";
+ destination.TwoFactorEnabled = source.TwoFactorEnabled ? "Yes" : "No";
+ destination.AccountLookout = source.LockoutEnd != null && source.LockoutEnd > DateTime.UtcNow ? "Yes" : "No";
+ }
+}
+```
+
+## Mapperly Mapping Class
+
+To use Mapperly, you'll need to create a dedicated mapping class for each source and destination types.
+
+* Use the `[Mapper]` attribute to designate the class as a Mapperly mapper.
+* Replace AutoMapper's `Ignore()` method with the `[MapperIgnoreTarget]` attribute.
+* Replace the `MapExtraProperties()` method with the `[MapExtraProperties]` attribute.
+* Use the `TwoWayMapperBase` class as an alternative to AutoMapper’s `ReverseMap()` functionality.
+* Implement the `AfterMap()` method to execute logic after the mapping is completed.
+
+### Dependency Injection in Mapper Class
+
+All Mapperly mapping classes automatically registered in the the [dependency injection (DI)](../../framework/fundamentals/dependency-injection.md) container. To use a service within a Mapper class, simply add it to the constructor, Mapperly will inject it automatically.
+
+**Example:**
+
+```csharp
+public partial class IdentityUserToIdentityUserDtoMapper : MapperBase
+{
+ public IdentityUserToIdentityUserDtoMapper(MyService myService)
+ {
+ _myService = myService;
+ }
+
+ public override partial IdentityUserDto Map(IdentityUser source);
+ public override partial void Map(IdentityUser source, IdentityUserDto destination);
+
+ public override void AfterMap(IdentityUser source, IdentityUserDto destination)
+ {
+ destination.MyProperty = _myService.GetMyProperty(source.MyProperty);
+ }
+}
+```
+
+## Mapperly Documentation
+
+Please refer to the [Mapperly documentation](https://mapperly.riok.app/docs/intro/) for more details.
+
+**Key points:**
+
+- [Mapperly Configuration](https://mapperly.riok.app/docs/configuration/mapper/)
+- [Mapperly Enums](https://mapperly.riok.app/docs/configuration/enum/)
+- [Mapperly Flattening and unflattening](https://mapperly.riok.app/docs/configuration/flattening/)
+
+
+## Set Default Mapping Provider
+
+When your project contains modules using both AutoMapper and Mapperly, you may need to explicitly set the default `IAutoObjectMappingProvider` to ensure consistent behavior across your application.
+
+If your application uses `AutoMapper`:
+
+```csharp
+public override void ConfigureServices(ServiceConfigurationContext context)
+{
+ context.Services.AddAutoMapperObjectMapper();
+}
+```
+
+If your application uses `Mapperly`:
+
+```csharp
+public override void ConfigureServices(ServiceConfigurationContext context)
+{
+ context.Services.AddMapperlyObjectMapper();
+}
+```
+
+### Why Set Default Mapping Provider?
+
+When your project contains modules using both AutoMapper and Mapperly, both `AbpAutoMapperModule` and `AbpMapperlyModule` will be loaded. Their dependency order may vary based on your project's module structure, and the last loaded module will override the `IAutoObjectMappingProvider` implementation. This could lead to unexpected behavior. Setting an explicit default ensures predictable mapping behavior throughout your application.
diff --git a/docs/en/tutorials/modular-crm/part-06.md b/docs/en/tutorials/modular-crm/part-06.md
index 75af841312..b685d72960 100644
--- a/docs/en/tutorials/modular-crm/part-06.md
+++ b/docs/en/tutorials/modular-crm/part-06.md
@@ -19,7 +19,7 @@ You have created two modules so far: the **Catalog** module to store and manage
In this part and next two pars, you will learn to implement three common patterns for integrating these modules:
1. The Order module will make a request to the Catalog module to get product information when needed.
-2. The Product module will listen to events from the Ordering module, so it can decrease a product's stock count when an order is placed.
+2. The Catalog module will listen to events from the Ordering module, so it can decrease a product's stock count when an order is placed.
3. Finally, you will execute a database query that includes product and order data.
Let's begin from the first one: The Integration Services.
diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index 4167492d16..e304510e48 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -491,6 +491,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.BlobStoring.Bunny.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Timing.Tests", "test\Volo.Abp.Timing.Tests\Volo.Abp.Timing.Tests.csproj", "{58FCF22D-E8DB-4EB8-B586-9BB6E9899D64}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Mapperly", "src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj", "{AF556046-54CD-48BC-9740-3E926DB8B510}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Mapperly.Tests", "test\Volo.Abp.Mapperly.Tests\Volo.Abp.Mapperly.Tests.csproj", "{C38926D5-C1E7-47D6-BD0B-D36BE4C19AE7}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EntityFrameworkCore.MySQL.Pomelo", "src\Volo.Abp.EntityFrameworkCore.MySQL.Pomelo\Volo.Abp.EntityFrameworkCore.MySQL.Pomelo.csproj", "{5B49FE47-A4C5-45BE-A903-8215CF5E2FAF}"
EndProject
Global
@@ -1467,6 +1471,14 @@ Global
{58FCF22D-E8DB-4EB8-B586-9BB6E9899D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58FCF22D-E8DB-4EB8-B586-9BB6E9899D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58FCF22D-E8DB-4EB8-B586-9BB6E9899D64}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AF556046-54CD-48BC-9740-3E926DB8B510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AF556046-54CD-48BC-9740-3E926DB8B510}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AF556046-54CD-48BC-9740-3E926DB8B510}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AF556046-54CD-48BC-9740-3E926DB8B510}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C38926D5-C1E7-47D6-BD0B-D36BE4C19AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C38926D5-C1E7-47D6-BD0B-D36BE4C19AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C38926D5-C1E7-47D6-BD0B-D36BE4C19AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C38926D5-C1E7-47D6-BD0B-D36BE4C19AE7}.Release|Any CPU.Build.0 = Release|Any CPU
{5B49FE47-A4C5-45BE-A903-8215CF5E2FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B49FE47-A4C5-45BE-A903-8215CF5E2FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B49FE47-A4C5-45BE-A903-8215CF5E2FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1718,6 +1730,8 @@ Global
{1BBCBA72-CDB6-4882-96EE-D4CD149433A2} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
{BC4BB2D6-DFD8-4190-AAC3-32C0A7A8E915} = {447C8A77-E5F0-4538-8687-7383196D04EA}
{58FCF22D-E8DB-4EB8-B586-9BB6E9899D64} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+ {AF556046-54CD-48BC-9740-3E926DB8B510} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+ {C38926D5-C1E7-47D6-BD0B-D36BE4C19AE7} = {447C8A77-E5F0-4538-8687-7383196D04EA}
{5B49FE47-A4C5-45BE-A903-8215CF5E2FAF} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs
index ba21ef11fd..4fc7c4ca75 100644
--- a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs
@@ -1,5 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Authentication.OAuth;
+using Volo.Abp.AspNetCore.Security;
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.RemoteServices;
@@ -16,5 +17,10 @@ public class AbpAspNetCoreAuthenticationOpenIdConnectModule : AbpModule
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddHttpClient();
+
+ Configure(options =>
+ {
+ options.IgnoredScriptNoncePaths.Add("/signout-oidc");
+ });
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Bundling/BlazorWebAssemblyScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Bundling/BlazorWebAssemblyScriptContributor.cs
index d24e5d6976..870d4a6e5f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Bundling/BlazorWebAssemblyScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Bundling/BlazorWebAssemblyScriptContributor.cs
@@ -10,7 +10,6 @@ public class BlazorWebAssemblyScriptContributor : BundleContributor
context.Files.AddIfNotContains("_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js");
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/lang-utils.js");
- context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/lang-utils.js");
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/authentication-state-listener.js");
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Microsoft/AspNetCore/Builder/AbpAspNetCoreMultiTenancyApplicationBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Microsoft/AspNetCore/Builder/AbpAspNetCoreMultiTenancyApplicationBuilderExtensions.cs
index ceb872e5c3..7ccd1a73c3 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Microsoft/AspNetCore/Builder/AbpAspNetCoreMultiTenancyApplicationBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Microsoft/AspNetCore/Builder/AbpAspNetCoreMultiTenancyApplicationBuilderExtensions.cs
@@ -1,12 +1,34 @@
-using Volo.Abp.AspNetCore.MultiTenancy;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Volo.Abp.AspNetCore.MultiTenancy;
+using Volo.Abp.MultiTenancy;
namespace Microsoft.AspNetCore.Builder;
public static class AbpAspNetCoreMultiTenancyApplicationBuilderExtensions
{
+ private const string AuthenticationMiddlewareSetKey = "__AuthenticationMiddlewareSet";
+
public static IApplicationBuilder UseMultiTenancy(this IApplicationBuilder app)
{
- return app
- .UseMiddleware();
+ var multiTenancyOptions = app.ApplicationServices.GetRequiredService>();
+ var hasCurrentUserTenantResolveContributor = multiTenancyOptions.Value.TenantResolvers.Any(r => r is CurrentUserTenantResolveContributor);
+ if (hasCurrentUserTenantResolveContributor)
+ {
+ var authenticationMiddlewareSet = app.Properties.TryGetValue(AuthenticationMiddlewareSetKey, out var value) && value is true;
+ if (!authenticationMiddlewareSet)
+ {
+ var logger = app.ApplicationServices.GetService>();
+ logger?.LogWarning(
+ "MultiTenancyMiddleware is being registered before the authentication middleware. " +
+ "This may lead to incorrect tenant resolution if the resolution depends on the authenticated user. " +
+ "Ensure app.UseAuthentication() is called before app.UseMultiTenancy()."
+ );
+ }
+ }
+
+ return app.UseMiddleware();
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
index 8b46f6e78c..3365ff6a85 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
@@ -96,7 +96,7 @@ public class AbpModalFooterTagHelperService : AbpTagHelperService predicate)
+ {
+ bundleConfiguration.Contributors.RemoveBundleFile(predicate);
+ return bundleConfiguration;
+ }
+
public static BundleConfiguration AddContributors(this BundleConfiguration bundleConfiguration, params IBundleContributor[] contributors)
{
Check.NotNull(contributors, nameof(contributors));
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs
index 5f245c1827..e92538a23f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs
@@ -76,6 +76,36 @@ public class BundleContributorCollection
}
}
+ public void RemoveBundleFile(string fileName)
+ {
+ RemoveBundleFile([fileName]);
+ }
+
+ public void RemoveBundleFile(string[] fileNames)
+ {
+ var contributors = _contributors
+ .Where(x => x is BundleFileContributor bundleContributor &&
+ bundleContributor.Files.Any(f => fileNames.Any(name => name.Equals(f.FileName, StringComparison.OrdinalIgnoreCase))))
+ .Cast();
+ foreach (var contributor in contributors)
+ {
+ contributor.Files.RemoveAll(x => fileNames.Any(name => name.Equals(x.FileName, StringComparison.OrdinalIgnoreCase)));
+ }
+ }
+
+ public void RemoveBundleFile(Func predicate)
+ {
+ var contributors = _contributors
+ .Where(x => x is BundleFileContributor bundleContributor &&
+ bundleContributor.Files.Any(f => predicate(f.FileName)))
+ .Cast();
+
+ foreach (var contributor in contributors)
+ {
+ contributor.Files.RemoveAll(x => predicate(x.FileName));
+ }
+ }
+
public IReadOnlyList GetAll()
{
return _contributors.ToImmutableList();
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollectionExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollectionExtensions.cs
index addbe7e2cd..74f73fa1f3 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollectionExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollectionExtensions.cs
@@ -1,4 +1,7 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using System;
+using System.Linq;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
public static class BundleContributorCollectionExtensions
{
@@ -16,4 +19,14 @@ public static class BundleContributorCollectionExtensions
{
contributors.Add(new BundleFileContributor(files));
}
+
+ public static void RemoveFile(this BundleContributorCollection contributors, params string[] files)
+ {
+ contributors.RemoveBundleFile(files.ToArray());
+ }
+
+ public static void RemoveFile(this BundleContributorCollection contributors, Func predicate)
+ {
+ contributors.RemoveBundleFile(predicate);
+ }
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs
index 7dd24fad23..cc5d45dcaa 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs
@@ -15,6 +15,10 @@ public class JQueryValidationScriptContributor : BundleContributor
public override void ConfigureBundle(BundleConfigurationContext context)
{
context.Files.AddIfNotContains("/libs/jquery-validation/jquery.validate.js");
+ if (context.FileProvider.GetFileInfo("/libs/jquery-validation/abp.jquery.validate.js").Exists)
+ {
+ context.Files.AddIfNotContains("/libs/jquery-validation/abp.jquery.validate.js");
+ }
}
public override void ConfigureDynamicResources(BundleConfigurationContext context)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs
index 9bc15ae617..d0ba8b98c0 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationPartSorter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
using System.Reflection;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Volo.Abp.Modularity;
@@ -15,152 +13,36 @@ public static class ApplicationPartSorter
{
public static void Sort(ApplicationPartManager partManager, IModuleContainer moduleContainer)
{
- /* Performing a double Reverse() to preserve the original order for non-sorted parts
- */
+ var orderedModuleAssemblies = moduleContainer.Modules
+ .Select((moduleDescriptor, index) => new { moduleDescriptor.Assembly, index })
+ .ToDictionary(x => x.Assembly, x => x.index);
- var dependencyDictionary = CreateDependencyDictionary(partManager, moduleContainer);
+ var modulesAssemblies = moduleContainer.Modules.Select(x => x.Assembly).ToList();
+ var sortedTypes = partManager.ApplicationParts
+ .Where(x => modulesAssemblies.Contains(GetApplicationPartAssembly(x)))
+ .OrderBy(x => orderedModuleAssemblies[GetApplicationPartAssembly(x)])
+ .ToList();
- var sortedParts = partManager
- .ApplicationParts
- .Reverse() //First Revers
- .SortByDependencies(p => dependencyDictionary[p]);
+ var sortIndex = 0;
+ var sortedParts = partManager.ApplicationParts
+ .Select(x => modulesAssemblies.Contains(GetApplicationPartAssembly(x)) ? sortedTypes[sortIndex++] : x)
+ .ToList();
- sortedParts.Reverse(); //Reverse again
-
- //Replace the original parts with the sorted parts
partManager.ApplicationParts.Clear();
+ sortedParts.Reverse();
foreach (var applicationPart in sortedParts)
{
partManager.ApplicationParts.Add(applicationPart);
}
}
- private static Dictionary> CreateDependencyDictionary(
- ApplicationPartManager partManager, IModuleContainer moduleContainer)
- {
- var dependencyDictionary = new Dictionary>();
-
- foreach (var applicationPart in partManager.ApplicationParts)
- {
- dependencyDictionary[applicationPart] =
- CreateDependencyList(applicationPart, partManager, moduleContainer);
- }
-
- return dependencyDictionary;
- }
-
- private static List CreateDependencyList(
- ApplicationPart applicationPart,
- ApplicationPartManager partManager,
- IModuleContainer moduleContainer)
+ private static Assembly GetApplicationPartAssembly(ApplicationPart part)
{
- var list = new List();
-
- if (applicationPart is AssemblyPart assemblyPart)
+ return part switch
{
- AddDependencies(list, assemblyPart, partManager, moduleContainer);
- }
- else if (applicationPart is CompiledRazorAssemblyPart compiledRazorAssemblyPart)
- {
- AddDependencies(list, compiledRazorAssemblyPart, partManager, moduleContainer);
- }
-
- return list;
- }
-
- private static void AddDependencies(
- List list,
- AssemblyPart assemblyPart,
- ApplicationPartManager partManager,
- IModuleContainer moduleContainer)
- {
- var dependedAssemblyParts = GetDependedAssemblyParts(
- partManager,
- moduleContainer,
- assemblyPart
- );
-
- list.AddRange(dependedAssemblyParts);
-
- foreach (var dependedAssemblyPart in dependedAssemblyParts)
- {
- var viewsPart = GetViewsPartOrNull(partManager, dependedAssemblyPart);
- if (viewsPart != null)
- {
- list.Add(viewsPart);
- }
- }
- }
-
- private static void AddDependencies(
- List list,
- CompiledRazorAssemblyPart compiledRazorAssemblyPart,
- ApplicationPartManager partManager,
- IModuleContainer moduleContainer)
- {
- if (!compiledRazorAssemblyPart.Name.EndsWith(".Views"))
- {
- return;
- }
-
- var originalAssemblyPart = GetOriginalAssemblyPartOrNull(compiledRazorAssemblyPart, partManager);
- if (originalAssemblyPart == null)
- {
- return;
- }
-
- list.Add(originalAssemblyPart);
- }
-
- private static AssemblyPart[] GetDependedAssemblyParts(
- ApplicationPartManager partManager,
- IModuleContainer moduleContainer,
- AssemblyPart assemblyPart)
- {
- var moduleDescriptor = GetModuleDescriptorForAssemblyOrNull(moduleContainer, assemblyPart.Assembly);
- if (moduleDescriptor == null)
- {
- return Array.Empty();
- }
-
- var moduleDependedAssemblies = moduleDescriptor
- .Dependencies
- .SelectMany(d => d.AllAssemblies)
- .ToArray();
-
- return partManager.ApplicationParts
- .OfType()
- .Where(a => a.Assembly.IsIn(moduleDependedAssemblies))
- .Distinct()
- .ToArray();
- }
-
- private static CompiledRazorAssemblyPart? GetViewsPartOrNull(ApplicationPartManager partManager,
- ApplicationPart assemblyPart)
- {
- var viewsAssemblyName = assemblyPart.Name + ".Views";
- return partManager
- .ApplicationParts
- .OfType()
- .FirstOrDefault(p => p.Name == viewsAssemblyName);
- }
-
- private static AssemblyPart? GetOriginalAssemblyPartOrNull(
- CompiledRazorAssemblyPart compiledRazorAssemblyPart,
- ApplicationPartManager partManager)
- {
- var originalAssemblyName = compiledRazorAssemblyPart.Name.RemovePostFix(".Views");
- return partManager.ApplicationParts
- .OfType()
- .FirstOrDefault(p => p.Name == originalAssemblyName);
- }
-
- private static IAbpModuleDescriptor? GetModuleDescriptorForAssemblyOrNull(
- IModuleContainer moduleContainer,
- Assembly assembly)
- {
- return moduleContainer
- .Modules
- .FirstOrDefault(m => m.AllAssemblies.Contains(assembly));
+ AssemblyPart assemblyPart => assemblyPart.Assembly,
+ CompiledRazorAssemblyPart compiledRazorAssemblyPart => compiledRazorAssemblyPart.Assembly,
+ _ => throw new AbpException("Unknown application part type")
+ };
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs
index 2d231c46ee..f1f2c9016e 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Security/AbpSecurityHeadersMiddleware.cs
@@ -25,7 +25,9 @@ public class AbpSecurityHeadersMiddleware : AbpMiddlewareBase, ITransientDepende
{
var endpoint = context.GetEndpoint();
- if (endpoint?.Metadata.GetMetadata() != null)
+ if (endpoint?.Metadata.GetMetadata() != null ||
+ await AlwaysIgnoreContentTypes(context) ||
+ Options.Value.IgnoredScriptNoncePaths.Any(x => context.Request.Path.StartsWithSegments(x.EnsureStartsWith('/'), StringComparison.OrdinalIgnoreCase)))
{
await next.Invoke(context);
return;
@@ -41,13 +43,13 @@ public class AbpSecurityHeadersMiddleware : AbpMiddlewareBase, ITransientDepende
AddHeader(context, "X-Frame-Options", "SAMEORIGIN");
var requestAcceptTypeHtml = context.Request.Headers["Accept"].Any(x =>
- x!.Contains("text/html") || x.Contains("*/*") || x.Contains("application/xhtml+xml"));
+ x!.Contains("text/html", StringComparison.OrdinalIgnoreCase) ||
+ x.Contains("*/*", StringComparison.OrdinalIgnoreCase) ||
+ x.Contains("application/xhtml+xml", StringComparison.OrdinalIgnoreCase));
if (!requestAcceptTypeHtml
|| !Options.Value.UseContentSecurityPolicyHeader
- || await AlwaysIgnoreContentTypes(context)
- || endpoint == null
- || Options.Value.IgnoredScriptNoncePaths.Any(x => context.Request.Path.StartsWithSegments(x.EnsureStartsWith('/'), StringComparison.OrdinalIgnoreCase)))
+ || endpoint == null)
{
AddOtherHeaders(context);
await next.Invoke(context);
@@ -60,7 +62,6 @@ public class AbpSecurityHeadersMiddleware : AbpMiddlewareBase, ITransientDepende
context.Items.Add(AbpAspNetCoreConsts.ScriptNonceKey, randomValue);
}
-
context.Response.OnStarting(() =>
{
if (context.Response.Headers.ContainsKey("Content-Security-Policy"))
diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
index 8d12eca643..e56ddd83a9 100644
--- a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
+++ b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
@@ -4,7 +4,7 @@
- net9.0
+ net8.0;net9.0
enable
Nullable
Volo.Abp.AutoMapper
diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs b/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
index e834b3d00d..1c9f4b2dd8 100644
--- a/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
@@ -126,7 +126,8 @@ public static class AbpRegistrationBuilderExtensions
}
else
{
- if (serviceRegistrationActionList.IsClassInterceptorsDisabled)
+ if (serviceRegistrationActionList.IsClassInterceptorsDisabled ||
+ serviceRegistrationActionList.DisabledClassInterceptorsSelectors.Any(selector => selector.Predicate(serviceType)))
{
return registrationBuilder;
}
diff --git a/framework/src/Volo.Abp.AzureServiceBus/Volo/Abp/AzureServiceBus/ClientConfig.cs b/framework/src/Volo.Abp.AzureServiceBus/Volo/Abp/AzureServiceBus/ClientConfig.cs
index 02b8397917..19db1beef7 100644
--- a/framework/src/Volo.Abp.AzureServiceBus/Volo/Abp/AzureServiceBus/ClientConfig.cs
+++ b/framework/src/Volo.Abp.AzureServiceBus/Volo/Abp/AzureServiceBus/ClientConfig.cs
@@ -11,5 +11,8 @@ public class ClientConfig
public ServiceBusClientOptions Client { get; set; } = new();
- public ServiceBusProcessorOptions Processor { get; set; } = new();
+ public ServiceBusProcessorOptions Processor { get; set; } = new ()
+ {
+ AutoCompleteMessages = false
+ };
}
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs
index 367b0716a8..3b1b18e8b3 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs
@@ -1,5 +1,7 @@
-using System.Threading.Tasks;
+using System.Threading;
+using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
using Volo.Abp.Data;
using Volo.Abp.Modularity;
@@ -29,9 +31,11 @@ public class AbpBackgroundWorkersModule : AbpModule
var options = context.ServiceProvider.GetRequiredService>().Value;
if (options.IsEnabled)
{
+ var hostApplicationLifetime = context.ServiceProvider.GetService();
+ var cancellationToken = hostApplicationLifetime?.ApplicationStopping ?? CancellationToken.None;
await context.ServiceProvider
.GetRequiredService()
- .StartAsync();
+ .StartAsync(cancellationToken);
}
}
@@ -40,9 +44,11 @@ public class AbpBackgroundWorkersModule : AbpModule
var options = context.ServiceProvider.GetRequiredService>().Value;
if (options.IsEnabled)
{
+ var hostApplicationLifetime = context.ServiceProvider.GetService();
+ var cancellationToken = hostApplicationLifetime?.ApplicationStopping ?? CancellationToken.None;
await context.ServiceProvider
.GetRequiredService()
- .StopAsync();
+ .StopAsync(cancellationToken);
}
}
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs
index 652aa35741..4f7a65226d 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs
@@ -3,6 +3,7 @@ using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
namespace Volo.Abp.BackgroundWorkers;
@@ -28,6 +29,15 @@ public static class BackgroundWorkersApplicationInitializationContextExtensions
throw new AbpException($"Given type ({workerType.AssemblyQualifiedName}) must implement the {typeof(IBackgroundWorker).AssemblyQualifiedName} interface, but it doesn't!");
}
+ if (cancellationToken == default)
+ {
+ var hostApplicationLifetime = context.ServiceProvider.GetService();
+ if (hostApplicationLifetime != null)
+ {
+ cancellationToken = hostApplicationLifetime.ApplicationStopping;
+ }
+ }
+
await context.ServiceProvider
.GetRequiredService()
.AddAsync((IBackgroundWorker)context.ServiceProvider.GetRequiredService(workerType), cancellationToken);
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CleanCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CleanCommand.cs
index 71964653a7..092e996095 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CleanCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CleanCommand.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Utils;
using Volo.Abp.DependencyInjection;
namespace Volo.Abp.Cli.Commands;
@@ -13,11 +14,14 @@ namespace Volo.Abp.Cli.Commands;
public class CleanCommand : IConsoleCommand, ITransientDependency
{
public const string Name = "clean";
-
+
public ILogger Logger { get; set; }
- public CleanCommand()
+ protected ICmdHelper CmdHelper { get; }
+
+ public CleanCommand(ICmdHelper cmdHelper)
{
+ CmdHelper = cmdHelper;
Logger = NullLogger.Instance;
}
@@ -26,6 +30,10 @@ public class CleanCommand : IConsoleCommand, ITransientDependency
var binEntries = Directory.EnumerateDirectories(Directory.GetCurrentDirectory(), "bin", SearchOption.AllDirectories);
var objEntries = Directory.EnumerateDirectories(Directory.GetCurrentDirectory(), "obj", SearchOption.AllDirectories);
+ Logger.LogInformation("Cleaning the solution with 'dotnet clean' command...");
+ CmdHelper.RunCmd($"dotnet clean", workingDirectory: Directory.GetCurrentDirectory());
+
+ Logger.LogInformation($"Removing 'bin' and 'obj' folders...");
foreach (var path in binEntries.Concat(objEntries))
{
if (path.IndexOf("node_modules", StringComparison.OrdinalIgnoreCase) > 0)
@@ -38,9 +46,9 @@ public class CleanCommand : IConsoleCommand, ITransientDependency
Directory.Delete(path, true);
}
}
+ Logger.LogInformation($"'bin' and 'obj' folders removed successfully!");
- Logger.LogInformation($"BIN and OBJ folders have been successfully deleted!");
-
+ Logger.LogInformation("Solution cleaned successfully!");
return Task.CompletedTask;
}
diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
index 286cc05210..68fda48ee8 100644
--- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
+++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
@@ -1,4 +1,5 @@
using System;
+using Volo.Abp;
using Volo.Abp.DependencyInjection;
namespace Microsoft.Extensions.DependencyInjection;
@@ -39,6 +40,11 @@ public static class ServiceCollectionRegistrationActionExtensions
return GetOrCreateRegistrationActionList(services).IsClassInterceptorsDisabled;
}
+ public static void DisableAbpClassInterceptors(this IServiceCollection services, NamedTypeSelector selector)
+ {
+ GetOrCreateRegistrationActionList(services).DisabledClassInterceptorsSelectors.Add(selector);
+ }
+
// OnExposing
public static void OnExposing(this IServiceCollection services, Action exposeAction)
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ClassInterceptorsSelectorList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ClassInterceptorsSelectorList.cs
new file mode 100644
index 0000000000..11abc597c6
--- /dev/null
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ClassInterceptorsSelectorList.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.DependencyInjection;
+
+public class ClassInterceptorsSelectorList : List, IClassInterceptorsSelectorList
+{
+
+}
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IClassInterceptorsSelectorList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IClassInterceptorsSelectorList.cs
new file mode 100644
index 0000000000..77991d813e
--- /dev/null
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IClassInterceptorsSelectorList.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.DependencyInjection;
+
+public interface IClassInterceptorsSelectorList : IList
+{
+
+}
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
index 8d4ce1b521..750a4c523e 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
@@ -6,4 +6,11 @@ namespace Volo.Abp.DependencyInjection;
public class ServiceRegistrationActionList : List>
{
public bool IsClassInterceptorsDisabled { get; set; }
+
+ public IClassInterceptorsSelectorList DisabledClassInterceptorsSelectors { get; }
+
+ public ServiceRegistrationActionList()
+ {
+ DisabledClassInterceptorsSelectors = new ClassInterceptorsSelectorList();
+ }
}
diff --git a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs
index bd65b22dba..d49c211ee5 100644
--- a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs
+++ b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs
@@ -1,53 +1,49 @@
using System;
+using System.Collections.Generic;
using System.Threading.Tasks;
using Hangfire.Dashboard;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Users;
+using Volo.Abp.Authorization;
+using Volo.Abp.MultiTenancy;
namespace Volo.Abp.Hangfire;
public class AbpHangfireAuthorizationFilter : IDashboardAsyncAuthorizationFilter
{
private readonly bool _enableTenant;
- private readonly string? _requiredPermissionName;
+ private readonly AuthorizationPolicyBuilder _policyBuilder;
- public AbpHangfireAuthorizationFilter(bool enableTenant = false, string? requiredPermissionName = null)
- {
- _enableTenant = requiredPermissionName.IsNullOrWhiteSpace() ? enableTenant : true;
- _requiredPermissionName = requiredPermissionName;
- }
+ public virtual AuthorizationPolicyBuilder PolicyBuilder => _policyBuilder;
- public async Task AuthorizeAsync(DashboardContext context)
+ public AbpHangfireAuthorizationFilter(bool enableTenant = false, string? requiredPermissionName = null, params string[]? requiredRoleNames)
{
- if (!IsLoggedIn(context, _enableTenant))
+ _enableTenant = enableTenant;
+ _policyBuilder = new AuthorizationPolicyBuilder().RequireAuthenticatedUser();
+ if (!requiredPermissionName.IsNullOrWhiteSpace())
{
- return false;
+ _policyBuilder.Requirements.Add(new PermissionRequirement(requiredPermissionName));
}
- if (_requiredPermissionName.IsNullOrEmpty())
+ if (!requiredRoleNames.IsNullOrEmpty())
{
- return true;
+ foreach (var roleName in requiredRoleNames!)
+ {
+ _policyBuilder.RequireRole(roleName);
+ }
}
-
- return await IsPermissionGrantedAsync(context, _requiredPermissionName!);
}
- private static bool IsLoggedIn(DashboardContext context, bool enableTenant)
+ public virtual async Task AuthorizeAsync(DashboardContext context)
{
- var currentUser = context.GetHttpContext().RequestServices.GetRequiredService();
-
- if (!enableTenant)
+ var currentTenant = context.GetHttpContext().RequestServices.GetRequiredService();
+ if (currentTenant.IsAvailable && !_enableTenant)
{
- return currentUser.IsAuthenticated && !currentUser.TenantId.HasValue;
+ return false;
}
- return currentUser.IsAuthenticated;
- }
-
- private static async Task IsPermissionGrantedAsync(DashboardContext context, string requiredPermissionName)
- {
- var permissionChecker = context.GetHttpContext().RequestServices.GetRequiredService();
- return await permissionChecker.IsGrantedAsync(requiredPermissionName);
+ var authorizationService = context.GetHttpContext().RequestServices.GetRequiredService();
+ var authorizationPolicy = _policyBuilder.Build();
+ return (await authorizationService.AuthorizeAsync(context.GetHttpContext().User, authorizationPolicy)).Succeeded;
}
}
diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextAbpAccessTokenProvider.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextAbpAccessTokenProvider.cs
index 5044513438..b993b006e3 100644
--- a/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextAbpAccessTokenProvider.cs
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo/Abp/Http/Client/IdentityModel/Web/HttpContextAbpAccessTokenProvider.cs
@@ -1,8 +1,10 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Http.Client.Authentication;
+using Volo.Abp.Users;
namespace Volo.Abp.Http.Client.IdentityModel.Web;
@@ -24,6 +26,11 @@ public class HttpContextAbpAccessTokenProvider : IAbpAccessTokenProvider, ITrans
return null;
}
+ if (!httpContext.RequestServices.GetRequiredService().IsAuthenticated)
+ {
+ return null;
+ }
+
return await httpContext.GetTokenAsync("access_token");
}
}
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyUrlBuilder.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyUrlBuilder.cs
index 09ec183929..69248680cc 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyUrlBuilder.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyUrlBuilder.cs
@@ -224,7 +224,7 @@ public class ClientProxyUrlBuilder : ITransientDependency
return true;
}
- protected virtual Task ConvertValueToStringAsync(object value)
+ protected virtual Task ConvertValueToStringAsync(object? value)
{
if (value is DateTime dateTimeValue)
{
@@ -236,6 +236,6 @@ public class ClientProxyUrlBuilder : ITransientDependency
return Task.FromResult(dateTimeValue.ToString("yyyy-MM-ddTHH:mm:ss.fffffff").TrimEnd('0').TrimEnd('.'));
}
- return Task.FromResult(value.ToString()!);
+ return Task.FromResult(value?.ToString() ?? string.Empty);
}
}
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs
index fb60e56a59..1d0e649d28 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs
@@ -12,9 +12,9 @@ namespace Volo.Abp.Imaging;
public class ImageCompressor : IImageCompressor, ITransientDependency
{
protected IEnumerable ImageCompressorContributors { get; }
-
+
protected ICancellationTokenProvider CancellationTokenProvider { get; }
-
+
public ImageCompressor(IEnumerable imageCompressorContributors, ICancellationTokenProvider cancellationTokenProvider)
{
ImageCompressorContributors = imageCompressorContributors.Reverse();
@@ -27,12 +27,12 @@ public class ImageCompressor : IImageCompressor, ITransientDependency
CancellationToken cancellationToken = default)
{
Check.NotNull(stream, nameof(stream));
-
+
if(!stream.CanRead)
{
return new ImageCompressResult(stream, ImageProcessState.Unsupported);
}
-
+
if(!stream.CanSeek)
{
var memoryStream = new MemoryStream();
@@ -41,12 +41,12 @@ public class ImageCompressor : IImageCompressor, ITransientDependency
stream = memoryStream;
}
- foreach (var imageCompressorContributor in ImageCompressorContributors)
+ foreach (var imageCompressorContributor in ImageCompressorContributors.Reverse())
{
var result = await imageCompressorContributor.TryCompressAsync(stream, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken));
-
+
SeekToBegin(stream);
-
+
if (result.State == ImageProcessState.Unsupported)
{
continue;
@@ -54,7 +54,7 @@ public class ImageCompressor : IImageCompressor, ITransientDependency
return result;
}
-
+
return new ImageCompressResult(stream, ImageProcessState.Unsupported);
}
@@ -64,22 +64,22 @@ public class ImageCompressor : IImageCompressor, ITransientDependency
CancellationToken cancellationToken = default)
{
Check.NotNull(bytes, nameof(bytes));
-
- foreach (var imageCompressorContributor in ImageCompressorContributors)
+
+ foreach (var imageCompressorContributor in ImageCompressorContributors.Reverse())
{
var result = await imageCompressorContributor.TryCompressAsync(bytes, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken));
-
+
if (result.State == ImageProcessState.Unsupported)
{
continue;
}
-
+
return result;
}
-
+
return new ImageCompressResult(bytes, ImageProcessState.Unsupported);
}
-
+
protected virtual void SeekToBegin(Stream stream)
{
if (stream.CanSeek)
@@ -87,4 +87,4 @@ public class ImageCompressor : IImageCompressor, ITransientDependency
stream.Seek(0, SeekOrigin.Begin);
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs
index 80d9ec8815..96bf69b2aa 100644
--- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs
+++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs
@@ -13,36 +13,36 @@ namespace Volo.Abp.Imaging;
public class ImageResizer : IImageResizer, ITransientDependency
{
protected IEnumerable ImageResizerContributors { get; }
-
+
protected ImageResizeOptions ImageResizeOptions { get; }
-
+
protected ICancellationTokenProvider CancellationTokenProvider { get; }
-
+
public ImageResizer(
- IEnumerable imageResizerContributors,
- IOptions imageResizeOptions,
+ IEnumerable imageResizerContributors,
+ IOptions imageResizeOptions,
ICancellationTokenProvider cancellationTokenProvider)
{
ImageResizerContributors = imageResizerContributors.Reverse();
CancellationTokenProvider = cancellationTokenProvider;
ImageResizeOptions = imageResizeOptions.Value;
}
-
+
public virtual async Task> ResizeAsync(
- [NotNull] Stream stream,
- ImageResizeArgs resizeArgs,
- string? mimeType = null,
+ [NotNull] Stream stream,
+ ImageResizeArgs resizeArgs,
+ string? mimeType = null,
CancellationToken cancellationToken = default)
{
Check.NotNull(stream, nameof(stream));
-
+
ChangeDefaultResizeMode(resizeArgs);
-
+
if(!stream.CanRead)
{
return new ImageResizeResult(stream, ImageProcessState.Unsupported);
}
-
+
if(!stream.CanSeek)
{
var memoryStream = new MemoryStream();
@@ -50,13 +50,13 @@ public class ImageResizer : IImageResizer, ITransientDependency
SeekToBegin(memoryStream);
stream = memoryStream;
}
-
- foreach (var imageResizerContributor in ImageResizerContributors)
+
+ foreach (var imageResizerContributor in ImageResizerContributors.Reverse())
{
var result = await imageResizerContributor.TryResizeAsync(stream, resizeArgs, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken));
SeekToBegin(stream);
-
+
if (result.State == ImageProcessState.Unsupported)
{
continue;
@@ -64,24 +64,24 @@ public class ImageResizer : IImageResizer, ITransientDependency
return result;
}
-
+
return new ImageResizeResult(stream, ImageProcessState.Unsupported);
}
public virtual async Task> ResizeAsync(
- [NotNull] byte[] bytes,
- ImageResizeArgs resizeArgs,
- string? mimeType = null,
+ [NotNull] byte[] bytes,
+ ImageResizeArgs resizeArgs,
+ string? mimeType = null,
CancellationToken cancellationToken = default)
{
Check.NotNull(bytes, nameof(bytes));
-
+
ChangeDefaultResizeMode(resizeArgs);
-
- foreach (var imageResizerContributor in ImageResizerContributors)
+
+ foreach (var imageResizerContributor in ImageResizerContributors.Reverse())
{
var result = await imageResizerContributor.TryResizeAsync(bytes, resizeArgs, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken));
-
+
if (result.State == ImageProcessState.Unsupported)
{
continue;
@@ -89,10 +89,10 @@ public class ImageResizer : IImageResizer, ITransientDependency
return result;
}
-
+
return new ImageResizeResult(bytes, ImageProcessState.Unsupported);
}
-
+
protected virtual void ChangeDefaultResizeMode(ImageResizeArgs resizeArgs)
{
if (resizeArgs.Mode == ImageResizeMode.Default)
@@ -100,7 +100,7 @@ public class ImageResizer : IImageResizer, ITransientDependency
resizeArgs.Mode = ImageResizeOptions.DefaultResizeMode;
}
}
-
+
protected virtual void SeekToBegin(Stream stream)
{
if (stream.CanSeek)
@@ -108,4 +108,4 @@ public class ImageResizer : IImageResizer, ITransientDependency
stream.Seek(0, SeekOrigin.Begin);
}
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.Mapperly/Microsoft/Extensions/DependencyInjection/AbpAutoMapperServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Mapperly/Microsoft/Extensions/DependencyInjection/AbpAutoMapperServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..516e7b969f
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Microsoft/Extensions/DependencyInjection/AbpAutoMapperServiceCollectionExtensions.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Volo.Abp.Mapperly;
+using Volo.Abp.ObjectMapping;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class AbpAutoMapperServiceCollectionExtensions
+{
+ public static IServiceCollection AddMapperlyObjectMapper(this IServiceCollection services)
+ {
+ return services.Replace(
+ ServiceDescriptor.Transient()
+ );
+ }
+
+ public static IServiceCollection AddMapperlyObjectMapper(this IServiceCollection services)
+ {
+ return services.Replace(
+ ServiceDescriptor.Transient, MapperlyAutoObjectMappingProvider>()
+ );
+ }
+}
diff --git a/framework/src/Volo.Abp.Mapperly/Volo.Abp.Mapperly.csproj b/framework/src/Volo.Abp.Mapperly/Volo.Abp.Mapperly.csproj
new file mode 100644
index 0000000000..7c085a146e
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Volo.Abp.Mapperly.csproj
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+ net9.0
+ enable
+ Nullable
+ Volo.Abp.Mapperly
+ Volo.Abp.Mapperly
+ $(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyConventionalRegistrar.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyConventionalRegistrar.cs
new file mode 100644
index 0000000000..028a72bb67
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyConventionalRegistrar.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Mapperly;
+
+public class AbpMapperlyConventionalRegistrar : DefaultConventionalRegistrar
+{
+ protected override bool IsConventionalRegistrationDisabled(Type type)
+ {
+ return !type.GetInterfaces().Any(x => x.IsGenericType && typeof(IAbpMapperlyMapper<,>) == x.GetGenericTypeDefinition()) ||
+ base.IsConventionalRegistrationDisabled(type);
+ }
+
+ protected override List GetExposedServiceTypes(Type type)
+ {
+ var exposedServiceTypes = base.GetExposedServiceTypes(type);
+ var mapperlyInterfaces = type.GetInterfaces().Where(x =>
+ x.IsGenericType && (typeof(IAbpMapperlyMapper<,>) == x.GetGenericTypeDefinition() ||
+ typeof(IAbpReverseMapperlyMapper<,>) == x.GetGenericTypeDefinition()));
+ return exposedServiceTypes
+ .Union(mapperlyInterfaces)
+ .Distinct()
+ .ToList();
+ }
+}
diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyModule.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyModule.cs
new file mode 100644
index 0000000000..f879354ed3
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyModule.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Auditing;
+using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectMapping;
+
+namespace Volo.Abp.Mapperly;
+
+[DependsOn(
+ typeof(AbpObjectMappingModule),
+ typeof(AbpObjectExtendingModule),
+ typeof(AbpAuditingModule)
+)]
+public class AbpMapperlyModule : AbpModule
+{
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ context.Services.AddConventionalRegistrar(new AbpMapperlyConventionalRegistrar());
+ }
+
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ // This is the temporary solution, We will remove it in when all apps are migrated to Mapperly.
+ var disableMapperlyAutoObjectMappingProvider = false;
+
+ var modules = context.Services.GetSingletonInstance().Modules.ToList();
+ var autoMapperModuleIndex = modules.FindIndex(x => x.Type.FullName!.Equals("Volo.Abp.AutoMapper.AbpAutoMapperModule", StringComparison.OrdinalIgnoreCase));
+ if (autoMapperModuleIndex >= 0)
+ {
+ var mapperlyModuleIndex = modules.FindIndex(x => x.Type == typeof(AbpMapperlyModule));
+ if (mapperlyModuleIndex > autoMapperModuleIndex)
+ {
+ disableMapperlyAutoObjectMappingProvider = true;
+ }
+ }
+
+ if (!disableMapperlyAutoObjectMappingProvider)
+ {
+ context.Services.AddMapperlyObjectMapper();
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/IAbpMapperlyMapper.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/IAbpMapperlyMapper.cs
new file mode 100644
index 0000000000..eac0f6644c
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/IAbpMapperlyMapper.cs
@@ -0,0 +1,23 @@
+namespace Volo.Abp.Mapperly;
+
+public interface IAbpMapperlyMapper
+{
+ TDestination Map(TSource source);
+
+ void Map(TSource source, TDestination destination);
+
+ void BeforeMap(TSource source);
+
+ void AfterMap(TSource source, TDestination destination);
+}
+
+public interface IAbpReverseMapperlyMapper : IAbpMapperlyMapper
+{
+ TSource ReverseMap(TDestination destination);
+
+ void ReverseMap(TDestination destination, TSource source);
+
+ void BeforeReverseMap(TDestination destination);
+
+ void AfterReverseMap(TDestination destination, TSource source);
+}
diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapExtraPropertiesAttribute.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapExtraPropertiesAttribute.cs
new file mode 100644
index 0000000000..705a1af72d
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapExtraPropertiesAttribute.cs
@@ -0,0 +1,14 @@
+using System;
+using Volo.Abp.ObjectExtending;
+
+namespace Volo.Abp.Mapperly;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class MapExtraPropertiesAttribute : Attribute
+{
+ public MappingPropertyDefinitionChecks DefinitionChecks { get; set; } = MappingPropertyDefinitionChecks.Null;
+
+ public string[]? IgnoredProperties { get; set; }
+
+ public bool MapToRegularProperties { get; set; }
+}
diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs
new file mode 100644
index 0000000000..39d9dce995
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperBase.cs
@@ -0,0 +1,32 @@
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Mapperly;
+
+public abstract class MapperBase : IAbpMapperlyMapper, ITransientDependency
+{
+ public abstract TDestination Map(TSource source);
+
+ public abstract void Map(TSource source, TDestination destination);
+
+ public virtual void BeforeMap(TSource source)
+ {
+ }
+ public virtual void AfterMap(TSource source, TDestination destination)
+ {
+ }
+}
+
+public abstract class TwoWayMapperBase : MapperBase, IAbpReverseMapperlyMapper
+{
+ public abstract TSource ReverseMap(TDestination destination);
+
+ public abstract void ReverseMap(TDestination destination, TSource source);
+
+ public virtual void BeforeReverseMap(TDestination destination)
+ {
+ }
+
+ public virtual void AfterReverseMap(TDestination destination, TSource source)
+ {
+ }
+}
diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs
new file mode 100644
index 0000000000..677649b79a
--- /dev/null
+++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs
@@ -0,0 +1,281 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectMapping;
+using Volo.Abp.Reflection;
+
+namespace Volo.Abp.Mapperly;
+
+public class MapperlyAutoObjectMappingProvider : MapperlyAutoObjectMappingProvider, IAutoObjectMappingProvider
+{
+ public MapperlyAutoObjectMappingProvider(IServiceProvider serviceProvider)
+ : base(serviceProvider)
+ {
+ }
+}
+
+public class MapperlyAutoObjectMappingProvider : IAutoObjectMappingProvider
+{
+ protected static readonly ConcurrentDictionary> MapCache = new();
+
+ protected IServiceProvider ServiceProvider { get; }
+
+ public MapperlyAutoObjectMappingProvider(IServiceProvider serviceProvider)
+ {
+ ServiceProvider = serviceProvider;
+ }
+
+ public virtual TDestination Map(object source)
+ {
+ if (TryToMapCollection((TSource)source, default, out var collectionResult))
+ {
+ return collectionResult;
+ }
+
+ var mapper = ServiceProvider.GetService>();
+ if (mapper != null)
+ {
+ mapper.BeforeMap((TSource)source);
+ var destination = mapper.Map((TSource)source);
+ TryMapExtraProperties(mapper.GetType().GetSingleAttributeOrNull(), (TSource)source, destination, new ExtraPropertyDictionary());
+ mapper.AfterMap((TSource)source, destination);
+ return destination;
+ }
+
+ var reverseMapper = ServiceProvider.GetService>();
+ if (reverseMapper != null)
+ {
+ reverseMapper.BeforeReverseMap((TSource)source);
+ var destination = reverseMapper.ReverseMap((TSource)source);
+ TryMapExtraProperties(reverseMapper.GetType().GetSingleAttributeOrNull(), (TSource)source, destination, GetExtraProperties(destination));
+ reverseMapper.AfterReverseMap((TSource)source, destination);
+ return destination;
+ }
+
+ throw new AbpException($"No {TypeHelper.GetFullNameHandlingNullableAndGenerics(typeof(IAbpMapperlyMapper))} or" +
+ $" {TypeHelper.GetFullNameHandlingNullableAndGenerics(typeof(IAbpReverseMapperlyMapper))} was found");
+ }
+
+ public virtual TDestination Map(TSource source, TDestination destination)
+ {
+ if (TryToMapCollection(source, destination, out var collectionResult))
+ {
+ return collectionResult;
+ }
+
+ var mapper = ServiceProvider.GetService>();
+ if (mapper != null)
+ {
+ mapper.BeforeMap(source);
+ var destinationExtraProperties = GetExtraProperties(destination);
+ mapper.Map(source, destination);
+ TryMapExtraProperties(mapper.GetType().GetSingleAttributeOrNull(), source, destination, destinationExtraProperties);
+ mapper.AfterMap(source, destination);
+ return destination;
+ }
+
+ var reverseMapper = ServiceProvider.GetService>();
+ if (reverseMapper != null)
+ {
+ reverseMapper.BeforeReverseMap(source);
+ var destinationExtraProperties = GetExtraProperties(destination);
+ reverseMapper.ReverseMap(source, destination);
+ TryMapExtraProperties(reverseMapper.GetType().GetSingleAttributeOrNull(), source, destination, destinationExtraProperties);
+ reverseMapper.AfterReverseMap(source, destination);
+ return destination;
+ }
+
+ throw new AbpException($"No {TypeHelper.GetFullNameHandlingNullableAndGenerics(typeof(IAbpMapperlyMapper))} or" +
+ $" {TypeHelper.GetFullNameHandlingNullableAndGenerics(typeof(IAbpReverseMapperlyMapper))} was found");
+ }
+
+ protected virtual bool TryToMapCollection(TSource source, TDestination? destination, out TDestination collectionResult)
+ {
+ if (!ObjectMappingHelper.IsCollectionGenericType(out var sourceArgumentType, out var destinationArgumentType, out var definitionGenericType))
+ {
+ collectionResult = default!;
+ return false;
+ }
+
+ var mapperType = typeof(IAbpMapperlyMapper<,>).MakeGenericType(sourceArgumentType, destinationArgumentType);
+ var mapper = ServiceProvider.GetService(mapperType);
+ if (mapper == null)
+ {
+ mapperType = typeof(IAbpReverseMapperlyMapper<,>).MakeGenericType(destinationArgumentType, sourceArgumentType);
+ mapper = ServiceProvider.GetService(mapperType);
+ if (mapper == null)
+ {
+ //skip, no specific mapper
+ collectionResult = default!;
+ return false;
+ }
+ }
+
+ var invoker = MapCache.GetOrAdd(
+ $"{mapperType.FullName}_{(destination == null ? "MapMethodWithSingleParameter" : "MapMethodWithDoubleParameters")}",
+ _ => CreateMapDelegate(mapperType, sourceArgumentType, destinationArgumentType, destination != null));
+
+ var sourceList = source!.As();
+ var result = definitionGenericType.IsGenericType
+ ? Activator.CreateInstance(definitionGenericType.MakeGenericType(destinationArgumentType))!.As()
+ : Array.CreateInstance(destinationArgumentType, sourceList.Count);
+
+ if (destination != null && !destination.GetType().IsArray)
+ {
+ //Clear destination collection if destination not an array, We won't change array just same behavior as AutoMapper.
+ destination.As().Clear();
+ }
+
+ for (var i = 0; i < sourceList.Count; i++)
+ {
+ var invokeResult = destination == null
+ ? invoker(this, sourceList[i]!, null!)
+ : invoker(this, sourceList[i]!, Activator.CreateInstance(destinationArgumentType)!);
+
+ if (definitionGenericType.IsGenericType)
+ {
+ result.Add(invokeResult);
+ destination?.As().Add(invokeResult);
+ }
+ else
+ {
+ result[i] = invokeResult;
+ }
+ }
+
+ if (destination != null && destination.GetType().IsArray)
+ {
+ //Return the new collection if destination is an array, We won't change array just same behavior as AutoMapper.
+ collectionResult = (TDestination)result;
+ return true;
+ }
+
+ //Return the destination if destination exists. The parameter reference equals with return object.
+ collectionResult = destination ?? (TDestination)result;
+ return true;
+ }
+
+ protected virtual Func CreateMapDelegate(
+ Type mapperType,
+ Type sourceArgumentType,
+ Type destinationArgumentType,
+ bool hasDestination)
+ {
+ var methods = typeof(MapperlyAutoObjectMappingProvider)
+ .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+ .Where(x => x.Name == nameof(Map))
+ .Where(x =>
+ {
+ var parameters = x.GetParameters();
+ return (hasDestination || parameters.Length == 1) &&
+ (!hasDestination || parameters.Length == 2);
+ })
+ .ToList();
+
+ if (methods.Count == 0)
+ {
+ throw new AbpException($"Could not find a method named '{nameof(Map)}'" +
+ $" with parameters({(hasDestination ? sourceArgumentType + ", " + destinationArgumentType : sourceArgumentType.ToString())})" +
+ $" in the type '{mapperType}'.");
+ }
+
+ if (methods.Count > 1)
+ {
+ throw new AbpException($"Found more than one method named '{nameof(Map)}'" +
+ $" with parameters({(hasDestination ? sourceArgumentType + ", " + destinationArgumentType : sourceArgumentType.ToString())})" +
+ $" in the type '{mapperType}'.");
+ }
+
+ var method = methods[0].MakeGenericMethod(sourceArgumentType, destinationArgumentType);
+
+ var instanceParam = Expression.Parameter(typeof(object), "mapper");
+ var sourceParam = Expression.Parameter(typeof(object), "source");
+ var destinationParam = Expression.Parameter(typeof(object), "destination");
+
+ var instanceCast = Expression.Convert(instanceParam, method.DeclaringType!);
+ var callParams = new List
+ {
+ Expression.Convert(sourceParam, sourceArgumentType)
+ };
+
+ if (hasDestination)
+ {
+ callParams.Add(Expression.Convert(destinationParam, destinationArgumentType));
+ }
+
+ var call = Expression.Call(instanceCast, method, callParams);
+ var callConvert = Expression.Convert(call, typeof(object));
+
+ return Expression.Lambda>(callConvert, instanceParam, sourceParam, destinationParam).Compile();
+ }
+
+ protected virtual ExtraPropertyDictionary GetExtraProperties(TDestination destination)
+ {
+ var extraProperties = new ExtraPropertyDictionary();
+ if (destination is not IHasExtraProperties hasExtraProperties)
+ {
+ return extraProperties;
+ }
+
+ foreach (var property in hasExtraProperties.ExtraProperties)
+ {
+ extraProperties.Add(property.Key, property.Value);
+ }
+ return extraProperties;
+ }
+
+ protected virtual void TryMapExtraProperties(MapExtraPropertiesAttribute? mapExtraPropertiesAttribute, TSource source, TDestination destination, ExtraPropertyDictionary destinationExtraProperty)
+ {
+ if (mapExtraPropertiesAttribute != null &&
+ typeof(IHasExtraProperties).IsAssignableFrom(typeof(TDestination)) &&
+ typeof(IHasExtraProperties).IsAssignableFrom(typeof(TSource)))
+ {
+ MapExtraProperties(
+ source!.As(),
+ destination!.As(),
+ destinationExtraProperty,
+ mapExtraPropertiesAttribute.DefinitionChecks,
+ mapExtraPropertiesAttribute.IgnoredProperties,
+ mapExtraPropertiesAttribute.MapToRegularProperties
+ );
+ }
+ }
+ protected virtual void MapExtraProperties(
+ IHasExtraProperties source,
+ IHasExtraProperties destination,
+ ExtraPropertyDictionary destinationExtraProperty,
+ MappingPropertyDefinitionChecks? definitionChecks = null,
+ string[]? ignoredProperties = null,
+ bool mapToRegularProperties = false)
+ {
+ var result = destinationExtraProperty.IsNullOrEmpty()
+ ? new Dictionary()
+ : new Dictionary(destinationExtraProperty);
+
+ if (source.ExtraProperties != null && destination.ExtraProperties != null)
+ {
+ ExtensibleObjectMapper
+ .MapExtraPropertiesTo(
+ typeof(TSource),
+ typeof(TDestination),
+ source.ExtraProperties,
+ result,
+ definitionChecks,
+ ignoredProperties
+ );
+ }
+
+ ObjectHelper.TrySetProperty(destination, x => x.ExtraProperties, () => new ExtraPropertyDictionary(result));
+ if (mapToRegularProperties)
+ {
+ destination.SetExtraPropertiesToRegularProperties();
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs
index 414983c87a..26640c3dfd 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs
+++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs
@@ -8,6 +8,11 @@ public class AbpTenantResolveOptions
[NotNull]
public List TenantResolvers { get; }
+ ///
+ /// Fallback tenant to use when no other resolver resolves a tenant.
+ ///
+ public string? FallbackTenant { get; set; }
+
public AbpTenantResolveOptions()
{
TenantResolvers = new List();
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolverNames.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolverNames.cs
new file mode 100644
index 0000000000..3542d3a948
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolverNames.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Volo.Abp.MultiTenancy;
+
+public static class TenantResolverNames
+{
+ public const string FallbackTenant = "FallbackTenant";
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs
index 3ae9ae67b1..4351ef62bb 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs
@@ -39,6 +39,12 @@ public class TenantResolver : ITenantResolver, ITransientDependency
}
}
+ if (result.TenantIdOrName.IsNullOrEmpty() && !string.IsNullOrWhiteSpace(_options.FallbackTenant))
+ {
+ result.TenantIdOrName = _options.FallbackTenant;
+ result.AppliedResolvers.Add(TenantResolverNames.FallbackTenant);
+ }
+
return result;
}
}
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectMapper.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectMapper.cs
index eae85f77d7..48a3d37916 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectMapper.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectMapper.cs
@@ -188,7 +188,7 @@ public static class ExtensibleObjectMapper
return false;
}
- if (definitionChecks != null)
+ if (definitionChecks != null && definitionChecks.Value != MappingPropertyDefinitionChecks.Null)
{
if (definitionChecks.Value.HasFlag(MappingPropertyDefinitionChecks.Source))
{
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/MappingPropertyDefinitionChecks.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/MappingPropertyDefinitionChecks.cs
index 04668476a0..f717e97714 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/MappingPropertyDefinitionChecks.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/MappingPropertyDefinitionChecks.cs
@@ -5,20 +5,25 @@ namespace Volo.Abp.ObjectExtending;
[Flags]
public enum MappingPropertyDefinitionChecks : byte
{
+ ///
+ /// Same as Null, We need to use this in Attribute to avoid null checks.
+ ///
+ Null = 0,
+
///
/// No check. Copy all extra properties from the source to the destination.
///
- None = 0,
+ None = 1 << 0,
///
/// Copy the extra properties defined for the source class.
///
- Source = 1,
+ Source = 1 << 1,
///
/// Copy the extra properties defined for the destination class.
///
- Destination = 2,
+ Destination = 1 << 2,
///
/// Copy extra properties defined for both of the source and destination classes.
diff --git a/framework/src/Volo.Abp.ObjectMapping/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs b/framework/src/Volo.Abp.ObjectMapping/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
index 30733b1e24..faf8c4e258 100644
--- a/framework/src/Volo.Abp.ObjectMapping/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
+++ b/framework/src/Volo.Abp.ObjectMapping/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
@@ -5,6 +5,7 @@ using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
+using System.Linq.Expressions;
using System.Reflection;
using Volo.Abp.DependencyInjection;
@@ -25,7 +26,7 @@ public class DefaultObjectMapper : DefaultObjectMapper, IObjectMapper<
public class DefaultObjectMapper : IObjectMapper, ITransientDependency
{
- protected static ConcurrentDictionary MethodInfoCache { get; } = new ConcurrentDictionary();
+ protected static readonly ConcurrentDictionary> MapCache = new();
public IAutoObjectMappingProvider AutoObjectMappingProvider { get; }
protected IServiceProvider ServiceProvider { get; }
@@ -122,7 +123,7 @@ public class DefaultObjectMapper : IObjectMapper, ITransientDependency
protected virtual bool TryToMapCollection(IServiceScope serviceScope, TSource source, TDestination? destination, out TDestination collectionResult)
{
- if (!IsCollectionGenericType(out var sourceArgumentType, out var destinationArgumentType, out var definitionGenericType))
+ if (!ObjectMappingHelper.IsCollectionGenericType(out var sourceArgumentType, out var destinationArgumentType, out var definitionGenericType))
{
collectionResult = default!;
return false;
@@ -137,46 +138,9 @@ public class DefaultObjectMapper : IObjectMapper, ITransientDependency
return false;
}
- var cacheKey = $"{mapperType.FullName}_{(destination == null ? "MapMethodWithSingleParameter" : "MapMethodWithDoubleParameters")}";
- var method = MethodInfoCache.GetOrAdd(
- cacheKey,
- _ =>
- {
- var methods = specificMapper
- .GetType()
- .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
- .Where(x => x.Name == nameof(IObjectMapper.Map))
- .Where(x =>
- {
- var parameters = x.GetParameters();
- if (destination == null && parameters.Length != 1 ||
- destination != null && parameters.Length != 2 ||
- parameters[0].ParameterType != sourceArgumentType)
- {
- return false;
- }
-
- return destination == null || parameters[1].ParameterType == destinationArgumentType;
- })
- .ToList();
-
- if (methods.IsNullOrEmpty())
- {
- throw new AbpException($"Could not find a method named '{nameof(IObjectMapper.Map)}'" +
- $" with parameters({(destination == null ? sourceArgumentType.ToString() : sourceArgumentType + "," + destinationArgumentType)})" +
- $" in the type '{mapperType}'.");
- }
-
- if (methods.Count > 1)
- {
- throw new AbpException($"Found more than one method named '{nameof(IObjectMapper.Map)}'" +
- $" with parameters({(destination == null ? sourceArgumentType.ToString() : sourceArgumentType + "," + destinationArgumentType)})" +
- $" in the type '{mapperType}'.");
- }
-
- return methods.First();
- }
- );
+ var invoker = MapCache.GetOrAdd(
+ $"{mapperType.FullName}_{(destination == null ? "MapMethodWithSingleParameter" : "MapMethodWithDoubleParameters")}",
+ _ => CreateMapDelegate(mapperType, sourceArgumentType, destinationArgumentType, destination != null));
var sourceList = source!.As();
var result = definitionGenericType.IsGenericType
@@ -192,8 +156,8 @@ public class DefaultObjectMapper : IObjectMapper, ITransientDependency
for (var i = 0; i < sourceList.Count; i++)
{
var invokeResult = destination == null
- ? method.Invoke(specificMapper, new [] { sourceList[i] })!
- : method.Invoke(specificMapper, new [] { sourceList[i], Activator.CreateInstance(destinationArgumentType)! })!;
+ ? invoker(specificMapper, sourceList[i]!, null!)
+ : invoker(specificMapper, sourceList[i]!, Activator.CreateInstance(destinationArgumentType)!);
if (definitionGenericType.IsGenericType)
{
@@ -218,61 +182,64 @@ public class DefaultObjectMapper : IObjectMapper, ITransientDependency
return true;
}
- protected virtual bool IsCollectionGenericType(out Type sourceArgumentType, out Type destinationArgumentType, out Type definitionGenericType)
+ protected virtual Func CreateMapDelegate(
+ Type mapperType,
+ Type sourceArgumentType,
+ Type destinationArgumentType,
+ bool hasDestination)
{
- sourceArgumentType = default!;
- destinationArgumentType = default!;
- definitionGenericType = default!;
-
- if ((!typeof(TSource).IsGenericType && !typeof(TSource).IsArray) ||
- (!typeof(TDestination).IsGenericType && !typeof(TDestination).IsArray))
- {
- return false;
- }
+ var methods = mapperType
+ .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+ .Where(x => x.Name == nameof(IObjectMapper.Map))
+ .Where(x =>
+ {
+ var parameters = x.GetParameters();
+ if (!hasDestination && parameters.Length != 1 ||
+ hasDestination && parameters.Length != 2 ||
+ parameters[0].ParameterType != sourceArgumentType)
+ {
+ return false;
+ }
- var supportedCollectionTypes = new[]
- {
- typeof(IEnumerable<>),
- typeof(ICollection<>),
- typeof(Collection<>),
- typeof(IList<>),
- typeof(List<>)
- };
+ return !hasDestination || parameters[1].ParameterType == destinationArgumentType;
+ })
+ .ToList();
- if (typeof(TSource).IsGenericType && supportedCollectionTypes.Any(x => x == typeof(TSource).GetGenericTypeDefinition()))
+ if (methods.Count == 0)
{
- sourceArgumentType = typeof(TSource).GenericTypeArguments[0];
+ throw new AbpException($"Could not find a method named '{nameof(IObjectMapper.Map)}'" +
+ $" with parameters({(hasDestination ? sourceArgumentType + ", " + destinationArgumentType : sourceArgumentType.ToString())})" +
+ $" in the type '{mapperType}'.");
}
- if (typeof(TSource).IsArray)
+ if (methods.Count > 1)
{
- sourceArgumentType = typeof(TSource).GetElementType()!;
+ throw new AbpException($"Found more than one method named '{nameof(IObjectMapper.Map)}'" +
+ $" with parameters({(hasDestination ? sourceArgumentType + ", " + destinationArgumentType : sourceArgumentType.ToString())})" +
+ $" in the type '{mapperType}'.");
}
- if (sourceArgumentType == default!)
- {
- return false;
- }
+ var method = methods[0];
- definitionGenericType = typeof(List<>);
- if (typeof(TDestination).IsGenericType && supportedCollectionTypes.Any(x => x == typeof(TDestination).GetGenericTypeDefinition()))
- {
- destinationArgumentType = typeof(TDestination).GenericTypeArguments[0];
+ var instanceParam = Expression.Parameter(typeof(object), "mapper");
+ var sourceParam = Expression.Parameter(typeof(object), "source");
+ var destinationParam = Expression.Parameter(typeof(object), "destination");
- if (typeof(TDestination).GetGenericTypeDefinition() == typeof(ICollection<>) ||
- typeof(TDestination).GetGenericTypeDefinition() == typeof(Collection<>))
- {
- definitionGenericType = typeof(Collection<>);
- }
- }
+ var instanceCast = Expression.Convert(instanceParam, method.DeclaringType!);
+ var callParams = new List
+ {
+ Expression.Convert(sourceParam, sourceArgumentType)
+ };
- if (typeof(TDestination).IsArray)
+ if (hasDestination)
{
- destinationArgumentType = typeof(TDestination).GetElementType()!;
- definitionGenericType = typeof(Array);
+ callParams.Add(Expression.Convert(destinationParam, destinationArgumentType));
}
- return destinationArgumentType != default!;
+ var call = Expression.Call(instanceCast, method, callParams);
+ var callConvert = Expression.Convert(call, typeof(object));
+
+ return Expression.Lambda>(callConvert, instanceParam, sourceParam, destinationParam).Compile();
}
protected virtual TDestination AutoMap(object source)
diff --git a/framework/src/Volo.Abp.ObjectMapping/Volo/Abp/ObjectMapping/ObjectMappingHelper.cs b/framework/src/Volo.Abp.ObjectMapping/Volo/Abp/ObjectMapping/ObjectMappingHelper.cs
new file mode 100644
index 0000000000..5949edaba9
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectMapping/Volo/Abp/ObjectMapping/ObjectMappingHelper.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Volo.Abp.ObjectMapping;
+
+public static class ObjectMappingHelper
+{
+ private static readonly ConcurrentDictionary<(Type, Type), (Type sourceArgumentType, Type destinationArgumentType, Type definitionGenericType)?> Cache = new();
+
+ public static bool IsCollectionGenericType(
+ out Type sourceArgumentType,
+ out Type destinationArgumentType,
+ out Type definitionGenericType)
+ {
+ var cached = Cache.GetOrAdd((typeof(TSource), typeof(TDestination)), _ => IsCollectionGenericTypeInternal());
+ if (cached == null)
+ {
+ sourceArgumentType = destinationArgumentType = definitionGenericType = null!;
+ return false;
+ }
+
+ (sourceArgumentType, destinationArgumentType, definitionGenericType) = cached.Value;
+ return true;
+ }
+
+ private static (Type, Type, Type)? IsCollectionGenericTypeInternal()
+ {
+ if (!IsCollectionGenericTypeInternal(typeof(TSource), out var sourceArgumentType, out _) ||
+ !IsCollectionGenericTypeInternal(typeof(TDestination), out var destinationArgumentType, out var definitionGenericType))
+ {
+ return null;
+ }
+
+ return (sourceArgumentType, destinationArgumentType, definitionGenericType);
+ }
+
+ private static bool IsCollectionGenericTypeInternal(Type type, out Type elementType, out Type definitionGenericType)
+ {
+ var supportedCollectionTypes = new[]
+ {
+ typeof(IEnumerable<>),
+ typeof(ICollection<>),
+ typeof(Collection<>),
+ typeof(IList<>),
+ typeof(List<>)
+ };
+
+ if (type.IsArray)
+ {
+ elementType = type.GetElementType()!;
+ definitionGenericType = type;
+ return true;
+ }
+
+ if (type.IsGenericType &&
+ supportedCollectionTypes.Contains(type.GetGenericTypeDefinition()) ||
+ type.GetInterfaces().Any(i => i.IsGenericType && supportedCollectionTypes.Contains(i.GetGenericTypeDefinition())))
+ {
+ elementType = type.GetGenericArguments()[0];
+ definitionGenericType = type.GetGenericTypeDefinition();
+ if (definitionGenericType == typeof(IEnumerable<>) ||
+ definitionGenericType == typeof(IList<>))
+ {
+ definitionGenericType = typeof(List<>);
+ }
+
+ if (definitionGenericType == typeof(ICollection<>))
+ {
+ definitionGenericType = typeof(Collection<>);
+ }
+ return true;
+ }
+
+ elementType = null!;
+ definitionGenericType = null!;
+ return false;
+ }
+}
diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
index 7776b34b13..1f53e36260 100644
--- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Net;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationPart/ApplicationPartSorter_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationPart/ApplicationPartSorter_Tests.cs
new file mode 100644
index 0000000000..829aa23527
--- /dev/null
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationPart/ApplicationPartSorter_Tests.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using NSubstitute;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationPart;
+
+public class ApplicationPartSorter_Tests
+{
+ [Fact]
+ public void Should_Sort_ApplicationParts_By_Module_Dependencies()
+ {
+ var moduleDescriptors = new List();
+ var partManager = new ApplicationPartManager();
+
+ for (var i = 0; i < 10; i++)
+ {
+ var assembly = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName($"ModuleA{i}.dll"), AssemblyBuilderAccess.Run);
+ partManager.ApplicationParts.Add(new AssemblyPart(assembly));
+ moduleDescriptors.Add(CreateModuleDescriptor(assembly));
+ }
+ var randomApplicationParts = partManager.ApplicationParts.OrderBy(x => Guid.NewGuid()).ToList(); // Shuffle the parts
+
+ // Additional part
+ randomApplicationParts.AddFirst(new CompiledRazorAssemblyPart(typeof(AbpAspNetCoreModule).Assembly));
+ randomApplicationParts.Insert(5, new CompiledRazorAssemblyPart(typeof(AbpAspNetCoreMvcModule).Assembly));
+ randomApplicationParts.AddLast(new CompiledRazorAssemblyPart(typeof(AbpVirtualFileSystemModule).Assembly));
+
+ partManager.ApplicationParts.Clear();
+ foreach (var part in randomApplicationParts)
+ {
+ partManager.ApplicationParts.Add(part);
+ }
+
+ var moduleContainer = CreateFakeModuleContainer(moduleDescriptors);
+
+ ApplicationPartSorter.Sort(partManager, moduleContainer);
+
+ // Act
+ partManager.ApplicationParts.Count.ShouldBe(13); // 10 modules + 3 additional parts
+
+ var applicationParts = partManager.ApplicationParts.Reverse().ToList(); // Reverse the order to match the expected output
+
+ applicationParts[0].ShouldBeOfType().Assembly.ShouldBe(typeof(AbpAspNetCoreModule).Assembly);
+ applicationParts[1].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA0");
+ applicationParts[2].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA1");
+ applicationParts[3].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA2");
+ applicationParts[4].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA3");
+ applicationParts[5].ShouldBeOfType().Assembly.ShouldBe(typeof(AbpAspNetCoreMvcModule).Assembly);
+ applicationParts[6].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA4");
+ applicationParts[7].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA5");
+ applicationParts[8].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA6");
+ applicationParts[9].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA7");
+ applicationParts[10].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA8");
+ applicationParts[11].ShouldBeOfType().Assembly.GetName().Name.ShouldStartWith("ModuleA9");
+ applicationParts[12].ShouldBeOfType().Assembly.ShouldBe(typeof(AbpVirtualFileSystemModule).Assembly);
+ }
+
+ private static IModuleContainer CreateFakeModuleContainer(List moduleDescriptors)
+ {
+ var fakeModuleContainer = Substitute.For();
+ fakeModuleContainer.Modules.Returns(moduleDescriptors);
+ return fakeModuleContainer;
+ }
+
+ private static IAbpModuleDescriptor CreateModuleDescriptor(Assembly assembly)
+ {
+ var moduleDescriptor = Substitute.For();
+ moduleDescriptor.Assembly.Returns(assembly);
+ return moduleDescriptor;
+ }
+}
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController.cs
index 8e92558cb8..aa6462996a 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController.cs
@@ -2,10 +2,18 @@
namespace Volo.Abp.AspNetCore.Mvc.Security.Headers;
+[Route("SecurityHeadersTest")]
public class SecurityHeadersTestController : AbpController
{
+ [HttpGet("Get")]
public ActionResult Get()
{
return Content("OK");
}
+
+ [HttpGet("ignored")]
+ public ActionResult Get_Ignored()
+ {
+ return Content("OK");
+ }
}
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs
index 336c7fe8db..b71103620b 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Security/Headers/SecurityHeadersTestController_Tests.cs
@@ -15,6 +15,8 @@ public class SecurityHeadersTestController_Tests : AspNetCoreMvcTestBase
{
options.UseContentSecurityPolicyHeader = true;
options.Headers["Referrer-Policy"] = "no-referrer";
+
+ options.IgnoredScriptNoncePaths.Add("/SecurityHeadersTest/ignored");
});
base.ConfigureServices(services);
@@ -27,7 +29,6 @@ public class SecurityHeadersTestController_Tests : AspNetCoreMvcTestBase
responseMessage.Headers.ShouldContain(x => x.Key == "X-Content-Type-Options" & x.Value.First().ToString() == "nosniff");
responseMessage.Headers.ShouldContain(x => x.Key == "X-XSS-Protection" & x.Value.First().ToString() == "1; mode=block");
responseMessage.Headers.ShouldContain(x => x.Key == "X-Frame-Options" & x.Value.First().ToString() == "SAMEORIGIN");
- responseMessage.Headers.ShouldContain(x => x.Key == "X-Content-Type-Options" & x.Value.First().ToString() == "nosniff");
}
[Fact]
@@ -37,4 +38,15 @@ public class SecurityHeadersTestController_Tests : AspNetCoreMvcTestBase
responseMessage.Headers.ShouldNotBeEmpty();
responseMessage.Headers.ShouldContain(x => x.Key == "Referrer-Policy" && x.Value.First().ToString() == "no-referrer");
}
+
+ [Fact]
+ public async Task SecurityHeaders_Should_Be_Ignored()
+ {
+ var responseMessage = await GetResponseAsync("/SecurityHeadersTest/ignored");
+ responseMessage.Headers.ShouldNotBeEmpty();
+ responseMessage.Headers.ShouldNotContain(x => x.Key == "X-Content-Type-Options" & x.Value.First().ToString() == "nosniff");
+ responseMessage.Headers.ShouldNotContain(x => x.Key == "X-XSS-Protection" & x.Value.First().ToString() == "1; mode=block");
+ responseMessage.Headers.ShouldNotContain(x => x.Key == "X-Frame-Options" & x.Value.First().ToString() == "SAMEORIGIN");
+ responseMessage.Headers.ShouldNotContain(x => x.Key == "Referrer-Policy" && x.Value.First().ToString() == "no-referrer");
+ }
}
diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Mapperly/AbpAutoMapperExtensibleDtoExtensions_Tests.cs b/framework/test/Volo.Abp.Mapperly.Tests/Mapperly/AbpAutoMapperExtensibleDtoExtensions_Tests.cs
new file mode 100644
index 0000000000..9e5fe4f8cf
--- /dev/null
+++ b/framework/test/Volo.Abp.Mapperly.Tests/Mapperly/AbpAutoMapperExtensibleDtoExtensions_Tests.cs
@@ -0,0 +1,82 @@
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.Data;
+using Volo.Abp.Mapperly;
+using Volo.Abp.ObjectExtending.TestObjects;
+using Volo.Abp.Testing;
+using Xunit;
+
+namespace Mapperly;
+
+public class AbpAutoMapperExtensibleDtoExtensions_Tests : AbpIntegratedTest
+{
+ private readonly Volo.Abp.ObjectMapping.IObjectMapper _objectMapper;
+
+ public AbpAutoMapperExtensibleDtoExtensions_Tests()
+ {
+ _objectMapper = ServiceProvider.GetRequiredService();
+ }
+
+ [Fact]
+ public void MapExtraPropertiesTo_Should_Only_Map_Defined_Properties_By_Default()
+ {
+ var person = new ExtensibleTestPerson()
+ .SetProperty("Name", "John")
+ .SetProperty("Age", 42)
+ .SetProperty("ChildCount", 2)
+ .SetProperty("Sex", "male")
+ .SetProperty("CityName", "Adana");
+
+ var personDto = new ExtensibleTestPersonDto()
+ .SetProperty("ExistingDtoProperty", "existing-value");
+
+ _objectMapper.Map(person, personDto);
+
+ personDto.GetProperty("Name").ShouldBe("John"); //Defined in both classes
+ personDto.GetProperty("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
+ personDto.GetProperty("ChildCount").ShouldBe(0); //Not defined in the source, but was set to the default value by ExtensibleTestPersonDto constructor
+ personDto.GetProperty("CityName").ShouldBeNull(); //Ignored, but was set to the default value by ExtensibleTestPersonDto constructor
+ personDto.HasProperty("Age").ShouldBeFalse(); //Not defined on the destination
+ personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
+ }
+
+ [Fact]
+ public void MapExtraProperties_Also_Should_Map_To_RegularProperties()
+ {
+ var person = new ExtensibleTestPerson()
+ .SetProperty("Name", "John")
+ .SetProperty("Age", 42);
+
+ var personDto = new ExtensibleTestPersonWithRegularPropertiesDto()
+ .SetProperty("IsActive", true);
+
+ _objectMapper.Map(person, personDto);
+
+ //Defined in both classes
+ personDto.HasProperty("Name").ShouldBe(false);
+ personDto.Name.ShouldBe("John");
+
+ //Defined in both classes
+ personDto.HasProperty("Age").ShouldBe(false);
+ personDto.Age.ShouldBe(42);
+
+ //Should not clear existing values
+ personDto.HasProperty("IsActive").ShouldBe(false);
+ personDto.IsActive.ShouldBe(true);
+ }
+
+ [Fact(Skip = "Mapperly requires IHasExtraProperties.ExtraPropertyDictionary to be marked as nullable")]
+ public void MapExtraPropertiesTo_Should_Ignored_If_ExtraProperties_Is_Null()
+ {
+ var person = new ExtensibleTestPerson();
+ person.SetExtraPropertiesAsNull();
+
+ var personDto = new ExtensibleTestPersonDto();
+ personDto.SetExtraPropertiesAsNull();
+
+ Should.NotThrow(() => _objectMapper.Map(person, personDto));
+
+ person.ExtraProperties.ShouldBe(null);
+ personDto.ExtraProperties.ShouldBeEmpty();
+ }
+}
diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo.Abp.Mapperly.Tests.csproj b/framework/test/Volo.Abp.Mapperly.Tests/Volo.Abp.Mapperly.Tests.csproj
new file mode 100644
index 0000000000..2ea799a4c9
--- /dev/null
+++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo.Abp.Mapperly.Tests.csproj
@@ -0,0 +1,17 @@
+
+
+
+
+
+ net9.0
+ Volo.Abp.Mapperly.Tests
+ Volo.Abp.Mapperly.Tests
+
+
+
+
+
+
+
+
+
diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyBeforeAndAfterMethod_Tests.cs b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyBeforeAndAfterMethod_Tests.cs
new file mode 100644
index 0000000000..1c07bff75b
--- /dev/null
+++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyBeforeAndAfterMethod_Tests.cs
@@ -0,0 +1,59 @@
+using Microsoft.Extensions.DependencyInjection;
+using Riok.Mapperly.Abstractions;
+using Shouldly;
+using Volo.Abp.ObjectMapping;
+using Volo.Abp.Testing;
+using Xunit;
+
+namespace Volo.Abp.Mapperly;
+
+public class MyClass
+{
+ public string Id { get; set; }
+
+ public string Name { get; set; }
+}
+
+public class MyClassDto
+{
+ public string Id { get; set; }
+
+ public string Name { get; set; }
+}
+
+[Mapper]
+public partial class MyClassMapper : MapperBase
+{
+ public override partial MyClassDto Map(MyClass source);
+
+ public override partial void Map(MyClass source, MyClassDto destination);
+
+ public override void BeforeMap(MyClass source)
+ {
+ source.Name = "BeforeMap " + source.Name;
+ }
+
+ public override void AfterMap(MyClass source, MyClassDto destination)
+ {
+ destination.Name = source.Name + " AfterMap";
+ }
+}
+
+public class AbpMapperlyBeforeAndAfterMethod_Tests : AbpIntegratedTest
+{
+ private readonly IObjectMapper _objectMapper;
+
+ public AbpMapperlyBeforeAndAfterMethod_Tests()
+ {
+ _objectMapper = ServiceProvider.GetRequiredService();
+ }
+
+ [Fact]
+ public void BeforeAndAfterMethods_Should_Be_Called_When_Mapping()
+ {
+ var myClass = new MyClass { Id = "1", Name = "Test" };
+
+ var myClassDto = _objectMapper.Map(myClass);
+ myClassDto.Name.ShouldBe("BeforeMap Test AfterMap");
+ }
+}
diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyModule_Basic_Tests.cs b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyModule_Basic_Tests.cs
new file mode 100644
index 0000000000..3f0773f0a1
--- /dev/null
+++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyModule_Basic_Tests.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.JavaScript;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.Mapperly.SampleClasses;
+using Volo.Abp.ObjectMapping;
+using Volo.Abp.Testing;
+using Xunit;
+
+namespace Volo.Abp.Mapperly;
+
+public class AbpMapperlyModule_Basic_Tests : AbpIntegratedTest
+{
+ private readonly IObjectMapper _objectMapper;
+
+ public AbpMapperlyModule_Basic_Tests()
+ {
+ _objectMapper = ServiceProvider.GetRequiredService();
+ }
+
+ [Fact]
+ public void Should_Replace_IAutoObjectMappingProvider()
+ {
+ Assert.True(ServiceProvider.GetRequiredService() is MapperlyAutoObjectMappingProvider);
+ }
+
+ [Fact]
+ public void Should_Map_Objects_With_AutoMap_Attributes()
+ {
+ var dto = _objectMapper.Map(new MyEntity { Number = 42 });
+ dto.Number.ShouldBe(42);
+ }
+
+ [Fact]
+ public void Should_Map_Objects_With_Existing_Target_Object()
+ {
+ var dto = new MyEntityDto {Id = Guid.Empty, Number = 42};
+
+ _objectMapper.Map(new MyEntity { Id = Guid.NewGuid(), Number = 43 }, dto);
+
+ dto.Number.ShouldBe(43);
+ dto.Id.ShouldNotBe(Guid.Empty);
+ }
+
+ [Fact]
+ public void Should_Map_Collection()
+ {
+ var dto = _objectMapper.Map, List>(new List
+ {
+ new MyEntity { Number = 42 },
+ new MyEntity { Number = 43 }
+ });
+
+ dto.Count.ShouldBe(2);
+ dto[0].Number.ShouldBe(42);
+ dto[1].Number.ShouldBe(43);
+
+ var dto2 = _objectMapper.Map, MyEntityDto[]>(new List
+ {
+ new MyEntity { Number = 42 },
+ new MyEntity { Number = 43 }
+ }.AsReadOnly());
+
+ dto2.Length.ShouldBe(2);
+ dto2[0].Number.ShouldBe(42);
+ dto2[1].Number.ShouldBe(43);
+
+ var dtoList = new List();
+ {
+ new MyEntityDto() { Number = 44 };
+ new MyEntityDto() { Number = 45 };
+ }
+
+ _objectMapper.Map, List>(new List
+ {
+ new MyEntity { Number = 42 },
+ new MyEntity { Number = 43 }
+ }, dtoList);
+
+ dtoList.Count.ShouldBe(2);
+ dtoList[0].Number.ShouldBe(42);
+ dtoList[1].Number.ShouldBe(43);
+
+ var dtoArray = dtoList.ToArray();
+ _objectMapper.Map, MyEntityDto[]>(new List
+ {
+ new MyEntity { Number = 42 },
+ new MyEntity { Number = 43 }
+ }.AsReadOnly(), dtoArray);
+
+ dtoArray.Length.ShouldBe(2);
+ dtoArray[0].Number.ShouldBe(42);
+ dtoArray[1].Number.ShouldBe(43);
+ }
+
+ [Fact]
+ public void Should_Map_Enum()
+ {
+ var dto = _objectMapper.Map(MyEnum.Value3);
+ dto.ShouldBe(MyEnumDto.Value2); //Value2 is same as Value3
+ }
+
+ [Fact]
+ public void Should_Throw_Exception_If_Mapper_Is_Not_Found()
+ {
+ var exception = Assert.Throws(() =>_objectMapper.Map(new MyEntity()));
+ exception.Message.ShouldBe("No " +
+ "Volo.Abp.Mapperly.IAbpMapperlyMapper or " +
+ "Volo.Abp.Mapperly.IAbpReverseMapperlyMapper" +
+ " was found");
+ }
+}
diff --git a/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyModule_Specific_ObjectMapper_Tests.cs b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyModule_Specific_ObjectMapper_Tests.cs
new file mode 100644
index 0000000000..60f4294aeb
--- /dev/null
+++ b/framework/test/Volo.Abp.Mapperly.Tests/Volo/Abp/Mapperly/AbpMapperlyModule_Specific_ObjectMapper_Tests.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.Mapperly.SampleClasses;
+using Volo.Abp.ObjectMapping;
+using Volo.Abp.Testing;
+using Xunit;
+
+namespace Volo.Abp.Mapperly;
+
+public class AbpMapperlyModule_Specific_ObjectMapper_Tests : AbpIntegratedTest
+{
+ private readonly IObjectMapper _objectMapper;
+
+ public AbpMapperlyModule_Specific_ObjectMapper_Tests()
+ {
+ _objectMapper = ServiceProvider.GetRequiredService();
+ }
+
+ [Fact]
+ public void Should_Use_Specific_Object_Mapper_If_Registered()
+ {
+ var dto = _objectMapper.Map(new MyEntity { Number = 42 });
+ dto.Number.ShouldBe(43); //MyEntityToMyEntityDto2Mapper adds 1 to number of the source.
+ }
+
+ [Fact]
+ public void Specific_Object_Mapper_Should_Be_Used_For_Collections_If_Registered()
+ {
+ // IEnumerable
+ _objectMapper.Map, IEnumerable>(new List