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

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

@@ -51,10 +51,14 @@ jobs:
     timeout-minutes: 50
     if: ${{ !github.event.pull_request.draft }}
     steps:
+    - uses: jlumbroso/free-disk-space@main
+    - uses: PSModule/install-powershell@v1
+      with:
+        Version: latest
     - 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,61 @@
     "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:SolutionTemplate:0": "Unknown",
+    "Enum:SolutionTemplate:1": "App No Layers",
+    "Enum:SolutionTemplate:2": "App Layered",
+    "Enum:SolutionTemplate: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 WebApp",
+    "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": "SQL Server",
+    "Enum:Dbms:3": "PostgreSQL",
+    "Enum:Dbms:4": "Oracle",
+    "Enum:Dbms:5": "Oracle Devart",
+    "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:UiTheme:5": "Lepton",
+    "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": "React Native",
+    "Enum:AbpTool:0": "Unknown",
+    "Enum:AbpTool:1": "Studio UI",
+    "Enum:AbpTool:2": "Studio CLI",
+    "Enum:AbpTool:3": "Old CLI",
+    "Menu:TelemetryMenu": "Telemetry Reports",
+    "Menu:Studio": "Studio",
+    "Menu:Solutions": "Solutions",
+    "Menu:Users": "Users",
+    "Menu:UserReports": "Users"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalization.csproj

@@ -253,6 +253,8 @@
     "AbpConferenceDescription": "ABP Conference is a virtual event for .NET developers to learn and connect with the community.",
     "Mobile": "Mobile",
     "MetaTwitterCard": "summary_large_image",
-    "IPAddress": "IP Address"
+    "IPAddress": "IP Address",
+    "LicenseBanner:InfoText": "Your license will <b>expire in {0} days.</b>",
+    "LicenseBanner:CallToAction": "Please <a href=\"/my-organizations/{0}\" class=\"text-decoration-underline\">extend your license.</a>"
   }
 }

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

@@ -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>.",