Merge branch 'dev' into auto-merge/rel-6-0/1335

.github/workflows/labeler.yml

@@ -2,8 +2,12 @@ name: Pull request labeler
 on:
   schedule:
     - cron: '0 12 */1 * *'
+permissions:
+  contents: read
 jobs:
   labeler:
+    permissions:
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: paulfantom/periodic-labeler@master

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

@@ -397,6 +397,8 @@
     "BookDiscountDeletionConfirmationMessage": "Are you sure you want to delete this book discount?",
     "CustomPaymentFlexSwitchDescription": "With license",
     "AllowFeatureUpgradeOnLicenseExpire": "Allow feature upgrade on license expire",
-    "Deleted{0}": "[Deleted {0}]"
+    "Deleted{0}": "[Deleted {0}]",
+    "Tags": "Tags",
+    "SetTagsInfo": "Tags should be comma-separated. Eg: CSharp, Entity Framework"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/ro-RO.json

@@ -30,7 +30,7 @@
     "NugetPackageDeletionWarningMessage": "Sunteţi sigur(ă) că doriţi să ştergeţi acest pachet de tip Nuget?",
     "ModuleDeletionWarningMessage": "Sunteţi sigur(ă) că doriţi să ştergeţi acest modul?",
     "Name": "Nume",
-    "DisplayName": "Nume de afişare",
+    "DisplayName": "Nume afişat",
     "ShortDescription": "Descriere scurtă",
     "NameFilter": "Nume",
     "CreationTime": "Data şi ora creării",
@@ -317,7 +317,7 @@
     "TrialLicenseStartDateFilter": "Data de început",
     "TrialLicenseEndDateFilter": "Data de încheiere",
     "FirsName": "Nume",
-    "LastName": "Nume",
+    "LastName": "Nume de familie",
     "StartDate": "Data de început",
     "EndDate": "Data de încheiere",
     "PurchasedDate": "Data achiziției",
@@ -350,4 +350,4 @@
     "Volo.AbpIo.Commercial:030010": "Pentru a achiziționa licența de probă, mai întâi trebuie să vă activați licența de probă!",
     "Volo.AbpIo.Commercial:030011": "Nu puteți șterge o licență de probă atunci când este achiziționată!"
   }
-}
+}

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

@@ -73,6 +73,7 @@
     "DeveloperFocused": "Developer Focused",
     "ShareYourExperiences": "Share your experiences with the ABP Framework",
     "LatestPosts": "Latest Posts",
+    "LatestVideos": "Latest Videos",
     "Views": "Views",
     "LearnLatestNewsAboutABPFramework": "Get information about happenings in ABP like new releases, free sources, posts, and more.",
     "DeveloperTools": "Developer Tools",
@@ -98,6 +99,7 @@
     "Logout": "Logout",
     "Home": "Home",
     "Posts": "Posts",
+    "Videos": "Videos",
     "JoinTheABPCommunity": "Join the ABP Community",
     "SubmitYourPost": "Submit Your Post",
     "Modules": "Modules",
@@ -164,6 +166,19 @@
     "Books": "Books",
     "ABPDiscordServer": "ABP Discord Server",
     "ABPCommunityTalks": "ABP Community Talks",
-    "ABPCommunityPosts": "ABP Community Posts"
+    "ABPCommunityPosts": "ABP Community Posts",
+    "BuyAndGetMonths": "BUY 12 MONTHS, <span class=\"text-info\">GET 14 MONTHS!</span>",
+    "GetYourDeal": "Get Your Deal",
+    "BuyOrRenewLicense": "Buy or Renew License Now and Get 2 Extra Months!",
+    "BuyOrRenewLicenseToGetExtra2Months": "Buy or Renew License Now and Get 2 Extra Months! HURRY UP! ⏰ Last Day: {0}",
+    "HurryUp": "HURRY UP!",
+    "LastDay": "Last Day: {0}",
+    "BuyNewLicenseBetweenDatesToGetBenefit": "Buy a new license between {0} and {1} to get benefit for extra 2 months!",
+    "CheckAllCommunityTalks": "Check All Community Posts",
+    "ReadMore": "Read More",
+    "Post": "Post",
+    "ExploreTheContentsCreatedByTheCoreABPTeamAndTheABPCommunity": "Explore the contents created by the core ABP team and the ABP community.",
+    "WelcomeFallCampaign": "Welcome Fall Campaign!",
+    "GiveAwayForNewPurchases": "Application Development Classroom Training will be given away for the new purchases!"
   }
 }

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

