Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
hughbe committed May 26, 2020
1 parent fe5b12a commit 2b04c66
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 30 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: .NET Core

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.101
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-restore --verbosity normal
- name: Pack
run: dotnet pack --configuration Release
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

A library that reads a row of an Excel sheet and maps it to an object. A flexible and extensible fluent mapping system allows you to customize the way the row is mapped to an object.

![.NET Core](https://github.com/hughbe/excel-mapper/workflows/.NET%20Core/badge.svg)

## Basic Mapping

ExcelMapper will go through each public property or field and attempt to map the value of the cell in the column with the name of the member. If the column cannot be found or mapped, an exception will be thrown.
Expand Down
18 changes: 0 additions & 18 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion coverage.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cd tests
dotnet test -f netcoreapp2.1 /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
dotnet test -f netcoreapp3.1 /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
dotnet reportgenerator -reports:coverage.opencover.xml -targetdir:../resources/coverage
2 changes: 1 addition & 1 deletion coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
set -e

cd tests
dotnet test -f netcoreapp2.1 /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
dotnet test -f netcoreapp3.1 /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
dotnet reportgenerator -reports:coverage.opencover.xml -targetdir:../resources/coverage
4 changes: 2 additions & 2 deletions src/ExcelMapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="ExcelDataReader" Version="3.4.2" />
<PackageReference Include="ExcelDataReader" Version="3.6.0" />
</ItemGroup>

<PropertyGroup>
Expand Down
18 changes: 11 additions & 7 deletions tests/ExcelMapper.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp1.1;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net46;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

Expand All @@ -12,17 +12,21 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
<DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="4.0.5-rc2" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion tests/ExcelMapper/Utilities/AutoMapperTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public void TryCreateClassMap_ValidType_ReturnsTrue(FallbackStrategy emptyValueS
Assert.Equal(5, classMap.Mappings.Count);

IEnumerable<string> members = classMap.Mappings.Select(m => m.Member.Name);
Console.WriteLine(string.Join(", ", members));
Assert.Contains("_inheritedField", members);
Assert.Contains("_field", members);
Assert.Contains("InheritedProperty", members);
Expand Down

0 comments on commit 2b04c66

Please sign in to comment.