Upgrade to dotnet core RC2

schotime · May 20, 2016 · 8af5466 · 8af5466
1 parent e553a96
commit 8af5466
Show file tree

Hide file tree

Showing 14 changed files with 177 additions and 197 deletions.
diff --git 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
@@ -5,6 +5,6 @@
     "wrap"
   ],
   "sdk": {
-    "version": "1.0.0-rc1-update2"
+    "version": "1.0.0-preview1-002702"
   }
 }
diff --git a/src/NPoco.JsonNet/NPoco.JsonNet.xproj b/src/NPoco.JsonNet/NPoco.JsonNet.xproj
@@ -4,17 +4,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>8dccbc0a-36d4-4f3c-9b16-39b23aafd726</ProjectGuid>
     <RootNamespace>NPoco.JsonNet</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git 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
@@ -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
@@ -9,7 +9,7 @@
     <ProjectGuid>56481bba-35a1-4061-9fe8-0ed9e1b6a0a3</ProjectGuid>
     <RootNamespace>NPoco</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/src/NPoco/SqlBulkCopyHelper.cs b/src/NPoco/SqlBulkCopyHelper.cs
@@ -26,7 +26,7 @@ public static void BulkInsert<T>(IDatabase db, IEnumerable<T> list, SqlBulkCopyO
                 bulkCopy.WriteToServer(table);
             }
         }
-#if NET45 || DNX451
+#if NET45
         public static async System.Threading.Tasks.Task BulkInsertAsync<T>(IDatabase db, IEnumerable<T> 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
@@ -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"
       }
     }
   }
-}
+}
diff --git 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
@@ -9,7 +9,7 @@
     <ProjectGuid>b39c2641-0655-47cc-a1a3-5e1f84714fb5</ProjectGuid>
     <RootNamespace>NPoco.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git 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);