@@ -39,6 +39,8 @@
     "TrialLicensePeriodHasExpired": "Deneme lisansınızın süresi {0} gün önce sona erdi.",
     "TrialLicensePeriodWillExpire": "Deneme lisansınızın süresi {0} gün içinde dolacak.",
     "TrialLicensePeriodExpireToday": "Deneme lisans süreniz bugün sona erecek.",
-    "PurchaseNow": "Şimdi satın al!"
+    "PurchaseNow": "Şimdi satın al!",
+    "WelcomeFallCampaign": "Hoş Geldin Sonbahar Kampanyası!",
+    "GiveAwayForNewPurchases": "Yeni alımlar için Uygulama Geliştirme Sınıfı Eğitimi hediye edilecektir!"
   }
 }

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

@@ -73,6 +73,7 @@
     "DeveloperFocused": "以开发者为中心",
     "ShareYourExperiences": "分享您使用 ABP 框架的经验",
     "LatestPosts": "最新的帖子",
+    "LatestVideos": "最新的视频",
     "Views": "意见",
     "LearnLatestNewsAboutABPFramework": "获取有关 ABP 的最新相关信息，例如新版本、免费资源、帖子等。",
     "DeveloperTools": "开发者工具",
@@ -98,6 +99,7 @@
     "Logout": "登出",
     "Home": "主页",
     "Posts": "帖子",
+    "Videos": "视频",
     "JoinTheABPCommunity": "加入 ABP 社区",
     "SubmitYourPost": "提交您的帖子",
     "Modules": "模块",
@@ -164,6 +166,19 @@
     "Books": "书籍",
     "ABPDiscordServer": "ABP Discord 服务器",
     "ABPCommunityTalks": "ABP社区讲话",
-    "ABPCommunityPosts": "ABP社区文章"
+    "ABPCommunityPosts": "ABP社区文章",
+    "BuyAndGetMonths": "购买 12 个月，<span class=\"text-info\">获得 14 个月!</span>",
+    "GetYourDeal": "得到你的交易",
+    "BuyOrRenewLicense": "立即购买或续订许可证并额外获得 2 个月！",
+    "BuyOrRenewLicenseToGetExtra2Months": "立即购买或续订 ABP 商业许可证（适用于所有版本）并额外获得 2 个月！",
+    "HurryUp": "赶快下单!",
+    "LastDay": "活动截止日期: {0}",
+    "BuyNewLicenseBetweenDatesToGetBenefit": "在 {0} 和 {1} 之间购买一个新的许可证以获得额外 2 个月的收益！",
+    "CheckAllCommunityTalks": "检查所有社区帖子",
+    "ReadMore": "阅读更多",
+    "Post": "邮政",
+    "ExploreTheContentsCreatedByTheCoreABPTeamAndTheABPCommunity": "探索核心 ABP 团队和 ABP 社区创建的内容。",
+    "WelcomeFallCampaign": "欢迎秋季活动！",
+    "GiveAwayForNewPurchases": "新购买将赠送应用程序开发课堂培训！"
   }
 }

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

@@ -39,6 +39,8 @@
     "TrialLicensePeriodHasExpired": "您的試用許可期限已於 {0} 天前到期。",
     "TrialLicensePeriodWillExpire": "您的試用許可期限將在 {0} 天后到期。",
     "TrialLicensePeriodExpireToday": "您的試用許可期將於今天到期。",
-    "PurchaseNow": "現在買！"
+    "PurchaseNow": "現在買！",
+    "WelcomeFallCampaign": "欢迎秋季活动！",
+    "GiveAwayForNewPurchases": "新购买将赠送应用程序开发课堂培训！"
   }
 }

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

@@ -89,7 +89,7 @@
     "Blogging": "التدوين",
     "Identity": "هوية",
     "IdentityServer": "خادم الهوية",
-    "Saas": "ساس",
+    "Saas": "البرمجيات كخدمة",
     "LanguageManagement": "إدارة اللغة",
     "TextTemplateManagement": "إدارة قالب النص",
     "See All Modules": "انظر جميع الوحدات",
@@ -382,4 +382,4 @@
     "RenewLicenseEarly": "إذا قمت بتجديد رخصتي في وقت مبكر ، هل سأحصل على السنة كاملة؟",
     "RenewLicenseEarylExplanation": "عند تجديد الترخيص الخاص بك قبل تاريخ انتهاء الترخيص الخاص بك ، ستتم إضافة سنة واحدة إلى تاريخ انتهاء الترخيص الخاص بك. على سبيل المثال ، إذا انتهت صلاحية ترخيصك في {0} -06-06 وقمت بتجديده في {0} -01-01 ، فسيكون تاريخ انتهاء صلاحية الترخيص الجديد {1} -06-06."
   }
