Upgrade to ABP 4.2.2

5 years ago · 974a36ea3c
97 changed files with 301 additions and 309 deletions
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@ -4,10 +4,6 @@ on:
    branches:
      - master
      - main
  pull_request:
    branches:
      - master
      - main
 jobs:
  publish:
    runs-on: ubuntu-latest
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -4,10 +4,6 @@ on:
    branches:
      - master
      - main
  pull_request:
    branches:
      - master
      - main
 jobs:
  publish:
    runs-on: windows-latest
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
-    <AbpVersion>4.0.2</AbpVersion>
+    <AbpVersion>4.2.2</AbpVersion>
  </PropertyGroup>
 </Project>
--- a/common.props
+++ b/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>2.1.1</Version>
+    <Version>2.1.2</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>
--- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.Application.Tests/EasyAbp.EShop.Application.Tests.csproj
+++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.Application.Tests/EasyAbp.EShop.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Application\EasyAbp.EShop.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Domain.Tests\EasyAbp.EShop.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.Domain.Tests/EasyAbp.EShop.Domain.Tests.csproj
+++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.Domain.Tests/EasyAbp.EShop.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.EntityFrameworkCore.Tests\EasyAbp.EShop.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.EntityFrameworkCore.Tests/EasyAbp.EShop.EntityFrameworkCore.Tests.csproj
+++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.EntityFrameworkCore.Tests/EasyAbp.EShop.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
--- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.MongoDB.Tests/EasyAbp.EShop.MongoDB.Tests.csproj
+++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.MongoDB.Tests/EasyAbp.EShop.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.MongoDB\EasyAbp.EShop.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.TestBase\EasyAbp.EShop.TestBase.csproj" />
  </ItemGroup>
--- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj
+++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj
@ -8,12 +8,12 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs
@ -40,9 +40,9 @@ namespace EasyAbp.EShop.Orders.Orders
            _repository = repository;
        }
-        protected override IQueryable<Order> CreateFilteredQuery(GetOrderListDto input)
+        protected override async Task<IQueryable<Order>> CreateFilteredQueryAsync(GetOrderListDto input)
        {
-            var query = _repository.WithDetails();
+            var query = await _repository.WithDetailsAsync();
            if (input.StoreId.HasValue)
            {
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/Orders/OrderRepository.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/Orders/OrderRepository.cs
@ -16,9 +16,9 @@ namespace EasyAbp.EShop.Orders.Orders
        {
        }
-        public override IQueryable<Order> WithDetails()
+        public override async Task<IQueryable<Order>> WithDetailsAsync()
        {
-            return base.WithDetails()
+            return (await base.WithDetailsAsync())
                .Include(x => x.OrderLines)
                .Include(x => x.OrderExtraFees);
        }
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/EasyAbp.EShop.Orders.Application.Tests.csproj
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/EasyAbp.EShop.Orders.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Orders.Application\EasyAbp.EShop.Orders.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Orders.Domain.Tests\EasyAbp.EShop.Orders.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/EasyAbp.EShop.Orders.Domain.Tests.csproj
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/EasyAbp.EShop.Orders.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.Orders.EntityFrameworkCore.Tests\EasyAbp.EShop.Orders.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests.csproj
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.MongoDB.Tests/EasyAbp.EShop.Orders.MongoDB.Tests.csproj
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.MongoDB.Tests/EasyAbp.EShop.Orders.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Orders.MongoDB\EasyAbp.EShop.Orders.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Orders.TestBase\EasyAbp.EShop.Orders.TestBase.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj
@ -8,12 +8,12 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />    
    <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs
@ -50,9 +50,9 @@ namespace EasyAbp.EShop.Payments.Payments
            return payment;
        }
-        protected override IQueryable<Payment> CreateFilteredQuery(GetPaymentListDto input)
+        protected override async Task<IQueryable<Payment>> CreateFilteredQueryAsync(GetPaymentListDto input)
        {
-            var query = base.CreateFilteredQuery(input);
+            var query = await base.CreateFilteredQueryAsync(input);
            if (input.UserId.HasValue)
            {
@ -95,21 +95,19 @@ namespace EasyAbp.EShop.Payments.Payments
                new PaymentOperationAuthorizationRequirement(PaymentOperation.Creation)
            );
-            var createPaymentEto = new CreatePaymentEto
+            var createPaymentEto = new CreatePaymentEto(
-            {
+                CurrentTenant.Id,
-                TenantId = CurrentTenant.Id,
+                CurrentUser.GetId(),
-                UserId = CurrentUser.GetId(),
+                input.PaymentMethod,
-                PaymentMethod = input.PaymentMethod,
+                orders.First().Currency,
-                Currency = orders.First().Currency,
+                orders.Select(order => new CreatePaymentItemEto
                ExtraProperties = new ExtraPropertyDictionary(),
                PaymentItems = orders.Select(order => new CreatePaymentItemEto
                {
                    ItemType = PaymentsConsts.PaymentItemType,
                    ItemKey = order.Id.ToString(),
                    OriginalPaymentAmount = order.ActualTotalPrice,
                    ExtraProperties = new ExtraPropertyDictionary {{"StoreId", order.StoreId.ToString()}}
                }).ToList()
-            };
+            );
            await _distributedEventBus.PublishAsync(createPaymentEto);
        }
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs
@ -60,12 +60,12 @@ namespace EasyAbp.EShop.Payments.Refunds
            return refund;
        }
        protected override IQueryable<Refund> CreateFilteredQuery(GetRefundListDto input)
        {
            var query = input.UserId.HasValue ? _repository.GetQueryableByUserId(input.UserId.Value) : _repository;
-            return query;
+        protected override async Task<IQueryable<Refund>> CreateFilteredQueryAsync(GetRefundListDto input)
        {
            return input.UserId.HasValue
                ? await _repository.GetQueryableByUserIdAsync(input.UserId.Value)
                : _repository;
        }
        // Todo: should a store owner user see orders of other stores in the same payment/refund?
@ -132,11 +132,7 @@ namespace EasyAbp.EShop.Payments.Refunds
                });
            }
-            await _distributedEventBus.PublishAsync(new RefundPaymentEto
+            await _distributedEventBus.PublishAsync(new RefundPaymentEto(CurrentTenant.Id, createRefundInput));
            {
                TenantId = CurrentTenant.Id,
                CreateRefundInput = createRefundInput
            });
        }
    }
 }
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <PackageReference Include="Volo.Abp.Validation" Version="$(AbpVersion)" />
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.1" />
  </ItemGroup>
  <ItemGroup>
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs
@ -1,11 +1,12 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
 namespace EasyAbp.EShop.Payments.Refunds
 {
    public interface IRefundRepository : IRepository<Refund, Guid>
    {
-        IQueryable<Refund> GetQueryableByUserId(Guid userId);
+        Task<IQueryable<Refund>> GetQueryableByUserIdAsync(Guid userId);
    }
 }
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs
@ -1,5 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Payments.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
@ -13,9 +14,9 @@ namespace EasyAbp.EShop.Payments.Payments
        {
        }
