Skip to content

Commit

Permalink
Upgrade to ABP 7.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@gdlcf88
gdlcf88 committed Oct 19, 2023
1 parent e8ed67c commit e9f5921
Show file tree
Hide file tree
Showing 19 changed files with 34 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>

<AbpVersion>7.3.0</AbpVersion>
<AbpVersion>7.4.0</AbpVersion>

</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion common.props
View file
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>1.11.0</Version>
<Version>1.12.0</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>
Expand Down
2 changes: 1 addition & 1 deletion sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj
View file
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj
View file
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj
View file
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
View file
Expand Up @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
</ItemGroup>

Expand All @@ -42,7 +42,7 @@
<ProjectReference Include="..\MyAbpApp.Application\MyAbpApp.Application.csproj" />
<ProjectReference Include="..\MyAbpApp.HttpApi\MyAbpApp.HttpApi.csproj" />
<ProjectReference Include="..\MyAbpApp.EntityFrameworkCore\MyAbpApp.EntityFrameworkCore.csproj" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.3.*-*" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.4.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion sample/MyAbpApp/src/MyAbpApp.Web/package.json
View file
Expand Up @@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1"
}
}
8 changes: 4 additions & 4 deletions sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock
View file
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0":
version "2.3.0"
resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be"
integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww==
"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1":
version "2.4.1"
resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c"
integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1"

Expand Down
2 changes: 1 addition & 1 deletion sample/MyAbpApp/test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj
View file
Expand Up @@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="Shouldly" Version="4.0.1" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
Expand Down
2 changes: 1 addition & 1 deletion ...bp.Abp.SettingUi.Application.Contracts/EasyAbp.Abp.SettingUi.Application.Contracts.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<RootNamespace>EasyAbp.Abp.SettingUi</RootNamespace>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs
View file
Expand Up @@ -124,7 +124,7 @@ public virtual async Task SetSettingValuesAsync(Dictionary<string, string> setti
}

