Tweaks to DNX

wxbjs · Apr 10, 2015 · ad177e5 · ad177e5
1 parent 5fd788d
commit ad177e5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/Dapper.DNX.Tests/Program.cs b/Dapper.DNX.Tests/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Data.SqlClient;
+using System.Threading.Tasks;
 
 namespace Dapper.DNX.Tests
 {
@@ -15,8 +16,18 @@ public void Main()
                 conn.Open();
                 var row = conn.Query<Foo>("select @a as X", new { a = 123 }).Single();
                 Console.WriteLine(row.X);
+
+                var methods = typeof(Dapper.SqlMapper).GetMethods().Where(x => x.Name == "QueryAsync").ToList();
+
+                //row = conn.QueryAsync<Foo>("select @a as X", new { a = 123 }).Wait().Single();
+                //Console.WriteLine(row.X);
             }
         }
+        private static async Task<int> WithDelay(int i)
+        {
+            await Task.Delay(100);
+            return i;
+        }
         class Foo
         {
             public int X { get; set; }

diff --git a/Dapper.DNX.Tests/project.json b/Dapper.DNX.Tests/project.json
@@ -1,7 +1,7 @@
 {
     "version": "1.0.0-*",
     "dependencies": {
-        "Dapper": "1.0.0-*"
+        "Dapper": "1.40-*"
     },
     "commands": {
         "Dapper.DNX.Tests": "Dapper.DNX.Tests"
@@ -14,13 +14,13 @@
                 "System.Data": "4.0.0.0"
             }
         },
-        "net40": {
-            "dependencies": {
-            },
-            "frameworkAssemblies": {
-                "System.Data": "4.0.0.0"
-            }
-        },
+        //"net40": {
+        //    "dependencies": {
+        //    },
+        //    "frameworkAssemblies": {
+        //        "System.Data": "4.0.0.0"
+        //    }
+        //},
         "dnx451": {
             "frameworkAssemblies": {
                 "System.Data": "4.0.0.0"

diff --git a/Dapper.DNX.Tests/project.lock.json b/Dapper.DNX.Tests/project.lock.json
@@ -3,14 +3,11 @@
   "version": -9998,
   "projectFileDependencyGroups": {
     "": [
-      "Dapper >= 1.0.0-*"
+      "Dapper >= 1.40-*"
     ],
     ".NETFramework,Version=v4.5": [
       "framework/System.Data >= 4.0.0.0"
     ],
-    ".NETFramework,Version=v4.0": [
-      "framework/System.Data >= 4.0.0.0"
-    ],
     "DNX,Version=v4.5.1": [
       "framework/System.Data >= 4.0.0.0"
     ]

diff --git a/Dapper/project.json b/Dapper/project.json
@@ -1,7 +1,7 @@
 {
     "authors": [ "Sam Saffron", "Marc Gravell" ],
     "description": "A high performance Micro-ORM supporting Sql Server, MySQL, Sqlite, SqlCE, Firebird etc..",
-    "version": "1.0.0-*",
+    "version": "1.40-*",
     "code": [ "../Dapper NET40/*.cs", "../Dapper NET45/*.cs" ],
     "frameworks": {
         "net45": {
@@ -12,13 +12,13 @@
                 "System.Data": "4.0.0.0"
             }
         },
-        "net40": {
-            "dependencies": {
-            },
-            "frameworkAssemblies": {
-                "System.Data": "4.0.0.0"
-            }
-        },
+        //"net40": {
+        //    "dependencies": {
+        //    },
+        //    "frameworkAssemblies": {
+        //        "System.Data": "4.0.0.0"
+        //    }
+        //},
         "dnx451": {
             "compilationOptions": { "define": [ "ASYNC" ] },
             "dependencies": {

diff --git a/Dapper/project.lock.json b/Dapper/project.lock.json
@@ -6,9 +6,6 @@
     ".NETFramework,Version=v4.5": [
       "framework/System.Data >= 4.0.0.0"
     ],
-    ".NETFramework,Version=v4.0": [
-      "framework/System.Data >= 4.0.0.0"
-    ],
     "DNX,Version=v4.5.1": [
       "framework/System.Data >= 4.0.0.0"
     ]