-}
+}

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

@@ -735,6 +735,14 @@
     "ConfirmedEmailAddressRequiredToStartTrial": "You should have a confirmed email address in order to start a trial license.",
     "EmailVerificationMailNotSent": "Email verification mail couldn't send.",
     "GetConfirmationEmail": "<a href=\"javascript:void(0);\" id=\"{0}\">Click here to get a confirmation email</a> if you haven't got it before.",
-    "WhichLicenseTypeYouAreInterestedIn": "Which license type you are interested in?"
+    "WhichLicenseTypeYouAreInterestedIn": "Which license type you are interested in?",
+    "DontTakeOurWordForIt": "Don't take our word for it...",
+    "ReadAbpCommercialUsersWantYouToKnow": "Read what ABP Commercial users want you to know",
+    "Testimonial_ShortDescription_1": "The modularity of ABP made it possible for the team to deliver in time.",
+    "Testimonial_ShortDescription_2": "Build new features faster than before.",
+    "Testimonial_ShortDescription_3": "We start from out-of-the-box features and just focus on what we really need to write.",
+    "Testimonial_ShortDescription_4": "ABP Commercial was the best fit for our needs.",
+    "OnlineReviewersOnAbpCommercial": "Online Reviews on ABP Commercial",
+    "SeeWhatToldAboutAbpCommercial": "See what has been told about ABP Commercial and write your thoughts if you want."
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json

@@ -341,7 +341,7 @@
     "SignIn": "Autentificare",
     "Or": "Sau",
     "TellUsAboutYourself": "Spuneţi-ne despre dumneavoastră",
-    "Surname": "Nume",
+    "Surname": "Nume de familie",
     "DoYouAgreePrivacyPolicy": "Sunt de acord cu <a href=\"/TermsConditions\">Termenii şi condiţiile<a/> şi <a href=\"/Privacy\">Politica de confidenţialitate</a>.",
     "VolosoftMarketingInformationMessage": "Sunt de acord să primesc informaţii, sfaturi şi oferte despre soluţii pentru afaceri şi organizaţii şi alte produse şi servicii Volosoft.",
     "VolosoftSharingInformationMessage": "Sunt de acord ca Volosoft să partajeze informaţiile mele cu partenerii selectaţi astfel încât să primesc informaţii relevante despre produsele şi serviciile lor.",
@@ -380,4 +380,4 @@
     "TrialLicenseExpiredInfo": "Perioada de licență de probă a expirat!",
     "CommercialNewsletterConfirmationMessage": "Sunt de acord cu <a href=\"https://commercial.abp.io/TermsConditions\">Termenii și condițiile</a> și cu <a href=\"https://commercial.abp.io/Privacy\">Politica de confidențialitate </a>."
   }
-}
+}

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

@@ -578,7 +578,7 @@
     "PrePayment_IyzicoRedirectionInfo": "您将被重定向到 Iyzico 支付网关以安全地完成您的购买。",
     "PrePayment_IyzicoAcceptVisaAndMasterCard": "Iyzico 接受 Visa 和 MasterCard。",
     "Purchase": "购买",
-    "AcceptTermsAndConditions": "我已阅读、理解并接受<a href=\"{0}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">隐私政策</a>， <a href=\"{1}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">条款和条件</a>和<a href=\"{ 2}\" target=\"_blank\" class=\"text-primary\"> EULA。</a>",
+    "AcceptTermsAndConditions": "我已阅读、理解并接受<a href=\"{0}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">隐私政策</a>， <a href=\"{1}\" target=\"_blank\" class=\"text-primary\" rel=\"noopener\">条款和条件</a>和<a href=\"{2}\" target=\"_blank\" class=\"text-primary\"> EULA。</a>",
     "AcceptTermsAndConditionsWarningMessage": "请接受隐私政策和条款和条件",
     "SelectGatewayToContinue": "请选择一个网关以继续！",
     "GatewaySelection_SelectGateway": "选择支付网关",

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

@@ -150,7 +150,6 @@
     "GetStarted": "Get Started",
     "SourceCode": "Source Code",
     "LeaveComment": "Leave Comment",
