Merge branch 'prerel-8.2' into auto-merge/rel-8-1/2655

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: true
 contact_links:
   - name: Issue with ABP Commercial
     url:  https://support.abp.io/QA/Questions
-    about: Please open issues relating to ABP Commercial in support.abp.io.
+    about: Please open ABP Commercial related issues at https://support.abp.io.
   - name: Ask a question (community support)
     url:  https://stackoverflow.com/questions/tagged/abp
     about: Ask a question that will be answered by the ABP community

.github/workflows/auto-pr.yml

@@ -1,36 +1,36 @@
-name: Merge branch prerel-8.2 with rel-8.1
+name: Merge branch dev with prerel-8.2
 on:
   push:
     branches:
-      - rel-8.1
+      - prerel-8.2
 permissions:
   contents: read
 
 jobs:
-  merge-prerel-8-2-with-rel-8-1:
+  merge-dev-with-prerel-8-2:
     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: prerel-8.2
+          ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-8.1:rel-8.1
-          git reset --hard rel-8.1
+          git fetch origin prerel-8.2:prerel-8.2
+          git reset --hard prerel-8.2
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-8-1/${{github.run_number}}
-          title: Merge branch prerel-8.2 with rel-8.1
-          body: This PR generated automatically to merge prerel-8.2 with rel-8.1. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/prerel-8-2/${{github.run_number}}
+          title: Merge branch dev with prerel-8.2
+          body: This PR generated automatically to merge dev with prerel-8.2. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: maliming
           token: ${{ github.token }}
       - name: Merge Pull Request
         env:
           GH_TOKEN: ${{ secrets.BOT_SECRET }}
         run: |
-          gh pr review auto-merge/rel-8-1/${{github.run_number}} --approve
-          gh pr merge auto-merge/rel-8-1/${{github.run_number}} --merge --auto --delete-branch
+          gh pr review auto-merge/prerel-8-2/${{github.run_number}} --approve
+          gh pr merge auto-merge/prerel-8-2/${{github.run_number}} --merge --auto --delete-branch

Directory.Packages.props

@@ -10,23 +10,24 @@
     <PackageVersion Include="Autofac" Version="8.0.0" />
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
-    <PackageVersion Include="AutoMapper" Version="12.0.1" />
+    <PackageVersion Include="AutoMapper" Version="13.0.1" />
     <PackageVersion Include="Asp.Versioning.Mvc" Version="7.1.0" />
     <PackageVersion Include="AWSSDK.S3" Version="3.7.300.2" />
     <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.300.2" />
     <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.17.0" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
-    <PackageVersion Include="Blazorise" Version="1.4.1" />
-    <PackageVersion Include="Blazorise.Components" Version="1.4.1" />
-    <PackageVersion Include="Blazorise.DataGrid" Version="1.4.1" />
-    <PackageVersion Include="Blazorise.Snackbar" Version="1.4.1" />
+    <PackageVersion Include="Blazorise" Version="1.5.0" />
+    <PackageVersion Include="Blazorise.Components" Version="1.5.0" />
+    <PackageVersion Include="Blazorise.DataGrid" Version="1.5.0" />
+    <PackageVersion Include="Blazorise.Snackbar" Version="1.5.0" />
     <PackageVersion Include="Castle.Core" Version="5.1.1" />
     <PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
     <PackageVersion Include="CommonMark.NET" Version="0.15.1" />
     <PackageVersion Include="Confluent.Kafka" Version="2.3.0" />
     <PackageVersion Include="Dapper" Version="2.1.21" />
     <PackageVersion Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageVersion Include="Dapr.Client" Version="1.12.0" />
+    <PackageVersion Include="DeviceDetector.NET" Version="6.1.4" />
     <PackageVersion Include="Devart.Data.Oracle.EFCore" Version="10.3.10.8" />
     <PackageVersion Include="DistributedLock.Core" Version="1.0.5" />
     <PackageVersion Include="DistributedLock.Redis" Version="1.0.2" />
@@ -55,6 +56,7 @@
     <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.0" />
@@ -102,7 +104,9 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageVersion Include="Minio" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.5.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
+    <PackageVersion Include="Minio" Version="6.0.2" />
     <PackageVersion Include="MongoDB.Driver" Version="2.22.0" />
     <PackageVersion Include="NEST" Version="7.17.5" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -113,15 +117,15 @@
     <PackageVersion Include="NUglify" Version="1.21.0" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="Octokit" Version="9.0.0" />