-        public override IQueryable<Payment> WithDetails()
+        public override async Task<IQueryable<Payment>> WithDetailsAsync()
        {
-            return base.WithDetails().Include(x => x.PaymentItems);
+            return (await base.WithDetailsAsync()).Include(x => x.PaymentItems);
        }
    }
 }
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs
@ -1,5 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Payments.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
@ -13,15 +14,15 @@ namespace EasyAbp.EShop.Payments.Refunds
        {
        }
-        public override IQueryable<Refund> WithDetails()
+        public override async Task<IQueryable<Refund>> WithDetailsAsync()
        {
-            return base.WithDetails().Include(x => x.RefundItems);
+            return (await base.WithDetailsAsync()).Include(x => x.RefundItems);
        }
-        public IQueryable<Refund> GetQueryableByUserId(Guid userId)
+        public virtual async Task<IQueryable<Refund>> GetQueryableByUserIdAsync(Guid userId)
        {
-            return from refund in DbContext.Refunds
+            return from refund in (await GetDbContextAsync()).Refunds
-                join payment in DbContext.Payments on refund.PaymentId equals payment.Id
+                join payment in (await GetDbContextAsync()).Payments on refund.PaymentId equals payment.Id
                where payment.UserId == userId
                select refund;
        }
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/EasyAbp.EShop.Payments.Application.Tests.csproj
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/EasyAbp.EShop.Payments.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Payments.Application\EasyAbp.EShop.Payments.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain.Tests\EasyAbp.EShop.Payments.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/EasyAbp.EShop.Payments.Domain.Tests.csproj
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/EasyAbp.EShop.Payments.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.Payments.EntityFrameworkCore.Tests\EasyAbp.EShop.Payments.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests.csproj
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.MongoDB.Tests/EasyAbp.EShop.Payments.MongoDB.Tests.csproj
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.MongoDB.Tests/EasyAbp.EShop.Payments.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Payments.MongoDB\EasyAbp.EShop.Payments.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Payments.TestBase\EasyAbp.EShop.Payments.TestBase.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj
@ -8,12 +8,12 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
--- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Application.Tests/EasyAbp.EShop.Plugins.Application.Tests.csproj
+++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Application.Tests/EasyAbp.EShop.Plugins.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.Application\EasyAbp.EShop.Plugins.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Domain.Tests\EasyAbp.EShop.Plugins.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Domain.Tests/EasyAbp.EShop.Plugins.Domain.Tests.csproj
+++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Domain.Tests/EasyAbp.EShop.Plugins.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests\EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests.csproj
+++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
--- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.MongoDB.Tests/EasyAbp.EShop.Plugins.MongoDB.Tests.csproj
+++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.MongoDB.Tests/EasyAbp.EShop.Plugins.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.MongoDB\EasyAbp.EShop.Plugins.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.TestBase\EasyAbp.EShop.Plugins.TestBase.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.TestBase/EasyAbp.EShop.Plugins.TestBase.csproj
+++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.TestBase/EasyAbp.EShop.Plugins.TestBase.csproj
@ -8,12 +8,12 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.Trees.Application.Contracts" Version="1.4.0" />
+    <PackageReference Include="EasyAbp.Abp.Trees.Application.Contracts" Version="2.2.2" />
    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
    <ProjectReference Include="..\EasyAbp.EShop.Products.Domain.Shared\EasyAbp.EShop.Products.Domain.Shared.csproj" />
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.Trees.Application" Version="1.4.0" />
+    <PackageReference Include="EasyAbp.Abp.Trees.Application" Version="2.2.2" />
    <PackageReference Include="Volo.Abp.AutoMapper" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Ddd.Application" Version="$(AbpVersion)" />
    <ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Application.Shared\EasyAbp.EShop.Stores.Application.Shared.csproj" />
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Categories/CategoryAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Categories/CategoryAppService.cs
@ -27,9 +27,9 @@ namespace EasyAbp.EShop.Products.Categories
            _repository = repository;
        }
-        protected override IQueryable<Category> CreateFilteredQuery(GetCategoryListDto input)
+        protected override async Task<IQueryable<Category>> CreateFilteredQueryAsync(GetCategoryListDto input)
        {
-            var query =  base.CreateFilteredQuery(input).Where(x => x.ParentId == input.ParentId);
+            var query = (await base.CreateFilteredQueryAsync(input)).Where(x => x.ParentId == input.ParentId);
            return input.ShowHidden ? query : query.Where(x => !x.IsHidden);
        }
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs
@ -20,7 +20,7 @@ namespace EasyAbp.EShop.Products.ProductCategories
            _repository = repository;
        }
-        protected override IQueryable<ProductCategory> CreateFilteredQuery(GetProductCategoryListDto input)
+        protected override async Task<IQueryable<ProductCategory>> CreateFilteredQueryAsync(GetProductCategoryListDto input)
        {
            var queryable = Repository.AsQueryable();
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs
@ -20,9 +20,9 @@ namespace EasyAbp.EShop.Products.ProductDetailHistories
            _repository = repository;
        }
-        protected override IQueryable<ProductDetailHistory> CreateFilteredQuery(GetProductDetailHistoryListDto input)
+        protected override async Task<IQueryable<ProductDetailHistory>> CreateFilteredQueryAsync(GetProductDetailHistoryListDto input)
        {
-            return base.CreateFilteredQuery(input).Where(x => x.ProductDetailId == input.ProductDetailId);
+            return (await base.CreateFilteredQueryAsync(input)).Where(x => x.ProductDetailId == input.ProductDetailId);
        }
        public async Task<ProductDetailHistoryDto> GetByTimeAsync(Guid productId, DateTime modificationTime)
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetails/ProductDetailAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetails/ProductDetailAppService.cs
@ -30,7 +30,7 @@ namespace EasyAbp.EShop.Products.ProductDetails
            _repository = repository;
        }
-        protected override IQueryable<ProductDetail> CreateFilteredQuery(GetProductDetailListInput input)
+        protected override async Task<IQueryable<ProductDetail>> CreateFilteredQueryAsync(GetProductDetailListInput input)
        {
            return _repository.WhereIf(input.StoreId.HasValue, x => x.StoreId == input.StoreId.Value);
        }
