Skip to content

.Netcore 3.1 support #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

.Netcore 3.1 support #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4038c42
updated Microsoft.SourceLink.GitHub to stable version 1.0.0
MagicAndre1981 Oct 12, 2020
94dee54
update log4net to version 2.0.11
MagicAndre1981 Oct 12, 2020
a94a810
updated NUnit packages
MagicAndre1981 Oct 12, 2020
25e1494
netstandard2.0 and netcoreapp3.1 added, removed net35 as TargetFramew…
MagicAndre1981 Oct 12, 2020
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
14 changes: 7 additions & 7 deletions src/LinqToExcel.Tests/ExcelQueryFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System.Linq;
using NUnit.Framework;
using System;
using System;
using System.IO;
using System.Data;
using System.Linq;
using System.Transactions;

using LinqToExcel.Domain;
using LinqToExcel.Query;

using NUnit.Framework;

namespace LinqToExcel.Tests
{
using LinqToExcel.Query;
using System.Transactions;

[Author("Paul Yoder", "[email protected]")]
[Category("Unit")]
[TestFixture]
Expand Down
29 changes: 16 additions & 13 deletions src/LinqToExcel.Tests/LinqToExcel.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net35;net451;net46</TargetFrameworks>
<DebugType>Full</DebugType>
<TargetFrameworks>net451;net46;netstandard2.0;netcoreapp3.1</TargetFrameworks>
<DebugType>portable</DebugType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit.Console" Version="3.9.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" />
<PackageReference Include="log4net" Version="2.0.11" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.Console" Version="3.11.1" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="NUnit.Extension.VSProjectLoader" Version="3.8.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup>

<!-- Run tests for .Net 3.5 in x64 mode, by default -->
<PropertyGroup Condition="'$(TargetFramework)|$(Platform)' == 'net35|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net46'">
<Reference Include="System.Transactions" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Data.OleDb" Version="4.7.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\LinqToExcel\LinqToExcel.csproj" />
Expand Down Expand Up @@ -52,7 +56,6 @@
<None Include="ExcelFiles\EmptyRows.xls">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Reference Include="System.Transactions" />
<None Update="ExcelFiles\WorksheetNames.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
18 changes: 14 additions & 4 deletions src/LinqToExcel.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2005
# Visual Studio Version 16
VisualStudioVersion = 16.0.30523.141
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqToExcel", "LinqToExcel\LinqToExcel.csproj", "{08F80D96-5387-4406-B88B-DCC0CB661702}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToExcel", "LinqToExcel\LinqToExcel.csproj", "{08F80D96-5387-4406-B88B-DCC0CB661702}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqToExcel.Tests", "LinqToExcel.Tests\LinqToExcel.Tests.csproj", "{195B956A-8029-44FD-9518-C04F5280611F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToExcel.Tests", "LinqToExcel.Tests\LinqToExcel.Tests.csproj", "{195B956A-8029-44FD-9518-C04F5280611F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|x86.ActiveCfg = Debug|x86
{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|x86.Build.0 = Debug|x86
{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|Any CPU.Build.0 = Release|Any CPU
{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|x86.ActiveCfg = Release|x86
{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|x86.Build.0 = Release|x86
{195B956A-8029-44FD-9518-C04F5280611F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{195B956A-8029-44FD-9518-C04F5280611F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{195B956A-8029-44FD-9518-C04F5280611F}.Debug|x86.ActiveCfg = Debug|x86
{195B956A-8029-44FD-9518-C04F5280611F}.Debug|x86.Build.0 = Debug|x86
{195B956A-8029-44FD-9518-C04F5280611F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{195B956A-8029-44FD-9518-C04F5280611F}.Release|Any CPU.Build.0 = Release|Any CPU
{195B956A-8029-44FD-9518-C04F5280611F}.Release|x86.ActiveCfg = Release|x86
{195B956A-8029-44FD-9518-C04F5280611F}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
15 changes: 10 additions & 5 deletions src/LinqToExcel/LinqToExcel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net35;net451;net46</TargetFrameworks>
<AssemblyVersion>2.0.0.2</AssemblyVersion>
<TargetFrameworks>net451;net46;netstandard2.0;netcoreapp3.1</TargetFrameworks>
<AssemblyVersion>2.0.0.4</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<Version>2.0.0-PRERELEASE-2</Version>
<Version>2.0.0-PRERELEASE-4</Version>
<Company>Yoder Web Solutions, LLC</Company>
<Authors>Paul Yoder, Stephen Workman</Authors>
<Description>Easily retrieve data from spreadsheets and csv files by using LINQ</Description>
<Copyright>Copyright © Paul Yoder 2019</Copyright>
<Copyright>Copyright © Paul Yoder 2020</Copyright>
<PackageLicenseUrl>https://github.com/paulyoder/LinqToExcel/blob/master/License.txt</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/paulyoder/LinqToExcel</PackageProjectUrl>
<PackageTags>Linq Excel spreadsheet csv</PackageTags>
Expand All @@ -26,11 +26,16 @@

<!-- Optional: Include the PDB in the built .nupkg -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Remotion.Linq" Version="2.2.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Data.OleDb" Version="4.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down