-    "ReadMore": "Read more",
     "ShowMore": "Show More",
     "NoPublishedPostsYet": "No published posts yet.",
     "Name": "Name",
@@ -184,6 +183,7 @@
     "Post_Index_Page_MetaDescription": "ABP Community's purpose is to create a contribution environment for developers who use the ABP framework.",
     "Layout_Title": "{0} | ABP Community",
     "Layout_MetaDescription": "ABP Community is an environment where people can share posts about ABP framework and follows the projects.",
-    "Index_Page_CommunityIntroduction": "This is a hub for ABP Framework, .NET and software development. You can read the articles, watch the video tutorials, get informed about ABP’s development progress and ABP-related events, help other developers and share your expertise with the ABP community."
+    "Index_Page_CommunityIntroduction": "This is a hub for ABP Framework, .NET and software development. You can read the articles, watch the video tutorials, get informed about ABP’s development progress and ABP-related events, help other developers and share your expertise with the ABP community.",
+    "TagsInArticle": "Tags in article"
   }
 }

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

@@ -150,7 +150,6 @@
     "GetStarted": "开始使用",
     "SourceCode": "源代码",
     "LeaveComment": "发表评论",
-    "ReadMore": "阅读更多",
     "ShowMore": "展示更多",
     "NoPublishedPostsYet": "还没有发布的帖子。",
     "Name": "名字",

abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs

@@ -1,5 +1,8 @@
-namespace AbpIoLocalization.Www
+using Volo.Abp.Localization;
+
+namespace AbpIoLocalization.Www
 {
+    [LocalizationResourceName("AbpIoWww")]
     public class AbpIoWwwResource
     {
 

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

@@ -293,7 +293,6 @@
     "ExploreDocumentationAndGuides": "Explore the comprehensive documentation and guides.",
     "Documentations": "Documentation",
     "Views": "Views",
-    "ReadMore": "Read More",
     "EnterYouEmailToGetNews": "Enter your email to get the latest news about the ABP Framework",
     "Tiered": "Tiered",
     "SeparateIdentityServer": "Separate Identity Server",
@@ -372,6 +371,27 @@
     "MasteringAbpFramework_Book_What_You_Will_Learn_8": "Write unit, integration, and UI tests using ABP Framework.",
     "MasteringAbpFramework_Book_WhoIsThisBookFor": "Who's this book for",
     "MasteringAbpFramework_Book_WhoIsThisBookFor_Description": "This book is for web developers who want to learn software architectures and best practices for building\n maintainable web-based solutions using Microsoft technologies and ABP Framework. Basic knowledge of C#\n and ASP.NET Core is necessary to get started with this book.",
-    "ComputersAndTechnology": "Computers & Technology"
+    "ComputersAndTechnology": "Computers & Technology",
+    "BuildingMicroserviceSolutions": "Building Microservice Solutions",
+    "MicroserviceBookPracticalGuide": "This book is a reference guide for developing and managing microservice-based applications using the ABP Framework. It references the <strong>.NET Microservice Sample Reference Application</strong>: eShopOnContainers and discusses the architectural design and implementation approaches using the ABP Framework. By the end of this book, you'll learn how ABP approaches the common microservice complexities such as authorization, distributed transactions, inter-microservice communications, deployment, etc.",
+    "IntroducingTheSolution": "Introducing the eShopOnAbp Solution",
+    "RunningTheSolution": "Running the Solution",
+    "UnderstandingTheAuthenticationSystem": "Understanding the Authentication System",
+    "ExploringTheApplications": "Exploring the Applications",
+    "UnderstandingTheAPIGateways": "Understanding the API Gateways",
+    "DevelopingTheMicroservices": "Developing the Microservices",
+    "UnderstandingTheInfrastructure": "Understanding the Infrastructure",
+    "DiggingInTheUseCases": "Digging in the Use Cases",
+    "DeployingTheSolution": "Deploying the Solution",
+    "ThisBookIsInDraftStageAndIsNotCompletedYet": "This book is in draft stage and is not completed yet.",
+    "Authors": "Authors",
+    "MicroserviceEBook": "Microservice E-Book",
+    "SelectUITheme": "Select UI Theme",
+    "LeptonXLiteTheme": "LeptonX Lite Theme",
+    "BasicTheme": "Basic Theme",
+    "LeptonXLiteThemeInfo": " A modern and stylish Bootstrap UI theme. Ideal if you want to have a production ready UI theme. This is the newest theme and is the default.",
+    "BasicThemeInfo": "Minimalist UI theme with plain Bootstrap colors and styles. Ideal if you will build your own UI theme.",
+    "SeeDocumentation": "See <a href='{0}' target='_blank'>documentation</a>.",
+    "SeeFullScreen": "<a href='{0}' target='_blank'>🖼️ See the screenshot</a>"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ro-RO.json

@@ -253,18 +253,18 @@
     "Or": "Sau",
     "TellUsAboutYourself": "Spuneţi-ne un pic despre dumneavoastră",
     "Name": "Nume",
-    "Surname": "Nume",
+    "Surname": "Nume de familie",
     "CompanyName": "Nume companie",
     "DoYouAgreePrivacyPolicy": "Sunt de acord cu <a href=\"https://account.abp.io/Account/TermsConditions\">Termenii & condiţiile</a> şi <a href=\"https://account.abp.io/Account/Privacy\">Politica de confidenţialitate</a>.",
     "Free": "Gratuit",
     "DDDEBook": "E-book DDD",
     "PracticalGuideForImplementingDDD": "Această carte este un ghid practic pentru implementarea Domain Driven Design în framework-ul ABP.",
     "IntroducingDDD": "Introducere în Domain Driven Design",
-    "DDDLayersAndCleanArchitecture": "Straturile DDD & Arhitectură curată",
+    "DDDLayersAndCleanArchitecture": "Straturile DDD şi Arhitectură curată",
     "LayeringOfADotnetSolution": "Stratificarea unei soluţii .NET",
     "ImplementingDDDBuildingBlocks": "Implementând DDD Building Blocks",
     "DomainVsApplicationLogic": "Domain Logic vs Application Logic",
-    "SamplesAndDiscussions": "Exemple & Discuţii",
+    "SamplesAndDiscussions": "Exemple şi Discuţii",
     "EmailNotValid": "Vă rugăm să introduceţi o adresa de email validă.",
     "WeWillSendYouADownloadLink": "Un link care conţine e-book-ul a fost trimis către {0}. Verificaţi-vă folderele de inbox, junk sau spam!",
     "GoHome": "Pagina principală",

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

@@ -279,6 +279,7 @@
     "SubscribeToNewsletter": "ABP.IO Platform'u ile ilgili yeni haberler, makaleler, teklifler ve daha fazlası gibi gelişmeler hakkında bilgi almak için bültene abone olun.",
     "FirstEdition": "İlk Baskı",
     "ThankYou": "Teşekkürler!",
-    "CheckboxMandatory": "Devam etmek için bunu kontrol etmeniz gerekiyor!"
+    "CheckboxMandatory": "Devam etmek için bunu kontrol etmeniz gerekiyor!",
+    "ThisBookIsInDraftStageAndIsNotCompletedYet": "Bu kitap taslak aşamasındadır ve henüz tamamlanmamıştır."
   }
 }

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

