From d6aef6fb3e37b8ec093fd4e4ce8d5ef13afdb9ae 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: f50eef7bfeb41814aa0beb312937a54fad2ba60d Former-commit-id: a27a69945b7178b01f6cdfa8e4a38ea0119dc471 Former-commit-id: adeb6709bb01f555f1788afec77fdccdffc9e8b5 --- 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 fa857dd615bf71ebf63b9b2e3a510cc2c4213535 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: cc66de04c7e29588150646c7cf5b76aea289d99a Former-commit-id: 28c1a1feae34652c6a31cb058db57a8366e1f5bf Former-commit-id: a4409afcce8bceb756aa2129d4e2f8f48696cc1d --- 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 e55631a0cc24e229370d8a518d696b4a4d89d6ea 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: 6f564e1adf4d161392fc6b1d96104154fa3a27a8 Former-commit-id: 356deda59bf977b7460d4f44bcd92c83337d85ed Former-commit-id: 0c658b6ea623a2445cb8c36adc8400ac6486509d --- 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 997866589003645224118dda835b755db4507b2c 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: 55a4fa6487fc7db697a7731bc82a1d3f8d2679ab Former-commit-id: 31ccf2356a0c067ddd7c707063f2316231f23a0a Former-commit-id: 4abb0f3d412bc21983a68ebff839c32b901f0fac --- 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 3f0dad95d120d83d3961557a7984399d08fecc69 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: 5023a9bee3e422eda6d3425d02d9945109a8061b Former-commit-id: 33d74bf9f61c8bb5f3c9e7cfeec0138062a8a769 Former-commit-id: 9f3b4212665479e017148cea4dd762c3c696f68e --- 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 485f9a53e516b8183282044ebb20ef37f2fbedb9 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: 237a246674c136839fb94ab6412d91e3a4a64129 Former-commit-id: f22f33b836818d6410b15040f80ccc43c46ae5ee Former-commit-id: 0a27cec31626def21ed1d8a5aafbcd01386f88a0 --- 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 a6dcbcad44fa46a188092a6b05f01bea53cd74fa 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: be900f851daa03256a656a7fd8cf94b6f376fb6f Former-commit-id: 82035d46f62049305683e28a6fa50d6d43fa4052 Former-commit-id: 3ad70545c662283460f352c9f9b5298607551a5d --- .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 657c64e41bc1d66c63ddd1b7ebe137338699acd4 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: c4aaa47617fc953e0ee0b44a81a83cc88be5ce4e Former-commit-id: ecad1a94605ff23414586f1d7adde67b3b5ef4e1 Former-commit-id: f0bc37a41980f9876e85e299f751f628a3898b83 --- 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 48bc322e07a6df305d70f19f1f37a1c23a880523 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: 03a7353db5bdf53fc3413c0bdb15015e77dab0ca Former-commit-id: 85685350d5868e8e1faad9c7aa0ce8bcffda17a3 Former-commit-id: 80681071d0bbf5dcd83e1dfa44f306da7d712b88 --- 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 bc01108386379c74344729c1cfd4c57c464c3fc3 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: 57d88ca94ce281fdddb3309241f08a3cc89b0e37 Former-commit-id: e0933167d925f033a0a01a558309a572bb1fd7b4 Former-commit-id: bb70c42d297875b020d42b48609c8cda5f29d5e5 --- 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 36831e98db931b9e2c9e31f3644ffbeed056ea5f 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: 64e1043a77f2a34852971e1f1088cb8b09bf510a Former-commit-id: 42e8f9b4673b362276e14faaee648c8b744122f1 Former-commit-id: 7d7cbf5e222162f38afe2966c4f144ed04a5529a --- 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 b10cdf88433acd93fad4171fa400d099b2fedbb2 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: 538b0d8e3edca2e35c15ee5db975b9fb3aa15a05 Former-commit-id: 5ef894ac95eef19578ed5708ef42f5ef333d6e02 Former-commit-id: 0cfed99eb17d954e902ce513f8dabb1a19673c40 --- .../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 acd51a5c05d8ae2496b4ce5aeef7a5d13cb02e56 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: abd4cea2d74834985879f191dc65b7417b0a4ad5 Former-commit-id: 522a488c76d3c12fd369977b7fa781ba8fcba776 Former-commit-id: 08e322a15b6063b00c30dea21ffcee503ace9d13 --- 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 dcdd381e242880e78023747873ae7ab6e756e6fa 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: acb3811987344f434db37d2209953eb7c11abe5e Former-commit-id: ef18a4865e8d55775499e10e93b55ee706d7b40d Former-commit-id: 74c60dd4dff92ee8ffe78f8d5e45c027c6033ae7 --- 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 7125fff9e6f6c7ccfd9260da9e929b5a20d5cab5 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: 49813c876fc245a691e2a18cfe6f1aa2a5b25ec7 Former-commit-id: 0556e911466fe8391cec8fc0dba8ed17dcaef6b8 Former-commit-id: d2961b1131d42d959acaa27ad4b388add1113fee --- 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 c25babc68a27db0dd3aaec240d494a5919750fd9 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: 1f3d7354d0a3f247e8426096f744c946346890e9 Former-commit-id: 3903b68106f23165d727964575486d6559d9160c Former-commit-id: 1eb54986f4d6bcd8325714ca764990c2e1731289 --- 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 7ff465fdc5a7c479422ef4172a381c9f3ce0d0ff 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: ab3dc5163de1e72622e6a7e6c2dfb817ee0b3ca1 Former-commit-id: ae275854710cbadb38608eb208cc0c4b465fed00 Former-commit-id: 256f61228782c5b2da105593ebed2050493efe58 --- 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 35f3b44aed5ac0796d698d06070a3cd69ebfe7b1 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: 337fdcc955e21e9348f28c5c77eff88f4e9b8478 Former-commit-id: fe4ccdb2158a053c49174f5c00fd438b34c72062 Former-commit-id: eca95b20077acc8d1f702d186cb0464b3895397d --- 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