From cb2be98d027b5d361ff1c54db1f55d24f68942b0 Mon Sep 17 00:00:00 2001 From: Dennis Fischer Date: Tue, 17 May 2016 10:26:57 +0200 Subject: [PATCH 1/4] 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 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..512f9e61ea 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 b84ba44d7f..b0e45f56e6 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 From 4f7fca39af111436daf2af4d20ffa1305845daf3 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Tue, 17 May 2016 10:32:16 +0100 Subject: [PATCH 2/4] Hopefully fix AppVeyor Former-commit-id: d37a6423f2dbc733b12ac9af80a5d6d7c1e54198 Former-commit-id: 40260d3883e501cedf72c355ec68ab018ab9da69 Former-commit-id: 0ea9bd29d15ca60f8c3317b186480c8fce648ddb --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 3862ed678d..e3a58e5e5a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ os: Visual Studio 2015 init: - cmd: >- choco install dotnetcli + set PATH=C:\Program Files\dotnet\bin;%PATH% assembly_info: From 720eefde520cd5a1726844a104d6f350362af8a7 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Tue, 17 May 2016 11:44:15 +0100 Subject: [PATCH 3/4] Output dotnet version to console Former-commit-id: bb4c496985d4d48e41d17b665da4fb40e0db75af Former-commit-id: cdf2fcaf37bd790d2a90e9d4234da5a3522735e9 Former-commit-id: 48dd22d3f57c88b733d899b6b5a06248f510bc1b --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index e3a58e5e5a..23d38426c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,8 @@ init: set PATH=C:\Program Files\dotnet\bin;%PATH% + dotnet --version + assembly_info: patch: true file: '**\AssemblyInfo.*' From b4b5efea03863fbc09938bf42827395b6408fbe5 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 17 May 2016 22:29:35 +1000 Subject: [PATCH 4/4] Project build + testrunner [skip ci] Former-commit-id: cd4cf4e1c23f337e6dec1c4bdd8881fbd17f8420 Former-commit-id: 0ae0792e140b9d09ca84b73001f28dae862e8b7c Former-commit-id: b99728903470f7b7188452f1826ccf11071df399 --- README.md | 8 +++--- .../ImageProcessorCore.xproj | 4 +-- .../project.json | 20 +++++++-------- tests/ImageProcessorCore.Tests/project.json | 25 ++++++++++--------- 4 files changed, 29 insertions(+), 28 deletions(-) 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/tests/ImageProcessorCore.Benchmarks/project.json b/tests/ImageProcessorCore.Benchmarks/project.json index 512f9e61ea..15244e5caa 100644 --- a/tests/ImageProcessorCore.Benchmarks/project.json +++ b/tests/ImageProcessorCore.Benchmarks/project.json @@ -20,15 +20,15 @@ "ImageProcessorCore.Benchmarks": "ImageProcessorCore.Benchmarks" }, "frameworks": { - "net451": { - "dependencies": { - }, - "imports": [ - "dnx451" - ], - "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 b0e45f56e6..39d6d2654a 100644 --- a/tests/ImageProcessorCore.Tests/project.json +++ b/tests/ImageProcessorCore.Tests/project.json @@ -19,17 +19,18 @@ "dotnet-test-xunit": "1.0.0-rc2-build10015" }, "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc2-3002702" - } - }, - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] + "netcoreapp1.1": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-3002702" } - } + }, + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + }, + "testRunner": "xunit" } \ No newline at end of file