Merge branch 'rel-10.0' into auto-merge/rel-9-3/4009

Author: maliming

.github/workflows/auto-pr.yml

@@ -1,31 +1,31 @@
-name: Merge branch rel-10.0 with rel-9.3
+name: Merge branch dev with rel-10.0
 on:
   push:
     branches:
-      - rel-9.3
+      - rel-10.0
 permissions:
   contents: read
 
 jobs:
-  merge-rel-10-0-with-rel-9-3:
+  merge-dev-with-rel-10-0:
     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-10.0
+          ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-9.3:rel-9.3
-          git reset --hard rel-9.3
+          git fetch origin rel-10.0:rel-10.0
+          git reset --hard rel-10.0
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-9-3/${{github.run_number}}
-          title: Merge branch rel-10.0 with rel-9.3
-          body: This PR generated automatically to merge rel-10.0 with rel-9.3. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-10-0/${{github.run_number}}
+          title: Merge branch dev with rel-10.0
+          body: This PR generated automatically to merge dev with rel-10.0. 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-3/${{github.run_number}} --approve
-          gh pr merge auto-merge/rel-9-3/${{github.run_number}} --merge --auto --delete-branch
+          gh pr review auto-merge/rel-10-0/${{github.run_number}} --approve
+          gh pr merge auto-merge/rel-10-0/${{github.run_number}} --merge --auto --delete-branch

.github/workflows/build-and-test.yml

@@ -54,7 +54,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@master
       with:
-        dotnet-version: 9.0.100
+        dotnet-version: 10.0.x
 
     - name: Build All
       run: ./build-all.ps1

Directory.Build.props

@@ -5,8 +5,9 @@
 
   <ItemGroup>
     <PackageReference Condition="'$(IsTestProject)' == 'true'" Include="coverlet.collector">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <Version Condition="$(MSBuildProjectFullPath.Contains('templates'))">6.0.4</Version>
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 

Directory.Packages.props

@@ -0,0 +1,3 @@
+<Solution>
+  <Project Path="AbpIoLocalization/AbpIoLocalization.csproj" />
+</Solution>

abp_io/AbpIoLocalization/AbpIoLocalization.sln

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

abp_io/AbpIoLocalization/AbpIoLocalization.slnx

@@ -721,6 +721,60 @@
     "NuGetApiKey": "NuGet API key",
     "QuestionCount": "Question Count",
     "MakeAnnouncement": "Make Announcement",
-    "MakeAnnouncementInfo": "Check it if you want to make an announcement for this post"
+    "MakeAnnouncementInfo": "Check it if you want to make an announcement for this post",
+    "Permission:ViewCounts": "View counts",
+    "ReadCount": "Read Count",
+    "Menu:Solution": "Solution",
+    "Enum:LicenseType:1": "Personal",
+    "Enum:LicenseType:2": "Team",
+    "Enum:LicenseType:3": "Business",
+    "Enum:LicenseType:4": "Enterprise",
+    "Enum:Template:0": "Unknown",
+    "Enum:Template:1": "App No Layers",
+    "Enum:Template:2": "App Layered",
+    "Enum:Template:3": "Microservice",
+    "Enum:UiFramework:0": "Unknown",
+    "Enum:UiFramework:1": "None",
+    "Enum:UiFramework:2": "Mvc Razor Pages",
+    "Enum:UiFramework:3": "Angular",
+    "Enum:UiFramework:4": "Blazor Wasm",
+    "Enum:UiFramework:5": "Blazor Server",
+    "Enum:UiFramework:6": "Blazor Web App",
+    "Enum:UiFramework:7": "Blazor MaUI",
+    "Enum:DatabaseProvider:0": "Unknown",
+    "Enum:DatabaseProvider:1": "None",
+    "Enum:DatabaseProvider:2": "EfCore",
+    "Enum:DatabaseProvider:3": "MongoDb",
+    "Enum:Dbms:0": "Unknown",
+    "Enum:Dbms:1": "None",
+    "Enum:Dbms:2": "SqlServer",
+    "Enum:Dbms:3": "PostgreSql",
+    "Enum:Dbms:4": "Oracle",
+    "Enum:Dbms:5": "OracleDevart",
+    "Enum:Dbms:6": "MySql",
+    "Enum:Dbms:7": "Sqlite",
+    "Enum:UiTheme:0": "Unknown",
+    "Enum:UiTheme:1": "None",
+    "Enum:UiTheme:2": "Basic",
+    "Enum:UiTheme:3": "LeptonX",
+    "Enum:UiTheme:4": "LeptonX Lite",
+    "Enum:UiThemeStyle:0": "Unknown",
+    "Enum:UiThemeStyle:1": "System",
+    "Enum:UiThemeStyle:2": "Dim",
+    "Enum:UiThemeStyle:3": "Dark",
+    "Enum:UiThemeStyle:4": "Light",
+    "Enum:MobileApp:0": "Unknown",
+    "Enum:MobileApp:1": "None",
+    "Enum:MobileApp:2": "Maui",
+    "Enum:MobileApp:3": "ReactNative",
+    "Enum:CreationTool:0": "Unknown",
+    "Enum:CreationTool:1": "StudioUI",
+    "Enum:CreationTool:2": "StudioCli",
+    "Enum:CreationTool:3": "OldCli",
+    "Menu:TelemetryMenu": "Telemetry Reports",
+    "Menu:Studio": "Studio",
+    "Menu:Solutions": "Solutions",
+    "Menu:Users": "Users",
+    "Menu:UserReports": "Users"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalization.csproj

