From 0a6dbdcd439c944edbab971b962fe921d0c44b5b Mon Sep 17 00:00:00 2001 From: Jeavon Date: Thu, 12 Nov 2015 12:42:23 +0000 Subject: [PATCH 01/18] Update csproj files to ToolsVersion="14" Former-commit-id: ad5488593d0d4e541e89acfc553dc11317935ace Former-commit-id: e3e7b109a4dca6e7825adf8372ca8745f79bd57c Former-commit-id: 9720de62b1e708e084f1fe23f79bc337e261949e --- src/ImageProcessor/ImageProcessor.csproj | 2 +- tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ImageProcessor/ImageProcessor.csproj b/src/ImageProcessor/ImageProcessor.csproj index 5f541ab6a..a36830e8f 100644 --- a/src/ImageProcessor/ImageProcessor.csproj +++ b/src/ImageProcessor/ImageProcessor.csproj @@ -1,5 +1,5 @@  - + 14.0 diff --git a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj index 7e75ec647..34751d447 100644 --- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj +++ b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj @@ -1,5 +1,5 @@  - + From 19fa17b26fae1582b78cedeceeeb6f0da4dbf99c Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 10:26:48 +0000 Subject: [PATCH 02/18] Converting to a Class Library (Package) project - wow, this is a brave new world! Former-commit-id: 1757442b1dd4f0767c8f07bc177ba76d80b1860e Former-commit-id: 317ea30a5acc3b373665db02e38f061fd958f3f0 Former-commit-id: e1ee3098705355aa3d8cabfaebd087d8114faad2 --- ImageProcessor.sln | 16 +- global.json | 1 + src/ImageProcessor/ImageProcessor.csproj | 281 ------------------ .../ImageProcessor.csproj.DotSettings | 24 -- src/ImageProcessor/ImageProcessor.nuspec | 18 -- src/ImageProcessor/ImageProcessor.xproj | 24 ++ src/ImageProcessor/Properties/AssemblyInfo.cs | 33 -- src/ImageProcessor/Settings.StyleCop | 24 -- src/ImageProcessor/project.json | 41 ++- .../project.lock.json.REMOVED.git-id | 2 +- .../ImageProcessor.Tests.csproj | 6 - 11 files changed, 56 insertions(+), 414 deletions(-) create mode 100644 global.json delete mode 100644 src/ImageProcessor/ImageProcessor.csproj delete mode 100644 src/ImageProcessor/ImageProcessor.csproj.DotSettings delete mode 100644 src/ImageProcessor/ImageProcessor.nuspec create mode 100644 src/ImageProcessor/ImageProcessor.xproj delete mode 100644 src/ImageProcessor/Properties/AssemblyInfo.cs delete mode 100644 src/ImageProcessor/Settings.StyleCop diff --git a/ImageProcessor.sln b/ImageProcessor.sln index 75e092892..ef8735a33 100644 --- a/ImageProcessor.sln +++ b/ImageProcessor.sln @@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor", "src\ImageProcessor\ImageProcessor.csproj", "{8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Tests", "tests\ImageProcessor.Tests\ImageProcessor.Tests.csproj", "{1741DC66-5404-4B15-AE58-B7721F1568A4}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessor", "src\ImageProcessor\ImageProcessor.xproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}.Release|Any CPU.Build.0 = Release|Any CPU - {1741DC66-5404-4B15-AE58-B7721F1568A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1741DC66-5404-4B15-AE58-B7721F1568A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1741DC66-5404-4B15-AE58-B7721F1568A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1741DC66-5404-4B15-AE58-B7721F1568A4}.Release|Any CPU.Build.0 = Release|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/global.json b/global.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/global.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/ImageProcessor/ImageProcessor.csproj b/src/ImageProcessor/ImageProcessor.csproj deleted file mode 100644 index a36830e8f..000000000 --- a/src/ImageProcessor/ImageProcessor.csproj +++ /dev/null @@ -1,281 +0,0 @@ - - - - - 14.0 - Debug - AnyCPU - {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36} - Library - Properties - ImageProcessor - ImageProcessor - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - v5.0 - ..\..\ - true - - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;NOCRYPTO;PCL - prompt - 4 - bin\Debug\ImageProcessor.XML - default - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\ImageProcessor.XML - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ImageProcessor/ImageProcessor.csproj.DotSettings b/src/ImageProcessor/ImageProcessor.csproj.DotSettings deleted file mode 100644 index b4cd56a17..000000000 --- a/src/ImageProcessor/ImageProcessor.csproj.DotSettings +++ /dev/null @@ -1,24 +0,0 @@ - - CSharp60 - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True \ No newline at end of file diff --git a/src/ImageProcessor/ImageProcessor.nuspec b/src/ImageProcessor/ImageProcessor.nuspec deleted file mode 100644 index 2a03ac069..000000000 --- a/src/ImageProcessor/ImageProcessor.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE - http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE - http://ICON_URL_HERE_OR_DELETE_THIS_LINE - false - $description$ - Alpha Release. - Copyright James Jackson-South and contributors2015 - Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated - - \ No newline at end of file diff --git a/src/ImageProcessor/ImageProcessor.xproj b/src/ImageProcessor/ImageProcessor.xproj new file mode 100644 index 000000000..32684b928 --- /dev/null +++ b/src/ImageProcessor/ImageProcessor.xproj @@ -0,0 +1,24 @@ + + + + 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/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs deleted file mode 100644 index 999af59c3..000000000 --- a/src/ImageProcessor/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ImageProcessor")] -[assembly: AssemblyDescription("A cross-platform library for processing of image files written in C#")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ImageProcessor")] -[assembly: AssemblyCopyright("Copyright (c) James South and contributors.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.0.0.0")] - -// Ensure the internals can be tested. -[assembly: InternalsVisibleTo("ImageProcessor.Tests")] diff --git a/src/ImageProcessor/Settings.StyleCop b/src/ImageProcessor/Settings.StyleCop deleted file mode 100644 index dd461b1f1..000000000 --- a/src/ImageProcessor/Settings.StyleCop +++ /dev/null @@ -1,24 +0,0 @@ - - - - cb - octree - quantizer - cr - EX - png - rgb - scanline - scanlines - tEXt - xt - th - nd - rd - lomograph - polaroid - colorspace - kodachrome - - - \ No newline at end of file diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json index 6288fcc23..d6b6d79a7 100644 --- a/src/ImageProcessor/project.json +++ b/src/ImageProcessor/project.json @@ -1,17 +1,26 @@ -{ - "supports": { - "net46.app": {}, - "uwp.10.0.app": {}, - "dnxcore50.app": {} - }, - "dependencies": { - "Microsoft.NETCore": "5.0.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.0", - "StyleCop.Analyzers": "1.0.0-beta015" - }, - "frameworks": { - "dotnet": { - "imports": "portable-net452+win81" +{ + "version": "3.0.0-*", + "description": "ImageProcessor", + "authors": [ "James Jackson-South" ], + "tags": [ "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" ], + "projectUrl": "", + "licenseUrl": "", + + "dependencies": { + "System.Collections": "4.0.10-beta-23019", + "System.Linq": "4.0.0-beta-23019", + "System.Threading": "4.0.10-beta-23019", + "System.Runtime": "4.0.10-beta-23019", + "Microsoft.CSharp": "4.0.0-beta-23019", + "Microsoft.NETCore": "5.0.0", + "Microsoft.NETCore.Portable.Compatibility": "1.0.0", + "System.Runtime.Extensions": "4.0.0", + "System.Reflection": "4.0.0", + "System.IO": "4.0.0", + "StyleCop.Analyzers": "1.0.0-beta015" + }, + + "frameworks": { + "dotnet": { } } - } -} \ No newline at end of file +} diff --git a/src/ImageProcessor/project.lock.json.REMOVED.git-id b/src/ImageProcessor/project.lock.json.REMOVED.git-id index 24339fed2..833f52323 100644 --- a/src/ImageProcessor/project.lock.json.REMOVED.git-id +++ b/src/ImageProcessor/project.lock.json.REMOVED.git-id @@ -1 +1 @@ -3f05708641eb3ed085d4689aae4a960eb067fd16 \ No newline at end of file +1cb54c4ca5fc8244fed40097407641c28dd42fe4 \ No newline at end of file diff --git a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj index 34751d447..02f91d9c0 100644 --- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj +++ b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj @@ -76,12 +76,6 @@ - - - {8047C4AC-7097-4DE4-B00D-6D55EBCF1D36} - ImageProcessor - - From 7b5907298c440f1fd2cb7c90fc26ccc6a41caba3 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 11:20:34 +0000 Subject: [PATCH 03/18] Missing global.json Former-commit-id: 72721800402254f90116aba290eedb7cad0ac64d Former-commit-id: 90011d881a58a87b3c65d973165ad896ab9f04e9 Former-commit-id: 05a66a25db9ca8bd9ddf6fc567638211bf692386 --- global.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index 9e26dfeeb..b0323e428 100644 --- a/global.json +++ b/global.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "projects": [ "src" ] +} \ No newline at end of file From ae6a80650d15a65541e0aba3665b397900a39c00 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 11:37:55 +0000 Subject: [PATCH 04/18] Bad reference Former-commit-id: 90eeba71267f8b9e77484492eb0572104fdcffc1 Former-commit-id: b90244ab2b31827aa2f381abe1279d597ba8def1 Former-commit-id: 1e0583b972042a3c88e7189bba2f0f2e9ec467f7 --- src/ImageProcessor/ImageProcessor.xproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ImageProcessor/ImageProcessor.xproj b/src/ImageProcessor/ImageProcessor.xproj index 32684b928..041633c50 100644 --- a/src/ImageProcessor/ImageProcessor.xproj +++ b/src/ImageProcessor/ImageProcessor.xproj @@ -17,8 +17,5 @@ True - - - \ No newline at end of file From ebc99456e495e49d6b3e147ac5437e531fea0f6b Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 11:52:39 +0000 Subject: [PATCH 05/18] Updating some packages Former-commit-id: bed74edbff8a62d518189a0bd3601c0698c49e6f Former-commit-id: 1d11ea3ee864034f1ba482476fb319528f727f5a Former-commit-id: 12225d99054bdada3bf90a23f2ab457497af90ce --- src/ImageProcessor/project.json | 44 +++++++++---------- .../project.lock.json.REMOVED.git-id | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json index d6b6d79a7..549a0d4c4 100644 --- a/src/ImageProcessor/project.json +++ b/src/ImageProcessor/project.json @@ -1,26 +1,26 @@ { - "version": "3.0.0-*", - "description": "ImageProcessor", - "authors": [ "James Jackson-South" ], - "tags": [ "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" ], - "projectUrl": "", - "licenseUrl": "", + "version": "3.0.0-*", + "description": "ImageProcessor", + "authors": [ "James Jackson-South" ], + "tags": [ "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" ], + "projectUrl": "", + "licenseUrl": "", - "dependencies": { - "System.Collections": "4.0.10-beta-23019", - "System.Linq": "4.0.0-beta-23019", - "System.Threading": "4.0.10-beta-23019", - "System.Runtime": "4.0.10-beta-23019", - "Microsoft.CSharp": "4.0.0-beta-23019", - "Microsoft.NETCore": "5.0.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.0", - "System.Runtime.Extensions": "4.0.0", - "System.Reflection": "4.0.0", - "System.IO": "4.0.0", - "StyleCop.Analyzers": "1.0.0-beta015" - }, + "dependencies": { + "System.Collections": "4.0.10", + "System.Linq": "4.0.0", + "System.Threading": "4.0.10", + "System.Runtime": "4.0.20", + "Microsoft.CSharp": "4.0.0", + "Microsoft.NETCore": "5.0.0", + "Microsoft.NETCore.Portable.Compatibility": "1.0.0", + "System.Runtime.Extensions": "4.0.10", + "System.Reflection": "4.0.10", + "System.IO": "4.0.10", + "StyleCop.Analyzers": "1.0.0-beta015" + }, - "frameworks": { - "dotnet": { } - } + "frameworks": { + "dotnet": { } + } } diff --git a/src/ImageProcessor/project.lock.json.REMOVED.git-id b/src/ImageProcessor/project.lock.json.REMOVED.git-id index 833f52323..997468c35 100644 --- a/src/ImageProcessor/project.lock.json.REMOVED.git-id +++ b/src/ImageProcessor/project.lock.json.REMOVED.git-id @@ -1 +1 @@ -1cb54c4ca5fc8244fed40097407641c28dd42fe4 \ No newline at end of file +40241cbd230d461a8d3a51be31208f171e18186e \ No newline at end of file From ce4bcf00aa0f261fbe79fe02e4cdbdaea73f6042 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 14:49:26 +0000 Subject: [PATCH 06/18] Adding netcore.platforms Former-commit-id: b8f3b43e8cb8f637473b47f8fb529306565df2b0 Former-commit-id: ecbed995d1129a8fa62739ab32014f1bb8c181a2 Former-commit-id: 4f9bf7b74329fc7f15336dbf9dc1526274d98c30 --- src/ImageProcessor/project.json | 23 ++++++++++--------- .../project.lock.json.REMOVED.git-id | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json index 549a0d4c4..bbd43a242 100644 --- a/src/ImageProcessor/project.json +++ b/src/ImageProcessor/project.json @@ -1,10 +1,10 @@ { - "version": "3.0.0-*", - "description": "ImageProcessor", - "authors": [ "James Jackson-South" ], - "tags": [ "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" ], - "projectUrl": "", - "licenseUrl": "", + "version": "3.0.0-*", + "description": "ImageProcessor", + "authors": [ "James Jackson-South" ], + "tags": [ "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" ], + "projectUrl": "", + "licenseUrl": "", "dependencies": { "System.Collections": "4.0.10", @@ -12,15 +12,16 @@ "System.Threading": "4.0.10", "System.Runtime": "4.0.20", "Microsoft.CSharp": "4.0.0", - "Microsoft.NETCore": "5.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0", "System.Runtime.Extensions": "4.0.10", "System.Reflection": "4.0.10", "System.IO": "4.0.10", - "StyleCop.Analyzers": "1.0.0-beta015" + "StyleCop.Analyzers": "1.0.0-beta015", + "Microsoft.NETCore": "5.0.1-beta-23409", + "Microsoft.NETCore.Platforms": "1.0.1-beta-23409" }, - "frameworks": { - "dotnet": { } - } + "frameworks": { + "dotnet": { } + } } diff --git a/src/ImageProcessor/project.lock.json.REMOVED.git-id b/src/ImageProcessor/project.lock.json.REMOVED.git-id index 997468c35..9087efb8b 100644 --- a/src/ImageProcessor/project.lock.json.REMOVED.git-id +++ b/src/ImageProcessor/project.lock.json.REMOVED.git-id @@ -1 +1 @@ -40241cbd230d461a8d3a51be31208f171e18186e \ No newline at end of file +869b4da8e5d4467a9e8fe7af0413a80080cd8f15 \ No newline at end of file From 9c2e68508e9e513179c96ddc5b1bcd8d7c11dcdf Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 15:46:20 +0000 Subject: [PATCH 07/18] Add a nodejs script to patch the project.json file with the AppVeyor version number Former-commit-id: 547399af66beb1b843ff0ef3d6540f8132ffaab1 Former-commit-id: ba3b2143364e06c45e662284cc134634451bbe5b Former-commit-id: ab0b04b0e427d286d3611dd424fccda6138c3999 --- .gitignore | 5 ++++- build/aspnet5-version.js | 12 ++++++++++++ build/package.json | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 build/aspnet5-version.js create mode 100644 build/package.json diff --git a/.gitignore b/.gitignore index ae6765a03..f327fe7d5 100644 --- a/.gitignore +++ b/.gitignore @@ -172,4 +172,7 @@ build/TestResult.xml *.db _site/ -.vs/config/applicationhost.config \ No newline at end of file +.vs/config/applicationhost.config + +**/node_modules +**/node_modules/* \ No newline at end of file diff --git a/build/aspnet5-version.js b/build/aspnet5-version.js new file mode 100644 index 000000000..96959486f --- /dev/null +++ b/build/aspnet5-version.js @@ -0,0 +1,12 @@ +var jsonfile = require('jsonfile'); +var util = require('util'); + +var file = '../src/imageprocessor/project.json'; +var buildNumber = process.env.APPVEYOR_BUILD_NUMBER; + +jsonfile.readFile(file, function (err, project) { + project.version = buildNumber; + jsonfile.writeFile(file, project, {spaces: 2}, function(err) { + console.error(err); + }); +}) \ No newline at end of file diff --git a/build/package.json b/build/package.json new file mode 100644 index 000000000..2207a278b --- /dev/null +++ b/build/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "jsonfile": "^2.2.3" + } +} From ee34dced5407f5e83edac0a39e18f1cd0de21b52 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 15:55:38 +0000 Subject: [PATCH 08/18] Oops should be version not build Former-commit-id: 0ed5cfc3e56b464e971a1ecf4d6304aba1cc682d Former-commit-id: 4c59f251dafe8b6d3ab1e5d86dbaf74af5bd7fad Former-commit-id: 235c036765afccd2818c950dbae8205c243fc33e --- build/aspnet5-version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/aspnet5-version.js b/build/aspnet5-version.js index 96959486f..ebdfc3706 100644 --- a/build/aspnet5-version.js +++ b/build/aspnet5-version.js @@ -2,7 +2,7 @@ var util = require('util'); var file = '../src/imageprocessor/project.json'; -var buildNumber = process.env.APPVEYOR_BUILD_NUMBER; +var buildNumber = process.env.APPVEYOR_BUILD_VERSION; jsonfile.readFile(file, function (err, project) { project.version = buildNumber; From 0ef340a472a5fc651a73c1469f06acc4b5643803 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 16:01:43 +0000 Subject: [PATCH 09/18] Drop the "v" Former-commit-id: 1c1ce12ede9edc9136cf2f07a55b4fe4893eb070 Former-commit-id: 7dd63ad98e5778ac762266f9f3eba0b2c24174e5 Former-commit-id: f01f03d617beeb0b1e9b461345b16a29760d337b --- build/aspnet5-version.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/aspnet5-version.js b/build/aspnet5-version.js index ebdfc3706..25a20b4a0 100644 --- a/build/aspnet5-version.js +++ b/build/aspnet5-version.js @@ -2,11 +2,11 @@ var util = require('util'); var file = '../src/imageprocessor/project.json'; -var buildNumber = process.env.APPVEYOR_BUILD_VERSION; +var buildNumber = process.env.APPVEYOR_BUILD_VERSION.substring(1); jsonfile.readFile(file, function (err, project) { - project.version = buildNumber; - jsonfile.writeFile(file, project, {spaces: 2}, function(err) { - console.error(err); - }); + project.version = buildNumber; + jsonfile.writeFile(file, project, {spaces: 2}, function(err) { + console.error(err); + }); }) \ No newline at end of file From a577b0fa22dc3f2697e16ce4cac79defd491d76c Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 16:19:19 +0000 Subject: [PATCH 10/18] Think I've got Semver versioning working but currently fixed with the "alpha" prefix, this needs to be changed to a Environmental variable Former-commit-id: 36db49c22a54ad2e5312c89382e6c23e384b688e Former-commit-id: 667ee9bd9f6fbee10341d6e62514c8a0666ae61b Former-commit-id: b9cf81be4888c902cd042b9d1434cfde14b386df --- build/aspnet5-version.js | 11 +++++++++-- build/package.json | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/aspnet5-version.js b/build/aspnet5-version.js index 25a20b4a0..7487d49b2 100644 --- a/build/aspnet5-version.js +++ b/build/aspnet5-version.js @@ -1,11 +1,18 @@ var jsonfile = require('jsonfile'); +var semver = require('semver'); var util = require('util'); var file = '../src/imageprocessor/project.json'; -var buildNumber = process.env.APPVEYOR_BUILD_VERSION.substring(1); +var buildVersion = process.env.APPVEYOR_BUILD_VERSION.substring(1); +//var buildVersion = '3.0.0.23'; + +var findPoint = buildVersion.lastIndexOf("."); +var basePackageVer = buildVersion.substring(0, findPoint); +var buildNumber = buildVersion.substring(findPoint + 1, buildVersion.length); +var semversion = semver.valid(basePackageVer + '-alpha-' + buildNumber) jsonfile.readFile(file, function (err, project) { - project.version = buildNumber; + project.version = semversion; jsonfile.writeFile(file, project, {spaces: 2}, function(err) { console.error(err); }); diff --git a/build/package.json b/build/package.json index 2207a278b..59cc96e92 100644 --- a/build/package.json +++ b/build/package.json @@ -1,5 +1,6 @@ { "dependencies": { - "jsonfile": "^2.2.3" + "jsonfile": "^2.2.3", + "semver": "^5.0.3" } } From 427f5724ecac63e185a620557e5fac513522db48 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 19:29:44 +0000 Subject: [PATCH 11/18] Bring back the tests, now also a "Class Library (Package" project - followed examples here https://xunit.github.io/docs/getting-started-dnx.html Former-commit-id: c8a5e50f94e3c8d917efe02aaba39283e5bc6bb9 Former-commit-id: 24c1653dcea127c882bcfbdb13beb02f6b24b20d Former-commit-id: 7173d7fe842a72a5b04bba45be924adb0b07c454 --- ImageProcessor.sln | 6 ++ build/aspnet5-version.js | 1 - src/ImageProcessor/Common/Helpers/Guard.cs | 3 + src/ImageProcessor/project.json | 24 ++--- .../project.lock.json.REMOVED.git-id | 2 +- .../ImageProcessor.Tests.csproj | 90 ------------------- .../ImageProcessor.Tests.csproj.DotSettings | 9 -- .../Processors/Filters/FilterTests.cs | 2 +- .../Processors/ProcessorTestBase.cs | 6 +- .../Properties/AssemblyInfo.cs | 21 +---- tests/ImageProcessor.Tests/packages.config | 20 ----- tests/ImageProcessor.Tests/project.json | 29 ++++++ .../project.lock.json.REMOVED.git-id | 1 + 13 files changed, 61 insertions(+), 153 deletions(-) delete mode 100644 tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj delete mode 100644 tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj.DotSettings delete mode 100644 tests/ImageProcessor.Tests/packages.config create mode 100644 tests/ImageProcessor.Tests/project.json create mode 100644 tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id diff --git a/ImageProcessor.sln b/ImageProcessor.sln index ef8735a33..35ec0a49d 100644 --- a/ImageProcessor.sln +++ b/ImageProcessor.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessor", "src\ImageProcessor\ImageProcessor.xproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessor.Tests", "tests\ImageProcessor.Tests\ImageProcessor.Tests.xproj", "{F836E8E6-B4D9-4208-8346-140C74678B91}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|Any CPU.Build.0 = Release|Any CPU + {F836E8E6-B4D9-4208-8346-140C74678B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F836E8E6-B4D9-4208-8346-140C74678B91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F836E8E6-B4D9-4208-8346-140C74678B91}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F836E8E6-B4D9-4208-8346-140C74678B91}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/aspnet5-version.js b/build/aspnet5-version.js index 7487d49b2..2af9f5a3c 100644 --- a/build/aspnet5-version.js +++ b/build/aspnet5-version.js @@ -1,6 +1,5 @@ var jsonfile = require('jsonfile'); var semver = require('semver'); -var util = require('util'); var file = '../src/imageprocessor/project.json'; var buildVersion = process.env.APPVEYOR_BUILD_VERSION.substring(1); diff --git a/src/ImageProcessor/Common/Helpers/Guard.cs b/src/ImageProcessor/Common/Helpers/Guard.cs index bb2952754..b04af6129 100644 --- a/src/ImageProcessor/Common/Helpers/Guard.cs +++ b/src/ImageProcessor/Common/Helpers/Guard.cs @@ -8,6 +8,9 @@ // // -------------------------------------------------------------------------------------------------------------------- +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("ImageProcessor.Tests")] namespace ImageProcessor { using System; diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json index bbd43a242..a32fb15f4 100644 --- a/src/ImageProcessor/project.json +++ b/src/ImageProcessor/project.json @@ -1,11 +1,14 @@ { - "version": "3.0.0-*", - "description": "ImageProcessor", - "authors": [ "James Jackson-South" ], - "tags": [ "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" ], - "projectUrl": "", - "licenseUrl": "", - + "version": "3.0.0-*", + "description": "ImageProcessor", + "authors": [ + "James Jackson-South" + ], + "tags": [ + "Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated" + ], + "projectUrl": "", + "licenseUrl": "", "dependencies": { "System.Collections": "4.0.10", "System.Linq": "4.0.0", @@ -20,8 +23,7 @@ "Microsoft.NETCore": "5.0.1-beta-23409", "Microsoft.NETCore.Platforms": "1.0.1-beta-23409" }, - - "frameworks": { - "dotnet": { } - } + "frameworks": { + "dnxcore50": {} + } } diff --git a/src/ImageProcessor/project.lock.json.REMOVED.git-id b/src/ImageProcessor/project.lock.json.REMOVED.git-id index 9087efb8b..686b92b42 100644 --- a/src/ImageProcessor/project.lock.json.REMOVED.git-id +++ b/src/ImageProcessor/project.lock.json.REMOVED.git-id @@ -1 +1 @@ -869b4da8e5d4467a9e8fe7af0413a80080cd8f15 \ No newline at end of file +b4afca3213a5d2714e409729a1ef2622b62a5bca \ No newline at end of file diff --git a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj deleted file mode 100644 index 02f91d9c0..000000000 --- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - Debug - AnyCPU - {1741DC66-5404-4B15-AE58-B7721F1568A4} - Library - Properties - ImageProcessor.Tests - ImageProcessor.Tests - v4.6 - 512 - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - ..\..\ - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - ..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll - True - - - - ..\..\packages\System.Numerics.Vectors.4.1.0\lib\net46\System.Numerics.Vectors.dll - True - - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj.DotSettings b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj.DotSettings deleted file mode 100644 index cb4957f1e..000000000 --- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj.DotSettings +++ /dev/null @@ -1,9 +0,0 @@ - - True - True - True - True - True - True - True - True \ No newline at end of file diff --git a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs b/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs index 76b0bfdaa..35029e8d9 100644 --- a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs +++ b/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs @@ -17,7 +17,7 @@ namespace ImageProcessor.Tests { "Brightness--50", new Brightness(-50) }, { "Contrast-50", new Contrast(50) }, { "Contrast--50", new Contrast(-50) }, - { "Blend", new Blend(new Image(File.OpenRead("../../TestImages/Formats/Bmp/Car.bmp")),15)}, + { "Blend", new Blend(new Image(File.OpenRead("TestImages/Formats/Bmp/Car.bmp")),15)}, { "Saturation-50", new Saturation(50) }, { "Saturation--50", new Saturation(-50) }, { "Alpha--50", new Alpha(50) }, diff --git a/tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs b/tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs index a34f6117f..059a94a3e 100644 --- a/tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs +++ b/tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs @@ -21,7 +21,7 @@ namespace ImageProcessor.Tests { //"../../TestImages/Formats/Jpg/Backdrop.jpg", //"../../TestImages/Formats/Jpg/Calliphora.jpg", - "../../TestImages/Formats/Jpg/china.jpg", + "TestImages/Formats/Jpg/china.jpg", //"../../TestImages/Formats/Jpg/ant.jpg", //"../../TestImages/Formats/Jpg/parachute.jpg", //"../../TestImages/Formats/Jpg/lomo.jpg", @@ -29,10 +29,10 @@ namespace ImageProcessor.Tests //"../../TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg", //"../../TestImages/Formats/Jpg/greyscale.jpg", //"../../TestImages/Formats/Bmp/Car.bmp", - "../../TestImages/Formats/Png/cballs.png", + "TestImages/Formats/Png/cballs.png", //"../../TestImages/Formats/Png/cmyk.png", //"../../TestImages/Formats/Png/gamma-1.0-or-2.2.png", - "../../TestImages/Formats/Png/splash.png", + "TestImages/Formats/Png/splash.png", //"../../TestImages/Formats/Gif/leaf.gif", //"../../TestImages/Formats/Gif/ben2.gif", //"../../TestImages/Formats/Gif/rings.gif", diff --git a/tests/ImageProcessor.Tests/Properties/AssemblyInfo.cs b/tests/ImageProcessor.Tests/Properties/AssemblyInfo.cs index b44979c8b..a21728dc8 100644 --- a/tests/ImageProcessor.Tests/Properties/AssemblyInfo.cs +++ b/tests/ImageProcessor.Tests/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("ImageProcessor.Tests")] @@ -14,23 +14,10 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8fea7d87-3f18-465a-b15f-abb1783c95bc")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: Guid("f836e8e6-b4d9-4208-8346-140c74678b91")] diff --git a/tests/ImageProcessor.Tests/packages.config b/tests/ImageProcessor.Tests/packages.config deleted file mode 100644 index 7cef95935..000000000 --- a/tests/ImageProcessor.Tests/packages.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/ImageProcessor.Tests/project.json b/tests/ImageProcessor.Tests/project.json new file mode 100644 index 000000000..2d57c937a --- /dev/null +++ b/tests/ImageProcessor.Tests/project.json @@ -0,0 +1,29 @@ +{ + "version": "1.0.0-*", + "description": "ImageProcessor.Tests Class Library", + "authors": [ "jeavon" ], + "tags": [ "" ], + "projectUrl": "", + "licenseUrl": "", + "frameworks": { + "dnxcore50": { + "dependencies": { + "Microsoft.CSharp": "4.0.1-beta-23409", + "System.Collections": "4.0.11-beta-23409", + "System.Linq": "4.0.1-beta-23409", + "System.Runtime": "4.0.21-beta-23409", + "System.Threading": "4.0.11-beta-23409" + } + } + }, + "dependencies": { + "ImageProcessor": "3.0.0-*", + "Microsoft.NETCore": "5.0.1-beta-23409", + "Microsoft.NETCore.Platforms": "1.0.1-beta-23409", + "xunit": "2.1.0", + "xunit.runner.dnx": "2.1.0-beta6-build191" + }, + "commands": { + "test": "xunit.runner.dnx" + } +} diff --git a/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id b/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id new file mode 100644 index 000000000..516e70542 --- /dev/null +++ b/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id @@ -0,0 +1 @@ +986564cced9c1356c73f345d4f605395896bf156 \ No newline at end of file From 1eba782314682d11d7ff41f0cea7d89fcc453302 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 13 Nov 2015 19:33:16 +0000 Subject: [PATCH 12/18] Missed the xproj file Former-commit-id: e483474c07013fcc8f361f2b85431db5a1345550 Former-commit-id: 64a46ff85001ceb11bb8b7ab0fddc6836a90600b Former-commit-id: bdba737df086aa51f9874a4760dcd8b52bb454b0 --- .../ImageProcessor.Tests.xproj | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj diff --git a/tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj b/tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj new file mode 100644 index 000000000..248e79963 --- /dev/null +++ b/tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + f836e8e6-b4d9-4208-8346-140c74678b91 + ImageProcessor.Tests + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + + + + \ No newline at end of file From f766df9f3261617db15758560a647c0e809aae48 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Sun, 15 Nov 2015 10:59:01 +0000 Subject: [PATCH 13/18] ImageProcessor can be set to general framework dotnet Former-commit-id: 2b2a28198a2734cdb086095887a6ab6d5a13a55e Former-commit-id: 67c8ec14c0ff59b8830b79c17c05c2e0f8d62609 Former-commit-id: 9b468e1dcf4a6a648b1914ba4492092288a693dc --- src/ImageProcessor/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json index a32fb15f4..cafdb6213 100644 --- a/src/ImageProcessor/project.json +++ b/src/ImageProcessor/project.json @@ -24,6 +24,6 @@ "Microsoft.NETCore.Platforms": "1.0.1-beta-23409" }, "frameworks": { - "dnxcore50": {} + "dotnet": {} } } From cbcded8c90c8c886ec7e63219f79c034471d325d Mon Sep 17 00:00:00 2001 From: Jeavon Date: Sun, 15 Nov 2015 11:49:31 +0000 Subject: [PATCH 14/18] Disabling failed tests to check AppVeyor artifacts Former-commit-id: 1fabb94ed14a9e18ab169707fce8025041cc3476 Former-commit-id: 8ee66ed2f82e9ffbe81e1d4b2fa6df13bdb8db70 Former-commit-id: 03fa93a60f09f3ab4768ae49f49f4940cccfdd8b --- tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs | 2 +- .../Processors/Formats/EncoderDecoderTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs b/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs index 1c286da7b..2ca54c35b 100644 --- a/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs +++ b/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs @@ -27,7 +27,7 @@ namespace ImageProcessor.Tests /// /// Tests the implicit conversion from to . /// - [Fact] + //[Fact] [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation", Justification = "Reviewed. Suppression is OK here.")] public void ColorToYCbCr() diff --git a/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs b/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs index f9049056b..c884a3c87 100644 --- a/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs +++ b/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs @@ -41,7 +41,7 @@ } } - [Fact] + //[Fact] public void QuantizedImageShouldPreserveMaximumColorPrecision() { if (!Directory.Exists("Quantized")) From 8aa06d4a9a56082ffd5a7c29d915a472a539c07b Mon Sep 17 00:00:00 2001 From: Jeavon Date: Sun, 15 Nov 2015 12:01:52 +0000 Subject: [PATCH 15/18] Re-enable failing tests Former-commit-id: eb49da4b67fa7123480b486e8994b1868ee976da Former-commit-id: 7096cd4dbd95ac916223a6d432ef6b23c36646a1 Former-commit-id: c6d9ce880547244d14678077c2e5d474f1b05347 --- tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs | 2 +- .../Processors/Formats/EncoderDecoderTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs b/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs index 2ca54c35b..1c286da7b 100644 --- a/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs +++ b/tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs @@ -27,7 +27,7 @@ namespace ImageProcessor.Tests /// /// Tests the implicit conversion from to . /// - //[Fact] + [Fact] [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation", Justification = "Reviewed. Suppression is OK here.")] public void ColorToYCbCr() diff --git a/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs b/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs index c884a3c87..f9049056b 100644 --- a/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs +++ b/tests/ImageProcessor.Tests/Processors/Formats/EncoderDecoderTests.cs @@ -41,7 +41,7 @@ } } - //[Fact] + [Fact] public void QuantizedImageShouldPreserveMaximumColorPrecision() { if (!Directory.Exists("Quantized")) From 21d4997441ecdc18b5ee388427d78a3ca7d324a0 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Sun, 15 Nov 2015 12:25:42 +0000 Subject: [PATCH 16/18] Add AppVeyor.yml Former-commit-id: be6d5a6c2ef0185fb6c5df0c20d2c9f0f6640715 Former-commit-id: adb67b636cea694fe6bb44d75d6a01b63b0690a2 Former-commit-id: b74d530d42ef65911f0f45ea07f4bfb3d709db71 --- appveyor.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..166dfb358 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,30 @@ +version: v3.0.0.{build} +os: Visual Studio 2015 +install: +# Remove NuGet v2 source as we want to use v3 for everything +- cmd: nuget sources remove -Name nuget.org +before_build: +- cmd: >- + dnvm install 1.0.0-beta8 -r clr + dnvm install 1.0.0-beta8 -r coreclr -arch x64 -a x64 + dnvm use 1.0.0-beta8 -r coreclr -a x64 + + dnvm list + + dnu restore src\ImageProcessor + dnu restore tests\ImageProcessor.Tests + + cd build + npm install + node aspnet5-version.js + cd.. +build: + project: ImageProcessor.sln + verbosity: minimal +test_script: +- cmd: >- + dnvm use 1.0.0-beta8 -r coreclr -a x64 + cd tests/ImageProcessor.Tests + dnx test +artifacts: +- path: artifacts\bin\ImageProcessor\**\*.nupkg \ No newline at end of file From b91c085035cd925e235ff3c6f14bdec89abde85d Mon Sep 17 00:00:00 2001 From: Jeavon Date: Sun, 15 Nov 2015 12:28:39 +0000 Subject: [PATCH 17/18] Missing spaces Former-commit-id: f68026d31098d2292ad59a3934a690892e72daa6 Former-commit-id: 9dc4c7c265a5fa4f2aa40a834bd810a476e6dbc7 Former-commit-id: 21678914c236383693e879718738a43b91b1c2e7 --- appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 166dfb358..cc2ba9139 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,17 +6,23 @@ install: before_build: - cmd: >- dnvm install 1.0.0-beta8 -r clr + dnvm install 1.0.0-beta8 -r coreclr -arch x64 -a x64 + dnvm use 1.0.0-beta8 -r coreclr -a x64 dnvm list dnu restore src\ImageProcessor + dnu restore tests\ImageProcessor.Tests cd build + npm install + node aspnet5-version.js + cd.. build: project: ImageProcessor.sln @@ -24,7 +30,9 @@ build: test_script: - cmd: >- dnvm use 1.0.0-beta8 -r coreclr -a x64 + cd tests/ImageProcessor.Tests + dnx test artifacts: - path: artifacts\bin\ImageProcessor\**\*.nupkg \ No newline at end of file From b47d40c5c05758f9c027c90f5d809576cea3ef7b Mon Sep 17 00:00:00 2001 From: Jeavon Date: Sun, 15 Nov 2015 21:13:25 +0000 Subject: [PATCH 18/18] Rename aspnet5-version.js to appveyor-project-version-patch.js Former-commit-id: adaf419f813dde0fc2d5e882b3901e087c954ee0 Former-commit-id: 888806fddd05c7531bd228a4795e650a54343127 Former-commit-id: 969e4ba7e998ee39a0bbfb4a9464221a4d3c6475 --- appveyor.yml | 2 +- build/{aspnet5-version.js => appveyor-project-version-patch.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename build/{aspnet5-version.js => appveyor-project-version-patch.js} (100%) diff --git a/appveyor.yml b/appveyor.yml index cc2ba9139..ebf5aed9c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,7 @@ before_build: npm install - node aspnet5-version.js + node appveyor-project-version-patch.js cd.. build: diff --git a/build/aspnet5-version.js b/build/appveyor-project-version-patch.js similarity index 100% rename from build/aspnet5-version.js rename to build/appveyor-project-version-patch.js