@ -40,7 +40,7 @@ namespace EasyAbp.EShop.Products.ProductDetails
            await AuthorizationService.CheckMultiStorePolicyAsync(input.StoreId, GetListPolicyName,
                ProductsPermissions.Products.CrossStore);
-            var query = CreateFilteredQuery(input);
+            var query = await CreateFilteredQueryAsync(input);
            var totalCount = await AsyncExecuter.CountAsync(query);
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs
@ -20,9 +20,9 @@ namespace EasyAbp.EShop.Products.ProductHistories
            _repository = repository;
        }
-        protected override IQueryable<ProductHistory> CreateFilteredQuery(GetProductHistoryListDto input)
+        protected override async Task<IQueryable<ProductHistory>> CreateFilteredQueryAsync(GetProductHistoryListDto input)
        {
-            return base.CreateFilteredQuery(input).Where(x => x.ProductId == input.ProductId);
+            return (await base.CreateFilteredQueryAsync(input)).Where(x => x.ProductId == input.ProductId);
        }
        public async Task<ProductHistoryDto> GetByTimeAsync(Guid productId, DateTime modificationTime)
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
@ -50,11 +50,11 @@ namespace EasyAbp.EShop.Products.Products
            _repository = repository;
        }
-        protected override IQueryable<Product> CreateFilteredQuery(GetProductListInput input)
+        protected override async Task<IQueryable<Product>> CreateFilteredQueryAsync(GetProductListInput input)
        {
            var query = input.CategoryId.HasValue
                ? _repository.WithDetails(input.CategoryId.Value)
-                : _repository.WithDetails();
+                : (await _repository.WithDetailsAsync());
            return query
                .Where(x => x.StoreId == input.StoreId)
@ -267,7 +267,7 @@ namespace EasyAbp.EShop.Products.Products
            }
            // Todo: Products cache.
-            var query = CreateFilteredQuery(input);
+            var query = await CreateFilteredQueryAsync(input);
            if (!isCurrentUserStoreAdmin)
            {
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs
@ -35,11 +35,11 @@ namespace EasyAbp.EShop.Products.Products
            _repository = repository;
        }
-        protected override IQueryable<ProductView> CreateFilteredQuery(GetProductListInput input)
+        protected override async Task<IQueryable<ProductView>> CreateFilteredQueryAsync(GetProductListInput input)
        {
            var query = input.CategoryId.HasValue
                ? _repository.WithDetails(input.CategoryId.Value)
-                : _repository.WithDetails();
+                : (await _repository.WithDetailsAsync());
            return query
                .Where(x => x.StoreId == input.StoreId)
@ -55,7 +55,7 @@ namespace EasyAbp.EShop.Products.Products
                await BuildStoreProductViewsAsync(input.StoreId);
            }
-            var query = CreateFilteredQuery(input);
+            var query = await CreateFilteredQueryAsync(input);
            var totalCount = await AsyncExecuter.CountAsync(query);
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj
@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.Trees.Domain.Shared" Version="1.4.0" />
+    <PackageReference Include="EasyAbp.Abp.Trees.Domain.Shared" Version="2.2.2" />
    <PackageReference Include="Volo.Abp.Validation" Version="$(AbpVersion)" />
    <ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.Trees.Domain" Version="1.4.0" />
+    <PackageReference Include="EasyAbp.Abp.Trees.Domain" Version="2.2.2" />
    <PackageReference Include="Volo.Abp.AutoMapper" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.Trees.EntityFrameworkCore" Version="1.4.0" />
+    <PackageReference Include="EasyAbp.Abp.Trees.EntityFrameworkCore" Version="2.2.2" />
    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="$(AbpVersion)" />
    <ProjectReference Include="..\EasyAbp.EShop.Products.Domain\EasyAbp.EShop.Products.Domain.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs
@ -19,13 +19,13 @@ namespace EasyAbp.EShop.Products.ProductCategories
        public virtual async Task<List<ProductCategory>> GetListByCategoryIdAsync(Guid categoryId,
            CancellationToken cancellationToken = default)
        {
-            return await GetQueryable().Where(pc => pc.CategoryId == categoryId).ToListAsync(cancellationToken);
+            return await (await GetQueryableAsync()).Where(pc => pc.CategoryId == categoryId).ToListAsync(cancellationToken);
        }
        public virtual async Task<List<ProductCategory>> GetListByProductIdAsync(Guid productId,
            CancellationToken cancellationToken = default)
        {
-            return await GetQueryable().Where(pc => pc.ProductId == productId).ToListAsync(cancellationToken);
+            return await (await GetQueryableAsync()).Where(pc => pc.ProductId == productId).ToListAsync(cancellationToken);
        }
    }
 }
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs
@ -31,7 +31,7 @@ namespace EasyAbp.EShop.Products.Products
        protected virtual async Task CheckUniqueNameAsync(Product entity, CancellationToken cancellationToken = new CancellationToken())
        {
-            if (await DbSet.AnyAsync(
+            if (await (await GetDbSetAsync()).AnyAsync(
                x => x.StoreId == entity.StoreId && x.UniqueName == entity.UniqueName && x.Id != entity.Id,
                cancellationToken))
            {
@ -39,9 +39,9 @@ namespace EasyAbp.EShop.Products.Products
            }
        }
-        public override IQueryable<Product> WithDetails()
+        public override async Task<IQueryable<Product>> WithDetailsAsync()
        {
-            return base.WithDetails()
+            return (await base.WithDetailsAsync())
                .Include(x => x.ProductAttributes).ThenInclude(x => x.ProductAttributeOptions)
                .Include(x => x.ProductSkus);
        }
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductViewRepository.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductViewRepository.cs
@ -1,5 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Products.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
@ -12,9 +13,9 @@ namespace EasyAbp.EShop.Products.Products
        {
        }
-        public override IQueryable<ProductView> WithDetails()
+        public override async Task<IQueryable<ProductView>> WithDetailsAsync()
        {
-            return base.GetQueryable().IncludeDetails();
+            return (await base.GetQueryableAsync()).IncludeDetails();
        }
        public IQueryable<ProductView> GetQueryable(Guid categoryId)
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj
@ -14,7 +14,7 @@
  <ItemGroup>
    <PackageReference Include="Volo.Abp.AutoMapper" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="$(AbpVersion)" />
-    <PackageReference Include="EasyAbp.Abp.TagHelperPlus" Version="0.6.0" />
+    <PackageReference Include="EasyAbp.Abp.TagHelperPlus" Version="0.6.2" />
  </ItemGroup>
  <ItemGroup>
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/EasyAbp.EShop.Products.Application.Tests.csproj
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/EasyAbp.EShop.Products.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Products.Application\EasyAbp.EShop.Products.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Products.Domain.Tests\EasyAbp.EShop.Products.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/EasyAbp.EShop.Products.Domain.Tests.csproj
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/EasyAbp.EShop.Products.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.Products.EntityFrameworkCore.Tests\EasyAbp.EShop.Products.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EasyAbp.EShop.Products.EntityFrameworkCore.Tests.csproj
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EasyAbp.EShop.Products.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.MongoDB.Tests/EasyAbp.EShop.Products.MongoDB.Tests.csproj
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.MongoDB.Tests/EasyAbp.EShop.Products.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Products.MongoDB\EasyAbp.EShop.Products.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Products.TestBase\EasyAbp.EShop.Products.TestBase.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj
@ -8,12 +8,12 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerAppService.cs
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerAppService.cs
@ -72,7 +72,7 @@ namespace EasyAbp.EShop.Stores.StoreOwners
            return result;
        }
-        protected override IQueryable<StoreOwner> CreateFilteredQuery(GetStoreOwnerListDto input)
+        protected override async Task<IQueryable<StoreOwner>> CreateFilteredQueryAsync(GetStoreOwnerListDto input)
        {
            var queryable = Repository.AsQueryable();
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Stores/StoreAppService.cs
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Stores/StoreAppService.cs
@ -29,14 +29,14 @@ namespace EasyAbp.EShop.Stores.Stores
            _repository = repository;
        }
-        protected virtual async Task<IQueryable<Store>> CreateFilteredQueryAsync(GetStoreListInput input)
+        protected override async Task<IQueryable<Store>> CreateFilteredQueryAsync(GetStoreListInput input)
        {
            if (!input.OnlyManageable || await _permissionChecker.IsGrantedAsync(StoresPermissions.Stores.CrossStore))
            {
                return _repository.AsQueryable();
            }
-            return _repository.GetQueryableOnlyOwnStore(CurrentUser.GetId());
+            return await _repository.GetQueryableOnlyOwnStoreAsync(CurrentUser.GetId());
        }
        public override async Task<PagedResultDto<StoreDto>> GetListAsync(GetStoreListInput input)
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Transactions/TransactionAppService.cs
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Transactions/TransactionAppService.cs
@ -1,5 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Stores.Permissions;
 using EasyAbp.EShop.Stores.Transactions.Dtos;
 using Volo.Abp.Application.Dtos;
@ -23,9 +24,9 @@ namespace EasyAbp.EShop.Stores.Transactions
            _repository = repository;
        }
-        protected override IQueryable<Transaction> CreateFilteredQuery(GetTransactionListInput input)
+        protected override async Task<IQueryable<Transaction>> CreateFilteredQueryAsync(GetTransactionListInput input)
        {
-            return base.CreateFilteredQuery(input).Where(x => x.StoreId == input.StoreId);
+            return (await base.CreateFilteredQueryAsync(input)).Where(x => x.StoreId == input.StoreId);
        }
    }
 }
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/IStoreRepository.cs
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/IStoreRepository.cs
@ -10,6 +10,6 @@ namespace EasyAbp.EShop.Stores.Stores
    {
        Task<Store> FindDefaultStoreAsync(CancellationToken cancellationToken = default);
-        IQueryable<Store> GetQueryableOnlyOwnStore(Guid userId);
+        Task<IQueryable<Store>> GetQueryableOnlyOwnStoreAsync(Guid userId);
    }
 }
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerRepository.cs
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerRepository.cs
@ -19,18 +19,18 @@ namespace EasyAbp.EShop.Stores.StoreOwners
        public async Task<List<StoreOwner>> GetListByStoreIdAsync(Guid storeId,
            CancellationToken cancellationToken = default)
        {
-            return await GetQueryable().Where(pc => pc.StoreId == storeId).ToListAsync(cancellationToken);
+            return await (await GetQueryableAsync()).Where(pc => pc.StoreId == storeId).ToListAsync(cancellationToken);
        }
        public async Task<List<StoreOwner>> GetListByOwnerUserIdAsync(Guid ownerUserId,
            CancellationToken cancellationToken = default)
        {
-            return await GetQueryable().Where(pc => pc.OwnerUserId == ownerUserId).ToListAsync(cancellationToken);
+            return await (await GetQueryableAsync()).Where(pc => pc.OwnerUserId == ownerUserId).ToListAsync(cancellationToken);
        }
        public async Task<bool> IsExistAsync(Guid storeId, Guid ownerUserId, CancellationToken cancellationToken = default)
        {
-            var storeOwner = await GetQueryable().FirstOrDefaultAsync(
+            var storeOwner = await (await GetQueryableAsync()).FirstOrDefaultAsync(
                x => x.OwnerUserId == ownerUserId && x.StoreId == storeId,
                cancellationToken: cancellationToken);
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/Stores/StoreRepository.cs
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/Stores/StoreRepository.cs
@ -17,13 +17,13 @@ namespace EasyAbp.EShop.Stores.Stores
        public async Task<Store> FindDefaultStoreAsync(CancellationToken cancellationToken = default)
        {
-            return await WithDetails().FirstOrDefaultAsync(cancellationToken: cancellationToken);
+            return await (await WithDetailsAsync()).FirstOrDefaultAsync(cancellationToken: cancellationToken);
        }
-        public virtual IQueryable<Store> GetQueryableOnlyOwnStore(Guid userId)
+        public virtual async Task<IQueryable<Store>> GetQueryableOnlyOwnStoreAsync(Guid userId)
        {
-            return DbSet.Join(
+            return (await GetDbSetAsync()).Join(
-                DbContext.StoreOwners.Where(storeOwner => storeOwner.OwnerUserId == userId),
+                (await GetDbContextAsync()).StoreOwners.Where(storeOwner => storeOwner.OwnerUserId == userId),
                store => store.Id,
                storeOwner => storeOwner.StoreId,
                (store, storeOwner) => store
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj
@ -12,7 +12,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.TagHelperPlus" Version="0.6.0" />
+    <PackageReference Include="EasyAbp.Abp.TagHelperPlus" Version="0.6.2" />
    <PackageReference Include="Volo.Abp.AutoMapper" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(AbpVersion)" />
--- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Application.Tests/EasyAbp.EShop.Stores.Application.Tests.csproj
+++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Application.Tests/EasyAbp.EShop.Stores.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Stores.Application\EasyAbp.EShop.Stores.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Stores.Domain.Tests\EasyAbp.EShop.Stores.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Domain.Tests/EasyAbp.EShop.Stores.Domain.Tests.csproj
+++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Domain.Tests/EasyAbp.EShop.Stores.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.Stores.EntityFrameworkCore.Tests\EasyAbp.EShop.Stores.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests.csproj
+++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
--- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.MongoDB.Tests/EasyAbp.EShop.Stores.MongoDB.Tests.csproj
+++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.MongoDB.Tests/EasyAbp.EShop.Stores.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Stores.MongoDB\EasyAbp.EShop.Stores.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Stores.TestBase\EasyAbp.EShop.Stores.TestBase.csproj" />
  </ItemGroup>
--- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj
+++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj
@ -8,12 +8,12 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
--- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs
+++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs
@ -83,7 +83,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems
                await AuthorizationService.CheckAsync(BasketsPermissions.BasketItem.Manage);
            }
-            var query = CreateFilteredQuery(input);
+            var query = await CreateFilteredQueryAsync(input);
            var totalCount = await AsyncExecuter.CountAsync(query);
@ -170,7 +170,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems
            }
        }
-        protected override IQueryable<BasketItem> CreateFilteredQuery(GetBasketItemListDto input)
+        protected override async Task<IQueryable<BasketItem>> CreateFilteredQueryAsync(GetBasketItemListDto input)
        {
            var userId = input.UserId ?? CurrentUser.GetId();
--- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/ProductUpdates/ProductUpdateRepository.cs
+++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/ProductUpdates/ProductUpdateRepository.cs
@ -18,7 +18,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.ProductUpdates
        public async Task<List<ProductUpdate>> GetListByProductSkuIdsAsync(IEnumerable<Guid> productSkuIds, CancellationToken cancellationToken = default)
        {
-            return await GetQueryable().Where(x => productSkuIds.Contains(x.ProductSkuId))
+            return await (await GetQueryableAsync()).Where(x => productSkuIds.Contains(x.ProductSkuId))
                .ToListAsync(cancellationToken: cancellationToken);
        }
    }
--- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj
+++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.Baskets.Application\EasyAbp.EShop.Plugins.Baskets.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Baskets.Domain.Tests\EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj
+++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj
+++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Baskets.TestBase\EasyAbp.EShop.Plugins.Baskets.TestBase.csproj" />
--- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj
+++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.Baskets.MongoDB\EasyAbp.EShop.Plugins.Baskets.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Baskets.TestBase\EasyAbp.EShop.Plugins.Baskets.TestBase.csproj" />
  </ItemGroup>
--- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj
+++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj
@ -8,9 +8,9 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
--- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateAppService.cs
+++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateAppService.cs
@ -28,9 +28,9 @@ namespace EasyAbp.EShop.Plugins.Coupons.CouponTemplates
            _repository = repository;
        }
-        protected override IQueryable<CouponTemplate> CreateFilteredQuery(PagedAndSortedResultRequestDto input)
+        protected override async Task<IQueryable<CouponTemplate>> CreateFilteredQueryAsync(PagedAndSortedResultRequestDto input)
        {
-            return _repository.WithDetails();
+            return (await _repository.WithDetailsAsync());
        }
        public override async Task<CouponTemplateDto> CreateAsync(CreateUpdateCouponTemplateDto input)
--- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponAppService.cs
+++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponAppService.cs
@ -35,7 +35,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons
            _repository = repository;
        }
