From cb2be98d027b5d361ff1c54db1f55d24f68942b0 Mon Sep 17 00:00:00 2001 From: Dennis Fischer Date: Tue, 17 May 2016 10:26:57 +0200 Subject: [PATCH] Fix project.json files Former-commit-id: 64ca2df82c876e3804f55ce5c3a524339e672631 Former-commit-id: f8be613634c7a90080618196f73dbd8bce223875 Former-commit-id: dda5186e2e954a2abe2f65f465acb75c4d2a615c --- src/ImageProcessorCore/project.json | 13 +++------- .../project.json | 15 +++++++---- tests/ImageProcessorCore.Tests/project.json | 25 +++++++++++++------ 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/ImageProcessorCore/project.json b/src/ImageProcessorCore/project.json index 70e77a2cc..c98ae6109 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 ad177c7b5..512f9e61e 100644 --- a/tests/ImageProcessorCore.Benchmarks/project.json +++ b/tests/ImageProcessorCore.Benchmarks/project.json @@ -20,10 +20,15 @@ "ImageProcessorCore.Benchmarks": "ImageProcessorCore.Benchmarks" }, "frameworks": { - "net4.5.1": { - "frameworkAssemblies": { - "System.Drawing": "4.0.0.0" - } - } + "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 b84ba44d7..b0e45f56e 100644 --- a/tests/ImageProcessorCore.Tests/project.json +++ b/tests/ImageProcessorCore.Tests/project.json @@ -9,16 +9,27 @@ "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": { - } - }, - "commands": { - "test": "xunit.runner.dnx" + "netcoreapp1.1": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-3002702" + } + }, + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } } } \ No newline at end of file