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 b21bec1 commit 65aa4f6
Show file tree
Hide file tree
Showing 20 changed files with 40 additions and 40 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>0.10.0</Version>
<Version>0.11.0</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>
Expand Down
8 changes: 4 additions & 4 deletions host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj
View file
Expand Up @@ -10,12 +10,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
Expand Down
6 changes: 3 additions & 3 deletions host/EasyAbp.UniappManagement.IdentityServer/EasyAbp.UniappManagement.IdentityServer.csproj
View file
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion host/EasyAbp.UniappManagement.IdentityServer/package.json
View file
Expand Up @@ -3,6 +3,6 @@
"name": "my-app-identityserver",
"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 host/EasyAbp.UniappManagement.IdentityServer/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
8 changes: 4 additions & 4 deletions host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj
View file
Expand Up @@ -10,18 +10,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OAuth" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Http.Client.Web" Version="$(AbpVersion)" />
<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.Identity.Web" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="$(AbpVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion host/EasyAbp.UniappManagement.Web.Host/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 host/EasyAbp.UniappManagement.Web.Host/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
6 changes: 3 additions & 3 deletions host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj
View file
Expand Up @@ -13,11 +13,11 @@

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<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.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(AbpVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion host/EasyAbp.UniappManagement.Web.Unified/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 host/EasyAbp.UniappManagement.Web.Unified/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 ...appManagement.Application.Contracts/EasyAbp.UniappManagement.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 />
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.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 />
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand All @@ -19,7 +19,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.UniappManagement.Domain/EasyAbp.UniappManagement.Domain.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 />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EasyAbp.UniappManagement.HttpApi.Client/EasyAbp.UniappManagement.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 />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EasyAbp.UniappManagement.MongoDB/EasyAbp.UniappManagement.MongoDB.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 />
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EasyAbp.UniappManagement.Web/EasyAbp.UniappManagement.Web.csproj
View file
Expand Up @@ -21,7 +21,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 ...ement.EntityFrameworkCore.Tests/EasyAbp.UniappManagement.EntityFrameworkCore.Tests.csproj
View file
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
<ProjectReference Include="..\..\src\EasyAbp.UniappManagement.EntityFrameworkCore\EasyAbp.UniappManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EasyAbp.UniappManagement.TestBase\EasyAbp.UniappManagement.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(AbpVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion test/EasyAbp.UniappManagement.TestBase/EasyAbp.UniappManagement.TestBase.csproj
View file
Expand Up @@ -8,7 +8,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

0 comments on commit 65aa4f6

Please sign in to comment.