Merge branch 'dev' into resource-based-auth

Author: maliming

Directory.Packages.props

@@ -11,18 +11,19 @@
     <PackageVersion Include="Autofac" Version="8.4.0" />
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
-    <PackageVersion Include="AutoMapper" Version="15.0.1" />
+    <PackageVersion Include="AutoMapper" Version="14.0.0" />
     <PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.0" />
     <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
     <PackageVersion Include="AWSSDK.S3" Version="4.0.7.2" />
     <PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.2.2" />
     <PackageVersion Include="BunnyCDN.Net.Storage" Version="1.0.4" />
+    <PackageVersion Include="Azure.Identity" Version="1.14.2" />
     <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.25.0" />
-    <PackageVersion Include="Blazorise" Version="1.8.5" />
-    <PackageVersion Include="Blazorise.Components" Version="1.8.5" />
-    <PackageVersion Include="Blazorise.DataGrid" Version="1.8.5" />
-    <PackageVersion Include="Blazorise.Snackbar" Version="1.8.5" />
+    <PackageVersion Include="Blazorise" Version="1.8.6" />
+    <PackageVersion Include="Blazorise.Components" Version="1.8.6" />
+    <PackageVersion Include="Blazorise.DataGrid" Version="1.8.6" />
+    <PackageVersion Include="Blazorise.Snackbar" Version="1.8.6" />
     <PackageVersion Include="Castle.Core" Version="5.2.1" />
     <PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
     <PackageVersion Include="CommonMark.NET" Version="0.15.1" />
@@ -53,7 +54,7 @@
     <PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
     <PackageVersion Include="LdapForNet" Version="2.7.15" />
     <PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
-    <PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.8.2" />
+    <PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.9.1" />
     <PackageVersion Include="MailKit" Version="4.13.0" />
     <PackageVersion Include="Markdig.Signed" Version="0.42.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
@@ -88,7 +89,6 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />   
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.61.0" />
     <PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.61.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.9.0" />
@@ -132,11 +132,11 @@
     <PackageVersion Include="NUglify" Version="1.21.17" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="Octokit" Version="14.0.0" />
-    <PackageVersion Include="OpenIddict.Abstractions" Version="7.1.0" />
-    <PackageVersion Include="OpenIddict.Core" Version="7.1.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.1.0" />
-    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.1.0" />
-    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="7.1.0" />
+    <PackageVersion Include="OpenIddict.Abstractions" Version="7.2.0" />
+    <PackageVersion Include="OpenIddict.Core" Version="7.2.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.2.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.2.0" />
+    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="7.2.0" />
     <PackageVersion Include="Oracle.EntityFrameworkCore" Version="9.23.90" />
     <PackageVersion Include="Polly" Version="8.6.3" />
     <PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
@@ -174,6 +174,7 @@
     <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.7" />
     <PackageVersion Include="System.Linq.Queryable" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0" />
     <PackageVersion Include="System.Security.Permissions" Version="10.0.0" />
     <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.0" />
@@ -193,6 +194,6 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
     <PackageVersion Include="Fody" Version="6.9.3" />
-	<PackageVersion Include="System.Management" Version="10.0.0"/>
+    <PackageVersion Include="System.Management" Version="10.0.0" />
   </ItemGroup>
-</Project>
+</Project>

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

@@ -262,11 +262,14 @@
     "LicenseBanner:CallToAction": "Please <a href=\"/my-organizations/{0}\" class=\"text-decoration-underline\">extend your license.</a>",
     "Referral.CreatorUserIdIsRequired": "Creator user ID is required.",
     "Referral.TargetEmailIsRequired": "Target email is required.",
-    "Referral.TargetEmailAlreadyExists": "A referral link for this email address already exists.",
+    "Referral.YouAlreadyHaveLinkForThisEmail": "You have already created a referral link for this email address.",
     "Referral.MaxLinkLimitExceeded": "You have reached the maximum limit of {Limit} active referral links.",
     "Referral.LinkNotFound": "Referral link not found.",
     "Referral.LinkNotFoundOrNotOwned": "Referral link not found or you don't have permission to access it.",
     "Referral.CannotDeleteUsedLink": "You cannot delete a referral link that has already been used.",
