From 748efcd3c91319853a80f84df089920b842e96f2 Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sat, 14 Jan 2017 19:39:22 +0100
Subject: [PATCH 01/11] branch-creation test commit

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 7346bdc28..6da79b611 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src" ],
     "sdk": {
-    "version": "1.0.0-preview2-003121"
+    "version": "1.0.0-preview2-003131"
   }
 }
\ No newline at end of file

From 453f167177b81d1cb84f4af29fe64d3166677924 Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sat, 14 Jan 2017 22:08:03 +0100
Subject: [PATCH 02/11] Initialized ImageSharp.Sandbox46.csproj

---
 ImageSharp.sln                                |  7 ++
 .../ImageSharp.Sandbox46.csproj               | 99 +++++++++++++++++++
 .../Properties/AssemblyInfo.cs                | 36 +++++++
 tests/ImageSharp.Sandbox46/Sandbox.cs         | 20 ++++
 tests/ImageSharp.Sandbox46/packages.config    |  9 ++
 5 files changed, 171 insertions(+)
 create mode 100644 tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
 create mode 100644 tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs
 create mode 100644 tests/ImageSharp.Sandbox46/Sandbox.cs
 create mode 100644 tests/ImageSharp.Sandbox46/packages.config

diff --git a/ImageSharp.sln b/ImageSharp.sln
index 1f848b34d..5490c1048 100644
--- a/ImageSharp.sln
+++ b/ImageSharp.sln
@@ -53,6 +53,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9E574A
 		src\Shared\stylecop.json = src\Shared\stylecop.json
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Sandbox46", "tests\ImageSharp.Sandbox46\ImageSharp.Sandbox46.csproj", "{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -99,6 +101,10 @@ Global
 		{A623CFE9-9D2B-4528-AD1F-2E834B061134}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A623CFE9-9D2B-4528-AD1F-2E834B061134}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A623CFE9-9D2B-4528-AD1F-2E834B061134}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -115,5 +121,6 @@ Global
 		{556ABDCF-ED93-4327-BE98-F6815F78B9B8} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
 		{A623CFE9-9D2B-4528-AD1F-2E834B061134} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
 		{9E574A07-F879-4811-9C41-5CBDC6BAFDB7} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
