Merge pull request #42 from henkmollema/netcore-rtm

Update to .NET Core RTM
henkmollema · Jul 7, 2016 · dae298c · dae298c
2 parents 4d68661 + cd583ee
commit dae298c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/build.ps1 b/build.ps1
@@ -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

diff --git a/build.sh b/build.sh
@@ -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

diff --git a/src/Dommel/DommelMapper.cs b/src/Dommel/DommelMapper.cs
@@ -1134,6 +1134,7 @@ protected virtual IEnumerable<PropertyInfo> FilterComplexTypes(IEnumerable<Prope
         /// </summary>
         public class DefaultPropertyResolver : PropertyResolverBase
         {
+            /// <inheritdoc />
             public override IEnumerable<PropertyInfo> ResolveProperties(Type type)
             {
                 return FilterComplexTypes(type.GetProperties());

diff --git a/src/Dommel/project.json b/src/Dommel/project.json
@@ -1,10 +1,11 @@
 {
-  "version": "1.6.0",
+  "version": "1.6.1",
   "title": "Dommel",
   "description": "Simple CRUD operations for Dapper.",
-  "authors": [ "henkmollema" ],
-  "copyright": "© 2016 Henk Mollema",
+  "authors": [ "Henk Mollema" ],
+  "copyright": "Copyright © Henk Mollema 2016",
   "packOptions": {
+    "owners": [ "Henk Mollema" ],
     "summary": "Simple CRUD operations for Dapper.",
     "tags": [ "dommel", "crud", "dapper", "database", "orm" ],
     "projectUrl": "https://github.com/henkmollema/Dommel",
@@ -16,7 +17,7 @@
   },
 
   "dependencies": {
-    "Dapper": "1.50.0-rc2b"
+    "Dapper": "1.50.0"
   },
 
   "frameworks": {
@@ -37,8 +38,8 @@
         "define": [ "COREFX" ]
       },
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027",
-        "System.ComponentModel.Annotations": "4.1.0-rc2-24027"
+        "NETStandard.Library": "1.6.0",
+        "System.ComponentModel.Annotations": "4.1.0"
       }
     }
   },