Skip to content
This repository has been archived by the owner on Mar 9, 2020. It is now read-only.

updated to netcore 3.0 #587

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updated to netcore 3.0 #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions EPPlus/EPPlus.MultiTarget.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netstandard2.0;net35;net40</TargetFrameworks>
<AssemblyVersion>4.5.3.2</AssemblyVersion>
<FileVersion>4.5.3.2</FileVersion>
<Version>4.5.3.2</Version>
<TargetFrameworks>netcoreapp3.0;netstandard2.0;net35;net40</TargetFrameworks>
<AssemblyVersion>4.5.3.3</AssemblyVersion>
<FileVersion>4.5.3.3</FileVersion>
<Version>4.5.3.3</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageLicenseUrl>https://licenses.nuget.org/LGPL-3.0-or-later</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/JanKallman/EPPlus</PackageProjectUrl>
Expand All @@ -16,8 +16,8 @@
<RootNamespace>EPPlus</RootNamespace>
<RepositoryUrl></RepositoryUrl>
<PackageTags>Excel ooxml</PackageTags>
<Copyright>Jan Källman 2018</Copyright>
<PackageReleaseNotes>EPPlus 4.5.3.2
<Copyright>Jan Källman 2019</Copyright>
<PackageReleaseNotes>EPPlus 4.5.3.3

New features in version 4.5:
* .NET Core support
Expand All @@ -44,6 +44,9 @@ apt-get install libgdiplus

EPPlus-A .NET Spreadsheet API
Changes
4.5.3.3
* Added a target build for .NET Core 3.0 (netcoreapp3.0) with System.Drawing.Common 4.6.0

4.5.3.2
* Added a target build for .NET Core 2.1 (netcoreapp2.1) with System.Drawing.Common 4.6.0-preview6.19303.8
* Fixed Text property with short date format
Expand Down Expand Up @@ -231,7 +234,7 @@ Release Candidate changes
<DefineConstants>Core;STANDARD20</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0'">
<DefineConstants>Core</DefineConstants>
</PropertyGroup>

Expand Down Expand Up @@ -294,8 +297,8 @@ Release Candidate changes
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="System.Drawing.Common" Version="4.6.0-preview6.19303.8" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.2" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
Expand Down
4 changes: 0 additions & 4 deletions EPPlus/FormulaParsing/Excel/Functions/BuiltInFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
*******************************************************************************
* Mats Alm Added 2013-12-03
*******************************************************************************/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Database;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
Expand Down
5 changes: 4 additions & 1 deletion EPPlus/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EPPlus 4.5.3.2
EPPlus 4.5.3.3

New features in version 4.5:
* .NET Core support
Expand Down Expand Up @@ -26,6 +26,9 @@ apt-get install libgdiplus
EPPlus-A .NET Spreadsheet API

Changes
4.5.3.3
* Added a target build for .NET Core 3.0 (netcoreapp3.0) with System.Drawing.Common 4.6.0

4.5.3.2
* Added a target build for .NET Core 2.1 (netcoreapp2.1) with System.Drawing.Common 4.6.0-preview6.19303.8
* Fixed Text property with short date format
Expand Down
2 changes: 1 addition & 1 deletion SampleApp.Core/SampleApp.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
5 changes: 1 addition & 4 deletions SampleWebApp.Core/SampleWebApp.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EPPlus\EPPlus.MultiTarget.csproj" />
</ItemGroup>
Expand Down