Skip to content

Commit 7e4d81f

Browse files
28810992881099
committed
- 预更新 .net10.0
1 parent cd0e7ee commit 7e4d81f

File tree

12 files changed

+30
-133
lines changed

12 files changed

+30
-133
lines changed

‎Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 扩展包，EFCore ModelBuilder 与 FreeSql 打通实体特性配置（实现室）.</Description>
@@ -27,7 +27,9 @@
2727
<None Include="../../logo.png" Pack="true" PackagePath="\" />
2828
</ItemGroup>
2929

30-
30+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
32+
</ItemGroup>
3133
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
3234
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
3335
</ItemGroup>

‎FreeSql.DbContext/FreeSql.DbContext.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net45;net40</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Clickhouse, DuckDB, TDengine, QuestDB, Odbc, Oledb, 达梦, 人大金仓, 南大通用, 虚谷, 神舟通用, 翰高, And Access</Description>
@@ -35,10 +35,13 @@
3535
<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
3636
<DefineConstants>net40</DefineConstants>
3737
</PropertyGroup>
38-
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
38+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
3939
<DefineConstants>netcoreapp</DefineConstants>
4040
</PropertyGroup>
4141

42+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
44+
</ItemGroup>
4245
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
4346
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
4447
</ItemGroup>

‎FreeSql.Repository/FreeSql.Repository.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net45;net40</TargetFrameworks>
55
<Authors>FreeSql;ncc;YeXiangQin</Authors>
66
<Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/Clickhouse/DuckDB/TDengine/QuestDB/达梦/人大金仓/南大通用/虚谷/神舟通用/翰高/Access, and read/write separation、and split table.</Description>
77
<PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/Repository</PackageProjectUrl>

‎FreeSql/FreeSql.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<!--<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
2323
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0')) or
2424
$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) or
25-
$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">true</IsAotCompatible>-->
25+
$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) or
26+
$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">true</IsAotCompatible>-->
2627
</PropertyGroup>
2728

2829
<ItemGroup>

‎FreeSql/FreeSql.xml‎

Lines changed: 0 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Providers/FreeSql.Provider.Duckdb/FreeSql.Provider.Duckdb.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql + DuckDB is a fast in-process analytical database，supports .NetCore、.NetFramework4.6.1+</Description>
@@ -35,7 +35,7 @@
3535
<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
3636
</ItemGroup>
3737

38-
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
38+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
3939
<DefineConstants>net60</DefineConstants>
4040
</PropertyGroup>
4141

‎Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0;net452;net451;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0;net452;net451;net45;net40</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 数据库实现，基于 MySql 5.6，Ado.Net 驱动是 MySql.Data（Oracle官方）</Description>
@@ -27,7 +27,7 @@
2727
<None Include="../../logo.png" Pack="true" PackagePath="\" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
30+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
3131
<PackageReference Include="MySql.Data" Version="9.1.0" />
3232
</ItemGroup>
3333
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
@@ -44,7 +44,7 @@
4444
<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
4545
<DefineConstants>net40</DefineConstants>
4646
</PropertyGroup>
47-
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
47+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
4848
<DefineConstants>net60</DefineConstants>
4949
</PropertyGroup>
5050

‎Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0;net45</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0;net45</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 数据库实现，基于 MySql 5.6，Ado.Net 驱动是 MySqlConnector</Description>
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030

31-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
31+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
3232
<PackageReference Include="MySqlConnector" Version="2.4.0" />
3333
</ItemGroup>
3434
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
@@ -49,7 +49,7 @@
4949
<PropertyGroup>
5050
<DefineConstants>MySqlConnector</DefineConstants>
5151
</PropertyGroup>
52-
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
52+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
5353
<DefineConstants>net60;MySqlConnector</DefineConstants>
5454
</PropertyGroup>
5555

‎Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp31;netstandard2.1;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp31;netstandard2.1;net45;net40</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 数据库实现，基于 Oracle 11</Description>
@@ -27,7 +27,7 @@
2727
<None Include="../../logo.png" Pack="true" PackagePath="\" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'netcoreapp31'">
30+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'netcoreapp31'">
3131
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.6.1" />
3232
</ItemGroup>
3333
<ItemGroup Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net40'">

‎Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;netstandard2.0;net461;net452;net451;net45</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0;netstandard2.0;net461;net452;net451;net45</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 数据库实现，基于 PostgreSQL 9.5</Description>
@@ -31,7 +31,7 @@
3131
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
3232
</ItemGroup>
3333

34-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
34+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
3535
<PackageReference Include="Npgsql.LegacyPostgis" Version="5.0.18" />
3636
<PackageReference Include="Npgsql.NetTopologySuite" Version="5.0.18" />
3737
</ItemGroup>
@@ -49,7 +49,7 @@
4949
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
5050
<DefineConstants>nts</DefineConstants>
5151
</PropertyGroup>
52-
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
52+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
5353
<DefineConstants>net60;nts</DefineConstants>
5454
</PropertyGroup>
5555

0 commit comments

Comments
 (0)