-        protected override IQueryable<Coupon> CreateFilteredQuery(GetCouponListInput input)
+        protected override async Task<IQueryable<Coupon>> CreateFilteredQueryAsync(GetCouponListInput input)
        {
            return (input.AvailableOnly ? _repository.GetAvailableCouponQueryable(Clock) : _repository.AsQueryable())
                .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
--- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateRepository.cs
+++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateRepository.cs
@ -1,5 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
@ -13,9 +14,9 @@ namespace EasyAbp.EShop.Plugins.Coupons.CouponTemplates
        {
        }
-        public override IQueryable<CouponTemplate> WithDetails()
+        public override async Task<IQueryable<CouponTemplate>> WithDetailsAsync()
        {
-            return base.WithDetails().Include(x => x.Scopes);
+            return (await base.WithDetailsAsync()).Include(x => x.Scopes);
        }
    }
 }
--- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponRepository.cs
+++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponRepository.cs
@ -36,7 +36,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons
            var clock = ServiceProvider.GetRequiredService<IClock>();
            var notExpiredCouponQuantity =
-                await DbSet.CountAsync(x => x.UserId == entity.UserId && x.ExpirationTime > clock.Now,
+                await (await GetDbSetAsync()).CountAsync(x => x.UserId == entity.UserId && x.ExpirationTime > clock.Now,
                    cancellationToken);
            if (notExpiredCouponQuantity >= CouponsConsts.MaxNotExpiredCouponQuantityPerUser)
--- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Application.Tests/EasyAbp.EShop.Plugins.Coupons.Application.Tests.csproj
+++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Application.Tests/EasyAbp.EShop.Plugins.Coupons.Application.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.Coupons.Application\EasyAbp.EShop.Plugins.Coupons.Application.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Coupons.Domain.Tests\EasyAbp.EShop.Plugins.Coupons.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Domain.Tests/EasyAbp.EShop.Plugins.Coupons.Domain.Tests.csproj
+++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Domain.Tests/EasyAbp.EShop.Plugins.Coupons.Domain.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests.csproj" />
  </ItemGroup>
--- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests.csproj
+++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Coupons.TestBase\EasyAbp.EShop.Plugins.Coupons.TestBase.csproj" />
--- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests.csproj
+++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Mongo2Go" Version="2.2.12" />
+    <PackageReference Include="Mongo2Go" Version="2.2.14" />
    <ProjectReference Include="..\..\src\EasyAbp.EShop.Plugins.Coupons.MongoDB\EasyAbp.EShop.Plugins.Coupons.MongoDB.csproj" />
    <ProjectReference Include="..\EasyAbp.EShop.Plugins.Coupons.TestBase\EasyAbp.EShop.Plugins.Coupons.TestBase.csproj" />
  </ItemGroup>
--- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.TestBase/EasyAbp.EShop.Plugins.Coupons.TestBase.csproj
+++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.TestBase/EasyAbp.EShop.Plugins.Coupons.TestBase.csproj
@ -8,9 +8,9 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
@ -15,9 +15,9 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application.Contracts" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application.Contracts" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.ObjectExtending" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
@ -17,9 +17,9 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Application" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Application" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Identity.Application" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
@ -9,9 +9,9 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain.Shared" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain.Shared" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
@ -15,9 +15,9 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain" Version="1.10.1" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
    <PackageReference Include="Volo.Abp.Identity.Domain" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
@ -12,9 +12,9 @@
    <ProjectReference Include="..\..\..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\..\..\..\..\plugins\Coupons\src\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
-    <PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.EntityFrameworkCore" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.EntityFrameworkCore" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
@ -15,9 +15,9 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi.Client" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi.Client" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
@ -15,9 +15,9 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
@ -50,9 +50,9 @@
    <ProjectReference Include="..\EShopSample.Application\EShopSample.Application.csproj" />
    <ProjectReference Include="..\EShopSample.HttpApi\EShopSample.HttpApi.csproj" />
    <ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
-    <PackageReference Include="EasyAbp.PaymentService.Web" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Web" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="1.10.1" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Web" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Web" Version="1.10.1" />
    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json
@ -3,6 +3,6 @@
  "name": "my-app",
  "private": true,
  "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~4.0.2"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~4.2.2"
  }
 }
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/yarn.lock
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/yarn.lock
@ -2,37 +2,37 @@
 # yarn lockfile v1
