Skip to content

Commit 5b8adc5

Browse files
malimingmaliming
authored
Merge branch 'rel-9.1' into auto-merge/rel-9-0/3470
2 parents 4b4e3c7 + 8097cf7 commit 5b8adc5

File tree

751 files changed

+15174
-4704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

751 files changed

+15174
-4704
lines changed

‎.github/workflows/auto-pr.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
name: Merge branch rel-9.1 with rel-9.0
1+
name: Merge branch dev with rel-9.1
22
on:
33
push:
44
branches:
5-
- rel-9.0
5+
- rel-9.1
66
permissions:
77
contents: read
88

99
jobs:
10-
merge-rel-9-1-with-rel-9-0:
10+
merge-dev-with-rel-9-1:
1111
permissions:
1212
contents: write # for peter-evans/create-pull-request to create branch
1313
pull-requests: write # for peter-evans/create-pull-request to create a PR
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
1717
with:
18-
ref: rel-9.1
18+
ref: dev
1919
- name: Reset promotion branch
2020
run: |
21-
git fetch origin rel-9.0:rel-9.0
22-
git reset --hard rel-9.0
21+
git fetch origin rel-9.1:rel-9.1
22+
git reset --hard rel-9.1
2323
- name: Create Pull Request
2424
uses: peter-evans/create-pull-request@v3
2525
with:
26-
branch: auto-merge/rel-9-0/${{github.run_number}}
27-
title: Merge branch rel-9.1 with rel-9.0
28-
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.
26+
branch: auto-merge/rel-9-1/${{github.run_number}}
27+
title: Merge branch dev with rel-9.1
28+
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.
2929
reviewers: maliming
3030
draft: true
3131
token: ${{ github.token }}
@@ -34,5 +34,5 @@ jobs:
3434
GH_TOKEN: ${{ secrets.BOT_SECRET }}
3535
run: |
3636
gh pr ready
37-
gh pr review auto-merge/rel-9-0/${{github.run_number}} --approve
38-
gh pr merge auto-merge/rel-9-0/${{github.run_number}} --merge --auto --delete-branch
37+
gh pr review auto-merge/rel-9-1/${{github.run_number}} --approve
38+
gh pr merge auto-merge/rel-9-1/${{github.run_number}} --merge --auto --delete-branch

‎Directory.Packages.props‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageVersion Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.0.0" />
77
<PackageVersion Include="aliyun-net-sdk-sts" Version="3.1.2" />
88
<PackageVersion Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
9-
<PackageVersion Include="AsyncKeyedLock" Version="7.0.1" />
9+
<PackageVersion Include="AsyncKeyedLock" Version="7.1.3" />
1010
<PackageVersion Include="Autofac" Version="8.1.0" />
1111
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
1212
<PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
@@ -39,8 +39,8 @@
3939
<PackageVersion Include="EphemeralMongo6.runtime.win-x64" Version="1.1.3" />
4040
<PackageVersion Include="FluentValidation" Version="11.10.0" />
4141
<PackageVersion Include="Google.Cloud.Storage.V1" Version="4.10.0" />
42-
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.14" />
43-
<PackageVersion Include="Hangfire.SqlServer" Version="1.8.14" />
42+
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.17" />
43+
<PackageVersion Include="Hangfire.SqlServer" Version="1.8.17" />
4444
<PackageVersion Include="HtmlSanitizer" Version="8.1.870" />
4545
<PackageVersion Include="IdentityModel" Version="7.0.0" />
4646
<PackageVersion Include="IdentityServer4" Version="4.1.2" />
@@ -106,25 +106,26 @@
106106
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
107107
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
108108
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
109-
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.0" />
110-
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.1.0" />
111-
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.0" />
109+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
110+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.3.0" />
111+
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.3.0" />
112+
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
112113
<PackageVersion Include="Minio" Version="6.0.3" />
113114
<PackageVersion Include="MongoDB.Driver" Version="2.29.0" />
114115
<PackageVersion Include="NEST" Version="7.17.5" />
115116
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
116117
<PackageVersion Include="Nito.AsyncEx.Context" Version="5.1.2" />
117-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
118+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
118119
<PackageVersion Include="NSubstitute" Version="5.1.0" />
119120
<PackageVersion Include="NuGet.Versioning" Version="6.11.1" />
120121
<PackageVersion Include="NUglify" Version="1.21.9" />
121122
<PackageVersion Include="Nullable" Version="1.3.1" />
122123
<PackageVersion Include="Octokit" Version="13.0.1" />
123-
<PackageVersion Include="OpenIddict.Abstractions" Version="5.8.0" />
124-
<PackageVersion Include="OpenIddict.Core" Version="5.8.0" />
125-
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.8.0" />
126-
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.8.0" />
127-
<PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="5.8.0" />
124+
<PackageVersion Include="OpenIddict.Abstractions" Version="6.0.0" />
125+
<PackageVersion Include="OpenIddict.Core" Version="6.0.0" />
126+
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="6.0.0" />
127+
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="6.0.0" />
128+
<PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="6.0.0" />
128129
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="9.23.60" />
129130
<PackageVersion Include="Polly" Version="8.4.2" />
130131
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
@@ -158,15 +159,16 @@
158159
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
159160
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
160161
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
161-
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.4.5" />
162+
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
162163
<PackageVersion Include="System.Linq.Queryable" Version="4.3.0" />
163164
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
164165
<PackageVersion Include="System.Security.Permissions" Version="9.0.0" />
165166
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
166167
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.0" />
167168
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
168169
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
169-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.1.0" />
170+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
171+
<PackageVersion Include="TencentCloudSDK.Sms" Version="3.0.1142" />
170172
<PackageVersion Include="TimeZoneConverter" Version="6.1.0" />
171173
<PackageVersion Include="Unidecode.NET" Version="2.1.0" />
172174
<PackageVersion Include="xunit" Version="2.9.2" />

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ABP Framework
22

