Merge branch 'rel-9.1' into auto-merge/rel-9-0/3456

abpframework · Feb 6, 2025 · 41d64dc · 41d64dc
2 parents c670be5 + 1d54640
commit 41d64dc
Show file tree

Hide file tree

Showing 752 changed files with 15,168 additions and 4,716 deletions.
diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
@@ -1,31 +1,31 @@
-name: Merge branch rel-9.1 with rel-9.0
+name: Merge branch dev with rel-9.1
 on:
   push:
     branches:
-      - rel-9.0
+      - rel-9.1
 permissions:
   contents: read
 
 jobs:
-  merge-rel-9-1-with-rel-9-0:
+  merge-dev-with-rel-9-1:
     permissions:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: rel-9.1
+          ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-9.0:rel-9.0
-          git reset --hard rel-9.0
+          git fetch origin rel-9.1:rel-9.1
+          git reset --hard rel-9.1
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-9-0/${{github.run_number}}
-          title: Merge branch rel-9.1 with rel-9.0
-          body: This PR generated automatically to merge rel-9.1 with rel-9.0. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-9-1/${{github.run_number}}
+          title: Merge branch dev with rel-9.1
+          body: This PR generated automatically to merge dev with rel-9.1. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: maliming
           draft: true
           token: ${{ github.token }}
@@ -34,5 +34,5 @@ jobs:
           GH_TOKEN: ${{ secrets.BOT_SECRET }}
         run: |
           gh pr ready
-          gh pr review auto-merge/rel-9-0/${{github.run_number}} --approve
-          gh pr merge auto-merge/rel-9-0/${{github.run_number}} --merge --auto --delete-branch
+          gh pr review auto-merge/rel-9-1/${{github.run_number}} --approve
+          gh pr merge auto-merge/rel-9-1/${{github.run_number}} --merge --auto --delete-branch
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,7 @@
     <PackageVersion Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.0.0" />
     <PackageVersion Include="aliyun-net-sdk-sts" Version="3.1.2" />
     <PackageVersion Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-    <PackageVersion Include="AsyncKeyedLock" Version="7.0.1" />
+    <PackageVersion Include="AsyncKeyedLock" Version="7.1.3" />
     <PackageVersion Include="Autofac" Version="8.1.0" />
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
@@ -39,8 +39,8 @@
     <PackageVersion Include="EphemeralMongo6.runtime.win-x64" Version="1.1.3" />
     <PackageVersion Include="FluentValidation" Version="11.10.0" />
     <PackageVersion Include="Google.Cloud.Storage.V1" Version="4.10.0" />
-    <PackageVersion Include="Hangfire.AspNetCore" Version="1.8.14" />
-    <PackageVersion Include="Hangfire.SqlServer" Version="1.8.14" />
+    <PackageVersion Include="Hangfire.AspNetCore" Version="1.8.17" />
+    <PackageVersion Include="Hangfire.SqlServer" Version="1.8.17" />
     <PackageVersion Include="HtmlSanitizer" Version="8.1.870" />
     <PackageVersion Include="IdentityModel" Version="7.0.0" />
     <PackageVersion Include="IdentityServer4" Version="4.1.2" />
@@ -106,25 +106,26 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.1.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
     <PackageVersion Include="Minio" Version="6.0.3" />
     <PackageVersion Include="MongoDB.Driver" Version="2.29.0" />
     <PackageVersion Include="NEST" Version="7.17.5" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Nito.AsyncEx.Context" Version="5.1.2" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="NuGet.Versioning" Version="6.11.1" />
     <PackageVersion Include="NUglify" Version="1.21.9" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="Octokit" Version="13.0.1" />
-    <PackageVersion Include="OpenIddict.Abstractions" Version="5.8.0" />
-    <PackageVersion Include="OpenIddict.Core" Version="5.8.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.8.0" />
-    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.8.0" />
-    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="5.8.0" />
+    <PackageVersion Include="OpenIddict.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="OpenIddict.Core" Version="6.0.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="6.0.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="6.0.0" />
+    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="6.0.0" />
     <PackageVersion Include="Oracle.EntityFrameworkCore" Version="9.23.60" />
     <PackageVersion Include="Polly" Version="8.4.2" />
     <PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
@@ -166,7 +167,8 @@
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.0" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.1.0" />
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageVersion Include="TencentCloudSDK.Sms" Version="3.0.1142" />
     <PackageVersion Include="TimeZoneConverter" Version="6.1.0" />
     <PackageVersion Include="Unidecode.NET" Version="2.1.0" />
     <PackageVersion Include="xunit" Version="2.9.2" />
