diff --git a/README.md b/README.md index 5016825043..130b3d6f0a 100644 --- a/README.md +++ b/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`. -- Dnvm and Dnx installed - -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 SDK Installer +(Preview 1)](https://www.microsoft.com/net/download) - Click `.NET Core SDK Installer +(Preview 1)` +- 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. diff --git a/src/ImageProcessorCore/ImageProcessorCore.xproj b/src/ImageProcessorCore/ImageProcessorCore.xproj index ae0dd9c869..ffe5b1cea0 100644 --- a/src/ImageProcessorCore/ImageProcessorCore.xproj +++ b/src/ImageProcessorCore/ImageProcessorCore.xproj @@ -8,8 +8,8 @@ 2aa31a1f-142c-43f4-8687-09abca4b3a26 ImageProcessorCore - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\ + .\obj + .\bin\ v4.5.1 diff --git a/src/ImageProcessorCore/project.json b/src/ImageProcessorCore/project.json index 70e77a2ccc..c98ae61098 100644 --- a/src/ImageProcessorCore/project.json +++ b/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": { - "imports": "dnxcore50", + "netstandard1.1": { "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" - } } } } \ No newline at end of file diff --git a/tests/ImageProcessorCore.Benchmarks/project.json b/tests/ImageProcessorCore.Benchmarks/project.json index ad177c7b58..15244e5caa 100644 --- a/tests/ImageProcessorCore.Benchmarks/project.json +++ b/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" } diff --git a/tests/ImageProcessorCore.Tests/project.json b/tests/ImageProcessorCore.Tests/project.json index b84ba44d7f..39d6d2654a 100644 --- a/tests/ImageProcessorCore.Tests/project.json +++ b/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", - "xunit.runner.dnx": "2.1.0-rc1-build204" + "System.Diagnostics.TraceSource": "4.0.0-rc2-24027", + "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": { - "test": "xunit.runner.dnx" - } + "testRunner": "xunit" } \ No newline at end of file