Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

Commit

Permalink
Update to .NET Core RTM (#40)
Browse files Browse the repository at this point in the history
* Update to .NET Core RTM

- .NETStandard Library v1.6.0
- Dapper v1.50.0
- xUnit 2.2.0-* builds
- KoreBuild v1.0.0

* Fix OS X build

* Throw when adding entity map fails

* Update Dommel extension to .NET Core RTM

- Dapper.FluentMap v1.5.1
- Dommel v1.6.1
  • Loading branch information
henkmollema authored Jul 7, 2016
1 parent bb42ed7 commit b3d667b
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 23 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ addons:
- libunwind8
- zlib1g
before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; brew install openssl; brew link --force openssl; fi
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; brew link --force openssl; fi
mono:
- 4.0.5
os:
- linux
- osx
osx_image: xcode7.1
script:
- ./build.sh --quiet verify
env:
- KOREBUILD_TEST_SKIPMONO=1
- ./build.sh --quiet verify
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ cd $PSScriptRoot
$repoFolder = $PSScriptRoot
$env:REPO_FOLDER = $repoFolder

$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
if ($env:KOREBUILD_ZIP)
{
$koreBuildZip=$env:KOREBUILD_ZIP
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $repoFolder

koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
if [ ! -z $KOREBUILD_ZIP ]; then
koreBuildZip=$KOREBUILD_ZIP
fi
Expand Down
6 changes: 3 additions & 3 deletions src/Dapper.FluentMap.Dommel/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.4.0",
"version": "1.4.1",
"description": "Dapper.FluentMap extension for Dommel support.",
"authors": [ "Henk Mollema" ],
"copyright": "Copyright © Henk Mollema 2016",
Expand All @@ -11,8 +11,8 @@
},

"dependencies": {
"Dapper.FluentMap": "1.5.0",
"Dommel": "1.6.0"
"Dapper.FluentMap": "1.5.1",
"Dommel": "1.6.1"
},

"frameworks": {
Expand Down
5 changes: 5 additions & 0 deletions src/Dapper.FluentMap/Configuration/FluentMapConfiguration.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Linq;
using System.ComponentModel;
using Dapper.FluentMap.Conventions;
using Dapper.FluentMap.Mapping;
Expand All @@ -24,6 +25,10 @@ public void AddMap<TEntity>(IEntityMap<TEntity> mapper) where TEntity : class
{
FluentMapper.AddTypeMap<TEntity>();
}
else
{
throw new InvalidOperationException($"Adding entity map for type '{typeof(TEntity)}' failed. The type already exists. Current entity maps: " + string.Join(", ", FluentMapper.EntityMaps.Select(e => e.Key.ToString())));
}
}

/// <summary>
Expand Down
7 changes: 3 additions & 4 deletions src/Dapper.FluentMap/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.5.0",
"version": "1.5.1",
"description": "Simple API to fluently map POCO properties to database columns when using Dapper.",
"authors": [ "Henk Mollema" ],
"copyright": "Copyright © Henk Mollema 2016",
Expand All @@ -11,7 +11,7 @@
},

"dependencies": {
"Dapper": "1.50.0-rc2b"
"Dapper": "1.50.0"
},

"frameworks": {
Expand All @@ -32,8 +32,7 @@
"define": [ "COREFX" ]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
"NETStandard.Library": "1.6.0"
}
}
},
Expand Down
16 changes: 6 additions & 10 deletions test/Dapper.FluentMap.Tests/project.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
{
"dependencies": {
"Dapper.FluentMap": "1.5.0",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10015",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027"
"Dapper.FluentMap": "1.5.1",
"dotnet-test-xunit": "2.2.0-*",
"xunit": "2.2.0-*"
},

"frameworks": {
"net451": {},
"netcoreapp1.0": {
"buildOptions": {
"define": [ "COREFX" ]
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-3002702",
"version": "1.0.0",
"type": "platform"
}
},
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
}
},

Expand Down

0 comments on commit b3d667b

Please sign in to comment.