@@ -847,6 +847,7 @@
     "BlazoriseSupportExplanation3": "Log into the Blazorise support website at <a href=\"https://blazorise.com/support/login\">blazorise.com/support/login</a>.",
     "BlazoriseSupportExplanation4": "If you have an active ABP Commercial license, you will also have a Blazorise PRO license. You can get your Blazorise license key at <a href=\"https://blazorise.com/support/user/manage/license\">blazorise.com/support/user/manage/license</a>.",
     "BlazoriseSupportExplanation5": "You can post your questions on the support website and generate a product token for your application.",
+    "BlazoriseSupportMoreInfo": "For more information <a href=\"{0}\">click here</a>.",
     "AbpLiveTrainingPackages": "ABP Live Training Packages",
     "Releases": "Releases",
     "ReleasesDescription": "This page contains detailed information about each release. You can see all the closed pull requests for a specific release. For overall milestone developments, you can check out the <a href=\"https://abp.io/docs/latest/release-info/release-notes\">brief release notes page</a>.",

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

@@ -431,6 +431,9 @@
     "WhoWeAre_Expert": "About Me",
     "CreateSolutionFolder": "Create Solution Folder",
     "CreateSolutionFolderOption": "Specifies if the project will be in a new folder in the output folder or directly the output folder.",
+    "CreateCrudPage": "Create CRUD Page",
+    "CreateCrudPageOption": "Generates a sample CRUD page with a Book entity to demonstrate basic operations (Create, Read, Update, Delete).",
+    "ConnectionString": "Connection string",
     "BooksPageTitle": "ABP Books",
     "BooksPageDescription": "Explore ABP books to deepen your understanding and mastery of ABP.",
     "PackageDetailPage_NuGetPackageInstallationOptions": "There are three ways to install <code>{0}</code> NuGet package to your project",
@@ -534,7 +537,7 @@
     "WhenShouldIRenewMyLicenseExplanation2": "{0} for Team Licenses;",
     "WhenShouldIRenewMyLicenseExplanation3": "{0} for Business and Enterprise Licenses;",
     "WhenShouldIRenewMyLicenseExplanation4": "However, if you renew your license more than {0} days after the expiry date, the renewal price will be the same as the initial purchase price of the license, with no discounts applied to your renewal.",
