Merge branch 'master' into develop

# Conflicts: # angular/package.json # common.props # sample/MyAbpApp/src/MyAbpApp.Web/package.json # sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock # test/EasyAbp.Abp.SettingUi.Domain.Tests/EasyAbp.Abp.SettingUi.Domain.Tests.csproj # test/EasyAbp.Abp.SettingUi.TestBase/EasyAbp.Abp.SettingUi.TestBase.csproj
EasyAbp · May 6, 2021 · 0b83925 · 0b83925
2 parents c7f7350 + b832d59
commit 0b83925
Show file tree

Hide file tree

Showing 34 changed files with 60 additions and 57 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,6 +25,9 @@ jobs:
           regex_flags: 'gim'
           search_string: '${{ steps.commonProps.outputs.content }}'
 
+      - name: dotnet restore
+        run: dotnet restore -s "https://api.nuget.org/v3/index.json"
+
       - name: dotnet build
         run: dotnet build -c Release
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>4.1.0</AbpVersion>
+    <AbpVersion>4.2.2</AbpVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,7 +26,7 @@ stages:
     - task: UseDotNet@2
       inputs:
         packageType: 'sdk'
-        version: '3.x'
+        version: '5.x'
 
     - task: DotNetCoreCLI@2
       displayName: 'restore'
@@ -94,7 +94,7 @@ stages:
      - task: UseDotNet@2
        inputs:
         packageType: 'sdk'
-        version: '3.x'
+        version: '5.x'
 
      - task: CmdLine@2
        displayName: 'install dotnet-ef'

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.3.3</Version>
+    <Version>1.4.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/docs/README.md b/docs/README.md
@@ -44,7 +44,7 @@ Run following command in your ABP project root folder:
     * EasyAbp.Abp.SettingUi.HttpApi.Client (Only [Tiered structure](https://docs.abp.io/en/abp/latest/Startup-Templates/Application#tiered-structure) is needed)
     * EasyAbp.Abp.SettingUi.Web
 
-1. Add `DependsOn(typeof(AbpSettingUiXxxModule))` attribute to configure the module dependencies. ([see how](https://github.com/EasyAbp/EasyAbpGuide/blob/master/How-To.md#add-module-dependencies))
+1. Add `DependsOn(typeof(AbpSettingUiXxxModule))` attribute to configure the module dependencies. ([see how](https://github.com/EasyAbp/EasyAbpGuide/blob/master/docs/How-To.md#add-module-dependencies))
 
 ### Configure localization resource
 

diff --git a/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpAppApplicationContractsModule.cs b/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpAppApplicationContractsModule.cs
@@ -17,7 +17,7 @@ namespace MyAbpApp
         typeof(AbpPermissionManagementApplicationContractsModule),
         typeof(AbpTenantManagementApplicationContractsModule),
         typeof(AbpObjectExtendingModule),
-        typeof(SettingUiApplicationContractsModule)
+        typeof(AbpSettingUiApplicationContractsModule)
     )]
     public class MyAbpAppApplicationContractsModule : AbpModule
     {

diff --git a/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpAppApplicationModule.cs b/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpAppApplicationModule.cs
@@ -18,7 +18,7 @@ namespace MyAbpApp
         typeof(AbpPermissionManagementApplicationModule),
         typeof(AbpTenantManagementApplicationModule),
         typeof(AbpFeatureManagementApplicationModule),
-        typeof(SettingUiApplicationModule),
+        typeof(AbpSettingUiApplicationModule),
         typeof(AbpEmailingModule)
         )]
     public class MyAbpAppApplicationModule : AbpModule

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpAppDomainSharedModule.cs b/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpAppDomainSharedModule.cs
@@ -27,7 +27,7 @@ namespace MyAbpApp
         typeof(AbpSettingManagementDomainSharedModule),
         typeof(AbpTenantManagementDomainSharedModule)
         )]
-    [DependsOn(typeof(SettingUiDomainSharedModule))]
+    [DependsOn(typeof(AbpSettingUiDomainSharedModule))]
     public class MyAbpAppDomainSharedModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)