33
![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) 🔹
4-
[![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)
4+
[![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)
55

66
[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.
77

@@ -121,4 +121,4 @@ GitHub repository stars are an important indicator of popularity and the size of
121121

122122
## Discord Server
123123

124-
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.
124+
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.

‎abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/en.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
"ManageAccount": "My Account | ABP.IO",
1414
"ManageYourProfile": "Manage your profile",
1515
"ReturnToApplication": "Return to application",
16-
"IdentityUserNotAvailable:Deleted": "This email address is not available. Reason: Already deleted."
16+
"IdentityUserNotAvailable:Deleted": "This email address is not available. Reason: Already deleted.",
17+
"SelectYourOrganization": "Select your organization",
18+
"PleaseSelectOrganization": "Please select an organization to continue",
19+
"Continue": "Continue"
1720
}
1821
}

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"Permission:Accounting": "Accounting",
2323
"Permission:Accounting:Quotation": "Quotation",
2424
"Permission:Accounting:Invoice": "Invoice",
25+
"Permission:Export" : "Export",
2526
"Menu:Organizations": "Organizations",
2627
"Menu:Accounting": "Accounting",
2728
"Menu:Packages": "Packages",
@@ -511,6 +512,7 @@
511512
"QuotationTemplate.BankAccount": "Our bank account information can be found at {0}",
512513
"Permission:Raffles": "Raffle",
513514
"Permission:Draw": "Draw",
515+
"Permission:ExportAttendeesAsExcel": "Export at attendees as Excel",
514516
"Menu:Raffles": "Raffles",
515517
"RaffleIsNotDrawable": "Raffle is not drawable",
516518
"WinnerCountMustBeGreaterThanZero": "Winner count must be greater than zero",
@@ -649,6 +651,22 @@
649651
"Permission:HeroSections": "Hero Sections",
650652
"RedirectLink": "Redirect link",
651653
"HeroSectionsDeletionConfirmationMessage": "Are you sure you want to delete the hero section?",
652-
"AbpStudioName": "Abp Studio name"
654+
"AbpStudioName": "ABP Studio name",
655+
"Permission:EditAttendees": "Edit Attendees",
656+
"AttendeesCount": "Attendees Count",
657+
"CreateQRCode": "Create QR Code",
658+
"DrawTV": "Public draw on the TV",
659+
"DrawModal": "Private draw on the modal",
660+
"SetAsDrawable": "Set as drawable",
661+
"SetAsNoDrawable": "Set as non-drawable",
662+
"SetAsCompleted": "Set as completed",
663+
"RemoveAllWinners": "Remove all winners",
664+
"EditWinners": "Edit winners",
665+
"EditAttendees": "Edit attendees",
666+
"ExportAttendeesAsExcel": "Export attendees as Excel",
667+
"DuplicateRaffle": "Duplicate raffle",
668+
"Menu:RedisManagement": "Redis Management",
669+
"RedisManagement": "Redis Management",
670+
"Permission:RedisManagement": "Redis Management"
653671
}
654-
}
672+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,14 +242,14 @@
242242
"ReturnOnInvestment": "Return on Investment",
243243
"PromotionalOffers": "Promotional Offers",
244244
"PromotionalOffersDefinition": "Discounts, seasonal campaigns, etc.",
245-
"EventsDefinition": "Community Talks, Webinars, ABP .NET Conference, etc.",
245+
"EventsDefinition": "Community Talks, Webinars, ABP DOTNET Conference, etc.",
246246
"ReleaseNotesDefinition": "ABP.IO Platform releases, new products, etc.",
247247
"Newsletter": "Newsletter",
248248
"NewsletterDefinition": "Blog posts, community news, etc.",
249249
"OrganizationOverview": "Organization Overview",
250250
"EmailPreferences": "Email Preferences",
251251
"VideoCourses": "Essential Videos",
252-
"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>.",
252+
"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>.",
253253
"AbpConferenceDescription": "ABP Conference is a virtual event for .NET developers to learn and connect with the community.",
254254
"Mobile": "Mobile",
255255
"MetaTwitterCard": "summary_large_image"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,5 @@
12111211
"TrainingDescription": "We are offering the following training packages for who want to get expertise on the ABP Framework and the ABP.",
12121212
"PurchaseDevelopers": "developers",
12131213
"LinkExpiredMessage": "The payment link has expired! Contact us at <a href='mailto:[email protected]'>[email protected]</a> to update the link or <a href='https://abp.io/contact'>click here</a> to navigate to the contact page."
1214-
12151214
}
12161215
}

0 commit comments

Comments
 (0)