-    "DoesTheSubscriptionRenewAutomaticallyExplanationAutoRenewal": "ABP Platform allows you to auto-renew your license. This is an optional free service. You can toggle this feature when you purchase a new license or later enable it from your <a href=\"{0}\">organization management page</a>. If you want to turn on or off the auto-renewal, visit the <a href=\"{0}\">organization management page</a>, go to the 'Payments Method' section and either check or uncheck the 'Automatic Renewal' checkbox. When you turn off the auto-renewal feature, it will be your responsibility to renew your license manually.",
+    "DoesTheSubscriptionRenewAutomaticallyExplanationAutoRenewal": "ABP Platform allows you to auto-renew your license. This is an optional free service. You can toggle this feature when you purchase a new license or later enable it from your <a href=\"{0}\">organization management page</a>. If you want to turn on or off the auto-renewal, visit the <a href=\"{0}\">organization management page</a>, go to the 'Payments Method' section and either check or uncheck the 'Automatic Renewal' checkbox. When you turn off the auto-renewal feature, it will be your responsibility to renew your license manually. <br> The <strong>renewals (manual)</strong> are non-refundable. On the other hand, all subscription <strong>auto-renewals</strong> are non-refundable after <strong>10 calendar days</strong> from the auto-renewal date. If you don't wish to continue your license, it is your responsibility to manage the renewal settings and cancel the subscription before the automatic renewal date.",
     "TrialPlanExplanation": "Yes, to start your free trial, please contact <a href=\"mailto:[email protected]?subject=Trial License Request\">[email protected]</a>. We also offer a 30-day money-back guarantee for the Team license, with no questions asked! You can request a full refund within the first 30 days of purchasing the license. For Business and Enterprise licenses, we provide a 60% refund if requested within 30 days of purchase. This policy is due to the inclusion of the full source code for all modules and themes in the Business and Enterprise licenses.",
     "BlazoriseLicenseExplanation": "We have an agreement between Volosoft and Megabit, according to which the Blazorise license is bundled with the ABP Platform’s commercial licenses. Therefore, our paid users do not need to purchase an additional Blazorise license.",
     "HowToUpgradeExplanation1": "When you create a new application using the ABP startup templates, all the modules and themes are used as NuGet and NPM packages. This setup allows for easy upgrades to newer versions of the packages.",
@@ -907,6 +910,7 @@
     "ProudToWorkWith": "Proud to Work With",
     "JoinOurConsumers": "Join them and build amazing products fast.",
     "AdditionalServicesExplanation": "Do you need additional or custom services?  <strong>We and our partners can provide;</strong>",
+    "CustomLicense": "Custom License",
     "CustomProjectDevelopment": "Custom Project Development",
     "CustomProjectDevelopmentExplanation": "Dedicated developers for your custom projects.",
     "PortingExistingProjects": "Porting Existing Projects",
@@ -1059,7 +1063,7 @@
     "BuyNow": "Buy Now",
     "PayViaAmexCard": "How can I pay via my AMEX card?",
     "PayViaAmexCardDescription": "The default payment gateway 'Iyzico' may decline some AMEX credit cards due to security measures. In this case, you can pay through the alternative payment gateway '2Checkout'.",
-    "InvalidReCaptchaErrorMessage": "There was an error verifying reCAPTCHA. Please try again.",
+    "InvalidReCaptchaErrorMessage": "There was an error verifying reCAPTCHA.",
     "YourCompanyName": "Your company name",
     "FirstName": "First name",
     "LastName": "Last name",
@@ -1425,7 +1429,7 @@
     "TotalDevelopers": "Total {0} developer(s)",
     "CustomPurchaseExplanation": "Tailored to your specific needs",
     "WhereDidYouHearAboutUs": "Where did you hear about us?",
-    "Twitter": "Twitter",
+    "Twitter": "Twitter (X)",
     "Facebook": "Facebook",
     "Youtube": "YouTube",
     "Google": "Google",
@@ -1460,6 +1464,7 @@
     "BlazoriseSupportExplanation3": "Log into the Blazorise support website at <a href=\"https://blazorise.com/support/login\">blazorise.com/support/login</a>.",
     "BlazoriseSupportExplanation4": "If you have an active ABP Commercial License, you will also have a Blazorise PRO license. You can get your Blazorise license key at <a href=\"https://blazorise.com/support/user/manage/license\">blazorise.com/support/user/manage/license</a>.",
     "BlazoriseSupportExplanation5": "You can post your questions on the support website and generate a product token for your application.",
+    "BlazoriseSupportMoreInfo": "For more information <a href=\"{0}\">click here</a>.",
     "AbpLiveTrainingPackages": "ABP Live Training Packages",
     "Releases": "Releases",
     "ReleasesDescription": "This page contains detailed information about each release. You can see all the closed pull requests for a specific release. For overall milestone developments, you can check out the <a href=\"https://abp.io/docs/latest/release-info/release-notes\">brief release notes page</a>.",