-    <PackageVersion Include="OpenIddict.Abstractions" Version="5.1.0" />
-    <PackageVersion Include="OpenIddict.Core" Version="5.1.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.1.0" />
-    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.1.0" />
-    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="5.1.0" />
+    <PackageVersion Include="OpenIddict.Abstractions" Version="5.2.0" />
+    <PackageVersion Include="OpenIddict.Core" Version="5.2.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.2.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.2.0" />
+    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="5.2.0" />
     <PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
     <PackageVersion Include="Polly" Version="8.2.0" />
     <PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
-    <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
+    <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
     <PackageVersion Include="Quartz" Version="3.7.0" />
     <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.7.0" />
     <PackageVersion Include="Quartz.Plugins.TimeZoneConverter" Version="3.7.0" />
@@ -159,6 +163,7 @@
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
     <PackageVersion Include="TimeZoneConverter" Version="6.1.0" />
     <PackageVersion Include="Unidecode.NET" Version="2.1.0" />
     <PackageVersion Include="xunit" Version="2.6.1" />

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "هل أنت متأكد أنك تريد حذف هذا السحب؟",
     "CreateRaffle": "إنشاء السحب",
     "RemoveImage": "إزالة الصورة",
-    "SuccessfullySaved": "تم الحفظ بنجاح",
+    "SavedSuccessfully": "تم الحفظ بنجاح",
     "Menu:CommunityTalks": "محادثات المجتمع",
     "Menu:Conferences": "المؤتمرات",
     "Menu:OtherLiveEvents": "الأحداث المباشرة الأخرى",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Opravdu chcete smazat toto slosování?",
     "CreateRaffle": "Vytvořit tombolu",
     "RemoveImage": "Odebrat obrázek",
-    "SuccessfullySaved": "Úspěšně uloženo",
+    "SavedSuccessfully": "Úspěšně uloženo",
     "Menu:CommunityTalks": "Komunitní rozhovory",
     "Menu:Conferences": "Konference",
     "Menu:OtherLiveEvents": "Další živé akce",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Sind Sie sicher, dass Sie dieses Gewinnspiel löschen möchten?",
     "CreateRaffle": "Gewinnspiel erstellen",
     "RemoveImage": "Entferne Bild",
-    "SuccessfullySaved": "Erfolgreich gespeichert",
+    "SavedSuccessfully": "Erfolgreich gespeichert",
     "Menu:CommunityTalks": "Community-Gespräche",
     "Menu:Conferences": "Konferenzen",
     "Menu:OtherLiveEvents": "Andere Live-Events",

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

@@ -283,6 +283,7 @@
     "ChooseCoverImage": "Choose a cover image...",
     "Menu:Quotation": "Quotation",
     "Menu:Invoice": "Invoice",
+    "Menu:Quotation/Invoice": "Quotation/Invoice",
     "Menu:PaymentRequests": "Payment Requests",
     "Permission:PaymentRequests": "Payment Requests",
     "PaymentRequests": "Payment Requests",
@@ -388,7 +389,7 @@
     "ShowBetweenDayCount": "Show Between Days",
     "PurchaseOrder": "Purchase Order",
     "ShowCreateInvoiceOfOrganization": "Create Invoice",
-    "ShowCreateQuotationOfOrganization": "Create Quotation",
+    "ShowCreateQuotationOfOrganization": "Create Quotation/Invoice",
     "BookDiscounts": "Book Discounts",
     "Permission:BookDiscount": "Book Discount",
     "Menu:BookDiscounts": "Book Discounts",
@@ -533,7 +534,7 @@
     "RaffleDeletionConfirmationMessage": "Are you sure you want to delete this raffle?",
     "CreateRaffle": "Create Raffle",
     "RemoveImage": "Remove Image",
-    "SuccessfullySaved": "Successfully saved",
+    "SavedSuccessfully": "Saved successfully",
     "Menu:CommunityTalks": "Community Talks",
     "Menu:Conferences": "Conferences",
     "Menu:OtherLiveEvents": "Other Live Events",
@@ -594,6 +595,32 @@
     "AutoRenewals": "Auto Renewals",
     "OrganizationHasCreditCard": "Organization has credit card. Please remove credit card first!",
     "DisplayName:DontSendEmailForLicenseExpire": "Don't Send Email For License Expire",
