Skip to content

Commit f055e05

Browse files
hueifenghueifeng
committed
Add net8.0 TFM
1 parent 20832a2 commit f055e05

File tree

13 files changed

+29
-17
lines changed

13 files changed

+29
-17
lines changed

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

Lines changed: 10 additions & 4 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</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0;net8.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'">
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
1414
<DefineConstants>Core</DefineConstants>
1515
</PropertyGroup>
1616

@@ -60,13 +60,19 @@
6060
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
6161
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
6262
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.1" />
63-
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
63+
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
6464
</ItemGroup>
6565

6666
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
6767
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
6868
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.1" />
69-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
69+
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
70+
</ItemGroup>
71+
72+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
73+
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
74+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
75+
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
7076
</ItemGroup>
7177
<ItemGroup>
7278
<Folder Include="Properties\" />

‎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</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.AspNetCore</PackageId>
66
</PropertyGroup>
77
<ItemGroup>

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

Lines changed: 7 additions & 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;net5.0;net6.0;net7.0;</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
55
<PackageId>Magicodes.IE.Core</PackageId>
66
</PropertyGroup>
77
<ItemGroup>
@@ -37,6 +37,12 @@
3737
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
3838
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
3939
</ItemGroup>
40+
41+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
42+
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
44+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
45+
</ItemGroup>
4046

4147
<ItemGroup>
4248
<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</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.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</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.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</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.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</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.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</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.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;net471</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.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.'))">
36+
<ItemGroup Condition=" $(TargetFramework.Contains('net6.')) or $(TargetFramework.Contains('net7.')) or $(TargetFramework.Contains('net8.'))">
3737
<ProjectReference Include="..\MagicodesWebSite\MagicodesWebSite.csproj" />
3838
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.3" />
3939
</ItemGroup>

‎src/Magicodes.ExporterAndImporter.Tests/MagicodesMiddleware_Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0 || NET6_0_OR_GREATER
1+
#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0 || NET6_0_OR_GREATER || NET7_0_OR_GREATER || NET8_0_OR_GREATER
22
using Magicodes.ExporterAndImporter.Builder;
33
using MagicodesWebSite;
44
using Microsoft.AspNetCore.Builder;

0 commit comments

Comments
 (0)