+    "Referral.CannotReferYourself": "You cannot create a referral link for your own email address.",
+    "Referral:TargetEmail": "Target Email",
+    "Referral.CannotReferSameOrganizationMember": "You cannot create a referral link for a user who is already a member of your organization.",
     "LinkCopiedToClipboard": "Link copied to clipboard",
     "AreYouSureToDeleteReferralLink": "Are you sure you want to delete this referral link?",
     "DefaultErrorMessage": "An error occurred."

common.props

@@ -18,11 +18,6 @@
   <ItemGroup>
     <None Include="..\..\NuGet.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
-  <Target Name="_PreserveFileProvidersEmbeddedPackageReference" AfterTargets="AddPrunePackageReferences">
-    <ItemGroup>
-      <PrunePackageReference Remove="Microsoft.Extensions.FileProviders.Embedded" />
-    </ItemGroup>
-  </Target>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>

docs/en/framework/architecture/domain-driven-design/repositories.md

@@ -254,6 +254,35 @@ ABP uses dynamic proxying to make these attributes work. There are some rules he
 
 > Change tracking behavior doesn't affect tracking entity objects returned from `InsertAsync` and `UpdateAsync` methods. The objects returned from these methods are always tracked (if the underlying provider has the change tracking feature) and any change you make to these objects are saved into the database.
 
+#### Check If Change Tracking Is Enabled
+
+In case of you need to check if change tracking is enabled or disabled on a repository object, you can simply read the `IsChangeTrackingEnabled` property. It is `false` by default for read only repositories (see the *Read Only Repositories* section below). It is `null` by default for other repository objects. If it is `null`, change tracking is enabled unless you've explicitly used the change tracking attributes (see the *Attributes for Change Tracking* section).
+
+### The `EntityName` Property
+
+The `EntityName` property is to set the related entity's name on the repository object in some advanced  scenarios. For example, you can use this property to use the [Shared-type entity types](https://learn.microsoft.com/en-us/ef/core/modeling/entity-types?tabs=data-annotations#shared-type-entity-types) feature of Entity Framework Core (it allows you to use a single entity class to work on multiple tables in the database). In other cases, you can just ignore it.
+
+Default value is `null` unless you explicitly set it.
+
+**Example usage:**
+
+````csharp
+IRepository<YourSharedType, Guid> _repository; // You can inject it into your class
+...
+_repository.SetEntityName("Product"); //Set the entity name before using the repository
+//use the _repository object as always
+````
+
+### The `ProviderName` Property
+
+The `ProviderName` property of a repository object returns the underlying database provider name. It may return one of the following string values for the built-in providers:
+
+* `Volo.Abp.EntityFrameworkCore` (from the constant `AbpEfCoreConsts.ProviderName` value)
+* `Volo.Abp.MongoDB` (from the constant `AbpMongoDbConsts.ProviderName` value)
+* `Volo.Abp.MemoryDb` (from the constant `AbpMemoryDbConsts.ProviderName` value)
+
+This property is not used in most cases. It is mainly available for internal usage of the ABP framework.
+
 ## Other Generic Repository Types
 
 Standard `IRepository<TEntity, TKey>` interface exposes the standard `IQueryable<TEntity>` and you can freely query using the standard LINQ methods. This is fine for most of the applications. However, some ORM providers or database systems may not support standard `IQueryable` interface. If you want to use such providers, you can't rely on the `IQueryable`.

docs/en/framework/infrastructure/event-bus/distributed/azure.md

@@ -137,4 +137,14 @@ Configure<AbpAzureServiceBusOptions>(options =>
 });
 ````
 
+Use `TokenCredential` instead of `ConnectionString` if you want to use custom credential.
+
+````csharp
+Configure<AbpAzureServiceBusOptions>(options =>
+{
+    options.Connections.Default.FullyQualifiedNamespace = "sb-my-app.servicebus.windows.net";
+    options.Connections.Default.TokenCredential = new DefaultAzureCredential();
+});
+````
+
 Using these options classes can be combined with the `appsettings.json` way. Configuring an option property in the code overrides the value in the configuration file.

docs/en/release-info/migration-guides/abp-10-0.md

@@ -7,19 +7,19 @@
 
 # ABP Version 10.0 Migration Guide
 
-This document is a guide for upgrading ABP v9.x solutions to ABP v10.0. There are some changes in this version that may affect your applications, please read it carefully and apply the necessary changes to your application.
+This document is a guide for upgrading ABP v9.x solutions to ABP v10.0. There are some changes in this version that may affect your applications. Please read them carefully and apply the necessary changes to your application.
 
 ## Open-Source (Framework)
 
