Merge remote-tracking branch 'origin/feature/NETCore-RC2' into feature/NETCore-RC2

# Conflicts:
#	appveyor.yml


Former-commit-id: fb89bf973b7378a2fd5c72aa519be0d78942e9ad
Former-commit-id: 01bcb6c45b498d85485bfc552701b37e73e0df2f
Former-commit-id: 455c8f6bb1335c499ff1da8dae72a956467c81b9

README.md

@@ -35,10 +35,10 @@ We already have a [MyGet package repository](https://www.myget.org/gallery/image
 If you prefer, you can compile ImageProcessorCore yourself (please do and help!), you'll need:
 
 - Visual Studio 2015 (or above)
-- The [Windows 10 development tools](https://dev.windows.com/en-us/downloads) - Click `Get Visual Studio Community`.
+- The [.NET Core SDK Installer
-- Dnvm and Dnx installed
+(Preview 1)](https://www.microsoft.com/net/download) - Click `.NET Core SDK Installer
-
+(Preview 1)`
-To install the last two please see the instructions at the [DotNet documentation](http://dotnet.readthedocs.org/en/latest/getting-started/installing-core-windows.html)
+- The [.NET Core Tooling Preview 1 for Visual Studio 2015](https://dev.windows.com/en-us/downloads) - Click `.NET Core Tooling Preview 1 for Visual Studio 2015`.
 
 To clone it locally click the "Clone in Windows" button above or run the following git commands.
 

src/ImageProcessorCore/ImageProcessorCore.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>2aa31a1f-142c-43f4-8687-09abca4b3a26</ProjectGuid>
     <RootNamespace>ImageProcessorCore</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>

src/ImageProcessorCore/project.json

@@ -13,27 +13,20 @@
     ]
   },
   "buildOptions": {
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "debugType": "portable"
   },
   "dependencies": {
     "NETStandard.Library": "1.5.0-rc2-24027",
     "System.Numerics.Vectors": "4.1.1-rc2-24027"
   },
   "frameworks": {
-    "netstandard1.5": {
+    "netstandard1.1": {
-      "imports": "dnxcore50",
       "dependencies": {
         "System.Threading": "4.0.11-rc2-24027",
         "System.Threading.Tasks": "4.0.11-rc2-24027",
         "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027"
       }
-    },
-    "net4.5.1": {
-      "frameworkAssemblies": {
-        "System.Threading": "4.0.0",
-        "System.Threading.Tasks": "4.0.0",
-        "System.Threading.Tasks.Parallel": "4.0.0"
-      }
     }
   }
 }

tests/ImageProcessorCore.Benchmarks/project.json

@@ -20,7 +20,12 @@
     "ImageProcessorCore.Benchmarks": "ImageProcessorCore.Benchmarks"
   },
   "frameworks": {
-    "net4.5.1": {
+    "net451": {
+      "dependencies": {
+      },
+      "imports": [
+        "dnx451"
+      ],
       "frameworkAssemblies": {
         "System.Drawing": "4.0.0.0"
       }

tests/ImageProcessorCore.Tests/project.json

@@ -9,16 +9,28 @@
       "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated"
     ]
   },
+  "buildOptions": {
+    "debugType": "portable"
+  },
   "dependencies": {
     "ImageProcessorCore": "1.0.0-*",
-    "xunit": "2.2.0-beta1-build3239",
+    "System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
-    "xunit.runner.dnx": "2.1.0-rc1-build204"
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-rc2-build10015"
   },
   "frameworks": {
-    "dnx451": {
+    "netcoreapp1.1": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-rc2-3002702"
+        }
+      },
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
     }
   },
-  "commands": {
+  "testRunner": "xunit"
-    "test": "xunit.runner.dnx"
-  }
 }