-"@abp/aspnetcore.mvc.ui.theme.basic@~4.0.2":
+"@abp/aspnetcore.mvc.ui.theme.basic@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.basic/download/@abp/aspnetcore.mvc.ui.theme.basic-4.0.2.tgz#ca6cf7407cf4137e83436d33187c8550995adb94"
+  resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.basic/download/@abp/aspnetcore.mvc.ui.theme.basic-4.2.2.tgz#7de6a36c8e6d0a60b8dbd13d1fd15e31b4ea91c3"
-  integrity sha1-ymz3QHz0E36DQ20zGHyFUJla25Q=
+  integrity sha1-feajbI5tCmC429E9H9FeMbTqkcM=
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.2"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.2"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.2":
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.shared/download/@abp/aspnetcore.mvc.ui.theme.shared-4.0.2.tgz#5b4d9ed4e3212bf5ed7671c59811c15def47be86"
+  resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.shared/download/@abp/aspnetcore.mvc.ui.theme.shared-4.2.2.tgz#3902475befccfb27b35c37a3372c4c56a7f09588"
-  integrity sha1-W02e1OMhK/XtdnHFmBHBXe9HvoY=
+  integrity sha1-OQJHW+/M+yezXDejNyxMVqfwlYg=
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.0.2"
+    "@abp/aspnetcore.mvc.ui" "~4.2.2"
-    "@abp/bootstrap" "~4.0.2"
+    "@abp/bootstrap" "~4.2.2"
-    "@abp/bootstrap-datepicker" "~4.0.2"
+    "@abp/bootstrap-datepicker" "~4.2.2"
-    "@abp/datatables.net-bs4" "~4.0.2"
+    "@abp/datatables.net-bs4" "~4.2.2"
-    "@abp/font-awesome" "~4.0.2"
+    "@abp/font-awesome" "~4.2.2"
-    "@abp/jquery-form" "~4.0.2"
+    "@abp/jquery-form" "~4.2.2"
-    "@abp/jquery-validation-unobtrusive" "~4.0.2"
+    "@abp/jquery-validation-unobtrusive" "~4.2.2"
-    "@abp/lodash" "~4.0.2"
+    "@abp/lodash" "~4.2.2"
-    "@abp/luxon" "~4.0.2"
+    "@abp/luxon" "~4.2.2"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.0.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.2.2"
-    "@abp/select2" "~4.0.2"
+    "@abp/select2" "~4.2.2"
-    "@abp/sweetalert" "~4.0.2"
+    "@abp/sweetalert" "~4.2.2"
-    "@abp/timeago" "~4.0.2"
+    "@abp/timeago" "~4.2.2"
-    "@abp/toastr" "~4.0.2"
+    "@abp/toastr" "~4.2.2"
-
+
-"@abp/aspnetcore.mvc.ui@~4.0.2":
+"@abp/aspnetcore.mvc.ui@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui/download/@abp/aspnetcore.mvc.ui-4.0.2.tgz#6e3554cafca18e5794867cb77686e8b67084859d"
+  resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui/download/@abp/aspnetcore.mvc.ui-4.2.2.tgz#df4640836f460c590574c61607f5a023f2e3f510"
-  integrity sha1-bjVUyvyhjleUhny3dobotnCEhZ0=
+  integrity sha1-30ZAg29GDFkFdMYWB/WgI/Lj9RA=
  dependencies:
    ansi-colors "^4.1.1"
    extend-object "^1.0.0"
@ -43,145 +43,145 @@
    micromatch "^4.0.2"
    path "^0.12.7"
-"@abp/bootstrap-datepicker@~4.0.2":
+"@abp/bootstrap-datepicker@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/bootstrap-datepicker/download/@abp/bootstrap-datepicker-4.0.2.tgz#e7865846791765da4aa4c7afa609fc401d370fd3"
+  resolved "https://registry.npm.taobao.org/@abp/bootstrap-datepicker/download/@abp/bootstrap-datepicker-4.2.2.tgz#1a553fb6824f2e795aecb0e803b8f5984a6f5ac6"
-  integrity sha1-54ZYRnkXZdpKpMevpgn8QB03D9M=
+  integrity sha1-GlU/toJPLnla7LDoA7j1mEpvWsY=
  dependencies:
    bootstrap-datepicker "^1.9.0"
-"@abp/bootstrap@~4.0.2":
+"@abp/bootstrap@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/bootstrap/download/@abp/bootstrap-4.0.2.tgz#eba957e39be0df0737e117e09b7e2cdfba395618"
+  resolved "https://registry.npm.taobao.org/@abp/bootstrap/download/@abp/bootstrap-4.2.2.tgz#3ae98e695edc32b2acb106bffc612c02627021b3"
-  integrity sha1-66lX45vg3wc34Rfgm34s37o5Vhg=
+  integrity sha1-OumOaV7cMrKssQa//GEsAmJwIbM=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    bootstrap "^4.5.0"
    bootstrap-v4-rtl "4.4.1-2"
-"@abp/core@~4.0.2":
+"@abp/core@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/core/download/@abp/core-4.0.2.tgz#cc4ad9459b2b3431bd576e8978a3fc8bf7e8df91"
+  resolved "https://registry.npm.taobao.org/@abp/core/download/@abp/core-4.2.2.tgz#a375404dec4f5b1e3f7496c2d5c92b18ab561fb6"
-  integrity sha1-zErZRZsrNDG9V26JeKP8i/fo35E=
+  integrity sha1-o3VATexPWx4/dJbC1ckrGKtWH7Y=
  dependencies:
