Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Dapper
提交
f32d318f
D
Dapper
项目概览
int
/
Dapper
大约 1 年 前同步成功
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
Dapper
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f32d318f
编写于
5月 05, 2015
作者:
M
Marc Gravell
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'CoreCLR'
Conflicts: Dapper NET40/SqlMapper.cs
上级
34371620
b52d3113
变更
14
展开全部
隐藏空白更改
内联
并排
Showing
14 changed file
with
4394 addition
and
341 deletion
+4394
-341
Dapper NET40/SqlMapper.cs
Dapper NET40/SqlMapper.cs
+488
-74
Dapper.DNX.Tests/Program.cs
Dapper.DNX.Tests/Program.cs
+0
-36
Dapper.DNX.Tests/project.json
Dapper.DNX.Tests/project.json
+47
-31
Dapper.DNX.Tests/project.lock.json
Dapper.DNX.Tests/project.lock.json
+1886
-55
Dapper.DNX.sln
Dapper.DNX.sln
+4
-1
Dapper/Dapper.xproj
Dapper/Dapper.xproj
+3
-0
Dapper/project.json
Dapper/project.json
+36
-11
Dapper/project.lock.json
Dapper/project.lock.json
+1587
-70
DapperTests NET35/DapperTests NET35.csproj
DapperTests NET35/DapperTests NET35.csproj
+3
-2
DapperTests NET45/DapperTests NET45.csproj
DapperTests NET45/DapperTests NET45.csproj
+2
-2
Tests/Assert.cs
Tests/Assert.cs
+4
-0
Tests/DapperTests NET40.csproj
Tests/DapperTests NET40.csproj
+3
-2
Tests/Program.cs
Tests/Program.cs
+77
-11
Tests/Tests.cs
Tests/Tests.cs
+254
-46
未找到文件。
Dapper NET40/SqlMapper.cs
浏览文件 @
f32d318f
此差异已折叠。
点击以展开。
Dapper.DNX.Tests/Program.cs
已删除
100644 → 0
浏览文件 @
34371620
using
System
;
using
System.Linq
;
using
System.Data.SqlClient
;
using
System.Threading.Tasks
;
namespace
Dapper.DNX.Tests
{
public
class
Program
{
public
void
Main
()
{
Console
.
WriteLine
(
"Version: {0}"
,
Environment
.
Version
);
const
string
connectionString
=
"Data Source=.;Initial Catalog=tempdb;Integrated Security=True"
;
using
(
var
conn
=
new
SqlConnection
(
connectionString
))
{
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
}).
Result
.
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
;
}
}
}
}
Dapper.DNX.Tests/project.json
浏览文件 @
f32d318f
{
"version"
:
"1.0.0-*"
,
"dependencies"
:
{
"Dapper"
:
"1.41-*"
"version"
:
"1.0.0-*"
,
"dependencies"
:
{
"Dapper"
:
"1.41-*"
},
"commands"
:
{
"Dapper.DNX.Tests"
:
"Dapper.DNX.Tests"
},
"compile"
:
[
"../Tests/Tests.cs"
,
"../Tests/Program.cs"
,
"../Tests/Assert.cs"
],
"compilationOptions"
:
{
"define"
:
[
"NOEXTERNALS"
]
},
"frameworks"
:
{
"net45"
:
{
"compilationOptions"
:
{
"define"
:
[
"ASYNC"
],
"warningsAsErrors"
:
true
},
"dependencies"
:
{
"System.Threading.Thread"
:
"4.0.0-beta-22816"
},
"frameworkAssemblies"
:
{
"System.Data"
:
"4.0.0.0"
,
"System.Xml"
:
"4.0.0.0"
}
},
"commands"
:
{
"Dapper.DNX.Tests"
:
"Dapper.DNX.Tests"
"net40"
:
{
"dependencies"
:
{
},
"frameworkAssemblies"
:
{
"System.Data"
:
"4.0.0.0"
,
"System.Xml"
:
"4.0.0.0"
}
},
"compilationOptions"
:
{
"define"
:
[
"ASYNC"
]},
"frameworks"
:
{
"net45"
:
{
"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"
}
"dnx451"
:
{
"compilationOptions"
:
{
"define"
:
[
"ASYNC"
],
"warningsAsErrors"
:
true
},
"frameworkAssemblies"
:
{
"System.Data"
:
"4.0.0.0"
,
"System.Xml"
:
"4.0.0.0"
}
}
//
"dnxcore50"
:
{
//
"dependencies"
:
{
//
"System.Console"
:
"4.0.0-beta-22716"
//
}
//
}
},
"dnxcore50"
:
{
"compilationOptions"
:
{
"define"
:
[
],
"warningsAsErrors"
:
true
},
"dependencies"
:
{
"System.Console"
:
"4.0.0-beta-*"
,
"System.Reflection"
:
"4.0.10-beta-*"
,
"System.Linq"
:
"4.0.0-beta-*"
,
"System.Data.Common"
:
"4.0.0-beta-*"
,
"System.Data.SqlClient"
:
"4.0.0-beta-*"
,
"System.Threading"
:
"4.0.10-beta-*"
,
"System.Threading.Thread"
:
"4.0.0-beta-*"
,
"System.Reflection.TypeExtensions"
:
"4.0.0-beta-*"
//
"System.Xml"
:
"4.0.10-beta-*"
}
}
}
}
Dapper.DNX.Tests/project.lock.json
浏览文件 @
f32d318f
此差异已折叠。
点击以展开。
Dapper.DNX.sln
浏览文件 @
f32d318f
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22
728
.1
VisualStudioVersion = 14.0.22
823
.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper", "Dapper\Dapper.xproj", "{088D8CC4-E71E-44B6-9B87-4060B043983D}"
EndProject
...
...
@@ -9,8 +9,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper.DNX.Tests", "Dapper.
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{03340C6E-4176-4C42-9C76-D5DFC79D1A22}"
ProjectSection(SolutionItems) = preProject
Tests\Assert.cs = Tests\Assert.cs
Tests\Program.cs = Tests\Program.cs
Dapper NET40\SqlMapper.cs = Dapper NET40\SqlMapper.cs
Dapper NET45\SqlMapperAsync.cs = Dapper NET45\SqlMapperAsync.cs
Tests\Tests.cs = Tests\Tests.cs
EndProjectSection
EndProject
Global
...
...
Dapper/Dapper.xproj
浏览文件 @
f32d318f
...
...
@@ -14,6 +14,9 @@
<PropertyGroup
Label=
"Configuration"
Condition=
"'$(Configuration)|$(Platform)'=='Release|AnyCPU'"
>
<AssemblyName>
Dapper
</AssemblyName>
</PropertyGroup>
<PropertyGroup
Label=
"Configuration"
Condition=
"'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"
>
<AssemblyName>
Dapper
</AssemblyName>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>
2.0
</SchemaVersion>
</PropertyGroup>
...
...
Dapper/project.json
浏览文件 @
f32d318f
{
"authors"
:
[
"Sam Saffron"
,
"Marc Gravell"
],
"owners"
:
[
"Sam Saffron"
,
"Marc Gravell"
],
"projectUrl"
:
"https://github.com/StackExchange/dapper-dot-net"
,
"licenseUrl"
:
"http://www.apache.org/licenses/LICENSE-2.0"
,
"summary"
:
"A high performance Micro-ORM"
,
"description"
:
"A high performance Micro-ORM supporting Sql Server, MySQL, Sqlite, SqlCE, Firebird etc.."
,
"version"
:
"1.41-
alpha
"
,
"version"
:
"1.41-
beta3
"
,
"compile"
:
[
"../Dapper NET40/*.cs"
,
"../Dapper NET45/*.cs"
],
"title"
:
"Dapper dot net"
,
"tags"
:
[
"orm"
,
"sql"
,
"micro-orm"
],
"frameworks"
:
{
"net45"
:
{
"compilationOptions"
:
{
"define"
:
[
"ASYNC"
],
"warningsAsErrors"
:
true
},
"dependencies"
:
{
"System.Runtime"
:
"4.0.20-beta-22816"
},
"frameworkAssemblies"
:
{
"System.Data"
:
"4.0.0.0"
...
...
@@ -20,6 +27,14 @@
"System.Data"
:
"4.0.0.0"
}
},
//
"net35"
:
{
//
"compilationOptions"
:
{
"warningsAsErrors"
:
true
,
"languageVersion"
:
"csharp3"
,
"define"
:
[
"CSHARP30"
]
},
//
"dependencies"
:
{
//
},
//
"frameworkAssemblies"
:
{
//
"System.Data"
:
"4.0.0.0"
//
}
//
},
"dnx451"
:
{
"compilationOptions"
:
{
"define"
:
[
"ASYNC"
],
"warningsAsErrors"
:
true
},
"dependencies"
:
{
...
...
@@ -28,15 +43,25 @@
"System.Data"
:
"4.0.0.0"
}
},
//
"dnxcore50"
:
{
//
"dependencies"
:
{
//
"System.Runtime"
:
"4.0.20-beta-22716"
,
//
"System.Data.Common"
:
"4.0.0-beta-*"
,
//
},
//
"frameworkAssemblies"
:
{
//
//
//
}
//
}
"dnxcore50"
:
{
"compilationOptions"
:
{
"define"
:
[
],
"warningsAsErrors"
:
true
},
"dependencies"
:
{
"System.Text.RegularExpressions"
:
"4.0.10-beta-*"
,
"System.Collections"
:
"4.0.10-beta-*"
,
"System.Collections.Concurrent"
:
"4.0.10-beta-*"
,
"System.Linq"
:
"4.0.0-beta-*"
,
"System.Threading"
:
"4.0.10-beta-*"
,
"Microsoft.CSharp"
:
"4.0.0-beta-*"
,
"System.Reflection"
:
"4.0.10-beta-*"
,
"System.Reflection.Emit"
:
"4.0.0-beta-*"
,
"System.Reflection.Emit.ILGeneration"
:
"4.0.0-beta-*"
,
"System.Reflection.Emit.Lightweight"
:
"4.0.0-beta-*"
,
"System.Reflection.TypeExtensions"
:
"4.0.0-beta-*"
,
"System.Data.Common"
:
"4.0.0-beta-*"
,
"System.Runtime.Extensions"
:
"4.0.10-beta-*"
,
"System.Text.Encoding.CodePages"
:
"4.0.0-beta-*"
,
"System.Globalization"
:
"4.0.10-beta-*"
}
}
}
}
Dapper/project.lock.json
浏览文件 @
f32d318f
此差异已折叠。
点击以展开。
DapperTests NET35/DapperTests NET35.csproj
浏览文件 @
f32d318f
...
...
@@ -21,7 +21,7 @@
<DebugType>
full
</DebugType>
<Optimize>
false
</Optimize>
<OutputPath>
bin\Debug\
</OutputPath>
<DefineConstants>
TRACE;DEBUG;NET35
</DefineConstants>
<DefineConstants>
TRACE;DEBUG;NET35
EXTERNALS
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
</PropertyGroup>
...
...
@@ -30,9 +30,10 @@
<DebugType>
pdbonly
</DebugType>
<Optimize>
true
</Optimize>
<OutputPath>
bin\Release\
</OutputPath>
<DefineConstants>
TRACE;NET35
</DefineConstants>
<DefineConstants>
TRACE;NET35
EXTERNALS
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference
Include=
"System"
/>
...
...
DapperTests NET45/DapperTests NET45.csproj
浏览文件 @
f32d318f
...
...
@@ -19,7 +19,7 @@
<DebugType>
full
</DebugType>
<Optimize>
false
</Optimize>
<OutputPath>
bin\Debug\
</OutputPath>
<DefineConstants>
DEBUG;TRACE
</DefineConstants>
<DefineConstants>
TRACE;DEBUG;EXTERNALS
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
</PropertyGroup>
...
...
@@ -28,7 +28,7 @@
<DebugType>
pdbonly
</DebugType>
<Optimize>
true
</Optimize>
<OutputPath>
bin\Release\
</OutputPath>
<DefineConstants>
TRACE
</DefineConstants>
<DefineConstants>
TRACE
;EXTERNALS
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
</PropertyGroup>
...
...
Tests/Assert.cs
浏览文件 @
f32d318f
...
...
@@ -3,6 +3,10 @@
using
System.Linq
;
using
System.Text
;
#if DNXCORE50
using
ApplicationException
=
global
::
System
.
InvalidOperationException
;
#endif
namespace
SqlMapper
{
static
class
Assert
...
...
Tests/DapperTests NET40.csproj
浏览文件 @
f32d318f
...
...
@@ -22,7 +22,7 @@
<DebugType>
full
</DebugType>
<Optimize>
false
</Optimize>
<OutputPath>
bin\Debug\
</OutputPath>
<DefineConstants>
DEBUG;TRACE
</DefineConstants>
<DefineConstants>
TRACE;DEBUG;EXTERNALS PERF
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<Prefer32Bit>
false
</Prefer32Bit>
...
...
@@ -32,10 +32,11 @@
<DebugType>
pdbonly
</DebugType>
<Optimize>
true
</Optimize>
<OutputPath>
bin\Release\
</OutputPath>
<DefineConstants>
TRACE
</DefineConstants>
<DefineConstants>
TRACE
;EXTERNALS PERF
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<Prefer32Bit>
false
</Prefer32Bit>
<AllowUnsafeBlocks>
false
</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference
Include=
"BLToolkit.4"
>
...
...
Tests/Program.cs
浏览文件 @
f32d318f
此差异已折叠。
点击以展开。
Tests/Tests.cs
浏览文件 @
f32d318f
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录