Merge pull request #80 from henkmollema/update-test-project

Update tests

.appveyor.yml

@@ -1,3 +1,7 @@
+version: '{build}'
+pull_requests:
+  do_not_increment_build_number: true
+image: Visual Studio 2017
 init:
   - git config --global core.autocrlf true
 build_script:
@@ -8,4 +12,7 @@ deploy: off
 environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
-os: Visual Studio 2017
+  CI: true  
+branches:
+  only:
+    - master

.travis.yml

@@ -1,17 +1,17 @@
 language: csharp
 mono: none
-dotnet: 2.0.0
+dotnet: 2.1.403
 dist: trusty
 env:
   global:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+    - DOTNET_CLI_TELEMETRY_OPTOUT: true
 os:
   - linux
   - osx
-osx_image: xcode8.2
-before_install:
-  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; fi
+branches:
+  only:
+    - master
 before_script:
   - chmod +x ./build.sh
 script:

build.sh

@@ -1,4 +1,4 @@
 dotnet restore
-dotnet build ./src/Dapper.FluentMap/Dapper.FluentMap.csproj -f netstandard1.3
-dotnet build ./src/Dapper.FluentMap.Dommel/Dapper.FluentMap.Dommel.csproj -f netstandard1.3
+dotnet build ./src/Dapper.FluentMap/Dapper.FluentMap.csproj -f netstandard2.0
+dotnet build ./src/Dapper.FluentMap.Dommel/Dapper.FluentMap.Dommel.csproj -f netstandard2.0
 dotnet test ./test/Dapper.FluentMap.Tests/Dapper.FluentMap.Tests.csproj

src/Dapper.FluentMap.Dommel/Dapper.FluentMap.Dommel.csproj

@@ -12,6 +12,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dapper.FluentMap\Dapper.FluentMap.csproj" />
+    <PackageReference Include="Dapper" Version="1.50.5" />
     <PackageReference Include="Dommel" Version="1.10.1" />
   </ItemGroup>
 </Project>

test/Dapper.FluentMap.Tests/Dapper.FluentMap.Tests.csproj

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>net452;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Dapper.FluentMap\Dapper.FluentMap.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
 </Project>