@@ -1795,7 +1800,7 @@
     "SpecialDiscount": "Special Discount",
     "YourOrganizationOverview": "Your Organization Overview",
     "TrainingDetailsHeaderInfo_TrainingHourSingular": "{0} hour",
-    "ContactPageError": "Please send your message via email to <a href=\"{0}\"> [email protected] </a><br /> Here's what you wrote :",
+    "ContactPageError": "You can also send your message via email. Copy your message below and send to <a href=\"{0}\"> [email protected] </a>",
     "GoBack": "Go back",
     "HereWhatYouWrote": "Here's what you wrote :",
     "Sales": "Sales",
@@ -1891,6 +1896,23 @@
     "CreatePostSEOTitleInfo": "SEO URL is a clean, readable, keyword-rich URL that helps both users and search engines understand what this post is about. Keep it short with 60 characters. SEO titles over 60 characters will be truncated. Use hyphens (-) to separate words (not underscores). Include target keywords near the start. Lowercase only. No stop words unless needed (e.g: \"and\", \"or\", \"the\").",
     "SEOTitle": "SEO URL",
     "InvalidYouTubeUrl": "The URL you entered is not a valid YouTube video link. Please make sure it points to a specific video and try again.",
-    "SelectAnOption": "Select an option"
+    "SelectAnOption": "Select an option",
+    "MostPopular": "Most Popular",
+    "AnnouncmentsPageTitle": "ABP Community Announcements | Stay Updated with the Latest News",
+    "AnnouncmentsPageDescription": "Get the latest news, feature updates, release notes, and important announcements about the ABP framework and .NET ecosystem. Stay ahead with timely information directly from the ABP team.",
+    "CanIUseABPProductsOnMoreThanOneComputer": "Can I use ABP products on more than one computer?",
+    "ABPProductsOnMoreThanOneComputerExplanation": "Yes. Each developer can install the software on up to two machines. A third machine requires approval via email. When you stop using one of your computers, the system understands and automatically invalidates that computer from your paired computer list.",
+    "CanIShareTheLicensedABPCommercialProducts": "Can I share the licensed ABP commercial products publicly or make them open source?",
+    "ShareTheLicensedABPCommercialProductsExplanation": "No! Sharing or sublicensing a Commercial (PRO) ABP package is strictly prohibited.",
+    "AreSubscriptionRenewalsAutomatic": "Are subscription renewals automatic?",
+    "SubscriptionRenewalsAutomaticExplanation": "By default, no, the renewals are manual. On the other hand, when you purchase a new license and use the payment gateway 'Iyzico' with your credit card, you will see a checkbox called 'Automatic Renewal' in the purchase steps which allows ABP system automatically renew your license. When you check that checkbox, the auto-renewal process lets you renew your license without losing this discount, and your development will never be interrupted. ABP does not save your credit card information, but our payment gateway does secure savings. You can disable auto-renewal at any time by accessing your Organization Management page.",
+    "DoYouProvideSupportForThird-partyLibraries": "Do you provide support for third-party libraries?",
+    "ProvideSupportForThird-partyExplanation": "No. Support only covers ABP Framework, ABP commercial packages and products which have been created by Volosoft.",
+    "DoYouSupportCustomABPArchitectures": "Do you support custom ABP architectures?",
+    "SupportCustomABPArchitecturesExplanation": "No. Support is only provided for standard ABP solution structures. On the other hand, you can always get support for your custom needs with a paid consultancy from the ABP Team.",
+    "DoesABPCollectAnyPersonalOrTechnicalData": "Does ABP collect any personal or technical data?",
+    "ABPCollectAnyDataExplanation": "The software may collect information about you and your use of the software, and send that to Volosoft. Volosoft as the software and service provider may use this information to provide services and improve its products & services. You may opt-out of these scenarios, as described in the <a href=\"{0}\">EULA</a> under PRIVACY AND COLLECTION OF PERSONAL DATA topic .",
+    "InThisDocument": "In this document",
+    "RecommendedArticles":  "Recommended Articles"
   }
 }