+		{96188137-5FA6-4924-AB6E-4EFF79C6E0BB} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
new file mode 100644
index 000000000..452eaca43
--- /dev/null
+++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
@@ -0,0 +1,99 @@
+<?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>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ImageSharp</RootNamespace>
+    <AssemblyName>ImageSharp.Sandbox46</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </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.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.assert, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.core, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\net45\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="ImageSharp">
+      <HintPath>..\..\src\ImageSharp\bin\$(Configuration)\net45\ImageSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageSharp.Drawing">
+      <HintPath>..\..\src\ImageSharp.Drawing\bin\$(Configuration)\net45\ImageSharp.Drawing.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageSharp.Formats.Bmp">
+      <HintPath>..\..\src\ImageSharp.Formats.Bmp\bin\$(Configuration)\net45\ImageSharp.Formats.Bmp.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageSharp.Formats.Gif">
+      <HintPath>..\..\src\ImageSharp.Formats.Gif\bin\$(Configuration)\net45\ImageSharp.Formats.Gif.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageSharp.Formats.Jpeg">
+      <HintPath>..\..\src\ImageSharp.Formats.Jpeg\bin\$(Configuration)\net45\ImageSharp.Formats.Jpeg.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageSharp.Formats.Png">
+      <HintPath>..\..\src\ImageSharp.Formats.Png\bin\$(Configuration)\net45\ImageSharp.Formats.Png.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageSharp.Processing">
+      <HintPath>..\..\src\ImageSharp\bin\$(Configuration)\net45\ImageSharp.Processing.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Sandbox.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Tests\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.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>
\ No newline at end of file
diff --git a/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs b/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..bee8fb408
--- /dev/null
+++ b/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+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("ImageSharp.Sandbox46")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Sapa")]
+[assembly: AssemblyProduct("ImageSharp.Sandbox46")]
+[assembly: AssemblyCopyright("Copyright © Sapa 2017")]
+[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 
+// 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("96188137-5fa6-4924-ab6e-4eff79c6e0bb")]
+
+// 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")]
diff --git a/tests/ImageSharp.Sandbox46/Sandbox.cs b/tests/ImageSharp.Sandbox46/Sandbox.cs
new file mode 100644
index 000000000..a92bb342e
--- /dev/null
+++ b/tests/ImageSharp.Sandbox46/Sandbox.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ImageSharp
+{
+    using Xunit;
+
+    public class Sandbox
+    {
+        [Fact]
+        public void HelloImage()
+        {
+            Image img = new Image(10, 20);
+            Assert.Equal(10, img.Width);
+        }
+    }
+}
diff --git a/tests/ImageSharp.Sandbox46/packages.config b/tests/ImageSharp.Sandbox46/packages.config
new file mode 100644
index 000000000..128826db5
--- /dev/null
+++ b/tests/ImageSharp.Sandbox46/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="net461" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
+  <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="net461" />
+  <package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="net461" />
+  <package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="net461" />
+  <package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="net461" />
+</packages>
\ No newline at end of file

From 29005d673b4feb673afd0c89b03a9de94d04fdd4 Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sat, 14 Jan 2017 22:40:42 +0100
Subject: [PATCH 03/11] added some test files to ImageSharp.Sandbox46.csproj

---
 .../ImageSharp.Sandbox46.csproj               | 63 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
index 452eaca43..fd7cc5c78 100644
--- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
+++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
@@ -79,6 +79,63 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\ImageSharp.Tests\Drawing\BeziersTests.cs">
+      <Link>Tests\Drawing\BeziersTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\DrawImageTest.cs">
+      <Link>Tests\Drawing\DrawImageTest.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\DrawPathTests.cs">
+      <Link>Tests\Drawing\DrawPathTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\FillPatternTests.cs">
+      <Link>Tests\Drawing\FillPatternTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\FillSolidBrushTests.cs">
+      <Link>Tests\Drawing\FillSolidBrushTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\LineComplexPolygonTests.cs">
+      <Link>Tests\Drawing\LineComplexPolygonTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\LineTests.cs">
+      <Link>Tests\Drawing\LineTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\PolygonTests.cs">
+      <Link>Tests\Drawing\PolygonTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\RecolorImageTest.cs">
+      <Link>Tests\Drawing\RecolorImageTest.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\SolidBezierTests.cs">
+      <Link>Tests\Drawing\SolidBezierTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\SolidComplexPolygonTests.cs">
+      <Link>Tests\Drawing\SolidComplexPolygonTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Drawing\SolidPolygonTests.cs">
+      <Link>Tests\Drawing\SolidPolygonTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\Block8x8FTests.cs">
+      <Link>Tests\Formats\Jpg\Block8x8FTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\JpegTests.cs">
+      <Link>Tests\Formats\Jpg\JpegTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\ReferenceImplementations.cs">
+      <Link>Tests\Formats\Jpg\ReferenceImplementations.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\ReferenceImplementationsTests.cs">
+      <Link>Tests\Formats\Jpg\ReferenceImplementationsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\UtilityTestClassBase.cs">
+      <Link>Tests\Formats\Jpg\UtilityTestClassBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\YCbCrImageTests.cs">
+      <Link>Tests\Formats\Jpg\YCbCrImageTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Processors\Filters\ResizeTests.cs">
+      <Link>Tests\Processors\Filters\ResizeTests.cs</Link>
+    </Compile>
     <Compile Include="Sandbox.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -86,7 +143,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Tests\" />
+    <Folder Include="Tests\Image\" />
+    <Folder Include="Tests\TestUtilities\Attributes\" />
+    <Folder Include="Tests\TestUtilities\Factories\" />
+    <Folder Include="Tests\TestUtilities\ImageProviders\" />
+    <Folder Include="Tests\TestUtilities\Tests\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 6d313e356838e46f771c9be646de3663f599ea5b Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sat, 14 Jan 2017 23:06:02 +0100
Subject: [PATCH 04/11] ImageSharp.Sandbox46.csproj compiles and runs!

---
 src/Shared/AssemblyInfo.Common.cs             |   3 +-
 .../ImageSharp.Sandbox46.csproj               | 133 ++++++++++++------
 tests/ImageSharp.Sandbox46/Sandbox.cs         |  20 ---
 tests/ImageSharp.Sandbox46/packages.config    |   1 +
 tests/ImageSharp.Tests/TestFile.cs            |   5 +-
 5 files changed, 95 insertions(+), 67 deletions(-)
 delete mode 100644 tests/ImageSharp.Sandbox46/Sandbox.cs

diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs
index 09f2d0d02..11f16769b 100644
--- a/src/Shared/AssemblyInfo.Common.cs
+++ b/src/Shared/AssemblyInfo.Common.cs
@@ -35,4 +35,5 @@ using System.Runtime.CompilerServices;
 
 // Ensure the internals can be tested.
 [assembly: InternalsVisibleTo("ImageSharp.Benchmarks")]
-[assembly: InternalsVisibleTo("ImageSharp.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("ImageSharp.Tests")]
+[assembly: InternalsVisibleTo("ImageSharp.Sandbox46")]
\ No newline at end of file
diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
index fd7cc5c78..0549a9e92 100644
--- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
+++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,10 +29,16 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.1.1\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -75,49 +82,22 @@
       <HintPath>..\..\src\ImageSharp.Formats.Png\bin\$(Configuration)\net45\ImageSharp.Formats.Png.dll</HintPath>
     </Reference>
     <Reference Include="ImageSharp.Processing">
-      <HintPath>..\..\src\ImageSharp\bin\$(Configuration)\net45\ImageSharp.Processing.dll</HintPath>
+      <HintPath>..\..\src\ImageSharp.Processing\bin\$(Configuration)\net45\ImageSharp.Processing.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\ImageSharp.Tests\Drawing\BeziersTests.cs">
-      <Link>Tests\Drawing\BeziersTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\DrawImageTest.cs">
-      <Link>Tests\Drawing\DrawImageTest.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\DrawPathTests.cs">
-      <Link>Tests\Drawing\DrawPathTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\FillPatternTests.cs">
-      <Link>Tests\Drawing\FillPatternTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\FillSolidBrushTests.cs">
-      <Link>Tests\Drawing\FillSolidBrushTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\LineComplexPolygonTests.cs">
-      <Link>Tests\Drawing\LineComplexPolygonTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\LineTests.cs">
-      <Link>Tests\Drawing\LineTests.cs</Link>
-    </Compile>
     <Compile Include="..\ImageSharp.Tests\Drawing\PolygonTests.cs">
       <Link>Tests\Drawing\PolygonTests.cs</Link>
     </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\RecolorImageTest.cs">
-      <Link>Tests\Drawing\RecolorImageTest.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\SolidBezierTests.cs">
-      <Link>Tests\Drawing\SolidBezierTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\SolidComplexPolygonTests.cs">
-      <Link>Tests\Drawing\SolidComplexPolygonTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\SolidPolygonTests.cs">
-      <Link>Tests\Drawing\SolidPolygonTests.cs</Link>
+    <Compile Include="..\ImageSharp.Tests\FileTestBase.cs">
+      <Link>Tests\FileTestBase.cs</Link>
     </Compile>
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\Block8x8FTests.cs">
       <Link>Tests\Formats\Jpg\Block8x8FTests.cs</Link>
     </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\JpegTestBase.cs">
+      <Link>Tests\Formats\Jpg\JpegTestBase.cs</Link>
+    </Compile>
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\JpegTests.cs">
       <Link>Tests\Formats\Jpg\JpegTests.cs</Link>
     </Compile>
@@ -127,28 +107,93 @@
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\ReferenceImplementationsTests.cs">
       <Link>Tests\Formats\Jpg\ReferenceImplementationsTests.cs</Link>
     </Compile>
-    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\UtilityTestClassBase.cs">
-      <Link>Tests\Formats\Jpg\UtilityTestClassBase.cs</Link>
-    </Compile>
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\YCbCrImageTests.cs">
       <Link>Tests\Formats\Jpg\YCbCrImageTests.cs</Link>
     </Compile>
+    <Compile Include="..\ImageSharp.Tests\Image\ImagePropertyTests.cs">
+      <Link>Tests\Image\ImagePropertyTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Image\ImageTests.cs">
+      <Link>Tests\Image\ImageTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Image\PixelAccessorTests.cs">
+      <Link>Tests\Image\PixelAccessorTests.cs</Link>
+    </Compile>
     <Compile Include="..\ImageSharp.Tests\Processors\Filters\ResizeTests.cs">
       <Link>Tests\Processors\Filters\ResizeTests.cs</Link>
     </Compile>
-    <Compile Include="Sandbox.cs" />
+    <Compile Include="..\ImageSharp.Tests\TestBase.cs">
+      <Link>Tests\TestBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestFile.cs">
+      <Link>Tests\TestFile.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestImages.cs">
+      <Link>Tests\TestImages.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\ImageDataAttributeBase.cs">
+      <Link>Tests\TestUtilities\Attributes\ImageDataAttributeBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithBlankImageAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithBlankImageAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithFileAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithFileAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithFileCollectionAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithFileCollectionAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithMemberFactoryAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithMemberFactoryAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithSolidFilledImagesAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithSolidFilledImagesAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Factories\GenericFactory.cs">
+      <Link>Tests\TestUtilities\Factories\GenericFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Factories\ImageFactory.cs">
+      <Link>Tests\TestUtilities\Factories\ImageFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\BlankProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\BlankProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\FileProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\FileProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\LambdaProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\LambdaProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\SolidProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\SolidProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\TestImageProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\TestImageProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImagingTestCaseUtility.cs">
+      <Link>Tests\TestUtilities\ImagingTestCaseUtility.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\MeasureFixture.cs">
+      <Link>Tests\TestUtilities\MeasureFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\PixelTypes.cs">
+      <Link>Tests\TestUtilities\PixelTypes.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Tests\TestImageProviderTests.cs">
+      <Link>Tests\TestUtilities\Tests\TestImageProviderTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Tests\TestUtilityExtensionsTests.cs">
+      <Link>Tests\TestUtilities\Tests\TestUtilityExtensionsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\TestUtilityExtensions.cs">
+      <Link>Tests\TestUtilities\TestUtilityExtensions.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Tests\Image\" />
-    <Folder Include="Tests\TestUtilities\Attributes\" />
-    <Folder Include="Tests\TestUtilities\Factories\" />
-    <Folder Include="Tests\TestUtilities\ImageProviders\" />
-    <Folder Include="Tests\TestUtilities\Tests\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.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.
diff --git a/tests/ImageSharp.Sandbox46/Sandbox.cs b/tests/ImageSharp.Sandbox46/Sandbox.cs
deleted file mode 100644
index a92bb342e..000000000
--- a/tests/ImageSharp.Sandbox46/Sandbox.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ImageSharp
-{
-    using Xunit;
-
-    public class Sandbox
-    {
-        [Fact]
-        public void HelloImage()
-        {
-            Image img = new Image(10, 20);
-            Assert.Equal(10, img.Width);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Sandbox46/packages.config b/tests/ImageSharp.Sandbox46/packages.config
index 128826db5..4eced5344 100644
--- a/tests/ImageSharp.Sandbox46/packages.config
+++ b/tests/ImageSharp.Sandbox46/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="System.Numerics.Vectors" version="4.1.1" targetFramework="net461" />
   <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
   <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="net461" />
diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs
index 61a6a9f64..01d760b68 100644
--- a/tests/ImageSharp.Tests/TestFile.cs
+++ b/tests/ImageSharp.Tests/TestFile.cs
@@ -35,7 +35,7 @@ namespace ImageSharp.Tests
         /// The file.
         /// </summary>
         private readonly string file;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TestFile"/> class.
         /// </summary>
@@ -135,7 +135,8 @@ namespace ImageSharp.Tests
             var directories = new[] {
                  "TestImages/Formats/", // Here for code coverage tests.
                   "tests/ImageSharp.Tests/TestImages/Formats/", // from travis/build script
-                  "../../../../TestImages/Formats/" 
+                  "../../../ImageSharp.Tests/TestImages/Formats/", // from Sandbox46
+                  "../../../../TestImages/Formats/"
             };
 
             directories= directories.Select(x => Path.GetFullPath(x)).ToArray();

From 6212408da290b218ab2739fce7a9ac97a5a693cc Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sun, 15 Jan 2017 00:51:24 +0100
Subject: [PATCH 05/11] project dependencies + started README.md

---
 ImageSharp.sln                                       | 10 ++++++++++
 .../ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj |  1 +
 tests/ImageSharp.Sandbox46/README.md                 | 12 ++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/ImageSharp.Sandbox46/README.md

diff --git a/ImageSharp.sln b/ImageSharp.sln
index 5490c1048..f1e9fb104 100644
--- a/ImageSharp.sln
+++ b/ImageSharp.sln
@@ -54,6 +54,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9E574A
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Sandbox46", "tests\ImageSharp.Sandbox46\ImageSharp.Sandbox46.csproj", "{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{299D8E18-102C-42DE-ADBF-79098EE706A8} = {299D8E18-102C-42DE-ADBF-79098EE706A8}
+		{2E33181E-6E28-4662-A801-E2E7DC206029} = {2E33181E-6E28-4662-A801-E2E7DC206029}
+		{2AA31A1F-142C-43F4-8687-09ABCA4B3A26} = {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}
+		{27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F} = {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}
+		{7213767C-0003-41CA-AB18-0223CFA7CE4B} = {7213767C-0003-41CA-AB18-0223CFA7CE4B}
+		{C77661B9-F793-422E-8E27-AC60ECC5F215} = {C77661B9-F793-422E-8E27-AC60ECC5F215}
+		{556ABDCF-ED93-4327-BE98-F6815F78B9B8} = {556ABDCF-ED93-4327-BE98-F6815F78B9B8}
+		{A623CFE9-9D2B-4528-AD1F-2E834B061134} = {A623CFE9-9D2B-4528-AD1F-2E834B061134}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
index 0549a9e92..d8cfe4ab2 100644
--- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
+++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
@@ -192,6 +192,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="README.md" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/tests/ImageSharp.Sandbox46/README.md b/tests/ImageSharp.Sandbox46/README.md
new file mode 100644
index 000000000..c7b819b4d
--- /dev/null
+++ b/tests/ImageSharp.Sandbox46/README.md
@@ -0,0 +1,12 @@
+## Purpose
+This project aims to workaround certain Visual Studio based .NET Core tooling issues of the time of it's creation (January 2017):
+- .NET Core Performance profiling is not possible neither with Visual Studio nor with JetBrains profilers
+- JetBrains Unit Test explorer does not work with .NET Core projects
+
+## How does it work
+- By referencing .NET 4.5 dll-s created by net45 target's of ImageSharp projects. NOTE: These are not project references!
+- By including test classes (and utility classes) of the `ImageSharp.Tests` project using MSBUILD `<Link>`
+- Compiling `ImageSharp.Sandbox46` should trigger the compilation of ImageSharp subprojects using a manually defined solution dependencies
+
+## How to profile unit tests
+

From f2d96334726ede1baa928f14a65c0dd27e2fd1ef Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sun, 15 Jan 2017 01:01:47 +0100
Subject: [PATCH 06/11] added xunit.runner.visualstudio

---
 .../ImageSharp.Sandbox46.csproj                   | 15 +++++++++++++--
 tests/ImageSharp.Sandbox46/packages.config        |  1 +
 tests/ImageSharp.Tests/TestFile.cs                |  2 --
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
index d8cfe4ab2..19ff65f1d 100644
--- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
+++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +12,8 @@
     <AssemblyName>ImageSharp.Sandbox46</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -26,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;BENCHMARKING</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -194,8 +197,16 @@
     <None Include="packages.config" />
     <None Include="README.md" />
   </ItemGroup>
-  <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. Use 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.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.2.0-beta4-build1194\build\net20\xunit.runner.visualstudio.props'))" />
+  </Target>
   <!-- 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">
diff --git a/tests/ImageSharp.Sandbox46/packages.config b/tests/ImageSharp.Sandbox46/packages.config
index 4eced5344..8163e6e2e 100644
--- a/tests/ImageSharp.Sandbox46/packages.config
+++ b/tests/ImageSharp.Sandbox46/packages.config
@@ -7,4 +7,5 @@
   <package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="net461" />
   <package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="net461" />
   <package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="net461" />
+  <package id="xunit.runner.visualstudio" version="2.2.0-beta4-build1194" targetFramework="net461" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs
index 01d760b68..144a19f4e 100644
--- a/tests/ImageSharp.Tests/TestFile.cs
+++ b/tests/ImageSharp.Tests/TestFile.cs
@@ -7,8 +7,6 @@ namespace ImageSharp.Tests
 {
     using System.Collections.Concurrent;
     using System.IO;
-
-    using ImageSharp.Formats;
     using System.Linq;
 
     /// <summary>

From 61b1d53114417b0f7235a05ea9b9be0cd48fa426 Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sun, 15 Jan 2017 01:59:17 +0100
Subject: [PATCH 07/11] finished README.md

---
 tests/ImageSharp.Sandbox46/README.md | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/ImageSharp.Sandbox46/README.md b/tests/ImageSharp.Sandbox46/README.md
index c7b819b4d..8856ad601 100644
--- a/tests/ImageSharp.Sandbox46/README.md
+++ b/tests/ImageSharp.Sandbox46/README.md
@@ -1,12 +1,25 @@
 ## Purpose
-This project aims to workaround certain Visual Studio based .NET Core tooling issues of the time of it's creation (January 2017):
+This project aims to workaround certain .NET Core tooling issues in Visual Studio based developer workflow at the time of it's creation (January 2017):
 - .NET Core Performance profiling is not possible neither with Visual Studio nor with JetBrains profilers
 - JetBrains Unit Test explorer does not work with .NET Core projects
 
-## How does it work
+## How does it work?
 - By referencing .NET 4.5 dll-s created by net45 target's of ImageSharp projects. NOTE: These are not project references!
 - By including test classes (and utility classes) of the `ImageSharp.Tests` project using MSBUILD `<Link>`
 - Compiling `ImageSharp.Sandbox46` should trigger the compilation of ImageSharp subprojects using a manually defined solution dependencies
 
 ## How to profile unit tests
 
+#### 1. With Visual Studio 2015 Test Runner
+- **Do not** build `ImageSharp.Tests`
+- Build `ImageSharp.Sandbox46`
+- Use the [context menu in Test Explorer](https://adamprescott.net/2012/12/12/performance-profiling-for-unit-tests/)
+
+NOTE: 
+There was no *Profile test* option in my VS Professional. Maybe things were messed by VS2017 RC installation. [This post suggests](http://stackoverflow.com/questions/32034375/profiling-tests-in-visual-studio-community-2015) that you need Premium or Ultimate edition of Visual Studio to profile tests. 
+
+#### 2. With JetBrains ReSharper Ultimate
+- Use the [context menu](https://www.jetbrains.com/resharper/features/unit_testing.html) from your test class
+![Context Menu](https://www.jetbrains.com/resharper/features/screenshots/100/unit_testing_profiling.png)
+- Or Unit Test Exporer or Unit Test Sessions
+- When working with test classes, make sure you open them from the `ImageSharp.Sandbox46` project!

From 3b66b3f6a241912fe320e8d63ff4170e1d039ebd Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sun, 15 Jan 2017 02:04:25 +0100
Subject: [PATCH 08/11] reverted global.json change

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 6da79b611..7346bdc28 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src" ],
     "sdk": {
-    "version": "1.0.0-preview2-003131"
+    "version": "1.0.0-preview2-003121"
   }
 }
\ No newline at end of file

From b90f208573eff476623e0f2b35f1b0e4191d7eae Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sun, 15 Jan 2017 02:10:23 +0100
Subject: [PATCH 09/11] fixed AssemblyInfo.cs

---
 .../Properties/AssemblyInfo.cs                | 27 ++++++-------------
 tests/ImageSharp.Sandbox46/README.md          |  2 +-
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs b/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs
index bee8fb408..51b205188 100644
--- a/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs
+++ b/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs
@@ -2,35 +2,24 @@
 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("ImageSharp.Sandbox46")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("A cross-platform library for processing of image files written in C#")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Sapa")]
+[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ImageSharp.Sandbox46")]
-[assembly: AssemblyCopyright("Copyright © Sapa 2017")]
+[assembly: AssemblyCopyright("Copyright © James Jackson-South and contributors.")]
 [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("96188137-5fa6-4924-ab6e-4eff79c6e0bb")]
-
-// 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")]
diff --git a/tests/ImageSharp.Sandbox46/README.md b/tests/ImageSharp.Sandbox46/README.md
index 8856ad601..b93cc0dda 100644
--- a/tests/ImageSharp.Sandbox46/README.md
+++ b/tests/ImageSharp.Sandbox46/README.md
@@ -16,7 +16,7 @@ This project aims to workaround certain .NET Core tooling issues in Visual Studi
 - Use the [context menu in Test Explorer](https://adamprescott.net/2012/12/12/performance-profiling-for-unit-tests/)
 
 NOTE: 
-There was no *Profile test* option in my VS Professional. Maybe things were messed by VS2017 RC installation. [This post suggests](http://stackoverflow.com/questions/32034375/profiling-tests-in-visual-studio-community-2015) that you need Premium or Ultimate edition of Visual Studio to profile tests. 
+There was no *Profile test* option in my VS Professional. Maybe things were messed by VS2017 RC installation. [This post suggests](http://stackoverflow.com/questions/32034375/profiling-tests-in-visual-studio-community-2015) it's necessary to won Premium or Ultimate edition of Visual Studio to profile tests.
 
 #### 2. With JetBrains ReSharper Ultimate
 - Use the [context menu](https://www.jetbrains.com/resharper/features/unit_testing.html) from your test class

From bb6fa653620ef7ec87da565b3021fe995e08c070 Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sun, 15 Jan 2017 18:59:14 +0100
Subject: [PATCH 10/11] ImageSharp.Tests (.NET Core!) test profiling is now
 possible from R# context menu

---
 tests/ImageSharp.Sandbox46/README.md | 11 +++++-----
 tests/ImageSharp.Tests/TestFile.cs   | 30 ++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/tests/ImageSharp.Sandbox46/README.md b/tests/ImageSharp.Sandbox46/README.md
index b93cc0dda..b05afb853 100644
--- a/tests/ImageSharp.Sandbox46/README.md
+++ b/tests/ImageSharp.Sandbox46/README.md
@@ -1,7 +1,7 @@
 ## Purpose
 This project aims to workaround certain .NET Core tooling issues in Visual Studio based developer workflow at the time of it's creation (January 2017):
 - .NET Core Performance profiling is not possible neither with Visual Studio nor with JetBrains profilers
-- JetBrains Unit Test explorer does not work with .NET Core projects
+- ~~JetBrains Unit Test explorer does not work with .NET Core projects~~
 
 ## How does it work?
 - By referencing .NET 4.5 dll-s created by net45 target's of ImageSharp projects. NOTE: These are not project references!
@@ -16,10 +16,9 @@ This project aims to workaround certain .NET Core tooling issues in Visual Studi
 - Use the [context menu in Test Explorer](https://adamprescott.net/2012/12/12/performance-profiling-for-unit-tests/)
 
 NOTE: 
-There was no *Profile test* option in my VS Professional. Maybe things were messed by VS2017 RC installation. [This post suggests](http://stackoverflow.com/questions/32034375/profiling-tests-in-visual-studio-community-2015) it's necessary to won Premium or Ultimate edition of Visual Studio to profile tests.
+There was no *Profile test* option in my VS Professional. Maybe things were messed by VS2017 RC installation. [This post suggests](http://stackoverflow.com/questions/32034375/profiling-tests-in-visual-studio-community-2015) it's necessary to own Premium or Ultimate edition of Visual Studio to profile tests.
 
 #### 2. With JetBrains ReSharper Ultimate
-- Use the [context menu](https://www.jetbrains.com/resharper/features/unit_testing.html) from your test class
-![Context Menu](https://www.jetbrains.com/resharper/features/screenshots/100/unit_testing_profiling.png)
-- Or Unit Test Exporer or Unit Test Sessions
-- When working with test classes, make sure you open them from the `ImageSharp.Sandbox46` project!
+- The `Sandbox46` project is no longer needed here. The classic `ImageSharp.Tests` project can be discovered by Unit Test Explorer.
+- You can use [context menus](https://www.jetbrains.com/resharper/features/unit_testing.html) from your test class, or from unit Test Exporer/Unit Test Sessions windows.
+![Context Menu](https://www.jetbrains.com/resharper/features/screenshots/100/unit_testing_profiling.png) 
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs
index 144a19f4e..cfc88ad67 100644
--- a/tests/ImageSharp.Tests/TestFile.cs
+++ b/tests/ImageSharp.Tests/TestFile.cs
@@ -5,9 +5,12 @@
 
 namespace ImageSharp.Tests
 {
+    using System;
     using System.Collections.Concurrent;
+    using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using System.Reflection;
 
     /// <summary>
     /// A test image file.
@@ -130,14 +133,19 @@ namespace ImageSharp.Tests
         /// </returns>
         private static string GetFormatsDirectory()
         {
-            var directories = new[] {
+            List<string> directories = new List< string > {
                  "TestImages/Formats/", // Here for code coverage tests.
                   "tests/ImageSharp.Tests/TestImages/Formats/", // from travis/build script
                   "../../../ImageSharp.Tests/TestImages/Formats/", // from Sandbox46
                   "../../../../TestImages/Formats/"
             };
 
-            directories= directories.Select(x => Path.GetFullPath(x)).ToArray();
+            directories = directories.SelectMany(x => new[]
+                                     {
+                                         Path.GetFullPath(x)
+                                     }).ToList();
+
+            AddFormatsDirectoryFromTestAssebmlyPath(directories);
 
             var directory = directories.FirstOrDefault(x => Directory.Exists(x));
 
@@ -148,5 +156,23 @@ namespace ImageSharp.Tests
 
             throw new System.Exception($"Unable to find Formats directory at any of these locations [{string.Join(", ", directories)}]");
         }
+
+        /// <summary>
+        /// The path returned by Path.GetFullPath(x) can be relative to dotnet framework directory
+        /// in certain scenarios like dotTrace test profiling.
+        /// </summary>
+        /// <param name="directories">The directories list</param>
+        private static void AddFormatsDirectoryFromTestAssebmlyPath(List<string> directories)
+        {
+            string assemblyLocation = typeof(TestFile).GetTypeInfo().Assembly.Location;
+            assemblyLocation = Path.GetDirectoryName(assemblyLocation);
+
+            if (assemblyLocation != null)
+            {
+                string dirFromAssemblyLocation = Path.Combine(assemblyLocation, "../../../TestImages/Formats/");
+                dirFromAssemblyLocation = Path.GetFullPath(dirFromAssemblyLocation);
+                directories.Add(dirFromAssemblyLocation);
+            }
+        }
     }
 }

From 7f32e0fcab72d64bafaa1e0c708125a0ad185635 Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sun, 15 Jan 2017 19:11:50 +0100
Subject: [PATCH 11/11] better comments for
 AddFormatsDirectoryFromTestAssebmlyPath()

---
 tests/ImageSharp.Tests/TestFile.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs
index cfc88ad67..3d6695841 100644
--- a/tests/ImageSharp.Tests/TestFile.cs
+++ b/tests/ImageSharp.Tests/TestFile.cs
@@ -160,6 +160,7 @@ namespace ImageSharp.Tests
         /// <summary>
         /// The path returned by Path.GetFullPath(x) can be relative to dotnet framework directory
         /// in certain scenarios like dotTrace test profiling.
+        /// This method calculates and adds the format directory based on the ImageSharp.Tests assembly location.
         /// </summary>
         /// <param name="directories">The directories list</param>
         private static void AddFormatsDirectoryFromTestAssebmlyPath(List<string> directories)