Skip to content

Commit

Permalink
Add net8.0 TFM
Browse files Browse the repository at this point in the history
  • Loading branch information
@hueifeng
hueifeng committed Jan 7, 2024
1 parent 20832a2 commit f055e05
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 17 deletions.
14 changes: 10 additions & 4 deletions src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<NeutralLanguage />
</PropertyGroup>
Expand All @@ -10,7 +10,7 @@
<DefineConstants>Core;STANDARD20</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
<DefineConstants>Core</DefineConstants>
</PropertyGroup>

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

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.AspNetCore/Magicodes.IE.AspNetCore.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.AspNetCore</PackageId>
</PropertyGroup>
<ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion src/Magicodes.ExporterAndImporter.Core/Magicodes.IE.Core.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Core</PackageId>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -37,6 +37,12 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<Compile Update="Resource.Designer.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.Csv/Magicodes.IE.Csv.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Csv</PackageId>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.Excel.AspNetCore/Magicodes.IE.Excel.AspNetCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Excel.AspNetCore</PackageId>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.Excel/Magicodes.IE.Excel.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Excel</PackageId>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.Html/Magicodes.IE.Html.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Html</PackageId>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.Pdf/Magicodes.IE.Pdf.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Pdf</PackageId>
</PropertyGroup>
<!--<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
Expand Down
4 changes: 2 additions & 2 deletions src/Magicodes.ExporterAndImporter.Tests/Magicodes.IE.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net471</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net471</TargetFrameworks>
<IsPackable>false</IsPackable>
<LangVersion>10</LangVersion>
<PackageProjectUrl>https://github.com/dotnetcore/Magicodes.IE</PackageProjectUrl>
Expand Down Expand Up @@ -33,7 +33,7 @@
<PackageReference Include="Moq" Version="4.16.1" />
<ProjectReference Include="..\MagicodesWebSite\MagicodesWebSite.csproj" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.Contains('net6.')) or $(TargetFramework.Contains('net7.'))">
<ItemGroup Condition=" $(TargetFramework.Contains('net6.')) or $(TargetFramework.Contains('net7.')) or $(TargetFramework.Contains('net8.'))">
<ProjectReference Include="..\MagicodesWebSite\MagicodesWebSite.csproj" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.3" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.Tests/MagicodesMiddleware_Tests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0 || NET6_0_OR_GREATER
#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0 || NET6_0_OR_GREATER || NET7_0_OR_GREATER || NET8_0_OR_GREATER
using Magicodes.ExporterAndImporter.Builder;
using MagicodesWebSite;
using Microsoft.AspNetCore.Builder;
Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.ExporterAndImporter.Word/Magicodes.IE.Word.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Word</PackageId>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Magicodes.IE.Excel.NPOI/Magicodes.IE.Excel.NPOI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="..\..\common.props"></Import>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>Magicodes.IE.Excel.NPOI</PackageId>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MagicodesWebSite/MagicodesWebSite.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;</TargetFrameworks>
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
</PropertyGroup>

Expand Down

0 comments on commit f055e05

Please sign in to comment.