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

Commit b3d667b

Browse files
authored
Update to .NET Core RTM (#40)
* 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
1 parent bb42ed7 commit b3d667b

7 files changed

Lines changed: 21 additions & 23 deletions

File tree

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ addons:
1111
- libunwind8
1212
- zlib1g
1313
before_install:
14-
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; brew install openssl; brew link --force openssl; fi
14+
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; brew link --force openssl; fi
1515
mono:
1616
- 4.0.5
1717
os:
1818
- linux
1919
- osx
2020
osx_image: xcode7.1
2121
script:
22-
- ./build.sh --quiet verify
23-
env:
24-
- KOREBUILD_TEST_SKIPMONO=1
22+
- ./build.sh --quiet verify

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cd $PSScriptRoot
3333
$repoFolder = $PSScriptRoot
3434
$env:REPO_FOLDER = $repoFolder
3535

36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
36+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
3737
if ($env:KOREBUILD_ZIP)
3838
{
3939
$koreBuildZip=$env:KOREBUILD_ZIP

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
cd $repoFolder
44

5-
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
5+
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
66
if [ ! -z $KOREBUILD_ZIP ]; then
77
koreBuildZip=$KOREBUILD_ZIP
88
fi

src/Dapper.FluentMap.Dommel/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.4.0",
2+
"version": "1.4.1",
33
"description": "Dapper.FluentMap extension for Dommel support.",
44
"authors": [ "Henk Mollema" ],
55
"copyright": "Copyright © Henk Mollema 2016",
@@ -11,8 +11,8 @@
1111
},
1212

1313
"dependencies": {
14-
"Dapper.FluentMap": "1.5.0",
15-
"Dommel": "1.6.0"
14+
"Dapper.FluentMap": "1.5.1",
15+
"Dommel": "1.6.1"
1616
},
1717

1818
"frameworks": {

src/Dapper.FluentMap/Configuration/FluentMapConfiguration.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Linq;
23
using System.ComponentModel;
34
using Dapper.FluentMap.Conventions;
45
using Dapper.FluentMap.Mapping;
@@ -24,6 +25,10 @@ public void AddMap<TEntity>(IEntityMap<TEntity> mapper) where TEntity : class
2425
{
2526
FluentMapper.AddTypeMap<TEntity>();
2627
}
28+
else
29+
{
30+
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())));
31+
}
2732
}
2833

2934
/// <summary>

src/Dapper.FluentMap/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.5.0",
2+
"version": "1.5.1",
33
"description": "Simple API to fluently map POCO properties to database columns when using Dapper.",
44
"authors": [ "Henk Mollema" ],
55
"copyright": "Copyright © Henk Mollema 2016",
@@ -11,7 +11,7 @@
1111
},
1212

1313
"dependencies": {
14-
"Dapper": "1.50.0-rc2b"
14+
"Dapper": "1.50.0"
1515
},
1616

1717
"frameworks": {
@@ -32,8 +32,7 @@
3232
"define": [ "COREFX" ]
3333
},
3434
"dependencies": {
35-
"NETStandard.Library": "1.5.0-rc2-24027",
36-
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
35+
"NETStandard.Library": "1.6.0"
3736
}
3837
}
3938
},

test/Dapper.FluentMap.Tests/project.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
{
22
"dependencies": {
3-
"Dapper.FluentMap": "1.5.0",
4-
"xunit": "2.1.0",
5-
"dotnet-test-xunit": "1.0.0-rc2-build10015",
6-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027"
3+
"Dapper.FluentMap": "1.5.1",
4+
"dotnet-test-xunit": "2.2.0-*",
5+
"xunit": "2.2.0-*"
76
},
87

98
"frameworks": {
9+
"net451": {},
1010
"netcoreapp1.0": {
1111
"buildOptions": {
1212
"define": [ "COREFX" ]
1313
},
1414
"dependencies": {
1515
"Microsoft.NETCore.App": {
16-
"version": "1.0.0-rc2-3002702",
16+
"version": "1.0.0",
1717
"type": "platform"
1818
}
19-
},
20-
"imports": [
21-
"dnxcore50",
22-
"portable-net451+win8"
23-
]
19+
}
2420
}
2521
},
2622

0 commit comments

Comments
 (0)