From fcec5ed399bac33735cdfed9d88f64e22af5fce3 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 17 May 2016 16:04:41 +1000 Subject: [PATCH] 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 f3677d892..898468eb5 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 7176b42b8..3862ed678 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 4013de3c5..0c4b1f2be 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 3f1e5c1fe..a9c7dc831 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 3e3a70af8..000000000 --- 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 041633c50..000000000 --- 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 48941be50..ae0dd9c86 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 d403a7558..70e77a2cc 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 4e06339d4..dd3a44428 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 fe674d9e0..07b512c8f 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 d4f539678..ad177c7b5 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 248e79963..5a0f189b5 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 6dd65e089..b84ba44d7 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"