Skip to content

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

Merge pull request #508 from onovotny/work 

Get building
parents c1ef42d2 cf732e0d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 285 additions and 361 deletions
Dapper.Contrib/project.json
View file @ d0091790
......@@ -40,16 +40,13 @@
"dependencies": {
}
},
"dotnet5.4": {
"netstandard1.3": {
"compilationOptions": {
"define": [ "ASYNC", "COREFX" ]
},
"dependencies": {
"System.Reflection.Emit": "4.0.1-*",
"System.Reflection.Emit.ILGeneration": "4.0.1-*",
"System.Reflection.Emit.Lightweight": "4.0.1-*",
"System.Runtime": "4.0.21-*"
}
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24015"
}
}
}
}
\ No newline at end of file
Dapper.Rainbow/project.json
View file @ d0091790
......@@ -40,12 +40,13 @@
"System.Data.Linq": "4.0.0.0"
}
},
"dotnet5.4": {
"netstandard1.3": {
"compilationOptions": {
"define": [ "ASYNC", "COREFX" ]
},
"dependencies": {
}
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24015"
}
}
}
}
\ No newline at end of file
Dapper.SqlBuilder/project.json
View file @ d0091790
......@@ -34,12 +34,13 @@
"System.Data.Linq": "4.0.0.0"
}
},
"dotnet5.4": {
"netstandard1.3": {
"compilationOptions": {
"define": [ "ASYNC", "COREFX" ]
},
"dependencies": {
}
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24015"
}
}
}
}
\ No newline at end of file
Dapper.StrongName/project.json
View file @ d0091790
......@@ -50,27 +50,20 @@
"define": [ "ASYNC" ]
}
},
"dotnet5.4": {
"netstandard1.3": {
"compilationOptions": {
"define": [ "ASYNC", "COREFX" ]
},
"dependencies": {
"Microsoft.CSharp": "4.0.1-*",
"System.Runtime": "4.0.21-*",
"System.Collections": "4.0.11-*",
"System.Collections.Concurrent": "4.0.11-*",
"System.Data.SqlClient": "4.0.0-*",
"System.Linq": "4.0.1-*",
"System.Reflection.Emit.ILGeneration": "4.0.1-*",
"System.Reflection.Emit.Lightweight": "4.0.1-*",
"System.Reflection.TypeExtensions": "4.1.0-*",
"System.Text.RegularExpressions": "4.0.11-*",
"System.Threading": "4.0.11-*",
"System.Threading.ThreadPool": "4.0.10-*",
"System.Collections.NonGeneric": "4.0.1-*",
"System.Xml.XDocument": "4.0.11-*",
"System.Xml.XmlDocument": "4.0.1-*"
}
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24015",
"System.Data.SqlClient": "4.1.0-rc2-24015",
"System.Dynamic.Runtime": "4.0.11-rc2-24015",
"System.Reflection.Emit": "4.0.1-rc2-24015",
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24015",
"System.Xml.XmlDocument": "4.0.1-rc2-24015",
"System.Collections.NonGeneric": "4.0.1-rc2-24015",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24015"
}
}
}
}
Dapper.Tests.Contrib/Program.cs 0 → 100644
View file @ d0091790
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/project.json
View file @ d0091790
{
"authors": [ "Sam Saffron", "Johan Danforth" ],
"owners": [ "johandanforth", "marc.gravell", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"description": "Dapper Contrib Test Suite",
"title": "Dapper.Contrib.Tests",
"version": "1.0.0",
"copyright": "2015 Stack Exchange, Inc.",
"dependencies": {
"Dapper": {
"version": "1.50-*",
"target": "project"
"authors": [ "Sam Saffron", "Johan Danforth" ],
"owners": [ "johandanforth", "marc.gravell", "nick.craver" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"description": "Dapper Contrib Test Suite",
"title": "Dapper.Contrib.Tests",
"version": "1.0.0",
"copyright": "2015 Stack Exchange, Inc.",
"dependencies": {
"Dapper": {
"version": "1.50-*",
"target": "project"
},
"Dapper.Contrib": {
"version": "1.50-*",
"target": "project"
},
"Dapper.SqlBuilder": {
"version": "1.50-*",
"target": "project"
}
},
"Dapper.Contrib": {
"version": "1.50-*",
"target": "project"
"compile": [
"**/*.cs",
"../Dapper.Tests/Assert.cs",
"../Dapper.Tests/XunitSkippable.cs",
"../Dapper/TypeExtensions.cs"
],
"compilationOptions": {
"warningsAsErrors": true,
"emitEntryPoint": true,
"debugType": "full"
},
"Dapper.SqlBuilder": {
"version": "1.50-*",
"target": "project"
}
},
"compile": [
"**/*.cs",
"../Dapper.Tests/Assert.cs",
"../Dapper.Tests/XunitSkippable.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-*",
"Microsoft.Data.Sqlite": "1.0.0-rc1-final",
"System.Collections": "4.0.11-*",
"System.Console": "4.0.0-*",
"System.Data.SqlClient": "4.0.0-*",
"System.Linq": "4.0.1-*",
"System.Runtime": "4.0.21-*",
"System.Threading": "4.0.11-*",
"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-*"
}
"testRunner": "xunit",
"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" ],
"compilationOptions": {
"define": [ "COREFX", "ASYNC", "XUNIT2" ]
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-24015",
"Microsoft.Data.Sqlite": "1.0.0-rc2-20597",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-*"
}
}
},
"dnxcore50": {
"compilationOptions": {
"define": [ "COREFX", "ASYNC", "XUNIT2" ]
},
"dependencies": {
"Microsoft.Data.Sqlite": "1.0.0-rc1-final",
"System.Runtime": "4.0.21-*",
"xunit": "2.1.0",
"xunit.runner.dnx": "2.1.0-*"
}
"runtimes": {
"win7-x64": { }
}
}
}
\ No newline at end of file
Dapper.Tests/project.json
View file @ d0091790
This diff is collapsed.
Dapper/project.json
View file @ d0091790
......@@ -43,27 +43,21 @@
"define": [ "ASYNC" ]
}
},
"dotnet5.4": {
"netstandard1.3": {
"compilationOptions": {
"define": [ "ASYNC", "COREFX" ]
},
"dependencies": {
"Microsoft.CSharp": "4.0.1-*",
"System.Collections": "4.0.11-*",
"System.Collections.Concurrent": "4.0.11-*",
"System.Collections.NonGeneric": "4.0.1-*",
"System.Data.SqlClient": "4.0.0-*",
"System.Linq": "4.0.1-*",
"System.Reflection.Emit.ILGeneration": "4.0.1-*",
"System.Reflection.Emit.Lightweight": "4.0.1-*",
"System.Reflection.TypeExtensions": "4.1.0-*",
"System.Runtime": "4.0.21-*",
"System.Text.RegularExpressions": "4.0.11-*",
"System.Threading": "4.0.11-*",
"System.Threading.ThreadPool": "4.0.10-*",
"System.Xml.XDocument": "4.0.11-*",
"System.Xml.XmlDocument": "4.0.1-*"
}
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24015",
"System.Data.SqlClient": "4.1.0-rc2-24015",
"System.Dynamic.Runtime": "4.0.11-rc2-24015",
"System.Reflection.Emit": "4.0.1-rc2-24015",
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24015",
"System.Xml.XmlDocument": "4.0.1-rc2-24015",
"System.Collections.NonGeneric": "4.0.1-rc2-24015",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24015"
}
}
}
}
NuGet.Config
View file @ d0091790
......@@ -5,7 +5,9 @@
<!--
<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="aspnetvnext" value="https://www.myget.org/F/aspnetvnext/"/>
</packageSources>
</configuration>
global.json
View file @ d0091790
{
"sdk": {
"version": "1.0.0-rc1-update1"
},
"projects": [
"Dapper", "Dapper.EntityFramework", "Dapper.Contrib", "Dapper.Rainbow", "Dapper.SqlBuilder", "Dapper.Tests"
]
......
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