From 4d932b58d8cd7c95ac72a02541160f218c016ae5 Mon Sep 17 00:00:00 2001
From: Marc Gravell <Marc Gravell>
Date: Sun, 24 Jul 2016 11:12:01 +0100
Subject: [PATCH] Repackage Dapper.EF to fix System.Runtime; deploy as .52; fix
 xunit refs; add test for #570

---
 .../project.json                              |  1 -
 Dapper.EntityFramework/project.json           |  1 -
 Dapper.Tests.Contrib/project.json             |  7 ++--
 Dapper.Tests/Tests.cs                         | 16 +++++++++
 Dapper.Tests/project.json                     | 35 ++++++++++---------
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/Dapper.EntityFramework.StrongName/project.json b/Dapper.EntityFramework.StrongName/project.json
index 26740b51d..ce82875af 100644
--- a/Dapper.EntityFramework.StrongName/project.json
+++ b/Dapper.EntityFramework.StrongName/project.json
@@ -55,7 +55,6 @@
         "System.Configuration": "4.0.0.0",
         "System.Data": "4.0.0.0",
         "System.Data.Linq": "4.0.0.0",
-        "System.Runtime": "4.0.0.0",
         "System.Xml": "4.0.0.0"
       },
       "dependencies": {
diff --git a/Dapper.EntityFramework/project.json b/Dapper.EntityFramework/project.json
index f892bdd1f..3628227b9 100644
--- a/Dapper.EntityFramework/project.json
+++ b/Dapper.EntityFramework/project.json
@@ -46,7 +46,6 @@
         "System.Configuration": "4.0.0.0",
         "System.Data": "4.0.0.0",
         "System.Data.Linq": "4.0.0.0",
-        "System.Runtime": "4.0.0.0",
         "System.Xml": "4.0.0.0"
       },
       "dependencies": {
diff --git a/Dapper.Tests.Contrib/project.json b/Dapper.Tests.Contrib/project.json
index 78b8c4d44..a4ec28544 100644
--- a/Dapper.Tests.Contrib/project.json
+++ b/Dapper.Tests.Contrib/project.json
@@ -25,8 +25,7 @@
     "Dapper.SqlBuilder": {
       "target": "project"
     },
-    "xunit": "2.2.0-beta2-build3300",
-    "dotnet-test-xunit": "2.2.0-preview2-build1029"
+    "xunit": "2.1.0"
   },
   "buildOptions": {
     "warningsAsErrors": true,
@@ -97,6 +96,10 @@
     //  }
     //},
     "netcoreapp1.0": {
+      "imports": [
+        "portable-net451+win8",
+        "dnxcore50"
+      ],
       "buildOptions": {
         "define": [ "COREFX", "ASYNC", "XUNIT2" ]
       },
diff --git a/Dapper.Tests/Tests.cs b/Dapper.Tests/Tests.cs
index e90e2e60c..ca6734857 100644
--- a/Dapper.Tests/Tests.cs
+++ b/Dapper.Tests/Tests.cs
@@ -2526,6 +2526,22 @@ public void Issue22_ExecuteScalar()
 #endif
         }
 
+#if ENTITY_FRAMEWORK
+        public void Issue570_DbGeo_HasValues()
+        {
+            Dapper.EntityFramework.Handlers.Register();
+            string redmond = "POINT (122.1215 47.6740)";
+            DbGeography point = DbGeography.PointFromText(redmond, DbGeography.DefaultCoordinateSystemId);
+            DbGeography orig = point.Buffer(20);
+
+
+            var fromDb = connection.QuerySingle<DbGeography>("declare @geos table(geo geography); insert @geos(geo) values(@val); select * from @geos",
+                new { val = orig });
+
+            fromDb.Area.IsNotNull();
+            fromDb.Area.IsEqualTo(orig.Area);
+        }
+#endif
         [Fact]
         public void Issue142_FailsNamedStatus()
         {
diff --git a/Dapper.Tests/project.json b/Dapper.Tests/project.json
index 4a4f51ba5..64188982e 100644
--- a/Dapper.Tests/project.json
+++ b/Dapper.Tests/project.json
@@ -22,8 +22,8 @@
     "Dapper.Contrib": {
       "target": "project"
     },
-    "xunit": "2.1.0",
-    "xunit.assert":  "2.1.0"
+    "xunit": "2.2.0-beta2-build3300",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029"
   },
   "buildOptions": {
     "warningsAsErrors": true,
@@ -98,7 +98,6 @@
         "System.Configuration": "4.0.0.0",
         "System.Data": "4.0.0.0",
         "System.Data.Linq": "4.0.0.0",
-        "System.Runtime": "4.0.10.0",
         "System.Xml": "4.0.0.0",
         "System.Xml.Linq": "4.0.0.0"
       },
@@ -106,6 +105,7 @@
         "Dapper.EntityFramework": {
           "target": "project"
         },
+        "System.Runtime": "4.1.0",
         "EntityFramework": "6.1.3",
         "FirebirdSql.Data.FirebirdClient": "4.10.0",
         "Microsoft.SqlServer.Compact": "4.0.8876.1",
@@ -123,19 +123,22 @@
         "Susanoo.SqlServer": "1.2.4",
         "System.Data.SQLite": "1.0.99"
       }
+    },
+    "netcoreapp1.0": {
+      "imports": [
+        "portable-net451+win8",
+        "dnxcore50"
+      ],
+      "buildOptions": {
+        "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ]
+      },
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0",
+          "type": "platform"
+        },
+        "Microsoft.Data.Sqlite": "1.0.0"
+      }
     }
-    //,
-    //"netcoreapp1.0": {
-    //  "buildOptions": {
-    //    "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ]
-    //  },
-    //  "dependencies": {
-    //    "Microsoft.NETCore.App": {
-    //      "version": "1.0.0",
-    //      "type": "platform"
-    //    },
-    //    "Microsoft.Data.Sqlite": "1.0.0"
-    //  }
-    //}
   }
 }
\ No newline at end of file