Skip to content

D
Dapper
Commit 0707ca80 authored by Nick Craver's avatar Nick Craver
Browse files
Options

Merge pull request #518 from StackExchange/netstandard 

RC2 Upgrade!
parents e894e7e2 b3013525
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1543 additions and 422 deletions
Dapper.Contrib/Dapper.Contrib.xproj
View file @ 0707ca80
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<ProjectGuid>4e409f8f-cfbb-4332-8b0a-fd5a283051fd</ProjectGuid> <ProjectGuid>4e409f8f-cfbb-4332-8b0a-fd5a283051fd</ProjectGuid>
<RootNamespace>Dapper.Contrib</RootNamespace> <RootNamespace>Dapper.Contrib</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
......
Dapper.Contrib/project.json
View file @ 0707ca80
{ {
"authors": [ "Sam Saffron", "Johan Danforth" ], "packOptions": {
"summary": "Dapper.Contrib",
"tags": [ "orm", "sql", "micro-orm", "dapper" ],
"owners": [ "johandanforth", "marc.gravell", "nick.craver" ], "owners": [ "johandanforth", "marc.gravell", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "Dapper.Contrib", "repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Sam Saffron", "Johan Danforth" ],
"description": "The official collection of get, insert, update and delete helpers for dapper.net. Also handles lists of entities and optional \"dirty\" tracking of interface-based entities.", "description": "The official collection of get, insert, update and delete helpers for dapper.net. Also handles lists of entities and optional \"dirty\" tracking of interface-based entities.",
"version": "1.50-beta9", "version": "1.50-beta10",
"title": "Dapper.Contrib", "title": "Dapper.Contrib",
"tags": [ "orm", "sql", "micro-orm", "dapper" ],
"copyright": "2016 Stack Exchange, Inc.", "copyright": "2016 Stack Exchange, Inc.",
"dependencies": { "dependencies": {
"Dapper": { "Dapper": {
...@@ -15,12 +21,16 @@ ...@@ -15,12 +21,16 @@
"target": "project" "target": "project"
} }
}, },
"compile": [ "buildOptions": {
"**/*.cs", "warningsAsErrors": true,
"../Dapper/TypeExtensions.cs" "compile": {
"include:": [
"**/*.cs"
], ],
"compilationOptions": { "includeFiles": [
"warningsAsErrors": true "../Dapper/TypeExtensions.cs"
]
}
}, },
"frameworks": { "frameworks": {
"net40": { "net40": {
...@@ -30,7 +40,7 @@ ...@@ -30,7 +40,7 @@
} }
}, },
"net45": { "net45": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC" ] "define": [ "ASYNC" ]
}, },
"frameworkAssemblies": { "frameworkAssemblies": {
...@@ -40,15 +50,12 @@ ...@@ -40,15 +50,12 @@
"dependencies": { "dependencies": {
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC", "COREFX" ] "define": [ "ASYNC", "COREFX" ]
}, },
"dependencies": { "dependencies": {
"System.Reflection.Emit": "4.0.1-beta-23516", "Microsoft.CSharp": "4.0.1-rc2-24027"
"System.Reflection.Emit.ILGeneration": "4.0.1-beta-23516",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
"System.Runtime": "4.0.21-beta-23516"
} }
} }
} }
......
Dapper.EntityFramework.StrongName/Dapper.EntityFramework.StrongName.xproj
View file @ 0707ca80
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<ProjectGuid>1a70b6d7-244e-41ed-8ff5-6f0e8e26a764</ProjectGuid> <ProjectGuid>1a70b6d7-244e-41ed-8ff5-6f0e8e26a764</ProjectGuid>
<RootNamespace>Dapper.EntityFramework.StrongName</RootNamespace> <RootNamespace>Dapper.EntityFramework.StrongName</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
......
Dapper.EntityFramework.StrongName/project.json
View file @ 0707ca80
{ {
"authors": [ "Marc Gravell", "Nick Craver" ], "packOptions": {
"summary": "Adds support for DbGeography, etc.",
"tags": [ "orm", "sql", "micro-orm" ],
"owners": [ "marc.gravell", "nick.craver" ], "owners": [ "marc.gravell", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "Adds support for DbGeography, etc.", "repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Marc Gravell", "Nick Craver" ],
"description": "Extension handlers for entity framework", "description": "Extension handlers for entity framework",
"version": "1.50-beta9", "version": "1.50-beta10",
"title": "Dapper entity framework type handlers (with a strong name)", "title": "Dapper entity framework type handlers (with a strong name)",
"tags": [ "orm", "sql", "micro-orm" ],
"copyright": "2016 Stack Exchange, Inc.", "copyright": "2016 Stack Exchange, Inc.",
"dependencies": { "dependencies": {
"Dapper.StrongName": { "Dapper.StrongName": {
...@@ -15,11 +21,16 @@ ...@@ -15,11 +21,16 @@
"target": "project" "target": "project"
} }
}, },
"compile": [ "buildOptions": {
"warningsAsErrors": true,
"compile": {
"include": [
"../Dapper.EntityFramework/**/*.cs" "../Dapper.EntityFramework/**/*.cs"
], ],
"compilationOptions": { "exclude": [
"warningsAsErrors": true "../Dapper.EntityFramework/obj/"
]
}
}, },
"frameworks": { "frameworks": {
"net40": { "net40": {
...@@ -35,7 +46,7 @@ ...@@ -35,7 +46,7 @@
} }
}, },
"net45": { "net45": {
"compilationOptions": { "buildOptions": {
"keyFile": "../Dapper.snk", "keyFile": "../Dapper.snk",
"define": [ "ASYNC" ] "define": [ "ASYNC" ]
}, },
......
Dapper.EntityFramework/Dapper.EntityFramework.xproj
View file @ 0707ca80
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<ProjectGuid>be401f7b-8611-4a1e-aeaa-5cb700128c16</ProjectGuid> <ProjectGuid>be401f7b-8611-4a1e-aeaa-5cb700128c16</ProjectGuid>
<RootNamespace>Dapper.EntityFramework</RootNamespace> <RootNamespace>Dapper.EntityFramework</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
......
Dapper.EntityFramework/project.json
View file @ 0707ca80
{ {
"authors": [ "Marc Gravell", "Nick Craver" ], "packOptions": {
"summary": "Adds support for DbGeography, etc.",
"tags": [ "orm", "sql", "micro-orm" ],
"owners": [ "marc.gravell", "nick.craver" ], "owners": [ "marc.gravell", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "Adds support for DbGeography, etc.", "repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Marc Gravell", "Nick Craver" ],
"description": "Extension handlers for entity framework", "description": "Extension handlers for entity framework",
"version": "1.50-beta9", "version": "1.50-beta10",
"title": "Dapper entity framework type handlers", "title": "Dapper entity framework type handlers",
"tags": [ "orm", "sql", "micro-orm" ],
"copyright": "2016 Stack Exchange, Inc.", "copyright": "2016 Stack Exchange, Inc.",
"dependencies": { "dependencies": {
"Dapper": { "Dapper": {
...@@ -15,7 +21,7 @@ ...@@ -15,7 +21,7 @@
"target": "project" "target": "project"
} }
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworks": { "frameworks": {
...@@ -32,7 +38,7 @@ ...@@ -32,7 +38,7 @@
} }
}, },
"net45": { "net45": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC" ] "define": [ "ASYNC" ]
}, },
"frameworkAssemblies": { "frameworkAssemblies": {
......
Dapper.Rainbow/Dapper.Rainbow.xproj
View file @ 0707ca80
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<ProjectGuid>8a74f0b6-188f-45d2-8a4b-51e4f211805a</ProjectGuid> <ProjectGuid>8a74f0b6-188f-45d2-8a4b-51e4f211805a</ProjectGuid>
<RootNamespace>Dapper.Rainbow</RootNamespace> <RootNamespace>Dapper.Rainbow</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
......
Dapper.Rainbow/project.json
View file @ 0707ca80
{ {
"authors": [ "Sam Saffron" ], "packOptions": {
"summary": "A demo is available at https://gist.github.com/1599013",
"tags": [ "orm", "sql", "micro-orm" ],
"owners": [ "samsaffron" ], "owners": [ "samsaffron" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "A demo is available at https://gist.github.com/1599013", "repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Sam Saffron" ],
"description": "Trivial micro-orm implemented on Dapper, provides with CRUD helpers.", "description": "Trivial micro-orm implemented on Dapper, provides with CRUD helpers.",
"version": "0.1.3-beta1", "version": "0.1.3-beta1",
"title": "Dapper.Rainbow", "title": "Dapper.Rainbow",
"tags": [ "orm", "sql", "micro-orm" ],
"copyright": "2012 Sam Saffron", "copyright": "2012 Sam Saffron",
"dependencies": { "dependencies": {
"Dapper": { "Dapper": {
...@@ -15,12 +21,16 @@ ...@@ -15,12 +21,16 @@
"target": "project" "target": "project"
} }
}, },
"compile": [ "buildOptions": {
"**/*.cs", "warningsAsErrors": true,
"../Dapper/TypeExtensions.cs" "compile": {
"include:": [
"**/*.cs"
], ],
"compilationOptions": { "includeFiles": [
"warningsAsErrors": true "../Dapper/TypeExtensions.cs"
]
}
}, },
"frameworks": { "frameworks": {
"net40": { "net40": {
...@@ -31,7 +41,7 @@ ...@@ -31,7 +41,7 @@
} }
}, },
"net45": { "net45": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC" ] "define": [ "ASYNC" ]
}, },
"frameworkAssemblies": { "frameworkAssemblies": {
...@@ -40,11 +50,12 @@ ...@@ -40,11 +50,12 @@
"System.Data.Linq": "4.0.0.0" "System.Data.Linq": "4.0.0.0"
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC", "COREFX" ] "define": [ "ASYNC", "COREFX" ]
}, },
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027"
} }
} }
} }
......
Dapper.SqlBuilder/Dapper.SqlBuilder.xproj
View file @ 0707ca80
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<ProjectGuid>196928f0-7052-4585-90e8-817bd720f5e3</ProjectGuid> <ProjectGuid>196928f0-7052-4585-90e8-817bd720f5e3</ProjectGuid>
<RootNamespace>Dapper.SqlBuilder</RootNamespace> <RootNamespace>Dapper.SqlBuilder</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
......
Dapper.SqlBuilder/project.json
View file @ 0707ca80
{ {
"authors": [ "Sam Saffron, Johan Danforth" ], "packOptions": {
"summary": "Dapper.SqlBuilder",
"tags": [ "orm", "sql", "micro-orm", "query", "sql-builder" ],
"owners": [ "AEckenberger", "nick.craver" ], "owners": [ "AEckenberger", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "Dapper.SqlBuilder", "repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Sam Saffron, Johan Danforth" ],
"description": "The Dapper SqlBuilder component, for building SQL queries dynamically.", "description": "The Dapper SqlBuilder component, for building SQL queries dynamically.",
"version": "1.50-beta9", "version": "1.50-beta10",
"title": "Dapper SqlBuilder component", "title": "Dapper SqlBuilder component",
"tags": [ "orm", "sql", "micro-orm", "query", "sql-builder" ],
"copyright": "2016 Stack Exchange, Inc.", "copyright": "2016 Stack Exchange, Inc.",
"dependencies": { "dependencies": {
"Dapper": { "Dapper": {
...@@ -15,7 +21,7 @@ ...@@ -15,7 +21,7 @@
"target": "project" "target": "project"
} }
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworks": { "frameworks": {
...@@ -26,7 +32,7 @@ ...@@ -26,7 +32,7 @@
} }
}, },
"net45": { "net45": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC" ] "define": [ "ASYNC" ]
}, },
"frameworkAssemblies": { "frameworkAssemblies": {
...@@ -34,11 +40,12 @@ ...@@ -34,11 +40,12 @@
"System.Data.Linq": "4.0.0.0" "System.Data.Linq": "4.0.0.0"
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC", "COREFX" ] "define": [ "ASYNC", "COREFX" ]
}, },
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027"
} }
} }
} }
......
Dapper.StrongName/Dapper.StrongName.xproj
View file @ 0707ca80
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<ProjectGuid>549c51a1-222b-4e12-96f1-3aeff45a7709</ProjectGuid> <ProjectGuid>549c51a1-222b-4e12-96f1-3aeff45a7709</ProjectGuid>
<RootNamespace>Dapper.StrongName</RootNamespace> <RootNamespace>Dapper.StrongName</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
......
Dapper.StrongName/project.json
View file @ 0707ca80
{ {
"authors": [ "Sam Saffron", "Marc Gravell", "Nick Craver" ], "packOptions": {
"summary": "A high performance Micro-ORM",
"tags": [ "orm", "sql", "micro-orm" ],
"owners": [ "marc.gravell", "nick.craver" ], "owners": [ "marc.gravell", "nick.craver" ],
"releaseNotes": "http://stackexchange.github.io/dapper-dot-net/",
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "A high performance Micro-ORM", "repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Sam Saffron", "Marc Gravell", "Nick Craver" ],
"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.50-beta9", "version": "1.50-beta10",
"title": "Dapper dot net (strong named)", "title": "Dapper dot net (strong named)",
"tags": [ "orm", "sql", "micro-orm" ],
"copyright": "2016 Stack Exchange, Inc.", "copyright": "2016 Stack Exchange, Inc.",
"dependencies": { "dependencies": {
}, },
"releaseNotes": "http://stackexchange.github.io/dapper-dot-net/", "buildOptions": {
"compile": [ "keyFile": "../Dapper.snk",
"warningsAsErrors": true,
"compile:": {
"include": [
"../Dapper/**/*.cs" "../Dapper/**/*.cs"
], ],
"compileExclude": [ "exclude": [
"../Dapper/obj/" "../Dapper/obj/"
], ]
"compilationOptions": { }
"keyFile": "../Dapper.snk",
"warningsAsErrors": true
}, },
"frameworks": { "frameworks": {
"net40": { "net40": {
...@@ -31,7 +39,7 @@ ...@@ -31,7 +39,7 @@
} }
}, },
"net45": { "net45": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC" ] "define": [ "ASYNC" ]
}, },
"frameworkAssemblies": { "frameworkAssemblies": {
...@@ -41,35 +49,28 @@ ...@@ -41,35 +49,28 @@
} }
}, },
"net451": { "net451": {
"buildOptions": {
"define": [ "ASYNC" ]
},
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Data": "4.0.0.0", "System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0", "System.Xml": "4.0.0.0",
"System.Xml.Linq": "4.0.0.0" "System.Xml.Linq": "4.0.0.0"
},
"compilationOptions": {
"define": [ "ASYNC" ]
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC", "COREFX" ] "define": [ "ASYNC", "COREFX" ]
}, },
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23516", "NETStandard.Library": "1.5.0-rc2-24027",
"System.Runtime": "4.0.21-beta-23516", "System.Data.SqlClient": "4.1.0-rc2-24027",
"System.Collections": "4.0.11-beta-23516", "System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Collections.Concurrent": "4.0.11-beta-23516", "System.Reflection.Emit": "4.0.1-rc2-24027",
"System.Data.SqlClient": "4.0.0-beta-23516", "System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
"System.Linq": "4.0.1-beta-23516", "System.Xml.XmlDocument": "4.0.1-rc2-24027",
"System.Reflection.Emit.ILGeneration": "4.0.1-beta-23516", "System.Collections.NonGeneric": "4.0.1-rc2-24027",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", "System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
"System.Reflection.TypeExtensions": "4.1.0-beta-23516",
"System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Threading": "4.0.11-beta-23516",
"System.Threading.ThreadPool": "4.0.10-beta-23516",
"System.Collections.NonGeneric": "4.0.1-beta-23516",
"System.Xml.XDocument": "4.0.11-beta-23516",
"System.Xml.XmlDocument": "4.0.1-beta-23516"
} }
} }
} }
......
Dapper.Tests.Contrib/Dapper.Tests.Contrib.xproj
View file @ 0707ca80
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<ProjectGuid>dab3c5b7-bcd1-4a5f-bb6b-50d2bb63db4a</ProjectGuid> <ProjectGuid>dab3c5b7-bcd1-4a5f-bb6b-50d2bb63db4a</ProjectGuid>
<RootNamespace>Dapper.Tests.Contrib</RootNamespace> <RootNamespace>Dapper.Tests.Contrib</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
......
Dapper.Tests.Contrib/Program.cs 0 → 100644
View file @ 0707ca80
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Dapper.Tests.Contrib
{
public class Program
{
static void Main(string[] args)
{
}
}
}
Dapper.Tests.Contrib/Properties/AssemblyInfo.cs
View file @ 0707ca80
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("Dapper.Contrib.Tests")] [assembly: AssemblyTitle("Dapper.Tests.Contrib")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Dapper.Contrib.Tests")] [assembly: AssemblyProduct("Dapper.Tests.Contrib")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] [assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
......
Dapper.Tests.Contrib/project.json
View file @ 0707ca80
{ {
"authors": [ "Sam Saffron", "Johan Danforth" ], "packOptions": {
"summary": "Dapper Contrib Test Suite",
"tags": [ "orm", "sql", "micro-orm" ],
"owners": [ "johandanforth", "marc.gravell", "nick.craver" ], "owners": [ "johandanforth", "marc.gravell", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Sam Saffron", "Johan Danforth" ],
"description": "Dapper Contrib Test Suite", "description": "Dapper Contrib Test Suite",
"title": "Dapper.Contrib.Tests", "title": "Dapper.Tests.Contrib",
"version": "1.0.0", "version": "1.0.0",
"copyright": "2016 Stack Exchange, Inc.", "copyright": "2016 Stack Exchange, Inc.",
"dependencies": { "dependencies": {
...@@ -21,95 +29,88 @@ ...@@ -21,95 +29,88 @@
"target": "project" "target": "project"
} }
}, },
"compile": [ "buildOptions": {
"**/*.cs", "warningsAsErrors": true,
"emitEntryPoint": true,
"debugType": "portable",
"compile": {
"include:": [
"**/*.cs"
],
"includeFiles": [
"../Dapper.Tests/Assert.cs", "../Dapper.Tests/Assert.cs",
"../Dapper.Tests/XunitSkippable.cs", "../Dapper.Tests/XunitSkippable.cs",
"../Dapper/TypeExtensions.cs" "../Dapper/TypeExtensions.cs"
], ]
"commands": {
"test": "xunit.runner.dnx"
},
"compilationOptions": {
"warningsAsErrors": true
},
"frameworks": {
"net40": {
"frameworkAssemblies": {
"System.Configuration": "4.0.0.0",
"System.Data": "4.0.0.0",
"System.Data.Linq": "4.0.0.0",
"System.Transactions": "4.0.0.0",
"System.Xml": "4.0.0.0"
},
"dependencies": {
"Microsoft.SqlServer.Compact": "4.0.8876.1",
"MySql.Data": "6.9.8",
"System.Data.SQLite.Core": "1.0.98.1",
"xunit": "1.9.2"
}
},
"net45": {
"compilationOptions": {
"define": [ "ASYNC", "XUNIT2" ]
},
"frameworkAssemblies": {
"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.Transactions": "4.0.0.0",
"System.Xml": "4.0.0.0"
},
"dependencies": {
"Microsoft.SqlServer.Compact": "4.0.8876.1",
"MySql.Data": "6.9.8",
"System.Data.SQLite.Core": "1.0.98.1",
"xunit": "2.1.0"
}
},
"dotnet5.4": {
"compilationOptions": {
"define": [ "ASYNC", "COREFX", "XUNIT2" ]
},
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23516",
"Microsoft.Data.Sqlite": "1.0.0-rc1-final",
"System.Collections": "4.0.11-beta-23516",
"System.Console": "4.0.0-beta-23516",
"System.Data.SqlClient": "4.0.0-beta-23516",
"System.Linq": "4.0.1-beta-23516",
"System.Runtime": "4.0.21-beta-23516",
"System.Threading": "4.0.11-beta-23516",
"xunit": "2.1.0"
}
},
"dnx451": {
"compilationOptions": {
"define": [ "ASYNC", "XUNIT2" ]
},
"frameworkAssemblies": {
"System.Configuration": "4.0.0.0",
"System.Data.Linq": "4.0.0.0",
"System.Transactions": "4.0.0.0"
},
"dependencies": {
"Microsoft.SqlServer.Compact": "4.0.8876.1",
"MySql.Data": "6.9.8",
"System.Data.SQLite.Core": "1.0.98.1",
"xunit": "2.1.0",
"xunit.runner.dnx": "2.1.0-rc1-build204"
} }
}, },
"dnxcore50": { "testRunner": "xunit",
"compilationOptions": { "frameworks": {
//"net40": {
// "frameworkAssemblies": {
// "System.Configuration": "4.0.0.0",
// "System.Data": "4.0.0.0",
// "System.Data.Linq": "4.0.0.0",
// "System.Transactions": "4.0.0.0",
// "System.Xml": "4.0.0.0"
// },
// "dependencies": {
// "Microsoft.SqlServer.Compact": "4.0.8876.1",
// "MySql.Data": "6.9.8",
// "System.Data.SQLite.Core": "1.0.98.1",
// "xunit": "1.9.2"
// }
//},
//"net45": {
// "compilationOptions": {
// "define": [ "ASYNC", "XUNIT2" ]
// },
// "frameworkAssemblies": {
// "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.Transactions": "4.0.0.0",
// "System.Xml": "4.0.0.0"
// },
// "dependencies": {
// "Microsoft.SqlServer.Compact": "4.0.8876.1",
// "MySql.Data": "6.9.8",
// "System.Data.SQLite.Core": "1.0.98.1",
// "xunit": "2.1.0"
// }
//},
//"dnx451": {
// "compilationOptions": {
// "define": [ "ASYNC", "XUNIT2" ]
// },
// "frameworkAssemblies": {
// "System.Configuration": "4.0.0.0",
// "System.Data.Linq": "4.0.0.0",
// "System.Transactions": "4.0.0.0"
// },
// "dependencies": {
// "Microsoft.SqlServer.Compact": "4.0.8876.1",
// "MySql.Data": "6.9.8",
// "System.Data.SQLite.Core": "1.0.98.1",
// "xunit": "2.1.0",
// "xunit.runner.dnx": "2.1.0-*"
// }
//},
"netcoreapp1.0": {
"imports": [ "dnxcore50", "portable-net45+win8" ],
"buildOptions": {
"define": [ "COREFX", "ASYNC", "XUNIT2" ] "define": [ "COREFX", "ASYNC", "XUNIT2" ]
}, },
"dependencies": { "dependencies": {
"Microsoft.Data.Sqlite": "1.0.0-rc1-final", "Microsoft.NETCore.App": {
"System.Runtime": "4.0.21-beta-23516", "version": "1.0.0-rc2-3002702",
"type": "platform"
},
"Microsoft.Data.Sqlite": "1.0.0-rc2-final",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.dnx": "2.1.0-rc1-build204" "dotnet-test-xunit": "1.0.0-rc2-*"
} }
} }
} }
......
Dapper.Tests/Dapper.Tests.xproj
View file @ 0707ca80
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<ProjectGuid>052c0817-db26-4925-8929-8c5e42d148d5</ProjectGuid> <ProjectGuid>052c0817-db26-4925-8929-8c5e42d148d5</ProjectGuid>
<RootNamespace>Dapper.Tests</RootNamespace> <RootNamespace>Dapper.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
......
Dapper.Tests/Tests.cs
View file @ 0707ca80
...@@ -2131,7 +2131,7 @@ public void DapperEnumValue_SqlServer() ...@@ -2131,7 +2131,7 @@ public void DapperEnumValue_SqlServer()
} }
#if SQLITE #if SQLITE
[FactSqlite(Skip = "Fixed in RC2 but not nuget.org, re-enable then.")] [FactSqlite]
public void DapperEnumValue_Sqlite() public void DapperEnumValue_Sqlite()
{ {
using (var connection = GetSqliteConnection()) using (var connection = GetSqliteConnection())
...@@ -2954,7 +2954,6 @@ public void SO29343103_UtcDates() ...@@ -2954,7 +2954,6 @@ public void SO29343103_UtcDates()
Assert.IsTrue(delta.TotalMilliseconds >= -10 && delta.TotalMilliseconds <= 10); Assert.IsTrue(delta.TotalMilliseconds >= -10 && delta.TotalMilliseconds <= 10);
} }
[FactUnlessCoreCLR("https://github.com/dotnet/corefx/issues/1612")]
public void Issue261_Decimals() public void Issue261_Decimals()
{ {
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
...@@ -2964,7 +2963,6 @@ public void Issue261_Decimals() ...@@ -2964,7 +2963,6 @@ public void Issue261_Decimals()
var c = parameters.Get<Decimal>("c"); var c = parameters.Get<Decimal>("c");
c.IsEqualTo(11.884M); c.IsEqualTo(11.884M);
} }
[FactUnlessCoreCLR("https://github.com/dotnet/corefx/issues/1612")]
public void Issue261_Decimals_ADONET_SetViaBaseClass() public void Issue261_Decimals_ADONET_SetViaBaseClass()
{ {
Issue261_Decimals_ADONET(true); Issue261_Decimals_ADONET(true);
...@@ -3675,7 +3673,7 @@ public void Isse467_SqliteLikesParametersWithPrefix() ...@@ -3675,7 +3673,7 @@ public void Isse467_SqliteLikesParametersWithPrefix()
{ {
Isse467_SqliteParameterNaming(true); Isse467_SqliteParameterNaming(true);
} }
[FactSqlite(Skip = "Fixed in RC2 but not nuget.org, re-enable then.")] [FactSqlite]
public void Isse467_SqliteLikesParametersWithoutPrefix() public void Isse467_SqliteLikesParametersWithoutPrefix()
{ // see issue 375 / 467; note: fixed from RC2 onwards { // see issue 375 / 467; note: fixed from RC2 onwards
Isse467_SqliteParameterNaming(false); Isse467_SqliteParameterNaming(false);
......
Dapper.Tests/project.json
View file @ 0707ca80
{ {
"authors": [ "Marc Gravell", "Nick Craver" ], "packOptions": {
"summary": "Dapper.Tests",
"tags": [ "orm", "sql", "micro-orm" ],
"owners": [ "marc.gravell", "nick.craver" ], "owners": [ "marc.gravell", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"authors": [ "Marc Gravell", "Nick Craver" ],
"description": "Dapper Core Test Suite", "description": "Dapper Core Test Suite",
"title": "Dapper.Tests", "title": "Dapper.Tests",
"version": "1.0.0-*", "version": "1.0.0-*",
...@@ -16,189 +24,122 @@ ...@@ -16,189 +24,122 @@
"target": "project" "target": "project"
} }
}, },
"commands": { //"commands": {
"perf": "Dapper.Tests", // "perf": "Dapper.Tests"
"test": "xunit.runner.dnx" //},
}, "buildOptions": {
"compilationOptions": { "warningsAsErrors": true,
"warningsAsErrors": true "emitEntryPoint": true,
"debugType": "portable"
}, },
"testRunner": "xunit",
"frameworks": { "frameworks": {
"net40": { //"net40": {
"compilationOptions": { // "compilationOptions": {
"define": [ // "define": [
"MYSQL", // "MYSQL",
"ENTITY_FRAMEWORK", // "ENTITY_FRAMEWORK",
"LINQ2SQL", // "LINQ2SQL",
"FIREBIRD", // "FIREBIRD",
"SQL_CE", // "SQL_CE",
"OLEDB", // "OLEDB",
"MASSIVE", // "MASSIVE",
"ORMLITE", // "ORMLITE",
"SOMA", // "SOMA",
"SIMPLEDATA", // "SIMPLEDATA",
"SQLITE" // "SQLITE"
] // ]
}, // },
"frameworkAssemblies": { // "frameworkAssemblies": {
"System.Configuration": "4.0.0.0", // "System.Configuration": "4.0.0.0",
"System.Data": "4.0.0.0", // "System.Data": "4.0.0.0",
"System.Data.Linq": "4.0.0.0", // "System.Data.Linq": "4.0.0.0",
"System.Xml": "4.0.0.0", // "System.Xml": "4.0.0.0",
"System.Xml.Linq": "4.0.0.0" // "System.Xml.Linq": "4.0.0.0"
}, // },
"dependencies": { // "dependencies": {
"Dapper.EntityFramework": { // "Dapper.EntityFramework": {
"target": "project" // "target": "project"
}, // },
"EntityFramework": "6.1.3", // "EntityFramework": "6.1.3",
"FirebirdSql.Data.FirebirdClient": "4.10.0", // "FirebirdSql.Data.FirebirdClient": "4.10.0",
"Microsoft.SqlServer.Compact": "4.0.8876.1", // "Microsoft.SqlServer.Compact": "4.0.8876.1",
"Microsoft.SqlServer.Types": "11.0.2", // "Microsoft.SqlServer.Types": "11.0.2",
"MySql.Data": "6.9.8", // "MySql.Data": "6.9.8",
"NHibernate": "4.0.4.4000", // "NHibernate": "4.0.4.4000",
"ServiceStack.OrmLite": "4.0.48", // "ServiceStack.OrmLite": "4.0.48",
"ServiceStack.OrmLite.SqlServer": "4.0.48", // "ServiceStack.OrmLite.SqlServer": "4.0.48",
"Simple.Data.Ado": "1.0.0-rc3", // "Simple.Data.Ado": "1.0.0-rc3",
"Simple.Data.Core": "1.0.0-rc3", // "Simple.Data.Core": "1.0.0-rc3",
"Simple.Data.SqlServer": "1.0.0-rc3", // "Simple.Data.SqlServer": "1.0.0-rc3",
"Soma": "1.8.0.7", // "Soma": "1.8.0.7",
"System.Data.SQLite": "1.0.99", // "System.Data.SQLite": "1.0.99",
"xunit": "1.9.2" // "xunit": "1.9.2"
} // }
}, //},
"net45": { //"net45": {
"compilationOptions": { // "compilationOptions": {
"define": [ // "define": [
"ASYNC", // "ASYNC",
"MYSQL", // "MYSQL",
"ENTITY_FRAMEWORK", // "ENTITY_FRAMEWORK",
"LINQ2SQL", // "LINQ2SQL",
"FIREBIRD", // "FIREBIRD",
"SQL_CE", // "SQL_CE",
"POSTGRESQL", // "POSTGRESQL",
"OLEDB", // "OLEDB",
"MASSIVE", // "MASSIVE",
"ORMLITE", // "ORMLITE",
"SOMA", // "SOMA",
"SIMPLEDATA", // "SIMPLEDATA",
"SQLITE", // "SQLITE",
"XUNIT2" // "XUNIT2"
] // ]
}, // },
"frameworkAssemblies": { // "frameworkAssemblies": {
"System.Configuration": "4.0.0.0", // "System.Configuration": "4.0.0.0",
"System.Data": "4.0.0.0", // "System.Data": "4.0.0.0",
"System.Data.Linq": "4.0.0.0", // "System.Data.Linq": "4.0.0.0",
"System.Runtime": "4.0.0.0", // "System.Runtime": "4.0.0.0",
"System.Xml": "4.0.0.0", // "System.Xml": "4.0.0.0",
"System.Xml.Linq": "4.0.0.0" // "System.Xml.Linq": "4.0.0.0"
}, // },
"dependencies": { // "dependencies": {
"Dapper.EntityFramework": { // "Dapper.EntityFramework": {
"target": "project" // "target": "project"
}, // },
"EntityFramework": "6.1.3", // "EntityFramework": "6.1.3",
"FirebirdSql.Data.FirebirdClient": "4.10.0", // "FirebirdSql.Data.FirebirdClient": "4.10.0",
"Microsoft.SqlServer.Compact": "4.0.8876.1", // "Microsoft.SqlServer.Compact": "4.0.8876.1",
"Microsoft.SqlServer.Types": "11.0.2", // "Microsoft.SqlServer.Types": "11.0.2",
"MySql.Data": "6.9.8", // "MySql.Data": "6.9.8",
"NHibernate": "4.0.4.4000", // "NHibernate": "4.0.4.4000",
"Npgsql": "3.0.5", // "Npgsql": "3.0.5",
"ServiceStack.OrmLite": "4.0.48", // "ServiceStack.OrmLite": "4.0.48",
"ServiceStack.OrmLite.SqlServer": "4.0.48", // "ServiceStack.OrmLite.SqlServer": "4.0.48",
"Simple.Data.Ado": "2.0.0-alpha1", // "Simple.Data.Ado": "2.0.0-alpha1",
"Simple.Data.Core": "2.0.0-alpha1", // "Simple.Data.Core": "2.0.0-alpha1",
"Simple.Data.SqlServer": "2.0.0-alpha1", // "Simple.Data.SqlServer": "2.0.0-alpha1",
"Soma": "1.8.0.7", // "Soma": "1.8.0.7",
"Susanoo.Core": "1.2.4", // "Susanoo.Core": "1.2.4",
"Susanoo.SqlServer": "1.2.4", // "Susanoo.SqlServer": "1.2.4",
"System.Data.SQLite": "1.0.99", // "System.Data.SQLite": "1.0.99",
"xunit": "2.1.0" // "xunit": "2.1.0"
} // }
}, //},
"dotnet5.4": { "netcoreapp1.0": {
"compilationOptions": { "imports": [ "dnxcore50", "portable-net45+win8" ],
"buildOptions": {
"define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ] "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ]
}, },
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23516", "Microsoft.NETCore.App": {
"Microsoft.Data.Sqlite": "1.0.0-rc1-final", "version": "1.0.0-rc2-24015",
"System.Collections": "4.0.11-beta-23516", "type": "platform"
"System.Console": "4.0.0-beta-23516",
"System.Data.SqlClient": "4.0.0-beta-23516",
"System.Linq": "4.0.1-beta-23516",
"System.Runtime": "4.0.21-beta-23516",
"System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Threading": "4.0.11-beta-23516",
"System.Xml.XDocument": "4.0.11-beta-23516",
"System.Xml.XmlDocument": "4.0.1-beta-23516",
"xunit": "2.2.0-beta1-build3239"
}
},
"dnx451": {
"compilationOptions": {
"define": [
"DNX",
"ASYNC",
"MYSQL",
"ENTITY_FRAMEWORK",
"LINQ2SQL",
"FIREBIRD",
"SQL_CE",
"POSTGRESQL",
"OLEDB",
"MASSIVE",
"ORMLITE",
"SOMA",
"SIMPLEDATA",
"XUNIT2",
"SQLITE"
]
},
"frameworkAssemblies": {
"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",
"System.Xml.Linq": "4.0.0.0"
},
"dependencies": {
"Dapper.EntityFramework": {
"target": "project"
}, },
"EntityFramework": "6.1.3", "Microsoft.Data.Sqlite": "1.0.0-rc2-20597",
"FirebirdSql.Data.FirebirdClient": "4.10.0", "xunit": "2.1.0",
"Microsoft.Data.Sqlite": "1.0.0-rc1-final", "dotnet-test-xunit": "1.0.0-rc2-*"
"Microsoft.SqlServer.Compact": "4.0.8876.1",
"Microsoft.SqlServer.Types": "11.0.2",
"MySql.Data": "6.9.8",
"NHibernate": "4.0.4.4000",
"Npgsql": "3.0.5",
"ServiceStack.OrmLite": "4.0.48",
"ServiceStack.OrmLite.SqlServer": "4.0.48",
"Simple.Data.Ado": "2.0.0-alpha1",
"Simple.Data.Core": "2.0.0-alpha1",
"Simple.Data.SqlServer": "2.0.0-alpha1",
"Soma": "1.8.0.7",
"Susanoo.Core": "1.2.4",
"Susanoo.SqlServer": "1.2.4",
"System.Text.RegularExpressions": "4.0.11-beta-23516",
"xunit": "2.2.0-beta1-build3239",
"xunit.runner.dnx": "2.1.0-rc1-build204"
}
},
"dnxcore50": {
"compilationOptions": {
"define": [ "COREFX", "ASYNC", "DNX", "XUNIT2", "SQLITE" ]
},
"dependencies": {
"Microsoft.Data.Sqlite": "1.0.0-rc1-final",
"System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Xml.XmlDocument": "4.0.1-beta-23516",
"xunit": "2.2.0-beta1-build3239",
"xunit.runner.dnx": "2.1.0-rc1-build204"
} }
} }
} }
......
Dapper/Dapper.xproj
View file @ 0707ca80
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<ProjectGuid>fac24c3f-68f9-4247-a4b9-21d487e99275</ProjectGuid> <ProjectGuid>fac24c3f-68f9-4247-a4b9-21d487e99275</ProjectGuid>
<RootNamespace>Dapper</RootNamespace> <RootNamespace>Dapper</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
</PropertyGroup> </PropertyGroup>
......
Dapper/project.json
View file @ 0707ca80
{ {
"authors": [ "Sam Saffron", "Marc Gravell", "Nick Craver" ], "packOptions": {
"summary": "A high performance Micro-ORM",
"tags": [ "orm", "sql", "micro-orm" ],
"owners": [ "marc.gravell", "nick.craver" ], "owners": [ "marc.gravell", "nick.craver" ],
"releaseNotes": "http://stackexchange.github.io/dapper-dot-net/",
"projectUrl": "https://github.com/StackExchange/dapper-dot-net", "projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "A high performance Micro-ORM", "repository": {
"type": "git",
"url": "https://github.com/StackExchange/dapper-dot-net"
}
},
"version": "1.50-beta10",
"authors": [ "Sam Saffron", "Marc Gravell", "Nick Craver" ],
"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.50-beta9",
"title": "Dapper dot net", "title": "Dapper dot net",
"tags": [ "orm", "sql", "micro-orm" ],
"copyright": "2016 Stack Exchange, Inc.", "copyright": "2016 Stack Exchange, Inc.",
"dependencies": { "dependencies": {
}, },
"releaseNotes": "http://stackexchange.github.io/dapper-dot-net/", "buildOptions": {
"compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworks": { "frameworks": {
...@@ -24,7 +30,7 @@ ...@@ -24,7 +30,7 @@
} }
}, },
"net45": { "net45": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC" ] "define": [ "ASYNC" ]
}, },
"frameworkAssemblies": { "frameworkAssemblies": {
...@@ -34,35 +40,28 @@ ...@@ -34,35 +40,28 @@
} }
}, },
"net451": { "net451": {
"buildOptions": {
"define": [ "ASYNC" ]
},
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Data": "4.0.0.0", "System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0", "System.Xml": "4.0.0.0",
"System.Xml.Linq": "4.0.0.0" "System.Xml.Linq": "4.0.0.0"
},
"compilationOptions": {
"define": [ "ASYNC" ]
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"compilationOptions": { "buildOptions": {
"define": [ "ASYNC", "COREFX" ] "define": [ "ASYNC", "COREFX" ]
}, },
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23516", "NETStandard.Library": "1.5.0-rc2-24027",
"System.Collections": "4.0.11-beta-23516", "System.Data.SqlClient": "4.1.0-rc2-24027",
"System.Collections.Concurrent": "4.0.11-beta-23516", "System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Collections.NonGeneric": "4.0.1-beta-23516", "System.Reflection.Emit": "4.0.1-rc2-24027",
"System.Data.SqlClient": "4.0.0-beta-23516", "System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
"System.Linq": "4.0.1-beta-23516", "System.Xml.XmlDocument": "4.0.1-rc2-24027",
"System.Reflection.Emit.ILGeneration": "4.0.1-beta-23516", "System.Collections.NonGeneric": "4.0.1-rc2-24027",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", "System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
"System.Reflection.TypeExtensions": "4.1.0-beta-23516",
"System.Runtime": "4.0.21-beta-23516",
"System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Threading": "4.0.11-beta-23516",
"System.Threading.ThreadPool": "4.0.10-beta-23516",
"System.Xml.XDocument": "4.0.11-beta-23516",
"System.Xml.XmlDocument": "4.0.1-beta-23516"
} }
} }
} }
......
NuGet.Config
View file @ 0707ca80
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
<!-- <!--
<add key="CoreCLR" value="https://www.myget.org/F/dotnet-coreclr/api/v3/index.json" /> <add key="CoreCLR" value="https://www.myget.org/F/dotnet-coreclr/api/v3/index.json" />
--> -->
<!--<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> -->
<!--<add key="aspnetcirelease" value="https://www.myget.org/F/aspnetcirelease/api/v3/index.json" /> -->
<!--<add key="coreclr-xunit" value="https://www.myget.org/F/coreclr-xunit/api/v3/index.json" />-->
<add key="NuGet" value="https://api.nuget.org/v3/index.json" /> <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<!--<add key="aspnetvnext" value="https://www.myget.org/F/aspnetvnext/"/>-->
</packageSources> </packageSources>
</configuration> </configuration>
appveyor.yml 0 → 100644
View file @ 0707ca80
version: 1.0.{build}
branches:
only:
- netstandard
clone_depth: 1
init:
- cmd: SET PATH=%POSTGRES_PATH%\bin;%MYSQL_PATH%\bin;%PATH%
environment:
Appveyor: true
MYSQL_ENV_MYSQL_USER: root
MYSQL_ENV_MYSQL_PASSWORD: Password12!
PGUSER: postgres
PGPASSWORD: Password12!
MYSQL_PATH: C:\Program Files\MySql\MySQL Server 5.6
POSTGRES_PATH: C:\Program Files\PostgreSQL\9.4
MYSQL_PWD: Password12!
services:
- mssql2014
- mysql56
- postgresql94
build_script:
- ps: >-
createdb test
.\build.ps1
test: off
\ No newline at end of file
build.ps1 0 → 100644
View file @ 0707ca80
$solutionPath = split-path $MyInvocation.MyCommand.Definition
$getDotNet = join-path $solutionPath "tools\install.ps1"
$env:DOTNET_INSTALL_DIR="$(Convert-Path "$PSScriptRoot")\.dotnet\win7-x64"
if (!(Test-Path $env:DOTNET_INSTALL_DIR))
{
mkdir $env:DOTNET_INSTALL_DIR | Out-Null
}
& $getDotNet
$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
$dotnet = "$env:DOTNET_INSTALL_DIR\dotnet"
$autoGeneratedVersion = $false
# Generate version number if not set
if ($env:BuildSemanticVersion -eq $null) {
$autoVersion = [math]::floor((New-TimeSpan $(Get-Date) $(Get-Date -month 1 -day 1 -year 2016 -hour 0 -minute 0 -second 0)).TotalMinutes * -1).ToString() + "-" + (Get-Date).ToString("ss")
$env:BuildSemanticVersion = "rc2-" + $autoVersion
$autoGeneratedVersion = $true
Write-Host "Set version to $autoVersion"
}
ls */*/project.json | foreach { echo $_.FullName} |
foreach {
$content = get-content "$_"
$content = $content.Replace("99.99.99-rc2", "1.0.0-$env:BuildSemanticVersion")
set-content "$_" $content -encoding UTF8
}
# Restore packages and build product
& $dotnet restore -v Minimal # Restore all packages
if ($LASTEXITCODE -ne 0)
{
throw "dotnet restore failed with exit code $LASTEXITCODE"
}
& $dotnet pack "Dapper" --configuration Release --output "artifacts\packages"
& $dotnet pack "Dapper.Contrib" --configuration Release --output "artifacts\packages"
# Build all
# Note the exclude: https://github.com/dotnet/cli/issues/1342
dir "Dapper*" | where {$_.PsIsContainer -and $_ -NotLike "*.EntityFramework.StrongName" } |
foreach {
pushd "$_"
& $dotnet build
popd
}
# Run tests
dir "*.Tests*" | where {$_.PsIsContainer} |
foreach {
pushd "$_"
& $dotnet test
popd
}
ls */*/project.json | foreach { echo $_.FullName} |
foreach {
$content = get-content "$_"
$content = $content.Replace("1.0.0-$env:BuildSemanticVersion", "99.99.99-rc2")
set-content "$_" $content -encoding UTF8
}
if ($autoGeneratedVersion){
$env:BuildSemanticVersion = $null
}
\ No newline at end of file
build.sh 0 → 100755
View file @ 0707ca80
#!/bin/bash
echo ""
echo "Installing dotnet cli..."
echo ""
export DOTNET_INSTALL_DIR="./.dotnet/"
tools/install.sh
origPath=$PATH
export PATH="./dotnet/bin/:$PATH"
if [ $? -ne 0 ]; then
echo >&2 ".NET Execution Environment installation has failed."
exit 1
fi
export DOTNET_HOME="$DOTNET_INSTALL_DIR/cli"
export PATH="$DOTNET_HOME/bin:$PATH"
export autoGeneratedVersion=false
# Generate version number if not set
if [[ -z "$BuildSemanticVersion" ]]; then
autoVersion="$((($(date +%s) - 1451606400)/60))-$(date +%S)"
export BuildSemanticVersion="rc2-$autoVersion"
autoGeneratedVersion=true
echo "Set version to $BuildSemanticVersion"
fi
sed -i '' "s/99.99.99-rc2/1.0.0-$BuildSemanticVersion/g" */*/project.json
# Restore packages and build product
dotnet restore -v Minimal # Restore all packages
# Build all
# Note the exclude: https://github.com/dotnet/cli/issues/1342
for d in Dapper*/; do
if [ "$d" != "*.EntityFramework.StrongName" ]; then
echo "Building $d"
pushd "$d"
dotnet build -f netstandard1.3
popd
fi
done
# Run tests
for d in *.Tests*/; do
echo "Testing $d"
pushd "$d"
dotnet test -f netcoreapp1.0
popd
done
sed -i '' "s/1.0.0-$BuildSemanticVersion/99.99.99-rc2/g" */*/project.json
if [ $autoGeneratedVersion ]; then
unset BuildSemanticVersion
fi
export PATH=$origPath
\ No newline at end of file
global.json
View file @ 0707ca80
{ {
"sdk": {
"version": "1.0.0-rc1-update1"
},
"projects": [ "projects": [
"Dapper", "Dapper.EntityFramework", "Dapper.Contrib", "Dapper.Rainbow", "Dapper.SqlBuilder", "Dapper.Tests" "Dapper", "Dapper.EntityFramework", "Dapper.Contrib", "Dapper.Rainbow", "Dapper.SqlBuilder", "Dapper.Tests"
] ]
......
tools/install.ps1 0 → 100644
View file @ 0707ca80
This diff is collapsed.
tools/install.sh 0 → 100644
View file @ 0707ca80
This diff is collapsed.
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