diff --git a/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpAppHttpApiModule.cs b/sample/MyAbpApp/src/MyAbpApp.HttpApi/MyAbpAppHttpApiModule.cs
@@ -19,7 +19,7 @@ namespace MyAbpApp
         typeof(AbpTenantManagementHttpApiModule),
         typeof(AbpFeatureManagementHttpApiModule)
         )]
-    [DependsOn(typeof(SettingUiHttpApiModule))]
+    [DependsOn(typeof(AbpSettingUiHttpApiModule))]
     public class MyAbpAppHttpApiModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)

diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpAppWebModule.cs b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpAppWebModule.cs
@@ -49,7 +49,7 @@ namespace MyAbpApp.Web
         typeof(AbpTenantManagementWebModule),
         typeof(AbpAspNetCoreSerilogModule),
         typeof(AbpSwashbuckleModule),
-        typeof(SettingUiWebModule)
+        typeof(AbpSettingUiWebModule)
     )]
     public class MyAbpAppWebModule : AbpModule
     {
@@ -140,11 +140,11 @@ private void ConfigureVirtualFileSystem(IWebHostEnvironment hostingEnvironment)
                     options.FileSets.ReplaceEmbeddedByPhysical<MyAbpAppWebModule>(hostingEnvironment.ContentRootPath);
 
                     string moduleDir = Path.Combine(hostingEnvironment.ContentRootPath, $"..{sept}..{sept}..{sept}..{sept}src");
-                    options.FileSets.ReplaceEmbeddedByPhysical<SettingUiDomainSharedModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Domain.Shared"));
-                    options.FileSets.ReplaceEmbeddedByPhysical<SettingUiDomainModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Domain"));
-                    options.FileSets.ReplaceEmbeddedByPhysical<SettingUiApplicationContractsModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Application.Contracts"));
-                    options.FileSets.ReplaceEmbeddedByPhysical<SettingUiApplicationModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Application"));
-                    options.FileSets.ReplaceEmbeddedByPhysical<SettingUiWebModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Web"));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpSettingUiDomainSharedModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Domain.Shared"));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpSettingUiDomainModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Domain"));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpSettingUiApplicationContractsModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Application.Contracts"));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpSettingUiApplicationModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Application"));
+                    options.FileSets.ReplaceEmbeddedByPhysical<AbpSettingUiWebModule>(Path.Combine(moduleDir, "EasyAbp.Abp.SettingUi.Web"));
                 });
             }
         }

diff --git a/sample/MyAbpApp/test/MyAbpApp.Application.Tests/MyAbpApp.Application.Tests.csproj b/sample/MyAbpApp/test/MyAbpApp.Application.Tests/MyAbpApp.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>
diff --git a/sample/MyAbpApp/test/MyAbpApp.Domain.Tests/MyAbpApp.Domain.Tests.csproj b/sample/MyAbpApp/test/MyAbpApp.Domain.Tests/MyAbpApp.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>
diff --git a/...yAbpApp/test/MyAbpApp.EntityFrameworkCore.Tests/MyAbpApp.EntityFrameworkCore.Tests.csproj b/...yAbpApp/test/MyAbpApp.EntityFrameworkCore.Tests/MyAbpApp.EntityFrameworkCore.Tests.csproj
@@ -14,7 +14,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>
diff --git a/sample/MyAbpApp/test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj b/sample/MyAbpApp/test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj
@@ -15,9 +15,9 @@
   </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.2" />

diff --git a/sample/MyAbpApp/test/MyAbpApp.Web.Tests/MyAbpApp.Web.Tests.csproj b/sample/MyAbpApp/test/MyAbpApp.Web.Tests/MyAbpApp.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" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.26" />
     <ProjectReference Include="..\MyAbpApp.Application.Tests\MyAbpApp.Application.Tests.csproj" />
     <ProjectReference Include="..\..\src\MyAbpApp.Web\MyAbpApp.Web.csproj" />