-### Upgraded to .NET 10.0
+### Upgrade to .NET 10.0
 
-We've upgraded ABP to .NET 10.0, so you need to move your solutions to .NET 10.0 if you want to use ABP 10.0. You can check Microsoft’s [Migrate from ASP.NET Core 9.0 to 10.0](https://learn.microsoft.com/en-us/aspnet/core/migration/90-to-100) documentation, to see how to update an existing ASP.NET Core 9.0 project to ASP.NET Core 10.0.
+We've upgraded ABP to .NET 10.0, so you need to move your solutions to .NET 10.0 if you want to use ABP 10.0. You can check Microsoft’s [Migrate from ASP.NET Core 9.0 to 10.0](https://learn.microsoft.com/en-us/aspnet/core/migration/90-to-100) documentation to see how to update an existing ASP.NET Core 9.0 project to ASP.NET Core 10.0.
 
-### Add new EF Core Migrations
+### Add New EF Core Migrations
 
 Some entities in certain modules have been modified. If you are using Entity Framework Core, please create a new EF Core migration in your project after upgrading to ABP 10.0.
 
-> If the migration file is empty, you can remove it by `dotnet ef migrations remove` command.
+> If the migration file is empty, you can remove it by using the `dotnet ef migrations remove` command.
 
 ### Razor Runtime Compilation Obsolete
 
