Merge branch 'dev' into npm-upgrade

.gitignore

@@ -322,3 +322,4 @@ deploy/nuget-api-key.txt
 deploy/npm-auth-token.txt
 deploy/ssh-password.txt
 deploy/github-api-key.txt
+deploy/_run_all_log.txt

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

@@ -316,7 +316,7 @@
     "TrialLicenseStatusFilter": "Status",
     "TrialLicenseStartDateFilter": "Start date",
     "TrialLicenseEndDateFilter": "End date",
-    "FirsName": "First name",
+    "FirstName": "First name",
     "LastName": "Last name",
     "StartDate": "Start date",
     "EndDate": "End date",
@@ -355,6 +355,9 @@
     "SendWelcomeEmailSuccessMessage": "Welcome email sent successfully!",
     "PaymentRequestId": "Payment Request Id",
     "AdditionalDeveloperCount": "Additional developer count",
-    "LicensePrice": "License price"
+    "LicensePrice": "License price",
+    "PurchaseDate": "Purchase date",
+    "IsAbpBookDownloaded": "ABP book downloaded",
+    "IsMasteringAbpBookDownloadEnabled": "Abp book download enable"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json

@@ -97,5 +97,7 @@
     "WelcomeToABP": "Welcome to the ABP",
     "EULA": "EULA",
     "ABPCommercialIntroductionMessage": "Pre-built application modules, advanced startup templates, rapid application development tooling, professional UI themes and premium support.",
+    "MasteringAbpFrameworkEBook": "Mastering ABP Framework",
+    "MasteringTheABPFrameworkExplanation": "Written by the creator of the ABP Framework, this book will help you gain a complete understanding of the framework and modern web application development techniques."
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -19,6 +19,8 @@
     "Developers": "Developers",
     "LicenseType": "License type",
     "Manage": "Manage",
+    "SetDefault": "Set as default",
+    "DefaultOrganization": "Default",
     "StartDate": "Start date",
     "EndDate": "End date",
     "Modules": "Modules",
@@ -431,8 +433,10 @@
     "LeptonXSemiDark": "LeptonX Semi-Dark",
     "BuiltOnBs5Library": "Built on Bootstrap 5 library",
     "FullyCompatibleWithBs5": "100% compatible with Bootstrap 5 HTML structure and CSS classes",
-    "ResponsiveAndMobileCompatible": "Responsive & mobile-compatible",
+    "ResponsiveAndMobileCompatible": "Responsive, mobile-compatible, RTL support",
     "ProvidesStylesForDatatables": "Provides styles for Datatables",
+    "MultipleLayoutOptions": "Multiple layout options",
+    "EasilyInstallAndUpgrade": "Easily install and upgrade",
     "SupportForum": "Support Forum",
     "TrustedBy": "Trusted By",
     "OurPricing": "Our <span class=\"gradient-commercial\">Pricing</span",
@@ -482,6 +486,10 @@
     "BackOfficeApplication": "Back Office Application",
     "BackOfficeApplicationExplanation": "The actual web application of your system, with multiple UI framework options. You can create any kind of business application.",
     "LandingWebsite": "Landing Website",
-    "LandingWebsiteExplanation": "A generic landing/public website that can be used for several purposes, like introducing your company, selling your products, etc."
+    "LandingWebsiteExplanation": "A generic landing/public website that can be used for several purposes, like introducing your company, selling your products, etc.",
+    "ABPFrameworkEBook": "E-Book: Mastering ABP Framework",
+    "MasteringAbpFrameworkEBookDescription": "Included within your ABP Commercial license",
+    "Volo.AbpIo.Domain:070000": "The organization name can only contain latin letters, numbers, dots and hyphens!",
+    "Volo.AbpIo.Domain:070001": "The company name can only contain latin letters, numbers, dots, space and hyphens!"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/tr.json

@@ -18,6 +18,8 @@
     "Developers": "Yazılımcılar",
     "LicenseType": "lisans türü",
     "Manage": "Yönet",
+    "SetDefault": "Varsayılan olarak ayarla",
+    "DefaultOrganization": "Varsayılan",
     "StartDate": "Başlangıç tarihi",
     "EndDate": "bitiş tarihi",
     "Modules": "Modüller",
@@ -395,4 +397,4 @@
     "ExtendNow": "Şimdi Uzat",
     "ContinueWithNewOrganization": "Yeni bir organizasyon ile devam et"
   }
-}
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json

@@ -18,6 +18,8 @@
     "Developers": "开发者",
     "LicenseType": "许可类型",
     "Manage": "管理",
+    "SetDefault": "设为默认",
+    "DefaultOrganization": "默认",
     "StartDate": "开始日期",
     "EndDate": "结束日期",
     "Modules": "模块",
@@ -391,4 +393,4 @@
     "TrialLicenseExpiredInfo": "您的试用许可期限已过！",
     "CommercialNewsletterConfirmationMessage": "我同意<a href=\"https://commercial.abp.io/TermsConditions\">条款和条件</a>和<a href=\"https://commercial.abp.io/Privacy\">隐私政策</a>。"
   }
-}
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hant.json

@@ -18,6 +18,8 @@
     "Developers": "開發者",
     "LicenseType": "許可證類型",
     "Manage": "管理",
+    "SetDefault": "設爲默認",
+    "DefaultOrganization": "默認",
     "StartDate": "開始日期",
     "EndDate": "結束日期",
     "Modules": "模組",
@@ -391,4 +393,4 @@
     "TrialLicenseExpiredInfo": "您的試用許可期限已過！",
     "CommercialNewsletterConfirmationMessage": "我同意<a href=\"https://commercial.abp.io/TermsConditions\">條款和條件</a>和<a href=\"https://commercial.abp.io/Privacy\">隱私政策</a>。"
   }
-}
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json

@@ -85,7 +85,9 @@
     "CommunityPostRequestErrorMessage": "Could not get the latest post request from Github.",
     "PostRequestFromGithubIssue": "There aren't any post requests now.",
     "LatestPosts": "Latest Posts",
-    "ArticleRequests": "Post Requests",
+    "ArticleRequests": "Request a content",
+    "ArticleRequestsDescription": "Want to see a specific content here? You can ask the community to create it!",
+    "LatestContentRequests": "Latest content requests",
     "AllPostRequests": "See All Post Requests",
     "SubscribeToTheNewsletter": "Subscribe to the Newsletter",
     "NewsletterEmailDefinition": "Get information about happenings in ABP, such as new releases, free sources, posts, and more.",

abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json

@@ -40,11 +40,11 @@
     "Theming": "Theming",
     "ThemingExplanationShort": "Use and customize the bootstrap-based standard UI theme or create your own.",
     "BootstrapTagHelpersDynamicForms": "Bootstrap Tag Helpers & Dynamic Forms",
-    "BootstrapTagHelpersDynamicFormsExplanation": "Instead of manually writing the repeating details of bootstrap components, Use ABP's tag helpers to simplify them and take advantage of the IntelliSense. Quickly build UI forms based on a C# model using the dynamic form tag helper.",
+    "BootstrapTagHelpersDynamicFormsExplanation": "Instead of manually writing the repeating details of bootstrap components, use ABP's tag helpers to simplify them and take advantage of the IntelliSense. Quickly build UI forms based on a C# model using the dynamic form tag helper.",
     "HTTPAPIsDynamicProxies": "HTTP APIs & Dynamic Proxies",
     "HTTPAPIsDynamicProxiesExplanation": "Automatically expose application services as REST style HTTP APIs, and consume them with dynamic JavaScript and C# proxies.",
     "CompleteArchitectureInfo": "Modern architecture to create maintainable software solutions.",
-    "DomainDrivenDesignBasedLayeringModelExplanation": "Helps implement a DDD based layered architecture and builds a maintainable code base.",
+    "DomainDrivenDesignBasedLayeringModelExplanation": "Helps implement a DDD based layered architecture and build a maintainable code base.",
     "DomainDrivenDesignBasedLayeringModelExplanationCont": "Provides startup templates, abstractions, base classes, services, documentation and guides to help you develop your application based on DDD patterns & principles.",
     "MicroserviceCompatibleModelExplanation": "The core framework & pre-built modules are designed with microservice architecture in mind.",
     "MicroserviceCompatibleModelExplanationCont": "Provides infrastructure, integrations, samples and documentation to implement microservice solutions easier, while it doesn\u2019t bring additional complexity if you want a monolithic application.",
@@ -82,7 +82,7 @@
     "CLI_CommandLineInterface": "CLI (Command Line Interface)",
     "CLI_CommandLineInterfaceExplanation": "Includes a CLI to help you automate the creation of new projects and the addition of new modules.",
     "StartupTemplates": "Startup Templates",
-    "StartupTemplatesExplanation": "Various startup templates provide a fully configured solution to jump start your development.",
+    "StartupTemplatesExplanation": "ABP’s application startup template provides a fully configured solution to jump start your development.",
     "BasedOnFamiliarTools": "Based on Familiar Tools",
     "BasedOnFamiliarToolsExplanation": "Built on and integrated with popular tools you already know. Low learning curve, easy adaptation, comfortable development.",
     "ORMIndependent": "ORM Independent",
@@ -114,7 +114,7 @@
     "AspectOrientedProgramming": "Aspect Oriented Programming",
     "DependencyInjection": "Dependency Injection",
     "DependencyInjectionByConventions": "Dependency Injection by Conventions",
-    "ABPCLIExplanation": "ABP CLI (Command Line Interface) is a command line tool to perform some common operations for ABP based solutions.",
+    "ABPCLIExplanation": "ABP CLI (Command Line Interface) is a command line tool to automate some common operations for ABP based solutions.",
     "ModularityExplanation": "ABP provides a complete infrastructure to build your own application modules that may have entities, services, database integration, APIs, UI components and so on..", //TODO: strong "your own application modules",-
     "MultiTenancyExplanation": "ABP framework doesn't only support developing multi-tenant applications, but also makes your code mostly unaware of the multi-tenancy.",
     "MultiTenancyExplanation2": "Can automatically determine the current tenant, isolate data of different tenants from each other.",
