Skip to content

Commit 9181f33

Browse files
gmf520gmf520
committed
chore: 去除.net6 7，添加.net10
1 parent f10d7ca commit 9181f33

32 files changed

Lines changed: 116 additions & 123 deletions

File tree

‎build/version.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionMain>9.0</VersionMain>
3+
<VersionMain>10.0</VersionMain>
44
<VersionPrefix>0</VersionPrefix>
55
<VersionSuffix>-preview.</VersionSuffix>
6-
<VersionSuffixVersion>907</VersionSuffixVersion>
6+
<VersionSuffixVersion>117</VersionSuffixVersion>
77
<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
88
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
99
<!--<Version>$(VersionMain).$(VersionPrefix)</Version>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

‎samples/web/Liuliu.Demo.Core/Liuliu.Demo.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="../../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
88
<RootNamespace>Liuliu.Demo</RootNamespace>
99
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1010
</PropertyGroup>

‎samples/web/Liuliu.Demo.EntityConfiguration/Liuliu.Demo.EntityConfiguration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="../../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
88
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
99
</PropertyGroup>
1010

‎src/OSharp.AspNetCore/OSharp.AspNetCore.csproj‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
88
<PackageId>OSharp.AspNetCore</PackageId>
99
<Summary>OSharp AspNetCore组件</Summary>
1010
<Description>OSharp AspNetCore组件，提供AspNetCore的服务端功能的封装</Description>
@@ -15,16 +15,6 @@
1515
<ItemGroup>
1616
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1717
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
19-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.*" />
20-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.*" />
21-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.*" />
22-
</ItemGroup>
23-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
24-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.*" />
25-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.*" />
26-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.*" />
27-
</ItemGroup>
2818
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
2919
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.*" />
3020
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.*" />
@@ -35,6 +25,11 @@
3525
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.*" />
3626
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.*" />
3727
</ItemGroup>
28+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
29+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="10.*" />
30+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.*" />
31+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.*" />
32+
</ItemGroup>
3833
<ItemGroup>
3934
<ProjectReference Include="..\OSharp\OSharp.csproj" />
4035
</ItemGroup>

‎src/OSharp.Authorization.Datas/OSharp.Authorization.Datas.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
88
<PackageId>OSharp.Authorization.Datas</PackageId>
99
<Summary>OSharp 数据权限组件</Summary>
1010
<Description>OSharp 数据权限组件，对应用中数据权限进行授权的设计实现</Description>

‎src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
88
<PackageId>OSharp.Authorization.Functions</PackageId>
99
<Summary>OSharp 功能权限组件</Summary>
1010
<Description>OSharp 功能权限组件，API功能权限授权的设计实现</Description>

‎src/OSharp.AutoMapper/OSharp.AutoMapper.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
88
<PackageId>OSharp.AutoMapper</PackageId>
99
<Summary>OSharp AutoMapper 对象映射组件</Summary>
1010
<Description>OSharp AutoMapper 对象映射组件，封装基于AutoMapper的对象映射实现</Description>

‎src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,21 @@
44
<Import Project="../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
88
<PackageId>OSharp.EntityFrameworkCore.MySql</PackageId>
99
<Description>OSharp 数据访问组件，封装EntityFrameworkCore的MySql数据访问功能的实现</Description>
1010
<Summary>OSharp 数据访问组件MySql</Summary>
1111
<RootNamespace>OSharp.Entity.MySql</RootNamespace>
1212
</PropertyGroup>
1313

14-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
15-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.*" />
16-
</ItemGroup>
17-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
18-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.*" />
19-
</ItemGroup>
2014
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
2115
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.*" />
2216
</ItemGroup>
2317
<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
24-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
18+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.*" />
2519
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.*" />
2620
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.*" />
2721
</ItemGroup>
28-
2922
<ItemGroup>
3023
<ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
3124
</ItemGroup>

‎src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@
44
<Import Project="../../build/version.props" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
88
<PackageId>OSharp.EntityFrameworkCore.Oracle</PackageId>
99
<Description>OSharp 数据访问组件，封装EntityFrameworkCore的Oracle数据访问功能的实现</Description>
1010
<Summary>OSharp 数据访问组件Oracle</Summary>
1111
<RootNamespace>OSharp.Entity.Oracle</RootNamespace>
1212
</PropertyGroup>
1313

14-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
15-
<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.*" />
16-
</ItemGroup>
17-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
18-
<PackageReference Include="Oracle.EntityFrameworkCore" Version="7.*" />
19-
</ItemGroup>
2014
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
2115
<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.*" />
2216
</ItemGroup>
@@ -25,6 +19,11 @@
2519
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.*" />
2620
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.*" />
2721
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
23+
<PackageReference Include="Oracle.EntityFrameworkCore" Version="10.*" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.*" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.*" />
26+
</ItemGroup>
2827
<ItemGroup>
2928
<ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
3029
</ItemGroup>

0 commit comments

Comments
 (0)