Skip to content

Commit a6c97bb

Browse files
codelove1314codelove1314
committed
feat: add support for .NET 10.0 across all core projects and update dependencies accordingly
1 parent 5e18ef9 commit a6c97bb

File tree

12 files changed

+39
-13
lines changed

12 files changed

+39
-13
lines changed

‎RELEASE.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Release Log
22

3+
## 2.8.3
4+
**2025.12.24**
5+
6+
- 全面支持 .NET 10.0（LTS 版本）
7+
- 更新所有核心库项目以支持 .NET 10.0 目标框架
8+
- 更新 EPPlus 项目添加 .NET 10.0 依赖包配置
9+
- 更新测试项目以支持 .NET 10.0 测试
10+
- 优化项目依赖包版本管理，统一 .NET 6.0+ 框架的包版本
11+
312
## 2.8.2
413
**2025.12.16**
514

‎src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<NeutralLanguage />
77
</PropertyGroup>
@@ -10,7 +10,7 @@
1010
<DefineConstants>Core;STANDARD20</DefineConstants>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net10.0'">
1414
<DefineConstants>Core</DefineConstants>
1515
</PropertyGroup>
1616

@@ -73,6 +73,12 @@
7373
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
7474
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
7575
</ItemGroup>
76+
77+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
78+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
79+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
80+
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
81+
</ItemGroup>
7682
<ItemGroup>
7783
<Folder Include="Properties\" />
7884
</ItemGroup>

‎src/Magicodes.ExporterAndImporter.AspNetCore/Magicodes.IE.AspNetCore.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
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.AspNetCore</PackageId>
66
</PropertyGroup>
77
<ItemGroup>

‎src/Magicodes.ExporterAndImporter.Core/Magicodes.IE.Core.csproj‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Core</PackageId>
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
99
</ItemGroup>
10+
<!-- netstandard2.0 依赖 -->
1011
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
1112
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
1213
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
1314
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
1415
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
1516
</ItemGroup>
17+
18+
<!-- netstandard2.1 依赖 -->
1619
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
1720
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
1821
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
1922
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.2" />
2023
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
2124
</ItemGroup>
2225

26+
<!-- .NET 5.0 依赖 -->
2327
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
2428
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
2529
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
2630
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
2731
</ItemGroup>
2832

33+
<!-- .NET 6.0+ 依赖：统一使用 SixLabors.ImageSharp 3.0.0 -->
2934
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
3035
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
3136
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
@@ -43,6 +48,12 @@
4348
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
4449
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
4550
</ItemGroup>
51+
52+
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
53+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
54+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
55+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
56+
</ItemGroup>
4657

4758
<ItemGroup>
4859
<Compile Update="Resource.Designer.cs">

‎src/Magicodes.ExporterAndImporter.Csv/Magicodes.IE.Csv.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
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Csv</PackageId>
66
</PropertyGroup>
77
<ItemGroup>

‎src/Magicodes.ExporterAndImporter.Excel.AspNetCore/Magicodes.IE.Excel.AspNetCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Import Project="..\..\common.props"></Import>
44
<PropertyGroup>
5-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
66
<PackageId>Magicodes.IE.Excel.AspNetCore</PackageId>
77
</PropertyGroup>
88

‎src/Magicodes.ExporterAndImporter.Excel/Magicodes.IE.Excel.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
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Excel</PackageId>
66
</PropertyGroup>
77
<ItemGroup>

‎src/Magicodes.ExporterAndImporter.Html/Magicodes.IE.Html.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
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Html</PackageId>
66
</PropertyGroup>
77

‎src/Magicodes.ExporterAndImporter.Pdf/Magicodes.IE.Pdf.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
<Import Project="..\..\common.props"></Import>
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net10.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Pdf</PackageId>
66
</PropertyGroup>
77
<!--<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎src/Magicodes.ExporterAndImporter.Tests/Magicodes.IE.Tests.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>net6.0;net7.0;net8.0;net471</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net10.0;net471</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<LangVersion>10</LangVersion>
77
<PackageProjectUrl>https://github.com/dotnetcore/Magicodes.IE</PackageProjectUrl>
@@ -33,7 +33,7 @@
3333
<PackageReference Include="Moq" Version="4.16.1" />
3434
<ProjectReference Include="..\MagicodesWebSite\MagicodesWebSite.csproj" />
3535
</ItemGroup>
36-
<ItemGroup Condition=" $(TargetFramework.Contains('net6.')) or $(TargetFramework.Contains('net7.')) or $(TargetFramework.Contains('net8.'))">
36+
<ItemGroup Condition=" $(TargetFramework.Contains('net6.')) or $(TargetFramework.Contains('net7.')) or $(TargetFramework.Contains('net8.')) or $(TargetFramework.Contains('net10.'))">
3737
<ProjectReference Include="..\MagicodesWebSite\MagicodesWebSite.csproj" />
3838
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.3" />
3939
</ItemGroup>

0 commit comments

Comments
 (0)