@@ -305,7 +305,6 @@
     "FrameworkNewsletterConfirmationMessage": "I agree to the <a class=\"text-white fw-6 text-decoration-underline opacity-50\" href=\"https://commercial.abp.io/TermsConditions\">Terms & Conditions</a> and <a  class=\"text-white fw-6 text-decoration-underline opacity-50\" href=\"https://commercial.abp.io/Privacy\">Privacy Policy</a>.",
     "GetYourFreeEBook": "Get Your <span class=\"gradient-framework d-block\">Free DDD E-book </span>",
     "EverythingYouNeedToKnow": "Everything you need to know.",
-    "MasteringTheABPFrameworkExplanation": "Written by the creator of ABP Framework, this book will help you gain a complete understanding of the framework and modern web application development techniques.",
     "PreOrderNow": "Pre-Order Now",
     "UITheming": "UI Theming",
     "UIThemingExplanation": "Create reusable UI themes and layouts or use one of the pre-built UI themes.",
@@ -316,6 +315,9 @@
     "SelectUIFramework": "Select UI Framework",
     "SelectDatabaseProvider": "Select Database Provider",
     "SelectDatabaseManagementSystem": "Select Database Management System",
-    "InstallingTheABPCLI": "Installing the ABP CLI"
+    "InstallingTheABPCLI": "Installing the ABP CLI",
+    "CreateYourProjectNow": "Create Your Project Now",
+    "OrderOn": "Order on {0}",
+    "DownloadFreeDDDBook": "Download Free DDD Book"
   }
 }

build/common.ps1

@@ -36,6 +36,7 @@ if ($full -eq "-f")
 		"../templates/app/aspnet-core",
 		"../templates/console",
 		"../templates/wpf",
+		"../templates/app-nolayers/aspnet-core",
 		"../abp_io/AbpIoLocalization"
 	) 
 }else{ 

deploy/_run_all.ps1

@@ -6,6 +6,8 @@ param(
 
 . ..\nupkg\common.ps1
 
+Start-Transcript -Append _run_all_log.txt
+
 if (!$branch)
 {
 	$branch = Read-Host "Enter the branch name"
@@ -41,3 +43,4 @@ $publishGithubReleaseParams = @{
 ./7-publish-github-release.ps1 @publishGithubReleaseParams
 ./8-download-release-zip.ps1
 
+Stop-Transcript

docs/en/Application-Services.md

@@ -61,7 +61,7 @@ public class Book : AggregateRoot<Guid>
 * `Book` entity has a `MaxNameLength` that defines the maximum length of the `Name` property. 
 * `Book` constructor and `ChangeName` method to ensure that the `Name` is always a valid value. Notice that `Name`'s  setter is not `public`.
 
-> ABP does not force you to design your entities like that. It just can have public get/set for all properties. It's your decision to full implement DDD practices.
+> ABP does not force you to design your entities like that. It just can have public get/set for all properties. It's your decision to fully implement DDD practices.
 
 ### IBookAppService Interface
 
@@ -124,13 +124,13 @@ public class BookAppService : ApplicationService, IBookAppService
 
 ## Data Transfer Objects
 
-Application services gets and returns DTOs instead of entities. ABP does not force this rule. However, exposing entities to presentation layer (or to remote clients) have significant problems and not suggested. 
+Application services get and return DTOs instead of entities. ABP does not force this rule. However, exposing entities to the presentation layer (or to remote clients) has significant problems and is not suggested. 
 
 See the [DTO documentation](Data-Transfer-Objects.md) for more.
 
 ## Object to Object Mapping
 
-The `CreateAsync` method above manually creates a `Book` entity from given `CreateBookDto` object. Because the `Book` entity enforces it (we designed it like that).
+The `CreateAsync` method above manually creates a `Book` entity from given `CreateBookDto` object, because the `Book` entity enforces it (we designed it like that).
 
 However, in many cases, it's very practical to use **auto object mapping** to set properties of an object from a similar object. ABP provides an [object to object mapping](Object-To-Object-Mapping.md) infrastructure to make this even easier.
 
@@ -239,7 +239,7 @@ public interface IBookAppService :
 
 `ICrudAppService` has generic arguments to get the primary key type of the entity and the DTO types for the CRUD operations (it does not get the entity type since the entity type is not exposed to the clients use this interface).
 
-> Creating interface for an application service is a good practice, but not required by the ABP Framework. You can skip the interface part.
+> Creating an interface for an application service is good practice, but not required by the ABP Framework. You can skip the interface part.
 
 `ICrudAppService` declares the following methods:
 
@@ -359,7 +359,7 @@ public class DistrictAppService
 }
 ````
 
-This implementation requires you to create a class represents your composite key:
+This implementation requires you to create a class that represents your composite key:
 
 ````csharp
 public class DistrictKey