From fcec5ed399bac33735cdfed9d88f64e22af5fce3 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 17 May 2016 16:04:41 +1000 Subject: [PATCH 01/14] Switch to RC2 [skip ci] Former-commit-id: 5dac15ae24465dbaa82fe2210048e49200cbc253 Former-commit-id: b87f2acfce66ac4aeda48cbf6b999bcc8e970c8e Former-commit-id: 2d52ca137b5146f454da3d8677f7a898a65f4a54 --- ImageProcessorCore.sln | 1 + appveyor.yml | 50 +++++++------------ global.json | 10 ++-- src/ImageProcessorCore/Bootstrapper.cs | 2 +- .../ImageProcessor.nuget.targets | 9 ---- src/ImageProcessorCore/ImageProcessor.xproj | 21 -------- .../ImageProcessorCore.xproj | 7 +-- src/ImageProcessorCore/project.json | 45 ++++++++--------- .../ImageProcessorCore.Benchmarks.xproj | 13 +++-- .../ImageProcessorCore.Benchmarks/Program.cs | 2 +- .../project.json | 22 ++++---- .../ImageProcessorCore.Tests.xproj | 9 ++-- tests/ImageProcessorCore.Tests/project.json | 19 ++++--- 13 files changed, 81 insertions(+), 129 deletions(-) delete mode 100644 src/ImageProcessorCore/ImageProcessor.nuget.targets delete mode 100644 src/ImageProcessorCore/ImageProcessor.xproj diff --git a/ImageProcessorCore.sln b/ImageProcessorCore.sln index f3677d892a..898468eb51 100644 --- a/ImageProcessorCore.sln +++ b/ImageProcessorCore.sln @@ -9,6 +9,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessorCore.Tests", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}" ProjectSection(SolutionItems) = preProject + global.json = global.json README.md = README.md EndProjectSection EndProject diff --git a/appveyor.yml b/appveyor.yml index 7176b42b8e..3862ed678d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,11 @@ version: v1.0.0.{build} os: Visual Studio 2015 +init: +- cmd: >- + choco install dotnetcli + set PATH=C:\Program Files\dotnet\bin;%PATH% + assembly_info: patch: true file: '**\AssemblyInfo.*' @@ -9,17 +14,7 @@ assembly_info: before_build: - cmd: >- - dnvm install 1.0.0-rc1-update1 -r clr - - dnvm install 1.0.0-rc1-update1 -r coreclr -arch x64 -alias x64 - - dnvm use 1.0.0-rc1-update1 -r coreclr -a x64 - - dnvm list - - dnu restore src\ImageProcessorCore - - dnu restore tests\ImageProcessorCore.Tests + dotnet restore src\ImageProcessorCore cd build @@ -31,29 +26,20 @@ before_build: build_script: - cmd: >- - dnu build src\ImageProcessorCore - - dnu build tests\ImageProcessorCore.Tests - - dnu pack src\ImageProcessorCore --configuration Release --out "artifacts\bin\ImageProcessorCore" - -test_script: -- cmd: >- - dnvm use 1.0.0-rc1-update1 -r coreclr -a x64 + dotnet pack src\ImageProcessorCore --configuration Release --output "artifacts\bin\ImageProcessorCore" - cd tests/ImageProcessorCore.Tests +test: off - dnx test artifacts: - path: artifacts\bin\ImageProcessorCore\**\*.nupkg -deploy: - # MyGet Deployment for builds & releases - - provider: NuGet - server: https://www.myget.org/F/imageprocessor/api/v2/package - symbol_server: https://nuget.symbolsource.org/MyGet/imageprocessor - api_key: - secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf - artifact: /.*\.nupkg/ - on: - branch: Core \ No newline at end of file +# deploy: +# # MyGet Deployment for builds & releases +# - provider: NuGet +# server: https://www.myget.org/F/imageprocessor/api/v2/package +# symbol_server: https://nuget.symbolsource.org/MyGet/imageprocessor +# api_key: +# secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf +# artifact: /.*\.nupkg/ +# on: +# branch: Core \ No newline at end of file diff --git a/global.json b/global.json index 4013de3c50..0c4b1f2be5 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,6 @@ { - "projects": [ "src" ], - "sdk": { - "version": "1.0.0-rc1-update1", - "runtime": "coreclr", - "architecture": "x64" - } + "projects": [ "src" ], + "sdk": { + "version": "1.0.0-preview1-002702" + } } \ No newline at end of file diff --git a/src/ImageProcessorCore/Bootstrapper.cs b/src/ImageProcessorCore/Bootstrapper.cs index 3f1e5c1fe0..a9c7dc8318 100644 --- a/src/ImageProcessorCore/Bootstrapper.cs +++ b/src/ImageProcessorCore/Bootstrapper.cs @@ -48,7 +48,7 @@ namespace ImageProcessorCore /// /// Gets the list of supported /// - public IReadOnlyCollection ImageFormats => new ReadOnlyCollection(imageFormats); + public IReadOnlyCollection ImageFormats => new ReadOnlyCollection(this.imageFormats); /// /// Adds a new to the collection of supported image formats. diff --git a/src/ImageProcessorCore/ImageProcessor.nuget.targets b/src/ImageProcessorCore/ImageProcessor.nuget.targets deleted file mode 100644 index 3e3a70af89..0000000000 --- a/src/ImageProcessorCore/ImageProcessor.nuget.targets +++ /dev/null @@ -1,9 +0,0 @@ - - - - C:\Users\James\.nuget\packages\ - - - - - \ No newline at end of file diff --git a/src/ImageProcessorCore/ImageProcessor.xproj b/src/ImageProcessorCore/ImageProcessor.xproj deleted file mode 100644 index 041633c508..0000000000 --- a/src/ImageProcessorCore/ImageProcessor.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2aa31a1f-142c-43f4-8687-09abca4b3a26 - ImageProcessor - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/src/ImageProcessorCore/ImageProcessorCore.xproj b/src/ImageProcessorCore/ImageProcessorCore.xproj index 48941be502..ae0dd9c869 100644 --- a/src/ImageProcessorCore/ImageProcessorCore.xproj +++ b/src/ImageProcessorCore/ImageProcessorCore.xproj @@ -4,12 +4,13 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + 2aa31a1f-142c-43f4-8687-09abca4b3a26 ImageProcessorCore ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin\ + v4.5.1 2.0 @@ -17,5 +18,5 @@ True - + \ No newline at end of file diff --git a/src/ImageProcessorCore/project.json b/src/ImageProcessorCore/project.json index d403a75585..70e77a2ccc 100644 --- a/src/ImageProcessorCore/project.json +++ b/src/ImageProcessorCore/project.json @@ -5,37 +5,34 @@ "authors": [ "James Jackson-South and contributors" ], - "tags": [ - "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" - ], - "compilationOptions": { + "packOptions": { + "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", + "tags": [ + "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" + ] + }, + "buildOptions": { "allowUnsafe": true }, - "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-24027", + "System.Numerics.Vectors": "4.1.1-rc2-24027" + }, "frameworks": { - "dotnet5.5": { + "netstandard1.5": { + "imports": "dnxcore50", "dependencies": { - "System.Collections": "4.0.11-beta-23516", - "System.Linq": "4.0.1-beta-23516", - "System.Threading": "4.0.11-beta-23516", - "System.Runtime": "4.0.21-beta-23516", - "Microsoft.CSharp": "4.0.1-beta-23516", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23516", - "System.Runtime.Extensions": "4.0.11-beta-23516", - "System.Reflection": "4.1.0-beta-23516", - "System.IO": "4.0.11-beta-23516", - "Microsoft.NETCore": "5.0.1-beta-23516", - "Microsoft.NETCore.Platforms": "1.0.1-beta-23516" + "System.Threading": "4.0.11-rc2-24027", + "System.Threading.Tasks": "4.0.11-rc2-24027", + "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027" } }, - "net451": { - "dependencies": { - "System.Numerics.Vectors": "4.0.0", - "System.Runtime": "4.0.0" - }, + "net4.5.1": { "frameworkAssemblies": { - "System.Runtime": "4.0.0" + "System.Threading": "4.0.0", + "System.Threading.Tasks": "4.0.0", + "System.Threading.Tasks.Parallel": "4.0.0" } } } diff --git a/tests/ImageProcessorCore.Benchmarks/ImageProcessorCore.Benchmarks.xproj b/tests/ImageProcessorCore.Benchmarks/ImageProcessorCore.Benchmarks.xproj index 4e06339d40..dd3a44428e 100644 --- a/tests/ImageProcessorCore.Benchmarks/ImageProcessorCore.Benchmarks.xproj +++ b/tests/ImageProcessorCore.Benchmarks/ImageProcessorCore.Benchmarks.xproj @@ -4,17 +4,16 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - + 299d8e18-102c-42de-adbf-79098ee706a8 ImageProcessorCore.Benchmarks - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.1 - 2.0 - - + + \ No newline at end of file diff --git a/tests/ImageProcessorCore.Benchmarks/Program.cs b/tests/ImageProcessorCore.Benchmarks/Program.cs index fe674d9e06..07b512c8fe 100644 --- a/tests/ImageProcessorCore.Benchmarks/Program.cs +++ b/tests/ImageProcessorCore.Benchmarks/Program.cs @@ -11,7 +11,7 @@ { public static void Main(string[] args) { - //Use reflection for a more maintainable way of creating the benchmark switcher, + // Use reflection for a more maintainable way of creating the benchmark switcher, Type[] benchmarks = typeof(Program).Assembly.GetTypes() .Where(t => t.GetMethods(BindingFlags.Instance | BindingFlags.Public) .Any(m => m.GetCustomAttributes(typeof(BenchmarkAttribute), false).Any())) diff --git a/tests/ImageProcessorCore.Benchmarks/project.json b/tests/ImageProcessorCore.Benchmarks/project.json index d4f5396781..ad177c7b58 100644 --- a/tests/ImageProcessorCore.Benchmarks/project.json +++ b/tests/ImageProcessorCore.Benchmarks/project.json @@ -2,25 +2,25 @@ "version": "1.0.0-*", "description": "ImageProcessorCore.Benchmarks Console Application", "authors": [ "James.South" ], - "tags": [ "" ], - "projectUrl": "", - "licenseUrl": "", - - "compilationOptions": { + "packOptions": { + "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", + "tags": [ + "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" + ] + }, + "buildOptions": { "emitEntryPoint": true }, - "dependencies": { - "ImageProcessorCore": "1.0.0-*", - "BenchmarkDotNet": "0.9.6" + "BenchmarkDotNet": "0.9.6", + "ImageProcessorCore": "1.0.0-*" }, - "commands": { "ImageProcessorCore.Benchmarks": "ImageProcessorCore.Benchmarks" }, - "frameworks": { - "dnx46": { + "net4.5.1": { "frameworkAssemblies": { "System.Drawing": "4.0.0.0" } diff --git a/tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj b/tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj index 248e799634..5a0f189b59 100644 --- a/tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj +++ b/tests/ImageProcessorCore.Tests/ImageProcessorCore.Tests.xproj @@ -4,12 +4,13 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + f836e8e6-b4d9-4208-8346-140c74678b91 ImageProcessor.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.1 2.0 @@ -17,5 +18,5 @@ - + \ No newline at end of file diff --git a/tests/ImageProcessorCore.Tests/project.json b/tests/ImageProcessorCore.Tests/project.json index 6dd65e0891..b84ba44d7f 100644 --- a/tests/ImageProcessorCore.Tests/project.json +++ b/tests/ImageProcessorCore.Tests/project.json @@ -2,22 +2,21 @@ "version": "1.0.0-*", "description": "ImageProcessorCore.Tests Class Library", "authors": [ "James Jackson-South and contributors" ], - "tags": [ "" ], - "projectUrl": "", - "licenseUrl": "", + "packOptions": { + "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", + "tags": [ + "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" + ] + }, "dependencies": { "ImageProcessorCore": "1.0.0-*", - "Microsoft.CSharp": "4.0.1-beta-23516", - "Microsoft.NETCore": "5.0.1-beta-23516", - "Microsoft.NETCore.Platforms": "1.0.1-beta-23516", - "System.Collections": "4.0.11-beta-23516", - "System.Linq": "4.0.1-beta-23516", - "System.Threading": "4.0.11-beta-23516", "xunit": "2.2.0-beta1-build3239", "xunit.runner.dnx": "2.1.0-rc1-build204" }, "frameworks": { - "dnxcore50": { } + "dnx451": { + } }, "commands": { "test": "xunit.runner.dnx" From cb2be98d027b5d361ff1c54db1f55d24f68942b0 Mon Sep 17 00:00:00 2001 From: Dennis Fischer Date: Tue, 17 May 2016 10:26:57 +0200 Subject: [PATCH 02/14] 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 03/14] 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 04/14] 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 05/14] 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 From e1eb6880fcc947ea59725601887944309d058c05 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 11:59:40 +1000 Subject: [PATCH 06/14] Test script for grabbing latest dotnet cli Former-commit-id: 610ea28bb7cd7d0b07efded1f7bd9caa28336c78 Former-commit-id: 92df24ee27c2df34c702a05bff895ae5faede94c Former-commit-id: 069b92217a51946d589a65bf907c0804aaa96905 --- ImageProcessorCore.sln | 2 ++ appveyor.yml | 22 +++++++++++----------- dotnet-latest.ps1 | 29 +++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 dotnet-latest.ps1 diff --git a/ImageProcessorCore.sln b/ImageProcessorCore.sln index 898468eb51..9d828a74a0 100644 --- a/ImageProcessorCore.sln +++ b/ImageProcessorCore.sln @@ -9,6 +9,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessorCore.Tests", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}" ProjectSection(SolutionItems) = preProject + appveyor.yml = appveyor.yml + build\dotnet-latest.ps1 = build\dotnet-latest.ps1 global.json = global.json README.md = README.md EndProjectSection diff --git a/appveyor.yml b/appveyor.yml index 3862ed678d..15b1df6dc4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ os: Visual Studio 2015 init: - cmd: >- - choco install dotnetcli +- ps: .\build\dotnet-latest.ps1 set PATH=C:\Program Files\dotnet\bin;%PATH% assembly_info: @@ -33,13 +33,13 @@ test: off artifacts: - path: artifacts\bin\ImageProcessorCore\**\*.nupkg -# deploy: -# # MyGet Deployment for builds & releases -# - provider: NuGet -# server: https://www.myget.org/F/imageprocessor/api/v2/package -# symbol_server: https://nuget.symbolsource.org/MyGet/imageprocessor -# api_key: -# secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf -# artifact: /.*\.nupkg/ -# on: -# branch: Core \ No newline at end of file +deploy: + # MyGet Deployment for builds & releases + - provider: NuGet + server: https://www.myget.org/F/imageprocessor/api/v2/package + symbol_server: https://nuget.symbolsource.org/MyGet/imageprocessor + api_key: + secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf + artifact: /.*\.nupkg/ + on: + branch: Core \ No newline at end of file diff --git a/dotnet-latest.ps1 b/dotnet-latest.ps1 new file mode 100644 index 0000000000..8ce43e7461 --- /dev/null +++ b/dotnet-latest.ps1 @@ -0,0 +1,29 @@ +# Set up everything for using the dotnet cli. This means we do not have to wait for Appveyor images to be updated. + +# Clean and recreate the folder in which all output packages should be placed +$ArtifactsPath = "artifacts" + +if (Test-Path $ArtifactsPath) { + Remove-Item -Path $ArtifactsPath -Recurse -Force -ErrorAction Ignore +} + +New-Item $ArtifactsPath -ItemType Directory -ErrorAction Ignore | Out-Null + +Write-Host "Created artifacts folder '$ArtifactsPath'" + +# Install the latest dotnet cli +if (Get-Command "dotnet.exe" -ErrorAction SilentlyContinue) { + Write-Host "dotnet SDK already installed" + dotnet --version +} else { + Write-Host "Installing dotnet SDK" + + $installScript = Join-Path $ArtifactsPath "dotnet-install.ps1" + + Write-Host $installScript + + Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1" ` + -OutFile $installScript + + & $installScript +} From d640a282e6f6e01b66a218156e18d8cc9da64b9a Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 11:59:55 +1000 Subject: [PATCH 07/14] Save files! Former-commit-id: 3f5c69f5b3623c4f36c94e10c4183128c2b0019d Former-commit-id: dace6b600472c4473513cd350c57fd495883ba73 Former-commit-id: 6032677a23514bf9c0e31f3cc9c0e15410b8c518 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 15b1df6dc4..7b769988a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,8 @@ version: v1.0.0.{build} os: Visual Studio 2015 init: -- cmd: >- - ps: .\build\dotnet-latest.ps1 +- cmd: >- set PATH=C:\Program Files\dotnet\bin;%PATH% assembly_info: From 89341c20cca5071888b5f3eaa17f667ca02a0c41 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 12:09:27 +1000 Subject: [PATCH 08/14] Fix path Former-commit-id: 12613a0fe352577889a735e6ee76744ea57feb78 Former-commit-id: 979cdf5dad10b41bb23c10f9b80e9c4ac4e86793 Former-commit-id: 2d5354db2bb0c2ef25d465cd2401448c25913462 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7b769988a6..e3e96cf1b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: v1.0.0.{build} os: Visual Studio 2015 init: -- ps: .\build\dotnet-latest.ps1 +- ps: .\dotnet-latest.ps1 - cmd: >- set PATH=C:\Program Files\dotnet\bin;%PATH% From 1c62646bdcb4ff8d971f87f04f7adc84c912f80b Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 12:20:42 +1000 Subject: [PATCH 09/14] Try invoking as a command Former-commit-id: 99f6778617c145f4cb4ad4b7a75e8c58821f7c3f Former-commit-id: 1bf20e67b953de2d003531572ec748d3e1868438 Former-commit-id: 80b5d0b7ab8ef59fc939f099c80543cf9796c186 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e3e96cf1b6..383efc8f3b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: v1.0.0.{build} os: Visual Studio 2015 init: -- ps: .\dotnet-latest.ps1 +- ps: & dotnet-latest.ps1 - cmd: >- set PATH=C:\Program Files\dotnet\bin;%PATH% From d76d288a1150e6e790a36c1b38ce662006d6aa43 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 12:25:44 +1000 Subject: [PATCH 10/14] Path should be routed Former-commit-id: 30dac87020c592f72e75e9df13d3fa7442a99537 Former-commit-id: 45c9d171d311687a5dcbe8382914fc4245e271a9 Former-commit-id: a91ba1b8f9279f5c01017237a423170527e04fa5 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 383efc8f3b..af2328ab98 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: v1.0.0.{build} os: Visual Studio 2015 init: -- ps: & dotnet-latest.ps1 +- ps: & .\dotnet-latest.ps1 - cmd: >- set PATH=C:\Program Files\dotnet\bin;%PATH% From 64d4492ef58925929413854d763feecf0ba78b84 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 12:31:46 +1000 Subject: [PATCH 11/14] Trigger build Former-commit-id: 91b13801e63a0bd24e7b6fb2bff8b0074ecac58d Former-commit-id: 8ecaa218ed3f46f491efccc85f0abc220021e763 Former-commit-id: 17de6759cf56e69252b8102b0824268352d6f790 --- dotnet-latest.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet-latest.ps1 b/dotnet-latest.ps1 index 8ce43e7461..bb2c5dcfed 100644 --- a/dotnet-latest.ps1 +++ b/dotnet-latest.ps1 @@ -1,4 +1,4 @@ -# Set up everything for using the dotnet cli. This means we do not have to wait for Appveyor images to be updated. +# Set up everything for using the dotnet cli. This should mean we do not have to wait for Appveyor images to be updated. # Clean and recreate the folder in which all output packages should be placed $ArtifactsPath = "artifacts" From 086e278d218e40bf3fcf6e2b70bfeedb3600b69a Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 12:39:25 +1000 Subject: [PATCH 12/14] Fix invalid yaml Former-commit-id: 0dfefeb6f21c8a40f1f5333d341b7f18fa4dd7e4 Former-commit-id: 0e21e3155ada10d09afcb3d3fb966cdc0da2dffc Former-commit-id: b22ee433ada785d34bf45ef48b90890015f6053f --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index af2328ab98..60c841e269 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,8 @@ version: v1.0.0.{build} os: Visual Studio 2015 init: -- ps: & .\dotnet-latest.ps1 +- ps: >- + & .\dotnet-latest.ps1 - cmd: >- set PATH=C:\Program Files\dotnet\bin;%PATH% From f2154d38c9b5fcaba57f7c2ed33e0af305702944 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 14:03:18 +1000 Subject: [PATCH 13/14] Use iex Former-commit-id: aa77a58d9622ab54450fbf20de914989b864f4e8 Former-commit-id: dcb9659f4f19000bf9d5e486d86f0d8b3c775bbc Former-commit-id: 2dc3369f137707009864405483b16096efb577cc --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 60c841e269..19bb6e8688 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,7 @@ version: v1.0.0.{build} os: Visual Studio 2015 init: -- ps: >- - & .\dotnet-latest.ps1 +- ps: iex .\dotnet-latest.ps1 - cmd: >- set PATH=C:\Program Files\dotnet\bin;%PATH% From bd561ed4b66f233c21f76400306fe57433e8a7e3 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 19 May 2016 14:41:56 +1000 Subject: [PATCH 14/14] Try moving to install Former-commit-id: 074e73ec451c7b43427805e84718d6ae472eb7b2 Former-commit-id: 7af4cc2024c24f2e1e29e5143da844412f97bc72 Former-commit-id: b431cdde031095591e50151310905ff3d5481e6c --- appveyor.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 19bb6e8688..ca38b81541 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,14 @@ version: v1.0.0.{build} os: Visual Studio 2015 -init: +install: +# Use the install script to grab the latest dotnet install - ps: iex .\dotnet-latest.ps1 -- cmd: >- - set PATH=C:\Program Files\dotnet\bin;%PATH% + +# Prepend newly installed Python to the PATH of this build (this cannot be + # done from inside the powershell script as it would require to restart + # the parent CMD process). +- "SET PATH=C:\\Program Files\\dotnet\\bin;%PATH%" assembly_info: patch: true