Browse Source
Merge pull request #23957 from abpframework/auto-merge/rel-10-0/4041
Merge branch dev with rel-10.0
pull/23995/head
Ma Liming
4 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
4 additions and
2 deletions
-
framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
-
global.json
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks> |
|
|
|
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks> |
|
|
|
<Nullable>enable</Nullable> |
|
|
|
<WarningsAsErrors>Nullable</WarningsAsErrors> |
|
|
|
<AssemblyName>Volo.Abp.Core</AssemblyName> |
|
|
|
|
|
|
|
@ -22,6 +22,8 @@ |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" /> |
|
|
|
<PackageReference Include=" Microsoft.EntityFrameworkCore" VersionOverride="10.0.0-rc.1.25451.107" /> |
|
|
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="10.0.0-rc.1.25451.107" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
{ |
|
|
|
"sdk": { |
|
|
|
"version": "10.0.100-rc.1.25451.107", |
|
|
|
"version": "10.0.100-rc.2.25502.107", |
|
|
|
"rollForward": "latestFeature" |
|
|
|
} |
|
|
|
} |
|
|
|
|
