diff --git a/build.ps1 b/build.ps1 index d1d66514..b04fe9dd 100644 --- a/build.ps1 +++ b/build.ps1 @@ -17,12 +17,12 @@ Task Default -depends Build Task Build -depends Clean { Write-Host "Creating BuildArtifacts" -ForegroundColor Green - Exec { dnu restore } + Exec { dotnet restore } Set-Location "$solution_dir" #$env:DNX_BUILD_VERSION="alpha02" - Exec { dnu pack --configuration release --out $build_artifacts_dir --quiet } + Exec { dotnet pack --configuration release --output $build_artifacts_dir } Set-Location "$jsonnet" - Exec { dnu pack --configuration release --out $build_artifacts_dir --quiet } + Exec { dotnet pack --configuration release --output $build_artifacts_dir } } Task Clean { diff --git a/global.json b/global.json index aa822f83..6710ed63 100644 --- a/global.json +++ b/global.json @@ -5,6 +5,6 @@ "wrap" ], "sdk": { - "version": "1.0.0-rc1-update2" + "version": "1.0.0-preview1-002702" } } \ No newline at end of file diff --git a/src/NPoco.JsonNet/NPoco.JsonNet.xproj b/src/NPoco.JsonNet/NPoco.JsonNet.xproj index d6919b73..188c41bb 100644 --- a/src/NPoco.JsonNet/NPoco.JsonNet.xproj +++ b/src/NPoco.JsonNet/NPoco.JsonNet.xproj @@ -4,17 +4,15 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - 8dccbc0a-36d4-4f3c-9b16-39b23aafd726 NPoco.JsonNet ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\bin\ - 2.0 - + \ No newline at end of file diff --git a/src/NPoco.JsonNet/project.json b/src/NPoco.JsonNet/project.json index 9ef6f9f8..d5321556 100644 --- a/src/NPoco.JsonNet/project.json +++ b/src/NPoco.JsonNet/project.json @@ -1,27 +1,32 @@ { - "version": "3.2.0-*", + "version": "3.3.0-*", "description": "NPoco.JsonNet", - "authors": [ "Adam" ], - "tags": [ "" ], - "projectUrl": "", - "licenseUrl": "", - + "packOptions": { + "authors": [ "Adam" ], + "tags": [ "" ], + "projectUrl": "", + "licenseUrl": "" + }, "dependencies": { - "NPoco": "3.2.0", - "Newtonsoft.Json": "6.0.1" + "NPoco": { + "target": "project" + }, + "Newtonsoft.Json": "8.0.3" }, "frameworks": { - "dnx451": { }, "net45": { }, "net40": { }, "net35": { }, - "dnxcore50": { + "netstandard1.3": { + "imports": [ + "dnxcore50" + ], "dependencies": { - "Microsoft.CSharp": "4.0.1-beta-23516", - "System.Collections": "4.0.11-beta-23516", - "System.Linq": "4.0.1-beta-23516", - "System.Runtime": "4.0.21-beta-23516", - "System.Threading": "4.0.11-beta-23516" + "Microsoft.CSharp": "4.0.1-rc2-24027", + "System.Collections": "4.0.11-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Threading": "4.0.11-rc2-24027" } } } diff --git a/src/NPoco/Cache.cs b/src/NPoco/Cache.cs index 9c1ad3a5..244bfefd 100644 --- a/src/NPoco/Cache.cs +++ b/src/NPoco/Cache.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Threading; -#if DNX451 || NET45 || NET40 +#if NET45 || NET40 using System.Runtime.Caching; #elif DNXCORE50 using Microsoft.Extensions.Caching.Memory; diff --git a/src/NPoco/NPoco.xproj b/src/NPoco/NPoco.xproj index a7137f07..2bd2fac9 100644 --- a/src/NPoco/NPoco.xproj +++ b/src/NPoco/NPoco.xproj @@ -9,7 +9,7 @@ 56481bba-35a1-4061-9fe8-0ed9e1b6a0a3 NPoco ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\bin\ 2.0 diff --git a/src/NPoco/SqlBulkCopyHelper.cs b/src/NPoco/SqlBulkCopyHelper.cs index bd28e0f9..89946656 100644 --- a/src/NPoco/SqlBulkCopyHelper.cs +++ b/src/NPoco/SqlBulkCopyHelper.cs @@ -26,7 +26,7 @@ public static void BulkInsert(IDatabase db, IEnumerable list, SqlBulkCopyO bulkCopy.WriteToServer(table); } } -#if NET45 || DNX451 +#if NET45 public static async System.Threading.Tasks.Task BulkInsertAsync(IDatabase db, IEnumerable list, SqlBulkCopyOptions sqlBulkCopyOptions) { using (var bulkCopy = new SqlBulkCopy(SqlConnectionResolver(db.Connection), sqlBulkCopyOptions, SqlTransactionResolver(db.Transaction))) diff --git a/src/NPoco/project.json b/src/NPoco/project.json index 004f5ca6..074fc380 100644 --- a/src/NPoco/project.json +++ b/src/NPoco/project.json @@ -1,75 +1,86 @@ { "version": "3.3.0-*", "description": "An extremely easy to use Micro-ORM supporting Sql Server, MySQL, PostgreSQL, Oracle, Sqlite, SqlCE. Originally Schotime's PetaPoco branch.", - "authors": [ "Adam Schroder" ], - "tags": [ "orm", "sql", "micro-orm", "database", "mvc" ], - "projectUrl": "https://github.com/schotime/NPoco", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - + "packOptions": { + "authors": [ + "Adam Schroder" + ], + "tags": [ + "orm", + "sql", + "micro-orm", + "database", + "mvc" + ], + "projectUrl": "https://github.com/schotime/NPoco", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0" + }, "frameworks": { - "dnx451": { - "frameworkAssemblies": { - "System.configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Runtime.Caching": "4.0.0.0", - "System.Runtime.Serialization": "4.0.0.0", - "System.XML": "4.0.0.0" - } - }, "net45": { "frameworkAssemblies": { - "System.configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Runtime.Caching": "4.0.0.0", - "System.Runtime.Serialization": "4.0.0.0", - "System.XML": "4.0.0.0" + "System.Configuration": "", + "System.Data": "", + "System.Runtime.Caching": "", + "System.Runtime.Serialization": "", + "System.Xml": "" } }, "net40": { "frameworkAssemblies": { - "System.configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Runtime.Caching": "4.0.0.0", - "System.Runtime.Serialization": "4.0.0.0", - "System.XML": "4.0.0.0" + "System.Configuration": "", + "System.Data": "", + "System.Runtime.Caching": "", + "System.Runtime.Serialization": "", + "System.Xml": "" } }, "net35": { "frameworkAssemblies": { - "System.configuration": "2.0.0.0", - "System.Data": "2.0.0.0", + "System.Configuration": "", + "System.Data": "", "System.Runtime.Serialization": "", - "System.XML": "2.0.0.0" + "System.Xml": "" } }, - "dnxcore50": { + "netstandard1.3": { + "buildOptions": { + "define": [ + "DNXCORE50" + ] + }, + "imports": [ + "dnxcore50" + ], "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Caching.Memory": "1.0.0-rc1-final", - "System.Collections": "4.0.11-beta-23516", - "System.Collections.Specialized": "4.0.1-beta-23516", - "System.Data.Common": "4.0.1-beta-23516", - "System.Data.SqlClient": "4.0.0-beta-23516", - "System.Diagnostics.Tools": "4.0.1-beta-23516", - "System.Diagnostics.StackTrace": "4.0.1-beta-23516", - "System.Dynamic.Runtime": "4.0.11-beta-23516", - "System.Linq": "4.0.1-beta-23516", - "System.Linq.Queryable": "4.0.1-beta-23516", - "System.Net.Primitives": "4.0.11-beta-23516", - "System.Reflection": "4.1.0-beta-23516", - "System.Reflection.Emit": "4.0.1-beta-23516", - "System.Reflection.Emit.ILGeneration": "4.0.1-beta-23516", - "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", - "System.Reflection.Extensions": "4.0.1-beta-23516", - "System.Runtime": "4.0.21-beta-23516", - "System.Runtime.Extensions": "4.0.11-beta-23516", - "System.Runtime.Serialization.Primitives": "4.1.0-beta-23516", - "System.Text.Encoding": "4.0.11-beta-23516", - "System.Text.RegularExpressions": "4.0.11-beta-23516", - "System.Threading": "4.0.11-beta-23516", - "System.Xml.XmlDocument": "4.0.1-beta-23516", - "System.Xml.XmlSerializer": "4.0.11-beta-23516" + "Microsoft.Extensions.Caching.Abstractions": "1.0.0-rc2-final", + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-final", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.NonGeneric": "4.0.1-rc2-24027", + "System.Collections.Specialized": "4.0.1-rc2-24027", + "System.Data.Common": "4.0.1-rc2-24027", + "System.Data.SqlClient": "4.1.0-rc2-24027", + "System.Diagnostics.Tools": "4.0.1-rc2-24027", + "System.Diagnostics.StackTrace": "4.0.1-rc2-24027", + "System.Dynamic.Runtime": "4.0.11-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Linq.Queryable": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Emit": "4.0.1-rc2-24027", + "System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027", + "System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.TypeExtensions": "4.1.0-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027", + "System.Runtime.InteropServices": "4.1.0-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Xml.XmlDocument": "4.0.1-rc2-24027", + "System.Xml.XmlSerializer": "4.0.11-rc2-24027" } } } -} +} \ No newline at end of file diff --git a/test/NPoco.Tests/Common/InMemoryDatabase.cs b/test/NPoco.Tests/Common/InMemoryDatabase.cs index 06204cfe..bb6d0f83 100644 --- a/test/NPoco.Tests/Common/InMemoryDatabase.cs +++ b/test/NPoco.Tests/Common/InMemoryDatabase.cs @@ -22,12 +22,7 @@ public override void EnsureSharedConnectionConfigured() lock (_syncRoot) { - -#if DNXCORE50 Connection = new Microsoft.Data.Sqlite.SqliteConnection(ConnectionString); -#else - Connection = new System.Data.SQLite.SQLiteConnection(ConnectionString); -#endif Connection.Open(); } } diff --git a/test/NPoco.Tests/NPoco.Tests.xproj b/test/NPoco.Tests/NPoco.Tests.xproj index ad5d54c3..6a399912 100644 --- a/test/NPoco.Tests/NPoco.Tests.xproj +++ b/test/NPoco.Tests/NPoco.Tests.xproj @@ -9,7 +9,7 @@ b39c2641-0655-47cc-a1a3-5e1f84714fb5 NPoco.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\bin\ 2.0 diff --git a/test/NPoco.Tests/Program.cs b/test/NPoco.Tests/Program.cs index 9249890f..efd03337 100644 --- a/test/NPoco.Tests/Program.cs +++ b/test/NPoco.Tests/Program.cs @@ -9,9 +9,9 @@ namespace NPoco.Tests { public class Program { - public int Main(string[] args) + public static int Main(string[] args) { -#if DNX451 || NET451 +#if NET452 return new AutoRun().Execute(args); #else return new AutoRun().Execute(typeof(Program).GetTypeInfo().Assembly, Console.Out, Console.In, args); diff --git a/test/NPoco.Tests/project.json b/test/NPoco.Tests/project.json index 1a18d72f..8f82f354 100644 --- a/test/NPoco.Tests/project.json +++ b/test/NPoco.Tests/project.json @@ -1,84 +1,88 @@ { - "version": "3.1.0-*", - "description": "NPoco Tests", + "version": "3.3.0-*", + "description": "NPoco Tests", + "packOptions": { "authors": [ "Adam Schroder" ], "tags": [ "" ], "projectUrl": "", - "licenseUrl": "", - "dependencies": { - "NPoco": { - "target": "project" - } - }, - "commands": { - "test": "NPoco.Tests" + "licenseUrl": "" + }, + "buildOptions": { + "emitEntryPoint": true, + "copyToOutput": [ + "config.json" + ] + }, + "dependencies": { + "NPoco": { + "target": "project" + } + }, + "commands": { + "test": "NPoco.Tests" + }, + "frameworks": { + "net452": { + "frameworkAssemblies": { + "System.Configuration": "4.0.0.0", + "System.Data": "4.0.0.0", + "System.Runtime.Caching": "4.0.0.0", + "System.Xml": "4.0.0.0" + }, + "dependencies": { + "FirebirdSql.Data.FirebirdClient": "4.8.1.1", + "Microsoft.Extensions.Configuration": "1.0.0-rc2-final", + "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final", + "Newtonsoft.Json": "8.0.3", + "NUnitLite": "3.0.0", + "Microsoft.Data.SQLite": "1.0.0-rc2-final" + } }, - "frameworks": { - "dnx451": { - "frameworkAssemblies": { - "System.configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Runtime.Caching": "4.0.0.0", - "System.XML": "4.0.0.0" - }, - "dependencies": { - "Newtonsoft.Json": "7.0.1", - "NUnitLite": "3.0.0", - "FirebirdSql.Data.FirebirdClient": "4.8.1.1", - "System.Data.SQLite": "1.0.0-*", - "Microsoft.Extensions.Configuration": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final" - } - }, - "net451": { - "frameworkAssemblies": { - "System.configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Runtime.Caching": "4.0.0.0", - "System.XML": "4.0.0.0" - }, - "dependencies": { - "FirebirdSql.Data.FirebirdClient": "4.8.1.1", - "Microsoft.Extensions.Configuration": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final", - "Newtonsoft.Json": "7.0.1", - "NUnitLite": "3.0.0", - "System.Data.SQLite": "1.0.0-*" - } + "netcoreapp1.0": { + "buildOptions": { + "define": [ + "DNXCORE50" + ] + }, + "imports": [ + "dnxcore50" + ], + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-3002702" }, - "dnxcore50": { - "dependencies": { - "Microsoft.CSharp": "4.0.1-beta-23516", - "Microsoft.Data.SQLite": "1.0.0-beta8", - "Microsoft.Extensions.Caching.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Caching.Memory": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final", - "Newtonsoft.Json": "7.0.1", - "NUnitLite": "3.0.0", - "System.Collections": "4.0.11-beta-23516", - "System.Collections.Specialized": "4.0.1-beta-23516", - "System.Console": "4.0.0-beta-23516", - "System.Data.Common": "4.0.1-beta-23516", - "System.Data.SqlClient": "4.0.0-beta-23516", - "System.Diagnostics.StackTrace": "4.0.1-beta-23516", - "System.Linq": "4.0.1-beta-23516", - "System.Linq.Queryable": "4.0.1-beta-23516", - "System.Net.Primitives": "4.0.11-beta-23516", - "System.Reflection": "4.1.0-beta-23516", - "System.Reflection.Emit": "4.0.1-beta-23516", - "System.Reflection.Emit.ILGeneration": "4.0.1-beta-23516", - "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", - "System.Reflection.Extensions": "4.0.1-beta-23516", - "System.Reflection.TypeExtensions": "4.1.0-beta-23516", - "System.Runtime": "4.0.21-beta-23516", - "System.Runtime.Extensions": "4.0.11-beta-23516", - "System.Text.Encoding": "4.0.11-beta-23516", - "System.Text.RegularExpressions": "4.0.11-beta-23516", - "System.Threading": "4.0.11-beta-23516", - "System.Xml.XmlDocument": "4.0.1-beta-23516", - "System.Xml.XmlSerializer": "4.0.11-beta-23516" - } - } + "Microsoft.CSharp": "4.0.1-rc2-24027", + "Microsoft.Data.SQLite": "1.0.0-rc2-final", + "Microsoft.Extensions.Caching.Abstractions": "1.0.0-rc2-final", + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-final", + "Microsoft.Extensions.Configuration": "1.0.0-rc2-final", + "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final", + "Newtonsoft.Json": "8.0.3", + "NUnitLite": "3.0.0", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.Specialized": "4.0.1-rc2-24027", + "System.Console": "4.0.0-rc2-24027", + "System.Data.Common": "4.0.1-rc2-24027", + "System.Data.SqlClient": "4.1.0-rc2-24027", + "System.Diagnostics.StackTrace": "4.0.1-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Linq.Queryable": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Emit": "4.0.1-rc2-24027", + "System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027", + "System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.TypeExtensions": "4.1.0-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Xml.XmlDocument": "4.0.1-rc2-24027", + "System.Xml.XmlSerializer": "4.0.11-rc2-24027" + } } + } } diff --git a/wrap/System.Data.SQLite/project.json b/wrap/System.Data.SQLite/project.json deleted file mode 100644 index 1e4d35a4..00000000 --- a/wrap/System.Data.SQLite/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": "1.0.0-*", - "frameworks": { - "dnx451": { - "bin": { - "assembly": "../../lib/System.Data.SQLite.dll" - } - }, - "net45": { - "bin": { - "assembly": "../../lib/System.Data.SQLite.dll" - } - } - } -} \ No newline at end of file diff --git a/wrap/System.Data.SQLite/project.lock.json b/wrap/System.Data.SQLite/project.lock.json deleted file mode 100644 index 2e09dc1c..00000000 --- a/wrap/System.Data.SQLite/project.lock.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "locked": false, - "version": 2, - "targets": { - "DNX,Version=v4.5.1": {}, - ".NETFramework,Version=v4.5": {}, - "DNX,Version=v4.5.1/win7-x86": {}, - "DNX,Version=v4.5.1/win7-x64": {}, - ".NETFramework,Version=v4.5/win7-x86": {}, - ".NETFramework,Version=v4.5/win7-x64": {} - }, - "libraries": {}, - "projectFileDependencyGroups": { - "": [], - "DNX,Version=v4.5.1": [], - ".NETFramework,Version=v4.5": [] - } -} \ No newline at end of file