Skip to content

D
Dapper
Commit eca4243a authored by johan_danforth@hotmail.com's avatar johan_danforth@hotmail.com
Browse files
Options

Merge branch 'master' of https://github.com/StackExchange/dapper-dot-net.git

parents db942443 1fc06af5
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 22 deletions
Dapper NET40/SqlMapper.cs
View file @ eca4243a
......@@ -6,6 +6,10 @@
I know the difference between language and runtime versions; this is a compromise).
*/
#if DNXCORE50
using IDbDataParameter = System.Data.Common.DbParameter;
#endif
using System;
using System.Collections;
using System.Collections.Generic;
......@@ -4630,7 +4634,7 @@ protected void AddParameters(IDbCommand command, SqlMapper.Identity identity)
// then explicitly adds a parameter of a matching name,
// it will already exist in 'parameters'.
if (!parameters.ContainsKey(param.ParameterName))
{
{
parameters.Add(param.ParameterName, new ParamInfo
{
AttachedParam = param,
......
Dapper.DNX.Tests/project.json
View file @ eca4243a
{
"version": "1.0.0-*",
"dependencies": {
"Dapper": "1.40-*"
"Dapper": "1.41-*"
},
"commands": {
"Dapper.DNX.Tests": "Dapper.DNX.Tests"
......@@ -27,7 +27,7 @@
"System.Data": "4.0.0.0"
}
},
}
//"dnxcore50" : {
// "dependencies": {
// "System.Console": "4.0.0-beta-22716"
......
Dapper.DNX.Tests/project.lock.json
View file @ eca4243a
{
"locked": false,
"version": -9998,
"version": -9997,
"targets": {
".NETFramework,Version=v4.5": {
"Dapper/1.41-alpha": {
"frameworkAssemblies": [
"System.Data",
"mscorlib",
"System",
"System.Core",
"Microsoft.CSharp"
],
"compile": [
"lib/net45/Dapper.dll"
],
"runtime": [
"lib/net45/Dapper.dll"
]
}
},
"DNX,Version=v4.5.1": {
"Dapper/1.41-alpha": {
"frameworkAssemblies": [
"System.Data",
"mscorlib",
"System",
"System.Core",
"Microsoft.CSharp"
],
"compile": [
"lib/dnx451/Dapper.dll"
],
"runtime": [
"lib/dnx451/Dapper.dll"
]
}
}
},
"libraries": {
"Dapper/1.41-alpha": {
"sha512": "dJPrw+E8nGHRydGRUddbjGUxQBR9w4d8ISLD8QM24FsRihEJjjlww+AFb77mK78qGFwkHAnpY2k8oZfpLR61gg==",
"files": [
"Dapper.1.41-alpha.nupkg",
"Dapper.1.41-alpha.nupkg.sha512",
"Dapper.nuspec",
"lib/dnx451/Dapper.dll",
"lib/dnx451/Dapper.xml",
"lib/net40/Dapper.dll",
"lib/net40/Dapper.xml",
"lib/net45/Dapper.dll",
"lib/net45/Dapper.xml"
]
}
},
"projectFileDependencyGroups": {
"": [
"Dapper >= 1.40-*"
"Dapper >= 1.41-*"
],
".NETFramework,Version=v4.5": [
"framework/System.Data >= 4.0.0.0"
......@@ -11,6 +63,5 @@
"DNX,Version=v4.5.1": [
"framework/System.Data >= 4.0.0.0"
]
},
"libraries": {}
}
}
\ No newline at end of file
Dapper/project.json
View file @ eca4243a
{
"authors": [ "Sam Saffron", "Marc Gravell" ],
"description": "A high performance Micro-ORM supporting Sql Server, MySQL, Sqlite, SqlCE, Firebird etc..",
"version": "1.40-*",
"code": [ "../Dapper NET40/*.cs", "../Dapper NET45/*.cs" ],
"version": "1.41-alpha",
"compile": [ "../Dapper NET40/*.cs", "../Dapper NET45/*.cs" ],
"frameworks": {
"net45": {
"compilationOptions": { "define": [ "ASYNC" ] },
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"dependencies": {
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
"net40": {
"compilationOptions": { "warningsAsErrors": true },
"dependencies": {
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
//"net40": {
// "dependencies": {
// },
// "frameworkAssemblies": {
// "System.Data": "4.0.0.0"
// }
//},
"dnx451": {
"compilationOptions": { "define": [ "ASYNC" ] },
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"dependencies": {
},
"frameworkAssemblies": {
......@@ -29,7 +30,12 @@
},
//"dnxcore50": {
// "dependencies": {
// "System.Runtime": "4.0.20-beta-22716"
// "System.Runtime": "4.0.20-beta-22716",
// "System.Data.Common": "4.0.0-beta-*",
// },
// "frameworkAssemblies": {
// //
// }
//}
}
......
Dapper/project.lock.json
View file @ eca4243a
{
"locked": false,
"version": -9998,
"version": -9997,
"targets": {
".NETFramework,Version=v4.5": {
"Dapper/1.41-alpha": {
"frameworkAssemblies": [
"System.Data",
"mscorlib",
"System",
"System.Core",
"Microsoft.CSharp"
],
"compile": [
"lib/net45/Dapper.dll"
],
"runtime": [
"lib/net45/Dapper.dll"
]
}
},
".NETFramework,Version=v4.0": {
"Dapper/1.41-alpha": {
"frameworkAssemblies": [
"System.Data",
"mscorlib",
"System",
"System.Core",
"Microsoft.CSharp"
],
"compile": [
"lib/net40/Dapper.dll"
],
"runtime": [
"lib/net40/Dapper.dll"
]
}
},
"DNX,Version=v4.5.1": {
"Dapper/1.41-alpha": {
"frameworkAssemblies": [
"System.Data",
"mscorlib",
"System",
"System.Core",
"Microsoft.CSharp"
],
"compile": [
"lib/dnx451/Dapper.dll"
],
"runtime": [
"lib/dnx451/Dapper.dll"
]
}
}
},
"libraries": {
"Dapper/1.41-alpha": {
"sha512": "dJPrw+E8nGHRydGRUddbjGUxQBR9w4d8ISLD8QM24FsRihEJjjlww+AFb77mK78qGFwkHAnpY2k8oZfpLR61gg==",
"files": [
"Dapper.1.41-alpha.nupkg",
"Dapper.1.41-alpha.nupkg.sha512",
"Dapper.nuspec",
"lib/dnx451/Dapper.dll",
"lib/dnx451/Dapper.xml",
"lib/net40/Dapper.dll",
"lib/net40/Dapper.xml",
"lib/net45/Dapper.dll",
"lib/net45/Dapper.xml"
]
}
},
"projectFileDependencyGroups": {
"": [],
".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"
]
},
"libraries": {}
}
}
\ No newline at end of file
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