-    "@abp/utils" "^4.0.2"
+    "@abp/utils" "^4.2.2"
-"@abp/datatables.net-bs4@~4.0.2":
+"@abp/datatables.net-bs4@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/datatables.net-bs4/download/@abp/datatables.net-bs4-4.0.2.tgz#afbdda7c776d0e21ab3fe8b6b6e3eced503a0d78"
+  resolved "https://registry.npm.taobao.org/@abp/datatables.net-bs4/download/@abp/datatables.net-bs4-4.2.2.tgz#d74f738b79e87f7b8b9f8c5d8d4b84c7a56d6ac4"
-  integrity sha1-r73afHdtDiGrP+i2tuPs7VA6DXg=
+  integrity sha1-109zi3nof3uLn4xdjUuEx6VtasQ=
  dependencies:
-    "@abp/datatables.net" "~4.0.2"
+    "@abp/datatables.net" "~4.2.2"
    datatables.net-bs4 "^1.10.21"
-"@abp/datatables.net@~4.0.2":
+"@abp/datatables.net@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/datatables.net/download/@abp/datatables.net-4.0.2.tgz#0822d438f4681e82633d3da8bac76ce721647441"
+  resolved "https://registry.npm.taobao.org/@abp/datatables.net/download/@abp/datatables.net-4.2.2.tgz#5e3ac4f9b40b35696e065ef8ba206ce0aa25973a"
-  integrity sha1-CCLUOPRoHoJjPT2ousds5yFkdEE=
+  integrity sha1-XjrE+bQLNWluBl74uiBs4Kollzo=
  dependencies:
-    "@abp/jquery" "~4.0.2"
+    "@abp/jquery" "~4.2.2"
    datatables.net "^1.10.21"
-"@abp/font-awesome@~4.0.2":
+"@abp/font-awesome@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/font-awesome/download/@abp/font-awesome-4.0.2.tgz#4971dfff0e9d010a256ec72dd8a226fc5de4cfd3"
+  resolved "https://registry.npm.taobao.org/@abp/font-awesome/download/@abp/font-awesome-4.2.2.tgz#d6babe704b44bf3902d896a1342569069d6c07e0"
-  integrity sha1-SXHf/w6dAQolbsct2KIm/F3kz9M=
+  integrity sha1-1rq+cEtEvzkC2JahNCVpBp1sB+A=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    "@fortawesome/fontawesome-free" "^5.13.0"
-"@abp/jquery-form@~4.0.2":
+"@abp/jquery-form@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/jquery-form/download/@abp/jquery-form-4.0.2.tgz#0996f8b2081c44c0c56594e861516bfff2c8ee6b"
+  resolved "https://registry.npm.taobao.org/@abp/jquery-form/download/@abp/jquery-form-4.2.2.tgz#a35c3eb8c2f4f0fa535fd020469273ce301c4941"
-  integrity sha1-CZb4sggcRMDFZZToYVFr//LI7ms=
+  integrity sha1-o1w+uML08PpTX9AgRpJzzjAcSUE=
  dependencies:
-    "@abp/jquery" "~4.0.2"
+    "@abp/jquery" "~4.2.2"
    jquery-form "^4.3.0"
-"@abp/jquery-validation-unobtrusive@~4.0.2":
+"@abp/jquery-validation-unobtrusive@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/jquery-validation-unobtrusive/download/@abp/jquery-validation-unobtrusive-4.0.2.tgz#fa34b5e509104d1792e3201c126902a45600764a"
+  resolved "https://registry.npm.taobao.org/@abp/jquery-validation-unobtrusive/download/@abp/jquery-validation-unobtrusive-4.2.2.tgz#f05298475d263b0f82c59bce23a8a9470782f718"
-  integrity sha1-+jS15QkQTReS4yAcEmkCpFYAdko=
+  integrity sha1-8FKYR10mOw+CxZvOI6ipRweC9xg=
  dependencies:
-    "@abp/jquery-validation" "~4.0.2"
+    "@abp/jquery-validation" "~4.2.2"
    jquery-validation-unobtrusive "^3.2.11"
-"@abp/jquery-validation@~4.0.2":
+"@abp/jquery-validation@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/jquery-validation/download/@abp/jquery-validation-4.0.2.tgz#feb61513923e6b97c59a840fc6cccfb73294fe02"
+  resolved "https://registry.npm.taobao.org/@abp/jquery-validation/download/@abp/jquery-validation-4.2.2.tgz#fe245a903c06baaae08222164cb1299af0ecf23b"
-  integrity sha1-/rYVE5I+a5fFmoQPxszPtzKU/gI=
+  integrity sha1-/iRakDwGuqrggiIWTLEpmvDs8js=
  dependencies:
-    "@abp/jquery" "~4.0.2"
+    "@abp/jquery" "~4.2.2"
    jquery-validation "^1.19.2"
