Commit ad177e5d authored by Marc Gravell's avatar Marc Gravell

Tweaks to DNX

parent 5fd788db
using System; using System;
using System.Linq; using System.Linq;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Threading.Tasks;
namespace Dapper.DNX.Tests namespace Dapper.DNX.Tests
{ {
...@@ -15,8 +16,18 @@ public void Main() ...@@ -15,8 +16,18 @@ public void Main()
conn.Open(); conn.Open();
var row = conn.Query<Foo>("select @a as X", new { a = 123 }).Single(); var row = conn.Query<Foo>("select @a as X", new { a = 123 }).Single();
Console.WriteLine(row.X); 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 class Foo
{ {
public int X { get; set; } public int X { get; set; }
......
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Dapper": "1.0.0-*" "Dapper": "1.40-*"
}, },
"commands": { "commands": {
"Dapper.DNX.Tests": "Dapper.DNX.Tests" "Dapper.DNX.Tests": "Dapper.DNX.Tests"
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
"System.Data": "4.0.0.0" "System.Data": "4.0.0.0"
} }
}, },
"net40": { //"net40": {
"dependencies": { // "dependencies": {
}, // },
"frameworkAssemblies": { // "frameworkAssemblies": {
"System.Data": "4.0.0.0" // "System.Data": "4.0.0.0"
} // }
}, //},
"dnx451": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Data": "4.0.0.0" "System.Data": "4.0.0.0"
......
...@@ -3,14 +3,11 @@ ...@@ -3,14 +3,11 @@
"version": -9998, "version": -9998,
"projectFileDependencyGroups": { "projectFileDependencyGroups": {
"": [ "": [
"Dapper >= 1.0.0-*" "Dapper >= 1.40-*"
], ],
".NETFramework,Version=v4.5": [ ".NETFramework,Version=v4.5": [
"framework/System.Data >= 4.0.0.0" "framework/System.Data >= 4.0.0.0"
], ],
".NETFramework,Version=v4.0": [
"framework/System.Data >= 4.0.0.0"
],
"DNX,Version=v4.5.1": [ "DNX,Version=v4.5.1": [
"framework/System.Data >= 4.0.0.0" "framework/System.Data >= 4.0.0.0"
] ]
......
{ {
"authors": [ "Sam Saffron", "Marc Gravell" ], "authors": [ "Sam Saffron", "Marc Gravell" ],
"description": "A high performance Micro-ORM supporting Sql Server, MySQL, Sqlite, SqlCE, Firebird etc..", "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" ], "code": [ "../Dapper NET40/*.cs", "../Dapper NET45/*.cs" ],
"frameworks": { "frameworks": {
"net45": { "net45": {
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
"System.Data": "4.0.0.0" "System.Data": "4.0.0.0"
} }
}, },
"net40": { //"net40": {
"dependencies": { // "dependencies": {
}, // },
"frameworkAssemblies": { // "frameworkAssemblies": {
"System.Data": "4.0.0.0" // "System.Data": "4.0.0.0"
} // }
}, //},
"dnx451": { "dnx451": {
"compilationOptions": { "define": [ "ASYNC" ] }, "compilationOptions": { "define": [ "ASYNC" ] },
"dependencies": { "dependencies": {
......
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
".NETFramework,Version=v4.5": [ ".NETFramework,Version=v4.5": [
"framework/System.Data >= 4.0.0.0" "framework/System.Data >= 4.0.0.0"
], ],
".NETFramework,Version=v4.0": [
"framework/System.Data >= 4.0.0.0"
],
"DNX,Version=v4.5.1": [ "DNX,Version=v4.5.1": [
"framework/System.Data >= 4.0.0.0" "framework/System.Data >= 4.0.0.0"
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment