From cf732e0d9852eb4e60b63a4f231f61a88fb48ed7 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Apr 2016 21:57:07 -0400 Subject: [PATCH] Get building --- Dapper.Contrib/project.json | 11 +- Dapper.Rainbow/project.json | 7 +- Dapper.SqlBuilder/project.json | 7 +- Dapper.StrongName/project.json | 29 +-- Dapper.Tests.Contrib/Program.cs | 15 ++ Dapper.Tests.Contrib/project.json | 210 +++++++++---------- Dapper.Tests/project.json | 329 ++++++++++++------------------ Dapper/project.json | 30 ++- NuGet.Config | 4 +- global.json | 4 +- 10 files changed, 285 insertions(+), 361 deletions(-) create mode 100644 Dapper.Tests.Contrib/Program.cs diff --git a/Dapper.Contrib/project.json b/Dapper.Contrib/project.json index ef43ae081..b53e1e085 100644 --- a/Dapper.Contrib/project.json +++ b/Dapper.Contrib/project.json @@ -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 diff --git a/Dapper.Rainbow/project.json b/Dapper.Rainbow/project.json index a5cbdfa94..7e46fbe2e 100644 --- a/Dapper.Rainbow/project.json +++ b/Dapper.Rainbow/project.json @@ -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 diff --git a/Dapper.SqlBuilder/project.json b/Dapper.SqlBuilder/project.json index 2867bf922..f2f04653a 100644 --- a/Dapper.SqlBuilder/project.json +++ b/Dapper.SqlBuilder/project.json @@ -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 diff --git a/Dapper.StrongName/project.json b/Dapper.StrongName/project.json index 528768010..2bbf500bb 100644 --- a/Dapper.StrongName/project.json +++ b/Dapper.StrongName/project.json @@ -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" + } } } } diff --git a/Dapper.Tests.Contrib/Program.cs b/Dapper.Tests.Contrib/Program.cs new file mode 100644 index 000000000..74fd3286b --- /dev/null +++ b/Dapper.Tests.Contrib/Program.cs @@ -0,0 +1,15 @@ +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) + { + + } + } +} diff --git a/Dapper.Tests.Contrib/project.json b/Dapper.Tests.Contrib/project.json index 74faf8c3b..f37cdf5fd 100644 --- a/Dapper.Tests.Contrib/project.json +++ b/Dapper.Tests.Contrib/project.json @@ -1,116 +1,106 @@ { - "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 diff --git a/Dapper.Tests/project.json b/Dapper.Tests/project.json index a8ea711d0..050156daf 100644 --- a/Dapper.Tests/project.json +++ b/Dapper.Tests/project.json @@ -1,205 +1,138 @@ { - "authors": [ "Marc Gravell", "Nick Craver" ], - "owners": [ "marc.gravell", "nick.craver" ], - "projectUrl": "https://github.com/StackExchange/dapper-dot-net", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "description": "Dapper Core Test Suite", - "title": "Dapper.Tests", - "version": "1.0.0-*", - "copyright": "2015 Stack Exchange, Inc.", - "dependencies": { - "Dapper": { - "version": "1.50-*", - "target": "project" - }, - "Dapper.Contrib": { - "target": "project" - } - }, - "commands": { - "perf": "Dapper.Tests", - "test": "xunit.runner.dnx" - }, - "compilationOptions": { - "warningsAsErrors": true - }, - "frameworks": { - "net40": { - "compilationOptions": { - "define": [ - "MYSQL", - "ENTITY_FRAMEWORK", - "LINQ2SQL", - "FIREBIRD", - "SQL_CE", - "OLEDB", - "MASSIVE", - "ORMLITE", - "SOMA", - "SIMPLEDATA", - "SQLITE" - ] - }, - "frameworkAssemblies": { - "System.Configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Data.Linq": "4.0.0.0", - "System.Xml": "4.0.0.0", - "System.Xml.Linq": "4.0.0.0" - }, - "dependencies": { - "Dapper.EntityFramework": { - "target": "project" + "authors": [ "Marc Gravell", "Nick Craver" ], + "owners": [ "marc.gravell", "nick.craver" ], + "projectUrl": "https://github.com/StackExchange/dapper-dot-net", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", + "description": "Dapper Core Test Suite", + "title": "Dapper.Tests", + "version": "1.0.0-*", + "copyright": "2015 Stack Exchange, Inc.", + "dependencies": { + "Dapper": { + "version": "1.50-*", + "target": "project" }, - "EntityFramework": "6.1.3", - "FirebirdSql.Data.FirebirdClient": "4.10.0", - "Microsoft.SqlServer.Compact": "4.0.8876.1", - "Microsoft.SqlServer.Types": "11.0.2", - "MySql.Data": "6.9.8", - "NHibernate": "4.0.4.4000", - "ServiceStack.OrmLite": "4.0.48", - "ServiceStack.OrmLite.SqlServer": "4.0.48", - "Simple.Data.Ado": "1.0.0-rc3", - "Simple.Data.Core": "1.0.0-rc3", - "Simple.Data.SqlServer": "1.0.0-rc3", - "Soma": "1.8.0.7", - "System.Data.SQLite": "1.0.99", - "xunit": "1.9.2" - } + "Dapper.Contrib": { + "target": "project" + } }, - "net45": { - "compilationOptions": { - "define": [ - "ASYNC", - "MYSQL", - "ENTITY_FRAMEWORK", - "LINQ2SQL", - "FIREBIRD", - "SQL_CE", - "POSTGRESQL", - "OLEDB", - "MASSIVE", - "ORMLITE", - "SOMA", - "SIMPLEDATA", - "SQLITE", - "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.Xml": "4.0.0.0", - "System.Xml.Linq": "4.0.0.0" - }, - "dependencies": { - "Dapper.EntityFramework": { - "target": "project" - }, - "EntityFramework": "6.1.3", - "FirebirdSql.Data.FirebirdClient": "4.10.0", - "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.Data.SQLite": "1.0.99", - "xunit": "2.1.0" - } + //"commands": { + // "perf": "Dapper.Tests" + //}, + "compilationOptions": { + "warningsAsErrors": true, + "emitEntryPoint": true, + "debugType": "full" }, - "dotnet5.4": { - "compilationOptions": { - "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ] - }, - "dependencies": { - "Microsoft.CSharp": "4.0.1-*", - "Microsoft.Data.Sqlite": "1.0.0-rc2-15948", - "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.Text.RegularExpressions": "4.0.11-*", - "System.Threading": "4.0.11-*", - "System.Xml.XDocument": "4.0.11-*", - "System.Xml.XmlDocument": "4.0.1-*", - "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", - "FirebirdSql.Data.FirebirdClient": "4.10.0", - "Microsoft.Data.Sqlite": "1.0.0-rc2-15948", - "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-*", - "xunit": "2.2.0-beta1-build3239", - "xunit.runner.dnx": "2.1.0-rc1-build204" - } + "testRunner": "xunit", + "frameworks": { + //"net40": { + // "compilationOptions": { + // "define": [ + // "MYSQL", + // "ENTITY_FRAMEWORK", + // "LINQ2SQL", + // "FIREBIRD", + // "SQL_CE", + // "OLEDB", + // "MASSIVE", + // "ORMLITE", + // "SOMA", + // "SIMPLEDATA", + // "SQLITE" + // ] + // }, + // "frameworkAssemblies": { + // "System.Configuration": "4.0.0.0", + // "System.Data": "4.0.0.0", + // "System.Data.Linq": "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", + // "FirebirdSql.Data.FirebirdClient": "4.10.0", + // "Microsoft.SqlServer.Compact": "4.0.8876.1", + // "Microsoft.SqlServer.Types": "11.0.2", + // "MySql.Data": "6.9.8", + // "NHibernate": "4.0.4.4000", + // "ServiceStack.OrmLite": "4.0.48", + // "ServiceStack.OrmLite.SqlServer": "4.0.48", + // "Simple.Data.Ado": "1.0.0-rc3", + // "Simple.Data.Core": "1.0.0-rc3", + // "Simple.Data.SqlServer": "1.0.0-rc3", + // "Soma": "1.8.0.7", + // "System.Data.SQLite": "1.0.99", + // "xunit": "1.9.2" + // } + //}, + //"net45": { + // "compilationOptions": { + // "define": [ + // "ASYNC", + // "MYSQL", + // "ENTITY_FRAMEWORK", + // "LINQ2SQL", + // "FIREBIRD", + // "SQL_CE", + // "POSTGRESQL", + // "OLEDB", + // "MASSIVE", + // "ORMLITE", + // "SOMA", + // "SIMPLEDATA", + // "SQLITE", + // "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.Xml": "4.0.0.0", + // "System.Xml.Linq": "4.0.0.0" + // }, + // "dependencies": { + // "Dapper.EntityFramework": { + // "target": "project" + // }, + // "EntityFramework": "6.1.3", + // "FirebirdSql.Data.FirebirdClient": "4.10.0", + // "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.Data.SQLite": "1.0.99", + // "xunit": "2.1.0" + // } + //}, + "netcoreapp1.0": { + "imports": [ "dnxcore50", "portable-net45+win8" ], + "compilationOptions": { + "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ] + }, + "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", "DNX", "XUNIT2", "SQLITE" ] - }, - "dependencies": { - "Microsoft.Data.Sqlite": "1.0.0-rc2-15948", - "System.Text.RegularExpressions": "4.0.11-*", - "System.Xml.XmlDocument": "4.0.1-*", - "xunit": "2.2.0-beta1-build3239", - "xunit.runner.dnx": "2.1.0-rc1-build204" - } + "runtimes": { + "win7-x64": { } } - } } \ No newline at end of file diff --git a/Dapper/project.json b/Dapper/project.json index 0e4c33eb7..015e8da4c 100644 --- a/Dapper/project.json +++ b/Dapper/project.json @@ -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" + + } } } } diff --git a/NuGet.Config b/NuGet.Config index 224a7317e..7181bcc51 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -5,7 +5,9 @@ + + + - diff --git a/global.json b/global.json index 2aac80781..27a7cca02 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,5 @@ { - "sdk": { - "version": "1.0.0-rc1-update1" - }, + "projects": [ "Dapper", "Dapper.EntityFramework", "Dapper.Contrib", "Dapper.Rainbow", "Dapper.SqlBuilder", "Dapper.Tests" ]