string name = pascalCaseName.RemovePreFix(SettingUiConst.FormNamePrefix).UnderscoreToDot();
var setting = _settingDefinitionManager.GetOrNull(name);
var setting = await _settingDefinitionManager.GetOrNullAsync(name);
if (setting == null)
{
continue;
Expand All @@ -138,7 +138,7 @@ public virtual async Task ResetSettingValuesAsync(List<string> settingNames)
{
foreach (var name in settingNames)
{
var setting = _settingDefinitionManager.GetOrNull(name);
var setting = await _settingDefinitionManager.GetOrNullAsync(name);
if (setting == null)
{
continue;
Expand Down Expand Up @@ -177,7 +177,7 @@ protected virtual Task SetSettingAsync(SettingDefinition setting, string value)
protected virtual async Task<List<SettingInfo>> SetSettingDefinitionPropertiesAsync(IDictionary<string, IDictionary<string, string>> settingProperties, IList<PermissionDefinition> permissionDefinitions)
{
var settingInfos = new List<SettingInfo>();
var settingDefinitions = _settingDefinitionManager.GetAll();
var settingDefinitions = await _settingDefinitionManager.GetAllAsync();
foreach (var settingDefinition in settingDefinitions)
{
var si = await CreateSettingInfoAsync(settingDefinition);
Expand Down
4 changes: 2 additions & 2 deletions src/EasyAbp.Abp.SettingUi.Domain.Shared/EasyAbp.Abp.SettingUi.Domain.Shared.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<RootNamespace>EasyAbp.Abp.SettingUi</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand All @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<RootNamespace>EasyAbp.Abp.SettingUi</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EasyAbp.Abp.SettingUi.HttpApi.Client/EasyAbp.Abp.SettingUi.HttpApi.Client.csproj
View file
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<RootNamespace>EasyAbp.Abp.SettingUi</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EasyAbp.Abp.SettingUi.Web/EasyAbp.Abp.SettingUi.Web.csproj
View file
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...syAbp.Abp.SettingUi.Application.Tests/SettingUi/SettingDefinitionGroupAppService_Tests.cs
View file
Expand Up @@ -35,15 +35,15 @@ protected override void AfterAddApplication(IServiceCollection services)
.WithProperty(SettingUiConst.Type, "number");
var setting2 = new SettingDefinition("Test.Setting2", "2");
var setting3 = new SettingDefinition("Test.Setting3", "3");
settingDefinitionManager.GetAll().Returns(new List<SettingDefinition>
settingDefinitionManager.GetAllAsync().Returns(new List<SettingDefinition>
{
setting1,
setting2,
setting3
});
settingDefinitionManager.GetOrNull("Test.Setting1").Returns(setting1);
settingDefinitionManager.GetOrNull("Test.Setting2").Returns(setting2);
settingDefinitionManager.GetOrNull("Test.Setting3").Returns(setting3);
settingDefinitionManager.GetOrNullAsync("Test.Setting1").Returns(setting1);
settingDefinitionManager.GetOrNullAsync("Test.Setting2").Returns(setting2);
settingDefinitionManager.GetOrNullAsync("Test.Setting3").Returns(setting3);
services.AddSingleton(settingDefinitionManager);

// Mock ISettingManager
Expand Down
7 changes: 2 additions & 5 deletions test/EasyAbp.Abp.SettingUi.Domain.Tests/SettingProperties/SettingProperty_Tests.cs
View file
Expand Up @@ -22,10 +22,10 @@ public SettingProperty_Tests(ITestOutputHelper output)
}

[Fact]
public Task BuiltIn_Setting_Properties_Should_Be_Defined()
public async Task BuiltIn_Setting_Properties_Should_Be_Defined()
{
// Arrange
var settingDefinitions = _settingDefinitionManager.GetAll();
var settingDefinitions = await _settingDefinitionManager.GetAllAsync();
var fileInfo = GetRequiredService<IVirtualFileProvider>().GetFileInfo("/SettingProperties/AbpSettingUiSettingProperties.json");
var jsonSerializer = GetRequiredService<IJsonSerializer>();

Expand All @@ -38,9 +38,6 @@ public Task BuiltIn_Setting_Properties_Should_Be_Defined()
_output.WriteLine($"Check property of the setting {settingDefinition.Name}");
propertyDict.ShouldContainKey(settingDefinition.Name, $"Setting property not found, setting name: {settingDefinition.Name}");
}


return Task.CompletedTask;
}
}
}
3 changes: 2 additions & 1 deletion test/EasyAbp.Abp.SettingUi.TestBase/EasyAbp.Abp.SettingUi.TestBase.csproj
View file
Expand Up @@ -8,9 +8,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="Shouldly" Version="4.0.1" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
Expand Down
9 changes: 4 additions & 5 deletions test/EasyAbp.Abp.SettingUi.TestBase/SettingUiTestBaseModule.cs
View file
@@ -1,11 +1,9 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp;
using Volo.Abp;
using Volo.Abp.Authorization;
using Volo.Abp.Autofac;
using Volo.Abp.Data;
using Volo.Abp.Modularity;
using Volo.Abp.SettingManagement;
using Volo.Abp.Threading;
using Volo.Abp.SettingManagement.EntityFrameworkCore;

namespace EasyAbp.Abp.SettingUi
{
Expand All @@ -14,7 +12,8 @@ namespace EasyAbp.Abp.SettingUi
typeof(AbpTestBaseModule),
typeof(AbpAuthorizationModule),
typeof(AbpSettingUiDomainModule),
typeof(AbpSettingManagementDomainModule)
typeof(AbpSettingManagementDomainModule),
typeof(AbpSettingManagementEntityFrameworkCoreModule)
)]
public class SettingUiTestBaseModule : AbpModule
{
Expand Down

0 comments on commit e9f5921

Please sign in to comment.