-    "DontSendEmailForLicenseExpire": "Don't Send Email For License Expire"
+    "DontSendEmailForLicenseExpire": "Don't Send Email For License Expire",
+    "SuccessfullyChanged": "Successfully changed",
+    "WinnerCountMustBeLessThanMaxWinnerCount": "Winner count must be less than max winner count",
+    "NoChangesDetected": "No changes detected",
+    "ProductCount": "Product Count",
+    "Actions": "Actions",
+    "CreateInvoice": "Create Invoice",
+    "IsVisible": "Visible",
+    "Menu:Testimonials": "Testimonials",
+    "TestimonialDeletionConfirmationMessage": "Are you sure you want to delete this testimonial ?",
+    "FullName": "Full name",
+    "TestimonialText": "Testimonial text",
+    "ExperienceYear": "Experience year",
+    "Position": "Title",
+    "YearsOfExperience": "Experience year",
+    "AllowedLicenses": "Allowed Licenses",
+    "AllowedModules": "Allowed Modules",
+    "ModuleName": "Module name",
+    "NonYet": "Non yet",
+    "Permission:Testimonials": "Testimonials",
+    "SelectCompanySizePlaceholder": "Company Size",
+    "SelectExperienceYearPlaceholder": "Experience year",
+    "SelectCountryPlaceholder": "Country",
+    "DeleteImageConfirmationMessage": "Are you sure you want to delete the image for \"{0}\"?",
+    "DeleteImageSuccessMessage": "Image successfully deleted",
+    "DeleteImage": "Delete Image",
+    "NetTerms": "Terms (Days)"
   }
-}
+}

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "¿Estás seguro de que quieres eliminar este sorteo?",
     "CreateRaffle": "Crear sorteo",
     "RemoveImage": "Quita la imagen",
-    "SuccessfullySaved": "Guardado con éxito",
+    "SavedSuccessfully": "Guardado con éxito",
     "Menu:CommunityTalks": "Charlas comunitarias",
     "Menu:Conferences": "Conferencias",
     "Menu:OtherLiveEvents": "Otros eventos en vivo",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Haluatko varmasti poistaa tämän arvonnan?",
     "CreateRaffle": "Luo arpajaiset",
     "RemoveImage": "Poista kuva",
-    "SuccessfullySaved": "Tallennettu onnistuneesti",
+    "SavedSuccessfully": "Tallennettu onnistuneesti",
     "Menu:CommunityTalks": "Yhteisön keskustelut",
     "Menu:Conferences": "Konferenssit",
     "Menu:OtherLiveEvents": "Muut live-tapahtumat",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Êtes-vous sûr de vouloir supprimer ce tirage au sort ?",
     "CreateRaffle": "Créer un tirage au sort",
     "RemoveImage": "Supprimer l'image",
-    "SuccessfullySaved": "Enregistré avec succès",
+    "SavedSuccessfully": "Enregistré avec succès",
     "Menu:CommunityTalks": "Discussions communautaires",
     "Menu:Conferences": "Conférences",
     "Menu:OtherLiveEvents": "Autres événements en direct",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "क्या आप वाकई इस रैफ़ल को हटाना चाहते हैं?",
     "CreateRaffle": "रैफ़ल बनाएं",
     "RemoveImage": "छवि हटाएँ",
-    "SuccessfullySaved": "सफलतापूर्वक संचित कर लिया गया है",
+    "SavedSuccessfully": "सफलतापूर्वक संचित कर लिया गया है",
     "Menu:CommunityTalks": "सामुदायिक वार्ता",
     "Menu:Conferences": "सम्मेलन",
     "Menu:OtherLiveEvents": "अन्य लाइव इवेंट",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Jeste li sigurni da želite izbrisati ovu nagradnu igru?",
     "CreateRaffle": "Napravite nagradnu igru",
     "RemoveImage": "Ukloni sliku",
-    "SuccessfullySaved": "Uspješno spremljeno",
+    "SavedSuccessfully": "Uspješno spremljeno",
     "Menu:CommunityTalks": "Razgovori zajednice",
     "Menu:Conferences": "Konferencije",
     "Menu:OtherLiveEvents": "Ostali događaji uživo",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Biztosan törölni szeretnéd ezt a nyereményjátékot?",
     "CreateRaffle": "Hozzon létre tombolát",
     "RemoveImage": "Kép eltávolítása",
-    "SuccessfullySaved": "Sikeresen mentve",
+    "SavedSuccessfully": "Sikeresen mentve",
     "Menu:CommunityTalks": "Közösségi beszélgetések",
     "Menu:Conferences": "Konferenciák",
     "Menu:OtherLiveEvents": "Egyéb élő események",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Ertu viss um að þú viljir eyða þessari happdrætti?",
     "CreateRaffle": "Búðu til happdrætti",
     "RemoveImage": "Fjarlægja mynd",