@@ -293,7 +293,6 @@
     "ExploreDocumentationAndGuides": "探索全面的文档和指南。",
     "Documentations": "文档",
     "Views": "意见",
-    "ReadMore": "阅读更多",
     "EnterYouEmailToGetNews": "输入您的电子邮件以获取有关 ABP 框架的最新消息",
     "Tiered": "分层",
     "SeparateIdentityServer": "独立的身份服务器",
@@ -372,6 +371,7 @@
     "MasteringAbpFramework_Book_What_You_Will_Learn_8": "使用 ABP 框架编写单元、集成和 UI 测试。",
     "MasteringAbpFramework_Book_WhoIsThisBookFor": "这本书是给谁看的",
     "MasteringAbpFramework_Book_WhoIsThisBookFor_Description": "本书适用于希望学习软件架构和最佳实践的 Web 开发人员，以使用 Microsoft 技术和 ABP 框架构建\n 可维护的基于 Web 的解决方案。 C#\n 和 ASP.NET Core 的基本知识是开始阅读本书所必需的。",
-    "ComputersAndTechnology": "计算机与技术"
+    "ComputersAndTechnology": "计算机与技术",
+    "ThisBookIsInDraftStageAndIsNotCompletedYet": "这本书正在草案阶段，还没有完成。"
   }
 }

common.DotSettings

@@ -38,5 +38,6 @@
 	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowTypeNameHintsForLambdaExpressionParameters/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowTypeNameHintsForLinqQueryRangeVariables/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowTypeNameHintsForPatternMatchingExpressions/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dapr/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Volo/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>6.0.0-rc.4</Version>
+    <Version>7.0.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>