Skip to content

Commit 7918190

Browse files
28810992881099
authored
Merge pull request #2008 from Delsin-Yu/trimmer-compat-initial
为各项目添加支持 `IsTrimmable` 和 `IsAotCompatible` 的框架以及属性
2 parents 7b666fc + cc13d0d commit 7918190

File tree

11 files changed

+35
-13
lines changed

11 files changed

+35
-13
lines changed

‎Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net45;net40;net6.0;net7.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 扩展包，聚合根（实现室）.</Description>
@@ -20,6 +20,8 @@
2020
<DelaySign>false</DelaySign>
2121
<Version>3.5.202</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
23+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
24+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2325
</PropertyGroup>
2426

2527
<ItemGroup>

‎Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net45;net40;net6.0;net7.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用.</Description>
@@ -21,6 +21,8 @@
2121
<LangVersion>latest</LangVersion>
2222
<Version>3.5.202</Version>
2323
<PackageReadmeFile>readme.md</PackageReadmeFile>
24+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
25+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2426
</PropertyGroup>
2527

2628
<ItemGroup>

‎Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net45;net40;net6.0;net7.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 扩展包，可实现实体类属性为对象时，以JSON形式映射存储.</Description>
@@ -20,6 +20,8 @@
2020
<DelaySign>false</DelaySign>
2121
<Version>3.5.202</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
23+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
24+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2325
</PropertyGroup>
2426

2527
<ItemGroup>

‎Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;net45;net40;net6.0;net7.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 扩展包，可实现【延时加载】属性.</Description>
@@ -17,21 +17,23 @@
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
1818
<Version>3.5.202</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
20+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
21+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2022
</PropertyGroup>
2123

2224
<ItemGroup>
2325
<None Include="../../readme.md" Pack="true" PackagePath="\"/>
2426
<None Include="../../logo.png" Pack="true" PackagePath="\" />
2527
</ItemGroup>
2628

27-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
29+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.2'))">
2830
<PackageReference Include="CS-Script.Core" Version="1.3.1" />
2931
</ItemGroup>
30-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
32+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.0'))">
3133
<PackageReference Include="CS-Script.Core" Version="1.2.3" />
3234
</ItemGroup>
3335

34-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0'">
36+
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.0'))">
3537
<DefineConstants>ns20;netstandard20</DefineConstants>
3638
</PropertyGroup>
3739

‎Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net45;net40;net6.0;net7.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 扩展包，实现 linq queryable 和 linq to sql 语法进行开发.</Description>
@@ -20,6 +20,8 @@
2020
<DelaySign>false</DelaySign>
2121
<Version>3.5.202</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
23+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
24+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2325
</PropertyGroup>
2426

2527
<ItemGroup>

‎Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net45;net40;net6.0;net7.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 扩展包，实现 低代码、零实体、ZeroEntity，并且支持导航属性，级联保存 等功能.</Description>
@@ -20,6 +20,8 @@
2020
<DelaySign>false</DelaySign>
2121
<Version>3.5.202</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
23+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
24+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2325
</PropertyGroup>
2426

2527
<ItemGroup>

‎Extensions/FreeSql.Generator/FreeSql.Generator.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net60</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<IsPackable>true</IsPackable>
88
<PackAsTool>true</PackAsTool>
@@ -15,6 +15,8 @@
1515
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
1616
<Version>3.5.202</Version>
1717
<PackageReadmeFile>readme.md</PackageReadmeFile>
18+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
19+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
1820
</PropertyGroup>
1921

2022
<ItemGroup>

‎FreeSql.All/FreeSql.All.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;netstandard2.0;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;net45;net40;net6.0;net7.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql 全家桶，懒人专用</Description>
@@ -19,6 +19,8 @@
1919
<DelaySign>false</DelaySign>
2020
<Version>3.5.202</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
22+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
23+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2224
</PropertyGroup>
2325

2426
<ItemGroup>

‎FreeSql.DbContext/FreeSql.DbContext.csproj

+3-1
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>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net45;net40;net6.0;net7.0</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>
@@ -19,6 +19,8 @@
1919
<DelaySign>false</DelaySign>
2020
<Version>3.5.202</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
22+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
23+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2224
</PropertyGroup>
2325

2426
<ItemGroup>

‎FreeSql.Repository/FreeSql.Repository.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<DelaySign>false</DelaySign>
2020
<Version>3.5.202</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
22+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
23+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2224
</PropertyGroup>
2325

2426
<ItemGroup>

‎FreeSql/FreeSql.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;netstandard2.0;net451;net45;net40</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;net451;net45;net40;net6.0;net7.0</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>
@@ -19,6 +19,8 @@
1919
<DelaySign>false</DelaySign>
2020
<Version>3.5.202</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
22+
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
23+
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
2224
</PropertyGroup>
2325

2426
<ItemGroup>

0 commit comments

Comments
 (0)