-    "SuccessfullySaved": "Vistað",
+    "SavedSuccessfully": "Vistað",
     "Menu:CommunityTalks": "Samfélagsspjall",
     "Menu:Conferences": "Ráðstefnur",
     "Menu:OtherLiveEvents": "Aðrir viðburðir í beinni",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Sei sicuro di voler eliminare questa lotteria?",
     "CreateRaffle": "Crea lotteria",
     "RemoveImage": "Rimuovi immagine",
-    "SuccessfullySaved": "Salvato con successo",
+    "SavedSuccessfully": "Salvato con successo",
     "Menu:CommunityTalks": "Colloqui comunitari",
     "Menu:Conferences": "Conferenze",
     "Menu:OtherLiveEvents": "Altri eventi dal vivo",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Weet je zeker dat je deze loterij wilt verwijderen?",
     "CreateRaffle": "Maak een loterij",
     "RemoveImage": "Afbeelding verwijderen",
-    "SuccessfullySaved": "Succesvol opgeslagen",
+    "SavedSuccessfully": "Succesvol opgeslagen",
     "Menu:CommunityTalks": "Gemeenschapsgesprekken",
     "Menu:Conferences": "Conferenties",
     "Menu:OtherLiveEvents": "Andere live-evenementen",

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/pl-PL.json

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Czy na pewno chcesz usunąć tę loterię?",
     "CreateRaffle": "Utwórz loterię",
     "RemoveImage": "Usuń obraz",
-    "SuccessfullySaved": "Pomyślnie zapisano",
+    "SavedSuccessfully": "Pomyślnie zapisano",
     "Menu:CommunityTalks": "Rozmowy społecznościowe",
     "Menu:Conferences": "Konferencje",
     "Menu:OtherLiveEvents": "Inne wydarzenia na żywo",

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/pt-BR.json

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Tem certeza de que deseja excluir este sorteio?",
     "CreateRaffle": "Criar sorteio",
     "RemoveImage": "Remover imagem",
-    "SuccessfullySaved": "Salvo com sucesso",
+    "SavedSuccessfully": "Salvo com sucesso",
     "Menu:CommunityTalks": "Palestras Comunitárias",
     "Menu:Conferences": "Conferências",
     "Menu:OtherLiveEvents": "Outros eventos ao vivo",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Sigur doriți să ștergeți această tombolă?",
     "CreateRaffle": "Creați tombolă",
     "RemoveImage": "Eliminați imaginea",
-    "SuccessfullySaved": "Salvat cu succes",
+    "SavedSuccessfully": "Salvat cu succes",
     "Menu:CommunityTalks": "Discuții comunitare",
     "Menu:Conferences": "Conferințe",
     "Menu:OtherLiveEvents": "Alte evenimente live",

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

@@ -547,7 +547,7 @@
     "RaffleDeletionConfirmationMessage": "Вы уверены, что хотите удалить этот розыгрыш?",
     "CreateRaffle": "Создать лотерею",
     "RemoveImage": "Удалить изображение",
-    "SuccessfullySaved": "Успешно сохранено",
+    "SavedSuccessfully": "Успешно сохранено",
     "Menu:CommunityTalks": "Обсуждения сообщества",
     "Menu:Conferences": "Конференции",
     "Menu:OtherLiveEvents": "Другие живые события",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Naozaj chcete odstrániť túto tombolu?",
     "CreateRaffle": "Vytvorenie tomboly",
     "RemoveImage": "Odstrániť obrázok",
-    "SuccessfullySaved": "Úspešne uložené",
+    "SavedSuccessfully": "Úspešne uložené",
     "Menu:CommunityTalks": "Komunitné rozhovory",
     "Menu:Conferences": "konferencie",
     "Menu:OtherLiveEvents": "Ďalšie živé podujatia",

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

@@ -533,7 +533,7 @@
     "RaffleDeletionConfirmationMessage": "Ali ste prepričani, da želite izbrisati to nagradno igro?",
     "CreateRaffle": "Ustvari nagradno igro",
     "RemoveImage": "Odstrani sliko",
-    "SuccessfullySaved": "Uspešno shranjeno",
+    "SavedSuccessfully": "Uspešno shranjeno",
     "Menu:CommunityTalks": "Skupnostni pogovori",
     "Menu:Conferences": "konference",
     "Menu:OtherLiveEvents": "Drugi dogodki v živo",