@@ -176,4 +178,4 @@
     <PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
     <PackageVersion Include="Fody" Version="6.8.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ABP Framework
 
 ![build and test](https://img.shields.io/github/actions/workflow/status/abpframework/abp/build-and-test.yml?branch=dev&style=flat-square) 🔹 [![codecov](https://codecov.io/gh/abpframework/abp/branch/dev/graph/badge.svg?token=jUKLCxa6HF)](https://codecov.io/gh/abpframework/abp) 🔹 [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://abp.io/docs/latest/release-info/nightly-builds) 🔹 
-[![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![Code of Conduct](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/abpframework/abp/blob/dev/CODE_OF_CONDUCT.md) 🔹 [![CLA Signed](https://cla-assistant.io/readme/badge/abpframework/abp)](https://cla-assistant.io/abpframework/abp) 🔹 [![Discord Shield](https://discord.com/api/guilds/951497912645476422/widget.png?style=shield)](https://discord.gg/abp)
+[![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![Code of Conduct](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/abpframework/abp/blob/dev/CODE_OF_CONDUCT.md) 🔹 [![CLA Signed](https://cla-assistant.io/readme/badge/abpframework/abp)](https://cla-assistant.io/abpframework/abp) 🔹 [![Discord Shield](https://discord.com/api/guilds/951497912645476422/widget.png?style=shield)](https://abp.io/join-discord)
 
 [ABP](https://abp.io/) offers an **opinionated architecture** to build enterprise software solutions with **best practices** on top of the **.NET** and the **ASP.NET Core** platforms. It provides the fundamental infrastructure, production-ready startup templates, pre-built application modules, UI themes, tooling, guides and documentation to implement that architecture properly and **automate the details** and repetitive works as much as possible.
 
@@ -121,4 +121,4 @@ GitHub repository stars are an important indicator of popularity and the size of
 
 ## Discord Server
 
-We have a Discord server where you can chat with other ABP users. Share your ideas, report technical issues, showcase your creations, share the tips that worked for you and catch up with the latest news and announcements about ABP Framework. Join 👉 https://discord.gg/abp.
+We have a Discord server where you can chat with other ABP users. Share your ideas, report technical issues, showcase your creations, share the tips that worked for you and catch up with the latest news and announcements about ABP Framework. Join 👉 https://abp.io/join-discord.
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/en.json
@@ -13,6 +13,9 @@
     "ManageAccount": "My Account | ABP.IO",
     "ManageYourProfile": "Manage your profile",
     "ReturnToApplication": "Return to application",
-    "IdentityUserNotAvailable:Deleted": "This email address is not available. Reason: Already deleted."
+    "IdentityUserNotAvailable:Deleted": "This email address is not available. Reason: Already deleted.",
+    "SelectYourOrganization": "Select your organization",
+    "PleaseSelectOrganization": "Please select an organization to continue",
+    "Continue": "Continue"
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
@@ -22,6 +22,7 @@
     "Permission:Accounting": "Accounting",
     "Permission:Accounting:Quotation": "Quotation",
     "Permission:Accounting:Invoice": "Invoice",
+    "Permission:Export" : "Export",
     "Menu:Organizations": "Organizations",
     "Menu:Accounting": "Accounting",
     "Menu:Packages": "Packages",
@@ -511,6 +512,7 @@
     "QuotationTemplate.BankAccount": "Our bank account information can be found at {0}",
     "Permission:Raffles": "Raffle",
     "Permission:Draw": "Draw",
+    "Permission:ExportAttendeesAsExcel": "Export at attendees as Excel",
     "Menu:Raffles": "Raffles",
     "RaffleIsNotDrawable": "Raffle is not drawable",
     "WinnerCountMustBeGreaterThanZero": "Winner count must be greater than zero",
@@ -649,6 +651,22 @@
     "Permission:HeroSections": "Hero Sections",
     "RedirectLink": "Redirect link",
     "HeroSectionsDeletionConfirmationMessage": "Are you sure you want to delete the hero section?",
-    "AbpStudioName": "Abp Studio name"
+    "AbpStudioName": "ABP Studio name",
+    "Permission:EditAttendees": "Edit Attendees",
+    "AttendeesCount": "Attendees Count",
+    "CreateQRCode": "Create QR Code",
+    "DrawTV": "Public draw on the TV",
+    "DrawModal": "Private draw on the modal",
+    "SetAsDrawable": "Set as drawable",
+    "SetAsNoDrawable": "Set as non-drawable",
+    "SetAsCompleted": "Set as completed",
+    "RemoveAllWinners": "Remove all winners",
+    "EditWinners": "Edit winners",
+    "EditAttendees": "Edit attendees",
+    "ExportAttendeesAsExcel": "Export attendees as Excel",
+    "DuplicateRaffle": "Duplicate raffle",
+    "Menu:RedisManagement": "Redis Management",
+    "RedisManagement": "Redis Management",
+    "Permission:RedisManagement": "Redis Management"
   }
-}
+}
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json
@@ -242,14 +242,14 @@
     "ReturnOnInvestment": "Return on Investment",
     "PromotionalOffers": "Promotional Offers",
     "PromotionalOffersDefinition": "Discounts, seasonal campaigns, etc.",
-    "EventsDefinition": "Community Talks, Webinars, ABP .NET Conference, etc.",
+    "EventsDefinition": "Community Talks, Webinars, ABP DOTNET Conference, etc.",
     "ReleaseNotesDefinition": "ABP.IO Platform releases, new products, etc.",
     "Newsletter": "Newsletter",
     "NewsletterDefinition": "Blog posts, community news, etc.",
     "OrganizationOverview": "Organization Overview",
     "EmailPreferences": "Email Preferences",
     "VideoCourses": "Essential Videos",
-    "DoYouAgreePrivacyPolicy": "By clicking <b>Subscribe</b> button you agree to the <a href=\"https://account.abp.io/Account/TermsConditions\">Terms & Conditions</a> and <a href=\"https://account.abp.io/Account/Privacy\">Privacy Policy</a>.",
+    "DoYouAgreePrivacyPolicy": "By clicking <b>Subscribe</b> button you agree to the <a href=\"/terms-conditions\">Terms & Conditions</a> and <a href=\"/privacy\">Privacy Policy</a>.",
     "AbpConferenceDescription": "ABP Conference is a virtual event for .NET developers to learn and connect with the community.",
     "Mobile": "Mobile",
     "MetaTwitterCard": "summary_large_image"

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
@@ -1211,6 +1211,5 @@
     "TrainingDescription": "We are offering the following training packages for who want to get expertise on the ABP Framework and the ABP.",
     "PurchaseDevelopers": "developers",
     "LinkExpiredMessage": "The payment link has expired! Contact us at <a href='mailto:sales@volosoft.com'>sales@volosoft.com</a> to update the link or <a href='https://abp.io/contact'>click here</a> to navigate to the contact page."
-
   }
 }