diff --git a/...ts/SettingUiApplicationContractsModule.cs → ...AbpSettingUiApplicationContractsModule.cs b/...ts/SettingUiApplicationContractsModule.cs → ...AbpSettingUiApplicationContractsModule.cs
@@ -9,11 +9,11 @@
 namespace EasyAbp.Abp.SettingUi
 {
     [DependsOn(
-        typeof(SettingUiDomainSharedModule),
+        typeof(AbpSettingUiDomainSharedModule),
         typeof(AbpDddApplicationContractsModule),
         typeof(AbpAuthorizationModule)
         )]
-    public class SettingUiApplicationContractsModule : AbpModule
+    public class AbpSettingUiApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

diff --git a/src/EasyAbp.Abp.SettingUi.Application.Contracts/Authorization/SettingUiPermissions.cs b/src/EasyAbp.Abp.SettingUi.Application.Contracts/Authorization/SettingUiPermissions.cs
@@ -4,7 +4,7 @@ namespace EasyAbp.Abp.SettingUi.Authorization
 {
     public class SettingUiPermissions
     {
-        public const string GroupName = "SettingUi";
+        public const string GroupName = "EasyAbp.Abp.SettingUi";
         public const string ShowSettingPage = GroupName + ".ShowSettingPage";
 
         public static string[] GetAll()

diff --git a/...Application/SettingUiApplicationModule.cs → ...lication/AbpSettingUiApplicationModule.cs b/...Application/SettingUiApplicationModule.cs → ...lication/AbpSettingUiApplicationModule.cs
@@ -4,11 +4,11 @@
 namespace EasyAbp.Abp.SettingUi
 {
     [DependsOn(
-        typeof(SettingUiDomainModule),
-        typeof(SettingUiApplicationContractsModule),
+        typeof(AbpSettingUiDomainModule),
+        typeof(AbpSettingUiApplicationContractsModule),
         typeof(AbpDddApplicationModule)
         )]
-    public class SettingUiApplicationModule : AbpModule
+    public class AbpSettingUiApplicationModule : AbpModule
     {
     }
 }
diff --git a/...ain.Shared/SettingUiDomainSharedModule.cs → ....Shared/AbpSettingUiDomainSharedModule.cs b/...ain.Shared/SettingUiDomainSharedModule.cs → ....Shared/AbpSettingUiDomainSharedModule.cs
@@ -14,11 +14,11 @@ namespace EasyAbp.Abp.SettingUi
         typeof(AbpUiModule),
         typeof(AbpSettingManagementDomainSharedModule)
     )]
-    public class SettingUiDomainSharedModule : AbpModule
+    public class AbpSettingUiDomainSharedModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<SettingUiDomainSharedModule>(); });
+            Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<AbpSettingUiDomainSharedModule>(); });
 
             Configure<AbpLocalizationOptions>(options =>
             {

diff --git a/src/EasyAbp.Abp.SettingUi.Domain.Shared/Localization/SettingUiResource.cs b/src/EasyAbp.Abp.SettingUi.Domain.Shared/Localization/SettingUiResource.cs
@@ -2,7 +2,7 @@
 
 namespace EasyAbp.Abp.SettingUi.Localization
 {
-    [LocalizationResourceName("SettingUi")]
+    [LocalizationResourceName("EasyAbpAbpSettingUi")]
     public class SettingUiResource
     {
 

diff --git a/...SettingUi.Domain/SettingUiDomainModule.cs → ...tingUi.Domain/AbpSettingUiDomainModule.cs b/...SettingUi.Domain/SettingUiDomainModule.cs → ...tingUi.Domain/AbpSettingUiDomainModule.cs
@@ -4,10 +4,10 @@
 namespace EasyAbp.Abp.SettingUi
 {
     [DependsOn(
-        typeof(SettingUiDomainSharedModule),
+        typeof(AbpSettingUiDomainSharedModule),
         typeof(AbpSettingManagementDomainModule)
         )]
-    public class SettingUiDomainModule : AbpModule
+    public class AbpSettingUiDomainModule : AbpModule
     {
 
     }

diff --git a/...pi.Client/SettingUiHttpApiClientModule.cs → ...Client/AbpSettingUiHttpApiClientModule.cs b/...pi.Client/SettingUiHttpApiClientModule.cs → ...Client/AbpSettingUiHttpApiClientModule.cs
@@ -5,16 +5,16 @@
 namespace EasyAbp.Abp.SettingUi
 {
     [DependsOn(
-        typeof(SettingUiApplicationContractsModule),
+        typeof(AbpSettingUiApplicationContractsModule),
         typeof(AbpHttpClientModule))]
-    public class SettingUiHttpApiClientModule : AbpModule
+    public class AbpSettingUiHttpApiClientModule : AbpModule
     {
-        public const string RemoteServiceName = "SettingUi";
+        public const string RemoteServiceName = "EasyAbpAbpSettingUi";
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddHttpClientProxies(
-                typeof(SettingUiApplicationContractsModule).Assembly,
+                typeof(AbpSettingUiApplicationContractsModule).Assembly,
                 RemoteServiceName
             );
         }

diff --git a/src/EasyAbp.Abp.SettingUi.HttpApi.Client/FodyWeavers.xml b/src/EasyAbp.Abp.SettingUi.HttpApi.Client/FodyWeavers.xml
@@ -1,3 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait />
+  <ConfigureAwait ContinueOnCapturedContext="false"/>
 </Weavers>
diff --git a/...ttingUi.HttpApi/SettingUiHttpApiModule.cs → ...ngUi.HttpApi/AbpSettingUiHttpApiModule.cs b/...ttingUi.HttpApi/SettingUiHttpApiModule.cs → ...ngUi.HttpApi/AbpSettingUiHttpApiModule.cs
@@ -8,15 +8,15 @@
 namespace EasyAbp.Abp.SettingUi
 {
     [DependsOn(
-        typeof(SettingUiApplicationContractsModule),
+        typeof(AbpSettingUiApplicationContractsModule),
         typeof(AbpAspNetCoreMvcModule))]
-    public class SettingUiHttpApiModule : AbpModule
+    public class AbpSettingUiHttpApiModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             PreConfigure<IMvcBuilder>(mvcBuilder =>
             {
-                mvcBuilder.AddApplicationPartIfNotExists(typeof(SettingUiHttpApiModule).Assembly);
+                mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpSettingUiHttpApiModule).Assembly);
             });
         }
 

diff --git a/src/EasyAbp.Abp.SettingUi.HttpApi/FodyWeavers.xml b/src/EasyAbp.Abp.SettingUi.HttpApi/FodyWeavers.xml
@@ -1,3 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait />
+  <ConfigureAwait ContinueOnCapturedContext="false"/>
 </Weavers>
diff --git a/src/EasyAbp.Abp.SettingUi.HttpApi/SettingUiController.cs b/src/EasyAbp.Abp.SettingUi.HttpApi/SettingUiController.cs
@@ -8,9 +8,9 @@
 
 namespace EasyAbp.Abp.SettingUi
 {
-    [RemoteService(Name = "SettingUi")]
+    [RemoteService(Name = "EasyAbpAbpSettingUi")]
     [Area("settingUi")]
-    [Route("api/settingUi")] 
+    [Route("api/setting-ui")] 
     public class SettingUiController : AbpController, ISettingUiAppService
     {
         private readonly ISettingUiAppService _service;
@@ -28,14 +28,14 @@ public virtual Task<List<SettingGroup>> GroupSettingDefinitions()
         }
 
         [HttpPut]
-        [Route("setSettingValues")]
+        [Route("set-setting-values")]
         public virtual Task SetSettingValues(Dictionary<string, string> settingValues)
         {
             return _service.SetSettingValues(settingValues);
         }
 
         [HttpPut]
-        [Route("resetSettingValues")]
+        [Route("reset-setting-values")]
         public virtual Task ResetSettingValues(List<string> settingNames)
         {
             return _service.ResetSettingValues(settingNames);

diff --git a/...p.Abp.SettingUi.Web/SettingUiWebModule.cs → ...bp.SettingUi.Web/AbpSettingUiWebModule.cs b/...p.Abp.SettingUi.Web/SettingUiWebModule.cs → ...bp.SettingUi.Web/AbpSettingUiWebModule.cs
@@ -13,22 +13,22 @@ namespace EasyAbp.Abp.SettingUi.Web
         typeof(AbpAspNetCoreMvcUiThemeSharedModule),
         typeof(AbpSettingManagementWebModule)
         )]
-    [DependsOn(typeof(SettingUiHttpApiModule))]
-    public class SettingUiWebModule : AbpModule
+    [DependsOn(typeof(AbpSettingUiHttpApiModule))]
+    public class AbpSettingUiWebModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             PreConfigure<IMvcBuilder>(mvcBuilder =>
             {
-                mvcBuilder.AddApplicationPartIfNotExists(typeof(SettingUiWebModule).Assembly);
+                mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpSettingUiWebModule).Assembly);
             });
         }
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<SettingUiWebModule>();
+                options.FileSets.AddEmbedded<AbpSettingUiWebModule>();
             });
 
             Configure<SettingManagementPageOptions>(options =>

diff --git a/src/EasyAbp.Abp.SettingUi.Web/Pages/SettingManagement/Index.js b/src/EasyAbp.Abp.SettingUi.Web/Pages/SettingManagement/Index.js
@@ -1,7 +1,7 @@
 (function ($) {
 
     var service = easyAbp.abp.settingUi.settingUi;
-    var l = abp.localization.getResource("SettingUi");
+    var l = abp.localization.getResource("EasyAbpAbpSettingUi");
 
     $("form").submit(function (e) {
         e.preventDefault();

diff --git a/test/EasyAbp.Abp.SettingUi.Application.Tests/EasyAbp.Abp.SettingUi.Application.Tests.csproj b/test/EasyAbp.Abp.SettingUi.Application.Tests/EasyAbp.Abp.SettingUi.Application.Tests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\EasyAbp.Abp.SettingUi.Application\EasyAbp.Abp.SettingUi.Application.csproj" />
     <ProjectReference Include="..\EasyAbp.Abp.SettingUi.Domain.Tests\EasyAbp.Abp.SettingUi.Domain.Tests.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/EasyAbp.Abp.SettingUi.Application.Tests/SettingUiApplicationTestModule.cs b/test/EasyAbp.Abp.SettingUi.Application.Tests/SettingUiApplicationTestModule.cs
@@ -4,7 +4,7 @@
 namespace EasyAbp.Abp.SettingUi
 {
     [DependsOn(
-        typeof(SettingUiApplicationModule),
+        typeof(AbpSettingUiApplicationModule),
         typeof(SettingUiDomainTestModule)
         )]
     public class SettingUiApplicationTestModule : AbpModule

diff --git a/test/EasyAbp.Abp.SettingUi.Domain.Tests/EasyAbp.Abp.SettingUi.Domain.Tests.csproj b/test/EasyAbp.Abp.SettingUi.Domain.Tests/EasyAbp.Abp.SettingUi.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" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/test/EasyAbp.Abp.SettingUi.Domain.Tests/SettingUiDomainTestModule.cs b/test/EasyAbp.Abp.SettingUi.Domain.Tests/SettingUiDomainTestModule.cs
@@ -9,7 +9,7 @@ namespace EasyAbp.Abp.SettingUi
      */
     [DependsOn(
         typeof(SettingUiTestBaseModule),
-        typeof(SettingUiDomainModule),
+        typeof(AbpSettingUiDomainModule),
         typeof(AbpEntityFrameworkCoreModule)
     )]
     public class SettingUiDomainTestModule : AbpModule