-"@abp/jquery@~4.0.2":
+"@abp/jquery@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/jquery/download/@abp/jquery-4.0.2.tgz#1b1db4e5de7a7be9f12805dcfda1aa5f1d01cc25"
+  resolved "https://registry.npm.taobao.org/@abp/jquery/download/@abp/jquery-4.2.2.tgz#9caf1692cf7153a6166332b72e8f3108b1990268"
-  integrity sha1-Gx205d56e+nxKAXc/aGqXx0BzCU=
+  integrity sha1-nK8Wks9xU6YWYzK3Lo8xCLGZAmg=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    jquery "~3.5.1"
-"@abp/lodash@~4.0.2":
+"@abp/lodash@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/lodash/download/@abp/lodash-4.0.2.tgz#b35a54a6fe17f3696ba087ca77f99620567c765e"
+  resolved "https://registry.npm.taobao.org/@abp/lodash/download/@abp/lodash-4.2.2.tgz#537808a7c062eed62a2f057bd68c80721398e490"
-  integrity sha1-s1pUpv4X82lroIfKd/mWIFZ8dl4=
+  integrity sha1-U3gIp8Bi7tYqLwV71oyAchOY5JA=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    lodash "^4.17.15"
-"@abp/luxon@~4.0.2":
+"@abp/luxon@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/luxon/download/@abp/luxon-4.0.2.tgz#a0156f03f496b37e2db08f8416df974fa7093300"
+  resolved "https://registry.npm.taobao.org/@abp/luxon/download/@abp/luxon-4.2.2.tgz#29d79ee76e97c148d5d015d7c05cd2eb6f03cde6"
-  integrity sha1-oBVvA/SWs34tsI+EFt+XT6cJMwA=
+  integrity sha1-Kdee526XwUjV0BXXwFzS628DzeY=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    luxon "^1.24.1"
-"@abp/malihu-custom-scrollbar-plugin@~4.0.2":
+"@abp/malihu-custom-scrollbar-plugin@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/malihu-custom-scrollbar-plugin/download/@abp/malihu-custom-scrollbar-plugin-4.0.2.tgz#9813192b921219617b1ecef1d1b16c8c080534ec"
+  resolved "https://registry.npm.taobao.org/@abp/malihu-custom-scrollbar-plugin/download/@abp/malihu-custom-scrollbar-plugin-4.2.2.tgz#41a50143d576b6a6d90cdf555f37071b80198e0c"
-  integrity sha1-mBMZK5ISGWF7Hs7x0bFsjAgFNOw=
+  integrity sha1-QaUBQ9V2tqbZDN9VXzcHG4AZjgw=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    malihu-custom-scrollbar-plugin "^3.1.5"
-"@abp/select2@~4.0.2":
+"@abp/select2@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/select2/download/@abp/select2-4.0.2.tgz#700234b74401e29156470a798bcfd02b64e6b450"
+  resolved "https://registry.npm.taobao.org/@abp/select2/download/@abp/select2-4.2.2.tgz#cff05d9d8078de237a6ce83642583a9fd1418b7c"
-  integrity sha1-cAI0t0QB4pFWRwp5i8/QK2TmtFA=
+  integrity sha1-z/BdnYB43iN6bOg2Qlg6n9FBi3w=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    select2 "^4.0.13"
-"@abp/sweetalert@~4.0.2":
+"@abp/sweetalert@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/sweetalert/download/@abp/sweetalert-4.0.2.tgz#54eba2d029d75ab1ae0b688fca4ccde309bc2a26"
+  resolved "https://registry.npm.taobao.org/@abp/sweetalert/download/@abp/sweetalert-4.2.2.tgz#227459cfdac1ef4095c71d08bc2cd52dd49a5390"
-  integrity sha1-VOui0CnXWrGuC2iPykzN4wm8KiY=
+  integrity sha1-InRZz9rB70CVxx0IvCzVLdSaU5A=
  dependencies:
-    "@abp/core" "~4.0.2"
+    "@abp/core" "~4.2.2"
    sweetalert "^2.1.2"
-"@abp/timeago@~4.0.2":
+"@abp/timeago@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/timeago/download/@abp/timeago-4.0.2.tgz#64f4a40f6acb50b4a202280dc00498f7370a7146"
+  resolved "https://registry.npm.taobao.org/@abp/timeago/download/@abp/timeago-4.2.2.tgz#8b9731fb070f71a7e0a833c771cc527bcbfb937d"
-  integrity sha1-ZPSkD2rLULSiAigNwASY9zcKcUY=
+  integrity sha1-i5cx+wcPcafgqDPHccxSe8v7k30=
  dependencies:
-    "@abp/jquery" "~4.0.2"
+    "@abp/jquery" "~4.2.2"
    timeago "^1.6.7"
-"@abp/toastr@~4.0.2":
+"@abp/toastr@~4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/toastr/download/@abp/toastr-4.0.2.tgz#039adfada21f6ed83bce8a1a9e6ada8decb4d808"
+  resolved "https://registry.npm.taobao.org/@abp/toastr/download/@abp/toastr-4.2.2.tgz#9d9fc8cc131e49cf2ed1cdfeead2a6fc30d16deb"
-  integrity sha1-A5rfraIfbtg7zooanmrajey02Ag=
+  integrity sha1-nZ/IzBMeSc8u0c3+6tKm/DDRbes=
  dependencies:
-    "@abp/jquery" "~4.0.2"
+    "@abp/jquery" "~4.2.2"
    toastr "^2.1.4"
-"@abp/utils@^4.0.2":
+"@abp/utils@^4.2.2":
-  version "4.0.2"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/@abp/utils/download/@abp/utils-4.0.2.tgz#ebdbb25ee680d4874d049d4190446e64a75b512d"
+  resolved "https://registry.npm.taobao.org/@abp/utils/download/@abp/utils-4.2.2.tgz#7afdbbd14246ce06c074109c51d01588596805a9"
-  integrity sha1-69uyXuaA1IdNBJ1BkERuZKdbUS0=
+  integrity sha1-ev270UJGzgbAdBCcUdAViFloBak=
  dependencies:
    just-compare "^1.3.0"
--- a/samples/EShopSample/aspnet-core/test/EShopSample.Application.Tests/EShopSample.Application.Tests.csproj
+++ b/samples/EShopSample/aspnet-core/test/EShopSample.Application.Tests/EShopSample.Application.Tests.csproj
@ -13,7 +13,7 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/samples/EShopSample/aspnet-core/test/EShopSample.Domain.Tests/EShopSample.Domain.Tests.csproj
+++ b/samples/EShopSample/aspnet-core/test/EShopSample.Domain.Tests/EShopSample.Domain.Tests.csproj
@ -12,7 +12,7 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
  </ItemGroup>
 </Project>
--- a/samples/EShopSample/aspnet-core/test/EShopSample.EntityFrameworkCore.Tests/EShopSample.EntityFrameworkCore.Tests.csproj
+++ b/samples/EShopSample/aspnet-core/test/EShopSample.EntityFrameworkCore.Tests/EShopSample.EntityFrameworkCore.Tests.csproj
@ -13,7 +13,7 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.*" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.*" />
  </ItemGroup>
--- a/samples/EShopSample/aspnet-core/test/EShopSample.TestBase/EShopSample.TestBase.csproj
+++ b/samples/EShopSample/aspnet-core/test/EShopSample.TestBase/EShopSample.TestBase.csproj
@ -15,12 +15,12 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
  </ItemGroup>
 </Project>
--- a/samples/EShopSample/aspnet-core/test/EShopSample.Web.Tests/EShopSample.Web.Tests.csproj
+++ b/samples/EShopSample/aspnet-core/test/EShopSample.Web.Tests/EShopSample.Web.Tests.csproj
@ -14,7 +14,7 @@
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
    <ProjectReference Include="..\EShopSample.Application.Tests\EShopSample.Application.Tests.csproj" />
    <ProjectReference Include="..\..\src\EShopSample.Web\EShopSample.Web.csproj" />
    <PackageReference Include="Volo.Abp.AspNetCore.TestBase" Version="$(AbpVersion)" />