@@ -53,31 +53,25 @@ For more information, you can check the [Razor Runtime Compilation Obsolete](htt
 
 ### IActionContextAccessor Obsolete
 
-We removed the `IActionContextAccessor` from dependency injection.
-
-> We are not using `IActionContextAccessor` in ABP core framework and modules.
+We removed the `IActionContextAccessor` from dependency injection and are not using the `IActionContextAccessor` in ABP's core framework and modules.
 
 See [IActionContextAccessor Obsolete](https://learn.microsoft.com/en-us/dotnet/core/compatibility/aspnet-core/10/iactioncontextaccessor-obsolete) for more information.
 
 ### Add `BLOB Storing Memory Provider` module.
 
-In this version, we added the `BLOB Storing Memory Provider` module for unit testing purposes.
+In this version, we have added the `BLOB Storing Memory Provider` module for unit testing purposes.
 
 See the [BLOB Storing Memory Provider](https://github.com/abpframework/abp/blob/dev/docs/en/framework/infrastructure/blob-storing/memory.md) document for more information.
 
 ### Always use `MapStaticAssets`
 
-Provious, the `MapStaticAssets` has performance problems if there are too many static files. and we will use `StaticFileMiddleware` to serve the static files in development mode. NET 10.0 has fixed this problem. We will always use `MapStaticAssets` to serve the static files.
+Previously, the `MapStaticAssets` had performance problems if there were too many static files. NET 10.0 has fixed this problem. We will always use `MapStaticAssets` to serve the static files.
 
 See [Static file serving performance issues](https://github.com/dotnet/aspnetcore/issues/59673) for more information.
 
 ### C# 14 overload resolution with span parameters
 
-NET Core will redirect `array.Contains` extension method to `MemoryExtensions.Contains`, This will cause `MongoDB.Driver` to be unable to translate `IQueryable<T>`, If you are using `array.Contains` in your code, you should use following code to avoid this problem.
-
-> Only array has this problem, other types are not affected. eg List<T>, HashSet<T>, etc.
-
-> MongoDB.Driver will be fixed in the future.
+NET Core will redirect the `array.Contains` extension method to `MemoryExtensions.Contains`. This will cause `MongoDB.Driver` to be unable to translate `IQueryable<T>`. If you are using `array.Contains` in your code, you should use the following code to avoid this problem:
 
 ```csharp
 M((array, num) => array.Contains(num)); // fails, binds to MemoryExtensions.Contains
@@ -86,13 +80,15 @@ M((array, num) => array.AsEnumerable().Contains(num)); // ok, binds to Enumerabl
 M((array, num) => Enumerable.Contains(array, num)); // ok, binds to Enumerable.Contains
 ```
 
+> Please note that only the `array` type has this problem. Other types are not affected (e.g. `List<T>`, `HashSet<T>`, etc). **MongoDB.Driver** provider will be fixed in future versions, and we will immediately apply the changes if needed.
+
 See the [C# 14 overload resolution with span parameters](https://learn.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/10.0/csharp-overload-resolution#recommended-action) for more information.
 
-###  OpenIddict 7.X
+###  OpenIddict Upgrade to 7.X
 
-We upgraded OpenIddict to 7.X. See the [OpenIddict 6.x to 7.x Migration Guide](https://documentation.openiddict.com/guides/migration/60-to-70.html) for more information.
+We have upgraded **OpenIddict** to **v7.x**. For detailed information about the changes introduced in this release, refer to the [OpenIddict 6.x to 7.x Migration Guide](https://documentation.openiddict.com/guides/migration/60-to-70.html).
 
-OpenIddict 7.X changed the `OpenIddictToken` entity, you must create a new database migration if you use Entity Framework Core.
+As a developer, you typically only need to **create a new Entity Framework Core migration** and **apply it to your database**, since **OpenIddict v7.x** introduces a modification in the `OpenIddictToken` entity.
 
 ### Migrating from AutoMapper to Mapperly
 
@@ -118,6 +114,3 @@ Starting from **ABP 10.0**, the [`HideErrors`](../../framework/fundamentals/cach
 
 By default, ABP hides and logs cache server errors to keep the application running even when the cache is unavailable.  
 However, in the **development environment**, errors are no longer hidden so that developers can immediately detect and fix **any cache server issues** (such as connection, configuration, or runtime errors).  
-
-## PRO
-

docs/en/studio/installation.md

@@ -11,15 +11,15 @@ This document explains how to install the ABP Studio tool.
 
 ## Pre-requirements
 
-ABP Studio automatically instals most of the required dependencies. When you first launch the application, it will check for and install the following components if missed:
+ABP Studio automatically installs most of the required dependencies. When you first launch the application, it will check for and install the following components if missed:
 
 * .NET SDK
 * Node.js
 * ABP CLI
 * mkcert (for HTTPS development)
 * WireGuard (for Kubernetes operations)
 
-However, the followings should be manually installed:
+However, the following should be manually installed:
 
 ### Docker (Required for Kubernetes Operations)
 
@@ -55,7 +55,7 @@ ABP Studio allows you to customize the user interface theme according to your pr
 
 ## Upgrading
 ABP Studio periodically checks for updates in the background, and when a new version of ABP Studio is available, you will be notified through a modal. 
-The modal will prompt you to update to the latest version as below:
+The modal will prompt you to update to the latest version as follows:
 
 ![new-version-available-window](./images/new-version-available-window.png)
 

docs/en/testing/integration-tests.md

@@ -350,7 +350,7 @@ There are multiple overloads of the `WithUnitOfWorkAsync` method that you can us
 
 ## Working with DbContext
 
-In some cases, you may want to directory work with the [Entity Framework's `DbContext` object](https://learn.microsoft.com/en-us/dotnet/api/system.data.entity.dbcontext) to perform database operations in your test methods. In this case, you can use `IDbContextProvider<T>`service to obtain a `DbContext` instance inside a unit of work.
+In some cases, you may want to directly work with the [Entity Framework's `DbContext` object](https://learn.microsoft.com/en-us/dotnet/api/system.data.entity.dbcontext) to perform database operations in your test methods. In this case, you can use `IDbContextProvider<T>`service to obtain a `DbContext` instance inside a unit of work.
 
 The following example shows how you can create a `DbContext` object in a test method:
 

framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs

@@ -2,7 +2,6 @@
 using AutoMapper;
 using AutoMapper.Internal;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Auditing;
 using Volo.Abp.Modularity;
@@ -41,7 +40,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     configurator(autoMapperConfigurationContext);
                 }
 
-                var mapperConfiguration = new MapperConfiguration(mapperConfigurationExpression, sp.GetRequiredService<ILoggerFactory>());
+                var mapperConfiguration = new MapperConfiguration(mapperConfigurationExpression);
 
                 foreach (var profileType in options.ValidatingProfiles)
                 {

framework/src/Volo.Abp.AzureServiceBus/Volo.Abp.AzureServiceBus.csproj

@@ -17,6 +17,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Azure.Identity" />
         <PackageReference Include="Azure.Messaging.ServiceBus" />
         <ProjectReference Include="..\Volo.Abp.Json\Volo.Abp.Json.csproj" />
         <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />