Fix merge conflist

Former-commit-id: 563b42c321ffeaef4f6d4728aa688dfe874c1f0d Former-commit-id: 8fab301a7ec01fa541f557aba6f1e877fdb2edb4 Former-commit-id: 5a3802f31efd51a37aab471e7c280b7898fbfca0
10 years ago · 9c77ffaf21
23 changed files with 188 additions and 539 deletions
--- a/.gitignore
+++ b/.gitignore
@ -172,4 +172,9 @@ build/TestResult.xml
 *.db

 _site/
-.vs/config/applicationhost.config
+.vs/config/applicationhost.config
+
+**/node_modules
+**/node_modules/*
+project.lock.json
+src/ImageProcessor/project.lock.json
--- a/ImageProcessor.sln
+++ b/ImageProcessor.sln
@ -3,9 +3,9 @@ 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}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessor", "src\ImageProcessor\ImageProcessor.xproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}"
 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.Tests", "tests\ImageProcessor.Tests\ImageProcessor.Tests.xproj", "{F836E8E6-B4D9-4208-8346-140C74678B91}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -13,14 +13,14 @@ 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
+		{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
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,38 @@
+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 appveyor-project-version-patch.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
--- a/build/appveyor-project-version-patch.js
+++ b/build/appveyor-project-version-patch.js
@ -0,0 +1,18 @@
+var jsonfile = require('jsonfile');
+var semver = require('semver');
+
+var file = '../src/imageprocessor/project.json';
+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 = semversion;
+	jsonfile.writeFile(file, project, {spaces: 2}, function(err) {
+		console.error(err);
+	});
+})
--- a/build/package.json
+++ b/build/package.json
@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "jsonfile": "^2.2.3",
+    "semver": "^5.0.3"
+  }
+}
--- a/global.json
+++ b/global.json
@ -0,0 +1,3 @@
+{
+    "projects": [ "src" ]
+}
--- a/src/ImageProcessor/Common/Helpers/Guard.cs
+++ b/src/ImageProcessor/Common/Helpers/Guard.cs
@ -8,6 +8,9 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------

+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("ImageProcessor.Tests")]
 namespace ImageProcessor
 {
    using System;
--- a/src/ImageProcessor/ImageProcessor.csproj
+++ b/src/ImageProcessor/ImageProcessor.csproj
@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ImageProcessor</RootNamespace>
-    <AssemblyName>ImageProcessor</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NOCRYPTO;PCL</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\ImageProcessor.XML</DocumentationFile>
-    <LangVersion>default</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\ImageProcessor.XML</DocumentationFile>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Colors\Formats\Cmyk.cs" />
-    <Compile Include="Colors\Color.cs" />
-    <Compile Include="Common\Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Common\Helpers\ImageMaths.cs" />
-    <Compile Include="Filters\Blend.cs" />
-    <Compile Include="Filters\ColorMatrix\IColorMatrixFilter.cs" />
-    <Compile Include="Filters\Convolution\Convolution2PassFilter.cs" />
-    <Compile Include="Filters\Convolution\Convolution2DFilter.cs" />
-    <Compile Include="Filters\ColorMatrix\ColorMatrixFilter.cs" />
-    <Compile Include="Filters\ColorMatrix\Kodachrome.cs" />
-    <Compile Include="Filters\ColorMatrix\Saturation.cs" />
-    <Compile Include="Filters\ColorMatrix\GreyscaleMode.cs" />
-    <Compile Include="Filters\Brightness.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\EdgeDetector2DFilter.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\EdgeDetectorFilter.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\IEdgeDetectorFilter.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\Scharr.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\RobertsCross.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\Prewitt.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\LaplacianOfGaussian.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\Laplacian3X3.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\Laplacian5X5.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\Kirsch.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\Kayyali.cs" />
-    <Compile Include="Filters\Convolution\EdgeDetection\Sobel.cs" />
-    <Compile Include="Filters\Convolution\GuassianSharpen.cs" />
-    <Compile Include="Filters\Convolution\GuassianBlur.cs" />
-    <Compile Include="Filters\Invert.cs" />
-    <Compile Include="Filters\Alpha.cs" />
-    <Compile Include="Filters\ColorMatrix\GreyscaleBt601.cs" />
-    <Compile Include="Filters\ColorMatrix\GreyscaleBt709.cs" />
-    <Compile Include="Filters\ColorMatrix\BlackWhite.cs" />
-    <Compile Include="Filters\ColorMatrix\Polaroid.cs" />
-    <Compile Include="Filters\ColorMatrix\Lomograph.cs" />
-    <Compile Include="Filters\ColorMatrix\Sepia.cs" />
-    <Compile Include="Filters\Contrast.cs" />
-    <Compile Include="Filters\ImageFilterExtensions.cs" />
-    <Compile Include="Formats\Png\Zlib\Adler32.cs" />
-    <Compile Include="Formats\Png\Zlib\InflaterDynHeader.cs" />
-    <Compile Include="Formats\Png\Zlib\InflaterHuffmanTree.cs" />
-    <Compile Include="Formats\Png\Zlib\Crc32.cs" />
-    <Compile Include="Formats\Png\Zlib\Deflater.cs" />
-    <Compile Include="Formats\Png\Zlib\DeflaterConstants.cs" />
-    <Compile Include="Formats\Png\Zlib\DeflaterEngine.cs" />
-    <Compile Include="Formats\Png\Zlib\DeflaterHuffman.cs" />
-    <Compile Include="Formats\Png\Zlib\DeflaterOutputStream.cs" />
-    <Compile Include="Formats\Png\Zlib\DeflaterPending.cs" />
-    <Compile Include="Formats\Png\Zlib\DeflateStrategy.cs" />
-    <Compile Include="Formats\Png\Zlib\GeneralBitFlags.cs" />
-    <Compile Include="Formats\Png\Zlib\IChecksum.cs" />
-    <Compile Include="Formats\Png\Zlib\Inflater.cs" />
-    <Compile Include="Formats\Png\Zlib\InflaterInputBuffer.cs" />
-    <Compile Include="Formats\Png\Zlib\InflaterInputStream.cs" />
-    <Compile Include="Formats\Png\Zlib\OutputWindow.cs" />
-    <Compile Include="Formats\Png\Zlib\PendingBuffer.cs" />
-    <Compile Include="Formats\Png\Zlib\StreamManipulator.cs" />
-    <Compile Include="Formats\Png\Zlib\ZipConstants.cs" />
-    <Compile Include="ImageExtensions.cs" />
-    <Compile Include="Numerics\Rectangle.cs" />
-    <Compile Include="ParallelImageProcessor.cs" />
-    <Compile Include="IImageProcessor.cs" />
-    <Compile Include="Colors\Formats\Hsv.cs" />
-    <Compile Include="Colors\Formats\YCbCr.cs" />
-    <Compile Include="Common\Extensions\ByteExtensions.cs" />
-    <Compile Include="Common\Extensions\ComparableExtensions.cs" />
-    <Compile Include="Formats\Bmp\BmpCompression.cs" />
-    <Compile Include="Formats\Bmp\BmpFileHeader.cs" />
-    <Compile Include="Formats\Bmp\BmpFormat.cs" />
-    <Compile Include="Formats\Bmp\BmpInfoHeader.cs" />
-    <Compile Include="Formats\Bmp\BmpDecoder.cs" />
-    <Compile Include="Formats\Bmp\BmpDecoderCore.cs" />
-    <Compile Include="Formats\Bmp\BmpEncoder.cs" />
-    <Compile Include="Formats\Gif\BitEncoder.cs" />
-    <Compile Include="Formats\Gif\GifFormat.cs" />
-    <Compile Include="Formats\Gif\LzwEncoder.cs" />
-    <Compile Include="Formats\Gif\GifConstants.cs" />
-    <Compile Include="Formats\Gif\GifDecoderCore.cs" />
-    <Compile Include="Formats\Gif\GifEncoder.cs" />
-    <Compile Include="Formats\Gif\Quantizer\QuantizedImage.cs" />
-    <Compile Include="Formats\Gif\Quantizer\IQuantizer.cs" />
-    <Compile Include="Formats\Gif\Quantizer\OctreeQuantizer.cs" />
-    <Compile Include="Formats\Gif\Quantizer\Quantizer.cs" />
-    <Compile Include="Formats\IImageFormat.cs" />
-    <Compile Include="Formats\Jpg\JpegFormat.cs" />
-    <Compile Include="Formats\Jpg\JpegDecoder.cs" />
-    <Compile Include="Formats\Jpg\JpegEncoder.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\BitmapDestination.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\BitStream.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\DensityUnit.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\bitread_perm_state.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\bitread_working_state.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\ComponentBuffer.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\d_derived_tbl.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\huff_entropy_decoder.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\huff_entropy_encoder.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\JpegUtils.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_color_converter.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_color_deconverter.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_color_quantizer.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_comp_master.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_c_coef_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_c_main_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_c_prep_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_decomp_master.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_downsampler.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_d_coef_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_d_main_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_d_post_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_entropy_decoder.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_entropy_encoder.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_forward_dct.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_input_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_inverse_dct.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_marker_reader.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_marker_writer.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_scan_info.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\jpeg_upsampler.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\J_BUF_MODE.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_1pass_cquantizer.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_2pass_cquantizer.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_c_coef_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_destination_mgr.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_merged_upsampler.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_source_mgr.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_trans_c_coef_controller.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\my_upsampler.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\phuff_entropy_decoder.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\Internal\phuff_entropy_encoder.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\JBLOCK.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\JHUFF_TBL.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\JpegConstants.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_common_struct.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_component_info.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_compress_struct.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_decompress_struct.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_destination_mgr.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_error_mgr.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\JPEG_MARKER.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_marker_struct.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_progress_mgr.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jpeg_source_mgr.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\JQUANT_TBL.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\jvirt_array.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\J_COLOR_SPACE.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\J_DCT_METHOD.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\J_DITHER_MODE.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\J_MESSAGE_CODE.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Classic\ReadResult.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\CompressionParameters.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\DecompressionParameters.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\DecompressorToJpegImage.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Enumerations.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\IDecompressDestination.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\IRawImage.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Jpeg.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\JpegImage.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\LoadedImageAttributes.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\RawImage.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Sample.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\SampleRow.cs" />
-    <Compile Include="Formats\Jpg\LibJpeg\Utils.cs" />
-    <Compile Include="Formats\Png\PngFormat.cs" />
-    <Compile Include="Formats\Png\PngDecoder.cs" />
-    <Compile Include="Formats\Png\PngDecoderCore.cs" />
-    <Compile Include="Formats\Png\PngEncoder.cs" />
-    <Compile Include="Formats\Png\PngColorTypeInformation.cs" />
-    <Compile Include="Formats\Png\PngChunk.cs" />
-    <Compile Include="Formats\Png\PngChunkTypes.cs" />
-    <Compile Include="Formats\Png\TrueColorReader.cs" />
-    <Compile Include="Formats\Png\PaletteIndexReader.cs" />
-    <Compile Include="Formats\Png\GrayscaleReader.cs" />
-    <Compile Include="Formats\Png\IColorReader.cs" />
-    <Compile Include="Formats\Png\PngHeader.cs" />
-    <Compile Include="IImage.cs" />
-    <Compile Include="IImageBase.cs" />
-    <Compile Include="ImageProperty.cs" />
-    <Compile Include="ImageFrame.cs" />
-    <Compile Include="Colors\Formats\Bgra32.cs" />
-    <Compile Include="Common\Exceptions\ImageFormatException.cs" />
-    <Compile Include="Common\Helpers\Guard.cs" />
-    <Compile Include="Formats\Gif\GifDecoder.cs" />
-    <Compile Include="Formats\Gif\LzwDecoder.cs" />
-    <Compile Include="Formats\Gif\Sections\GifLogicalScreenDescriptor.cs" />
-    <Compile Include="Formats\Gif\Sections\GifImageDescriptor.cs" />
-    <Compile Include="Formats\Gif\Sections\GifGraphicsControlExtension.cs" />
-    <Compile Include="Formats\Gif\DisposalMethod.cs" />
-    <Compile Include="Formats\IImageDecoder.cs" />
-    <Compile Include="Formats\IImageEncoder.cs" />
-    <Compile Include="Image.cs" />
-    <Compile Include="ImageBase.cs" />
-    <Compile Include="Numerics\Point.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Numerics\Size.cs" />
-    <Compile Include="Filters\Convolution\ConvolutionFilter.cs" />
-    <Compile Include="Samplers\Crop.cs" />
-    <Compile Include="Samplers\Resamplers\Lanczos5Resampler.cs" />
-    <Compile Include="Samplers\Resamplers\Lanczos8Resampler.cs" />
-    <Compile Include="Samplers\Resamplers\WelchResampler.cs" />
-    <Compile Include="Samplers\Resamplers\CatmullRomResampler.cs" />
-    <Compile Include="Samplers\Resamplers\RobidouxSoftResampler.cs" />
-    <Compile Include="Samplers\Resamplers\RobidouxSharpResampler.cs" />
-    <Compile Include="Samplers\Resamplers\RobidouxResampler.cs" />
-    <Compile Include="Samplers\Resamplers\SplineResampler.cs" />
-    <Compile Include="Samplers\Resamplers\HermiteResampler.cs" />
-    <Compile Include="Samplers\Resamplers\MitchellNetravaliResampler.cs" />
-    <Compile Include="Samplers\Resamplers\TriangleResampler.cs" />
-    <Compile Include="Samplers\Resamplers\BoxResampler.cs" />
-    <Compile Include="Samplers\Resamplers\Lanczos3Resampler.cs" />
-    <Compile Include="Samplers\Resamplers\BicubicResampler.cs" />
-    <Compile Include="Samplers\ImageSampleExtensions.cs" />
-    <Compile Include="Samplers\Resamplers\IResampler.cs" />
-    <Compile Include="Samplers\Resize.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Formats\Gif\README.md" />
-    <None Include="Formats\Jpg\README.md" />
-    <None Include="Formats\Png\Zlib\README.md" />
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Formats\Bmp\README.md" />
-    <None Include="Formats\Png\README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="stylecop.json" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/src/ImageProcessor/ImageProcessor.csproj.DotSettings
+++ b/src/ImageProcessor/ImageProcessor.csproj.DotSettings
@ -1,24 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=colors/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=colors_005Cformats/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=common/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=common_005Cexceptions/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=common_005Cextensions/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=common_005Chelpers/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=encoders_005Cgif/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=filters_005Ccolormatrix/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=filters_005Cconvolution/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=filters_005Cconvolution_005Cedgedetection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cbmp/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cgif/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cgif_005Cquantizer/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cgif_005Csections/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cjpg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cjpg_005Clibjpeg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cpng/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cpng_005Czlib/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cpng_005Czlib2/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats_005Cpng_005Czlip2/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=numerics/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=samplers_005Cresamplers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
--- a/src/ImageProcessor/ImageProcessor.nuspec
+++ b/src/ImageProcessor/ImageProcessor.nuspec
@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package>
-  <metadata>
-    <id>ImageProcessor</id>
-    <version>3.0.0-alpha</version>
-    <title>ImageProcessor</title>
-    <authors>James Jackson-South</authors>
-    <owners>James Jackson-South</owners>
-    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-    <projectUrl>http://imageprocessor.org</projectUrl>
-    <iconUrl>http://imageprocessor.org/assets/ico/apple-touch-icon-144x144.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>A cross-platform library for processing of image files written in C#</description>
-    <releaseNotes>Alpha Release.</releaseNotes>
-    <copyright>Copyright (c) James Jackson-South and contributors</copyright>
-    <tags>Image Resize Crop Quality Gif Jpg Jpeg Bitmap Png Fluent Animated</tags>
-    <dependencies>
-      <group targetFramework="dotnet">
-        <dependency id="System.Collections" version="4.0.10" />
-        <dependency id="System.Collections.Immutable" version="1.1.37" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.10" />
-        <dependency id="System.Globalization" version="4.0.10" />
-        <dependency id="System.IO" version="4.0.10" />
-        <dependency id="System.Linq" version="4.0.0" />
-        <dependency id="System.Numerics.Vectors" version="4.1.0" />
-        <dependency id="System.Reflection" version="4.0.10" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.0" />
-        <dependency id="System.Runtime" version="4.0.20" />
-        <dependency id="System.Runtime.Extensions" version="4.0.10" />
-        <dependency id="System.Text.Encoding" version="4.0.10" />
-        <dependency id="System.Threading" version="4.0.10" />
-        <dependency id="System.Threading.Tasks" version="4.0.10" />
-        <dependency id="System.Threading.Tasks.Parallel" version="4.0.0" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Debug\ImageProcessor.dll" target="lib\dotnet\ImageProcessor.dll" />
-  </files>
-</package>
--- a/src/ImageProcessor/ImageProcessor.xproj
+++ b/src/ImageProcessor/ImageProcessor.xproj
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>2aa31a1f-142c-43f4-8687-09abca4b3a26</ProjectGuid>
+    <RootNamespace>ImageProcessor</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
--- a/src/ImageProcessor/Settings.StyleCop
+++ b/src/ImageProcessor/Settings.StyleCop
@ -1,24 +0,0 @@
-<StyleCopSettings Version="105">
-  <GlobalSettings>
-    <CollectionProperty Name="RecognizedWords">
-      <Value>cb</Value>
-      <Value>octree</Value>
-      <Value>quantizer</Value>
-      <Value>cr</Value>
-      <Value>EX</Value>
-      <Value>png</Value>
-      <Value>rgb</Value>
-      <Value>scanline</Value>
-      <Value>scanlines</Value>
-      <Value>tEXt</Value>
-      <Value>xt</Value>
-      <Value>th</Value>
-      <Value>nd</Value>
-      <Value>rd</Value>
-      <Value>lomograph</Value>
-      <Value>polaroid</Value>
-      <Value>colorspace</Value>
-      <Value>kodachrome</Value>
-    </CollectionProperty>
-  </GlobalSettings>
-</StyleCopSettings>
--- a/src/ImageProcessor/project.json
+++ b/src/ImageProcessor/project.json
@ -1,18 +1,29 @@
-{
-  "supports": {
-    "net46.app": {},
-    "uwp.10.0.app": {},
-    "dnxcore50.app": {}
-  },
+{
+  "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": {
-    "Microsoft.NETCore": "5.0.0",
+    "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.Portable.Compatibility": "1.0.0",
-    "NuSpec.ReferenceGenerator": "1.3.6",
-    "StyleCop.Analyzers": "1.0.0-beta015"
+    "System.Runtime.Extensions": "4.0.10",
+    "System.Reflection": "4.0.10",
+    "System.IO": "4.0.10",
+    "StyleCop.Analyzers": "1.0.0-beta015",
+    "Microsoft.NETCore": "5.0.1-beta-23409",
+    "Microsoft.NETCore.Platforms": "1.0.1-beta-23409"
  },
  "frameworks": {
-    "dotnet": {
-      "imports": "portable-net452+win81"
-    }
+    "dotnet": {}
  }
 }
--- a/src/ImageProcessor/project.lock.json.REMOVED.git-id
+++ b/src/ImageProcessor/project.lock.json.REMOVED.git-id
@ -1 +1 @@
-5c58fbc6a5c85cdb06443246b3b327845381c790
+b4afca3213a5d2714e409729a1ef2622b62a5bca
--- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj
+++ b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj
@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1741DC66-5404-4B15-AE58-B7721F1568A4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ImageProcessor.Tests</RootNamespace>
-    <AssemblyName>ImageProcessor.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.1.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Colors\ColorConversionTests.cs" />
-    <Compile Include="Colors\ColorTests.cs" />
-    <Compile Include="Processors\Filters\FilterTests.cs" />
-    <Compile Include="Processors\Formats\EncoderDecoderTests.cs" />
-    <Compile Include="Helpers\GuardTests.cs" />
-    <Compile Include="Numerics\RectangleTests.cs" />
-    <Compile Include="Numerics\PointTests.cs" />
-    <Compile Include="Numerics\SizeTests.cs" />
-    <Compile Include="Processors\ProcessorTestBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Processors\Samplers\SamplerTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\ImageProcessor\ImageProcessor.csproj">
-      <Project>{8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}</Project>
-      <Name>ImageProcessor</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>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}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-</Project>
--- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj.DotSettings
+++ b/tests/ImageProcessor.Tests/ImageProcessor.Tests.csproj.DotSettings
@ -1,9 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=colors/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=formats/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=helpers/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=numerics/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=processors/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=processors_005Cfilters/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=processors_005Cformats/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=processors_005Csamplers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
--- a/tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj
+++ b/tests/ImageProcessor.Tests/ImageProcessor.Tests.xproj
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>f836e8e6-b4d9-4208-8346-140c74678b91</ProjectGuid>
+    <RootNamespace>ImageProcessor.Tests</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
--- 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) },
--- 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",
--- 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")]
--- a/tests/ImageProcessor.Tests/packages.config
+++ b/tests/ImageProcessor.Tests/packages.config
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Collections" version="4.0.0" targetFramework="net46" />
-  <package id="System.Collections.Immutable" version="1.1.37" targetFramework="net46" />
-  <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net46" />
-  <package id="System.Globalization" version="4.0.10" targetFramework="net46" />
-  <package id="System.Linq" version="4.0.0" targetFramework="net46" />
-  <package id="System.Numerics.Vectors" version="4.1.0" targetFramework="net46" />
-  <package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net46" />
-  <package id="System.Runtime" version="4.0.20" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.0.10" targetFramework="net46" />
-  <package id="System.Threading" version="4.0.0" targetFramework="net46" />
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.console" version="2.0.0" />
-  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
-</packages>
--- a/tests/ImageProcessor.Tests/project.json
+++ 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"
+  }
+}
--- a/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id
+++ b/tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id
@ -0,0 +1 @@
+986564cced9c1356c73f345d4f605395896bf156