Skip to content

Commit

Permalink
Maintenance
Browse files Browse the repository at this point in the history
- Add .NET 8.0
- Update dependencies
  • Loading branch information
yzhoholiev committed Jul 11, 2024
1 parent f2a9594 commit 8129e40
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 16 deletions.
2 changes: 1 addition & 1 deletion OpenXmlFormats/NPOI.OpenXmlFormats.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OpenXmlFormats</AssemblyName>
<RootNamespace>NPOI.OpenXmlFormats</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/NPOI.Benchmarks/NPOI.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
16 changes: 10 additions & 6 deletions main/NPOI.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
<RootNamespace>NPOI</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\npoi.snk</AssemblyOriginatorKeyFile>
Expand All @@ -14,22 +14,26 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Enums.NET" Version="4.0.1" />
<PackageReference Include="ExtendedNumerics.BigDecimal" Version="2025.1001.2.129" />
<PackageReference Include="Enums.NET" Version="4.0.2" />
<PackageReference Include="ExtendedNumerics.BigDecimal" Version="2025.1002.0.190" />
<PackageReference Include="MathNet.Numerics.Signed" Version="5.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
<PackageReference Include="SharpZipLib" Version="1.4.2" />
<PackageReference Include="SixLabors.Fonts" Version="1.0.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' AND '$(TargetFramework)' != 'net8.0' ">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>

</Project>
11 changes: 8 additions & 3 deletions ooxml/NPOI.OOXML.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OOXML</AssemblyName>
<RootNamespace>NPOI</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand All @@ -25,9 +25,14 @@
<EmbeddedResource Include="Resources\presetTableStyles.xml" />
</ItemGroup>

<ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net8.0' ">
<PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion openxml4Net/NPOI.OpenXml4Net.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OpenXml4Net</AssemblyName>
<RootNamespace>NPOI.OpenXml4Net</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion solution/NPOI.Pack.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- This is an umbrella project that gathers dependencies for dotnet pack -->

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
<IncludeBuildOutput>false</IncludeBuildOutput>
<PackageId>Emerge.ThirdParty.NPOI</PackageId>
<OutputPath>..\solution\$(Configuration)\</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion testcases/main/NPOI.TestCases.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<AssemblyName>NPOI.TestCases</AssemblyName>
<RootNamespace>TestCases</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion testcases/ooxml/NPOI.OOXML.TestCases.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OOXML.TestCases</AssemblyName>
<RootNamespace>TestCases</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion testcases/openxml4net/NPOI.OOXML4Net.TestCases.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OOXML4Net.TestCases</AssemblyName>
<RootNamespace>TestCases</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down

0 comments on commit 8129e40

Please sign in to comment.