diff --git a/.editorconfig b/.editorconfig index f39b267256..c3fb970c3b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,16 @@ +# top-most EditorConfig file +root = true + [*.cs] indent_style = space indent_size = 4 +csharp_style_var_for_built_in_types = false:warning +csharp_style_var_elsewhere = false:warning +csharp_style_var_when_type_is_apparent = false:warning +end_of_line = crlf +dotnet_sort_system_directives_first = true +dotnet_style_predefined_type_for_locals_parameters_members = true:warning +dotnet_style_predefined_type_for_member_access = true:warning +dotnet_style_qualification_for_field = true:warning +dotnet_style_qualification_for_method = true:warning +dotnet_style_qualification_for_property = true:warning \ No newline at end of file diff --git a/.gitignore b/.gitignore index d1463bd549..fb8af2320c 100644 --- a/.gitignore +++ b/.gitignore @@ -211,6 +211,9 @@ artifacts/ #BenchmarkDotNet **/BenchmarkDotNet.Artifacts/ +# Build process +*.csproj.bak + #CodeCoverage **/CodeCoverage/* docs/ diff --git a/.travis.yml b/.travis.yml index 172079df24..af8d4ad9de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: - os: linux # Ubuntu 14.04 dist: trusty sudo: required - dotnet: 1.0.0-preview2-003121 + dotnet: 1.0.1 mono: latest # - os: osx # OSX 10.11 # osx_image: xcode7.3.1 @@ -20,8 +20,7 @@ branches: script: - dotnet restore - - dotnet build -c Release src/*/project.json - - dotnet test tests/ImageSharp.Tests/project.json -c Release -f "netcoreapp1.1" + - dotnet test tests/ImageSharp.Tests/ImageSharp.Tests.csproj -c Release -f "netcoreapp1.1" env: global: diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 128265ff6f..a1a55a389a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,7 +8,7 @@ "tasks": [ { "taskName": "build", - "args": [ "src/*/project.json", "-f", "netstandard1.1" ], + "args": [ "ImageSharp.sln" ], "isBuildCommand": true, "showOutput": "always", "problemMatcher": "$msCompile" @@ -22,7 +22,7 @@ }, { "taskName": "test", - "args": ["tests/ImageSharp.Tests/project.json", "-f", "netcoreapp1.1"], + "args": ["tests/ImageSharp.Tests/ImageSharp.Tests.csproj", "-c", "release", "-f", "netcoreapp1.1"], "isTestCommand": true, "showOutput": "always", "problemMatcher": "$msCompile" diff --git a/ImageSharp.ruleset b/ImageSharp.ruleset index 2daf6243ae..3f10206fca 100644 --- a/ImageSharp.ruleset +++ b/ImageSharp.ruleset @@ -1,7 +1,11 @@  - + + + + + - + \ No newline at end of file diff --git a/ImageSharp.sln b/ImageSharp.sln index 1bcea0b929..9c729493b2 100644 --- a/ImageSharp.sln +++ b/ImageSharp.sln @@ -1,14 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp", "src\ImageSharp\ImageSharp.xproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Tests", "tests\ImageSharp.Tests\ImageSharp.Tests.xproj", "{F836E8E6-B4D9-4208-8346-140C74678B91}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Benchmarks", "tests\ImageSharp.Benchmarks\ImageSharp.Benchmarks.xproj", "{299D8E18-102C-42DE-ADBF-79098EE706A8}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -31,121 +25,119 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C06 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{56801022-D71A-4FBE-BC5B-CBA08E2284EC}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.xproj", "{2E33181E-6E28-4662-A801-E2E7DC206029}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E919DF0B-2607-4462-8FC0-5C98FE50F8C9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "build", "build\build.xproj", "{575A5002-DD9F-4335-AA47-1DD87FA13645}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Bmp", "src\ImageSharp.Formats.Bmp\ImageSharp.Formats.Bmp.xproj", "{C77661B9-F793-422E-8E27-AC60ECC5F215}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Gif", "src\ImageSharp.Formats.Gif\ImageSharp.Formats.Gif.xproj", "{27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Jpeg", "src\ImageSharp.Formats.Jpeg\ImageSharp.Formats.Jpeg.xproj", "{7213767C-0003-41CA-AB18-0223CFA7CE4B}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Png", "src\ImageSharp.Formats.Png\ImageSharp.Formats.Png.xproj", "{556ABDCF-ED93-4327-BE98-F6815F78B9B8}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Processing", "src\ImageSharp.Processing\ImageSharp.Processing.xproj", "{A623CFE9-9D2B-4528-AD1F-2E834B061134}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9E574A07-F879-4811-9C41-5CBDC6BAFDB7}" ProjectSection(SolutionItems) = preProject src\Shared\AssemblyInfo.Common.cs = src\Shared\AssemblyInfo.Common.cs 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}" - 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} - {E5BD4F96-28A8-410C-8B63-1C5731948549} = {E5BD4F96-28A8-410C-8B63-1C5731948549} - {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 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp", "src\ImageSharp\ImageSharp.csproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{2E33181E-6E28-4662-A801-E2E7DC206029}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "build", "build\build.csproj", "{575A5002-DD9F-4335-AA47-1DD87FA13645}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Drawing.Paths", "src\ImageSharp.Drawing.Paths\ImageSharp.Drawing.Paths.xproj", "{E5BD4F96-28A8-410C-8B63-1C5731948549}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Tests", "tests\ImageSharp.Tests\ImageSharp.Tests.csproj", "{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Drawing.Text", "src\ImageSharp.Drawing.Text\ImageSharp.Drawing.Text.xproj", "{329D7698-65BC-48AD-A16F-428682964493}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Benchmarks", "tests\ImageSharp.Benchmarks\ImageSharp.Benchmarks.csproj", "{2BF743D8-2A06-412D-96D7-F448F00C5EA5}" +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 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {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}.Debug|x64.ActiveCfg = Debug|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|x64.Build.0 = Debug|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|x86.ActiveCfg = Debug|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|x86.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 - {299D8E18-102C-42DE-ADBF-79098EE706A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {299D8E18-102C-42DE-ADBF-79098EE706A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {299D8E18-102C-42DE-ADBF-79098EE706A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {299D8E18-102C-42DE-ADBF-79098EE706A8}.Release|Any CPU.Build.0 = Release|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|x64.ActiveCfg = Release|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|x64.Build.0 = Release|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|x86.ActiveCfg = Release|Any CPU + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|x86.Build.0 = Release|Any CPU {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.ActiveCfg = Debug|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.Build.0 = Debug|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.ActiveCfg = Debug|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.Build.0 = Debug|Any CPU {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.ActiveCfg = Release|Any CPU {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.Build.0 = Release|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.ActiveCfg = Release|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.Build.0 = Release|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.ActiveCfg = Release|Any CPU + {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.Build.0 = Release|Any CPU {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|Any CPU.Build.0 = Debug|Any CPU + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|x64.ActiveCfg = Debug|Any CPU + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|x64.Build.0 = Debug|Any CPU + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|x86.ActiveCfg = Debug|Any CPU + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|x86.Build.0 = Debug|Any CPU {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|Any CPU.ActiveCfg = Release|Any CPU {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|Any CPU.Build.0 = Release|Any CPU - {C77661B9-F793-422E-8E27-AC60ECC5F215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C77661B9-F793-422E-8E27-AC60ECC5F215}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C77661B9-F793-422E-8E27-AC60ECC5F215}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C77661B9-F793-422E-8E27-AC60ECC5F215}.Release|Any CPU.Build.0 = Release|Any CPU - {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Release|Any CPU.Build.0 = Release|Any CPU - {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Release|Any CPU.Build.0 = Release|Any CPU - {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Release|Any CPU.Build.0 = Release|Any CPU - {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x64.ActiveCfg = Release|Any CPU + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x64.Build.0 = Release|Any CPU + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x86.ActiveCfg = Release|Any CPU + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x86.Build.0 = Release|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.ActiveCfg = Debug|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.Build.0 = Debug|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.ActiveCfg = Debug|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.Build.0 = Debug|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.Build.0 = Release|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.ActiveCfg = Release|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.Build.0 = Release|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.ActiveCfg = Release|Any CPU + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.Build.0 = Release|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|x64.ActiveCfg = Debug|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|x64.Build.0 = Debug|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|x86.ActiveCfg = Debug|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|x86.Build.0 = Debug|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|Any CPU.Build.0 = Release|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x64.ActiveCfg = Release|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x64.Build.0 = Release|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x86.ActiveCfg = Release|Any CPU + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x86.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}.Debug|x64.ActiveCfg = Debug|Any CPU + {96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Debug|x64.Build.0 = Debug|Any CPU + {96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Debug|x86.ActiveCfg = Debug|Any CPU + {96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Debug|x86.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 - {E5BD4F96-28A8-410C-8B63-1C5731948549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5BD4F96-28A8-410C-8B63-1C5731948549}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5BD4F96-28A8-410C-8B63-1C5731948549}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5BD4F96-28A8-410C-8B63-1C5731948549}.Release|Any CPU.Build.0 = Release|Any CPU - {329D7698-65BC-48AD-A16F-428682964493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {329D7698-65BC-48AD-A16F-428682964493}.Debug|Any CPU.Build.0 = Debug|Any CPU - {329D7698-65BC-48AD-A16F-428682964493}.Release|Any CPU.ActiveCfg = Release|Any CPU - {329D7698-65BC-48AD-A16F-428682964493}.Release|Any CPU.Build.0 = Release|Any CPU + {96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x64.ActiveCfg = Release|Any CPU + {96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x64.Build.0 = Release|Any CPU + {96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x86.ActiveCfg = Release|Any CPU + {96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {9E574A07-F879-4811-9C41-5CBDC6BAFDB7} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} {2AA31A1F-142C-43F4-8687-09ABCA4B3A26} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} - {F836E8E6-B4D9-4208-8346-140C74678B91} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} - {299D8E18-102C-42DE-ADBF-79098EE706A8} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} {2E33181E-6E28-4662-A801-E2E7DC206029} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} {575A5002-DD9F-4335-AA47-1DD87FA13645} = {E919DF0B-2607-4462-8FC0-5C98FE50F8C9} - {C77661B9-F793-422E-8E27-AC60ECC5F215} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} - {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} - {7213767C-0003-41CA-AB18-0223CFA7CE4B} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} - {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} + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} + {2BF743D8-2A06-412D-96D7-F448F00C5EA5} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} {96188137-5FA6-4924-AB6E-4EFF79C6E0BB} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} - {E5BD4F96-28A8-410C-8B63-1C5731948549} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} - {329D7698-65BC-48AD-A16F-428682964493} = {815C0625-CD3D-440F-9F80-2D83856AB7AE} EndGlobalSection EndGlobal diff --git a/README.md b/README.md index 9d5c9788a7..368afc3b3f 100644 --- a/README.md +++ b/README.md @@ -28,32 +28,25 @@ We already have a [MyGet package repository](https://www.myget.org/gallery/image ### Packages -The **ImageSharp** library is made up of multiple packages, to make **ImageSharp** do anything useful you will want to make sure you include at least one format as a dependency otherwise you will not be able to save/load any images. +The **ImageSharp** library is made up of multiple packages. Packages include: - **ImageSharp** - Contains the Image classes, Colors, Primitives, Bootstrapper, IImageFormat interface, and other core functionality. -- **ImageSharp.Formats.Jpeg** - The jpeg decoder/encoder (Auto registered) -- **ImageSharp.Formats.Png** - The png decoder/encoder (Auto registered) -- **ImageSharp.Formats.Gif** - The gif decoder/encoder (Auto registered) -- **ImageSharp.Formats.Bmp** - The bmp decoder/encoder (Auto registered) -- **ImageSharp.Processing** - Contains methods like Resize, Crop, Skew, Rotate - Anything that alters the dimensions of the image. - Contains methods like Gaussian Blur, Pixelate, Edge Detection - Anything that maintains the original image dimensions. + - Contains the Image classes, Colors, Primitives, Configuration, and other core functionality. + - The IImageFormat interface, Jpeg, Png, Bmp, and Gif formats. + - Transform methods like Resize, Crop, Skew, Rotate - Anything that alters the dimensions of the image. + - Non-transform methods like Gaussian Blur, Pixelate, Edge Detection - Anything that maintains the original image dimensions. + - **ImageSharp.Drawing** - Brushes and various drawing algorithms, including drawing Images - - **ImageSharp.Drawing.Paths** - Various vector drawing methods for drawing paths, polygons etc. + - Brushes and various drawing algorithms, including drawing images. + - Various vector drawing methods for drawing paths, polygons etc. + - Text drawing. ### Manual build If you prefer, you can compile ImageSharp yourself (please do and help!), you'll need: -- [Visual Studio 2015 with Update 3 (or above)](https://www.visualstudio.com/news/releasenotes/vs2015-update3-vs) +- [Visual Studio 2017 (or above)](https://www.visualstudio.com/en-us/news/releasenotes/vs2017-relnotes) - The [.NET Core 1.0 SDK Installer](https://www.microsoft.com/net/core#windows) - Non VSCode link. Alternatively on Linux you can use: diff --git a/appveyor.yml b/appveyor.yml index 2792ab0fc6..c456a8d722 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,22 +1,9 @@ version: 1.0.0.{build} -os: Visual Studio 2015 +image: Visual Studio 2017 init: - ps: iex ((new-object net.webclient).DownloadString('https://gist.githubusercontent.com/PureKrome/0f79e25693d574807939/raw/8cf3160c9516ef1f4effc825c0a44acc918a0b5a/appveyor-build-info.ps')) -environment: - # Version Suffix - version_suffix: alpha - -install: -# Use the install script to grab the latest dotnet install -- ps: iex .\dotnet-latest.ps1 - -# Prepend newly installed dotnet cli to the PATH of this build (this cannot be -# done from inside the powershell script as it would require to restart -# the parent CMD process). -- "SET PATH=C:\\Program Files\\dotnet\\bin;%PATH%" - build_script: - cmd: build.cmd diff --git a/build/Program.cs b/build/Program.cs index a79743393c..6e04dc1df4 100644 --- a/build/Program.cs +++ b/build/Program.cs @@ -10,10 +10,10 @@ namespace ConsoleApplication using System.IO; using System.Linq; using System.Text; - + using System.Xml; using LibGit2Sharp; - using Microsoft.DotNet.ProjectModel; - using Newtonsoft.Json; + using Microsoft.Build.Construction; + using Microsoft.Build.Evaluation; using NuGet.Versioning; /// @@ -65,31 +65,29 @@ namespace ConsoleApplication { var resetmode = args.Contains("reset"); - // Find the project root where glbal.json lives - var root = ProjectRootResolver.ResolveRootDirectory("."); + // Find the project root + var root = Path.GetFullPath(Path.Combine(LibGit2Sharp.Repository.Discover("."), "..")); // Lets find the repo var repo = new LibGit2Sharp.Repository(root); // Lets find all the project.json files in the src folder (don't care about versioning `tests`) - var projectFiles = Directory.EnumerateFiles(Path.Combine(root, "src"), Project.FileName, SearchOption.AllDirectories); + var projectFiles = Directory.EnumerateFiles(Path.Combine(root, "src"), "*.csproj", SearchOption.AllDirectories); + + ResetProject(projectFiles); // Open them and convert them to source projects - var projects = projectFiles.Select(x => ProjectReader.GetProject(x)) + var projects = projectFiles.Select(x => ProjectRootElement.Open(x, ProjectCollection.GlobalProjectCollection, true)) .Select(x => new SourceProject(x, repo.Info.WorkingDirectory)) .ToList(); - if (resetmode) - { - ResetProject(projects); - } - else + if (!resetmode) { CaclulateProjectVersionNumber(projects, repo); UpdateVersionNumbers(projects); - CreateBuildScript(projects); + CreateBuildScript(projects, root); foreach (var p in projects) { @@ -98,12 +96,14 @@ namespace ConsoleApplication } } - private static void CreateBuildScript(IEnumerable projects) + private static void CreateBuildScript(IEnumerable projects, string root) { + var outputDir = Path.GetFullPath(Path.Combine(root, @"artifacts\bin\ImageSharp")); + var sb = new StringBuilder(); foreach (var p in projects) { - sb.AppendLine($@"dotnet pack --configuration Release --output ""artifacts\bin\ImageSharp"" ""{p.ProjectFilePath}"""); + sb.AppendLine($@"dotnet pack --configuration Release --output ""{outputDir}"" ""{p.ProjectFilePath}"""); } File.WriteAllText("build-inner.cmd", sb.ToString()); @@ -113,17 +113,17 @@ namespace ConsoleApplication { foreach (var p in projects) { - // TODO force update of all dependent projects to point to the newest build. - // we skip the build number and standard CI prefix on first commits - var newVersion = p.FinalVersionNumber; - // create a backup file so we can rollback later without breaking formatting File.Copy(p.FullProjectFilePath, $"{p.FullProjectFilePath}.bak", true); + } - dynamic projectFile = JsonConvert.DeserializeObject(File.ReadAllText(p.FullProjectFilePath)); + foreach (var p in projects) + { + // TODO force update of all dependent projects to point to the newest build. + // we skip the build number and standard CI prefix on first commits + var newVersion = p.FinalVersionNumber; - projectFile.version = $"{newVersion}-*"; - File.WriteAllText(p.FullProjectFilePath, JsonConvert.SerializeObject(projectFile, Formatting.Indented)); + p.UpdateVersion(newVersion); } } @@ -168,7 +168,7 @@ namespace ConsoleApplication projects.ForEach(x => x.CalculateVersion(repo, branch)); } - private static void ResetProject(List projects) + private static void ResetProject(IEnumerable projectPaths) { if (File.Exists("build-inner.cmd")) { @@ -176,12 +176,12 @@ namespace ConsoleApplication } // revert the project.json change be reverting it but skipp all the git stuff as its not needed - foreach (var p in projects) + foreach (var p in projectPaths) { - if (File.Exists($"{p.FullProjectFilePath}.bak")) + if (File.Exists($"{p}.bak")) { - File.Copy($"{p.FullProjectFilePath}.bak", p.FullProjectFilePath, true); - File.Delete($"{p.FullProjectFilePath}.bak"); + File.Copy($"{p}.bak", p, true); + File.Delete($"{p}.bak"); } } } @@ -192,21 +192,24 @@ namespace ConsoleApplication public class SourceProject { private readonly IEnumerable dependencies; + private readonly ProjectRootElement project; /// /// Initializes a new instance of the class. /// /// The project. /// The root. - public SourceProject(Project project, string root) + public SourceProject(ProjectRootElement project, string root) { - this.Name = project.Name; - this.ProjectDirectory = project.ProjectDirectory.Substring(root.Length); - this.ProjectFilePath = project.ProjectFilePath.Substring(root.Length); - this.FullProjectFilePath = project.ProjectFilePath; - this.Version = project.Version; - this.dependencies = project.Dependencies.Select(x => x.Name); + this.Name = project.Properties.FirstOrDefault(x => x.Name == "AssemblyTitle").Value; + + this.ProjectDirectory = project.DirectoryPath.Substring(root.Length); + this.ProjectFilePath = project.ProjectFileLocation.File.Substring(root.Length); + this.FullProjectFilePath = Path.GetFullPath(project.ProjectFileLocation.File); + this.Version = new NuGetVersion(project.Properties.FirstOrDefault(x => x.Name == "VersionPrefix").Value); + this.dependencies = project.Items.Where(x => x.ItemType == "ProjectReference").Select(x => Path.GetFullPath(Path.Combine(project.DirectoryPath, x.Include))); this.FinalVersionNumber = this.Version.ToFullString(); + this.project = project; } /// @@ -223,7 +226,7 @@ namespace ConsoleApplication /// /// The version. /// - public NuGetVersion Version { get; } + public NuGetVersion Version { get; private set; } /// /// Gets the dependent projects. @@ -279,7 +282,18 @@ namespace ConsoleApplication /// The projects. public void PopulateDependencies(IEnumerable projects) { - this.DependentProjects = projects.Where(x => this.dependencies.Contains(x.Name)).ToList(); + this.DependentProjects = projects.Where(x => this.dependencies.Contains(x.FullProjectFilePath)).ToList(); + } + + /// + /// Update the version number in the project file + /// + /// the new version number to save. + internal void UpdateVersion(string versionnumber) + { + this.project.AddProperty("VersionPrefix", versionnumber); + this.Version = new NuGetVersion(versionnumber); + this.project.Save(); } /// @@ -334,11 +348,15 @@ namespace ConsoleApplication var blob = repo.Lookup(projectFileChange.Oid); using (var s = blob.GetContentStream()) { - var project = new ProjectReader().ReadProject(s, this.Name, this.FullProjectFilePath, null); - if (project.Version != this.Version) + using (var reader = XmlReader.Create(s)) { - // version changed - return false; + var proj = ProjectRootElement.Create(reader); + var version = new NuGetVersion(proj.Properties.FirstOrDefault(x => x.Name == "VersionPrefix").Value); + if (version != this.Version) + { + // version changed + return false; + } } } } diff --git a/build/Properties/launchSettings.json b/build/Properties/launchSettings.json index b3ff6cb020..d175ae7547 100644 --- a/build/Properties/launchSettings.json +++ b/build/Properties/launchSettings.json @@ -1,7 +1,8 @@ { "profiles": { "build": { - "commandName": "Project" + "commandName": "Project", + "commandLineArgs": "reset" } } } \ No newline at end of file diff --git a/build/build.csproj b/build/build.csproj new file mode 100644 index 0000000000..dc431284ed --- /dev/null +++ b/build/build.csproj @@ -0,0 +1,16 @@ + + + netcoreapp1.1 + portable + true + build + Exe + build + ..\ImageSharp.ruleset + + + + + + + \ No newline at end of file diff --git a/build/build.xproj b/build/build.xproj deleted file mode 100644 index 3b85ca8722..0000000000 --- a/build/build.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 575a5002-dd9f-4335-aa47-1dd87fa13645 - build - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/build/project.json b/build/project.json deleted file mode 100644 index cf95cc8a0b..0000000000 --- a/build/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../src/Shared/stylecop.json", "/ruleset:../ImageSharp.ruleset" ] - }, - "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121", - "LibGit2Sharp": "0.23.0", - "StyleCop.Analyzers": { - "version": "1.1.0-beta001", - "type": "build" - } - }, - "frameworks": { - "net46": { - // this is only a net46 app because of LibGit2Sharp once they have a version that works on coreclr we can shift over. - } - } -} diff --git a/dotnet-latest.ps1 b/dotnet-latest.ps1 deleted file mode 100644 index bb2c5dcfed..0000000000 --- a/dotnet-latest.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -# Set up everything for using the dotnet cli. This should mean we do not have to wait for Appveyor images to be updated. - -# Clean and recreate the folder in which all output packages should be placed -$ArtifactsPath = "artifacts" - -if (Test-Path $ArtifactsPath) { - Remove-Item -Path $ArtifactsPath -Recurse -Force -ErrorAction Ignore -} - -New-Item $ArtifactsPath -ItemType Directory -ErrorAction Ignore | Out-Null - -Write-Host "Created artifacts folder '$ArtifactsPath'" - -# Install the latest dotnet cli -if (Get-Command "dotnet.exe" -ErrorAction SilentlyContinue) { - Write-Host "dotnet SDK already installed" - dotnet --version -} else { - Write-Host "Installing dotnet SDK" - - $installScript = Join-Path $ArtifactsPath "dotnet-install.ps1" - - Write-Host $installScript - - Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1" ` - -OutFile $installScript - - & $installScript -} diff --git a/global.json b/global.json deleted file mode 100644 index c1b6f33634..0000000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "tests" ], - "sdk": { - "version": "1.0.0-preview2-003121" - } -} \ No newline at end of file diff --git a/src/ImageSharp.Drawing.Paths/ImageSharp.Drawing.Paths.xproj b/src/ImageSharp.Drawing.Paths/ImageSharp.Drawing.Paths.xproj deleted file mode 100644 index 196f7bc1bc..0000000000 --- a/src/ImageSharp.Drawing.Paths/ImageSharp.Drawing.Paths.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e5bd4f96-28a8-410c-8b63-1c5731948549 - ImageSharp.Drawing - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Drawing.Paths/Properties/AssemblyInfo.cs b/src/ImageSharp.Drawing.Paths/Properties/AssemblyInfo.cs deleted file mode 100644 index fba25a9dba..0000000000 --- a/src/ImageSharp.Drawing.Paths/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// -// Copyright (c) James Jackson-South and contributors. -// Licensed under the Apache License, Version 2.0. -// - -// Common values read from `AssemblyInfo.Common.cs` diff --git a/src/ImageSharp.Drawing.Paths/project.json b/src/ImageSharp.Drawing.Paths/project.json deleted file mode 100644 index cca2f9bf9c..0000000000 --- a/src/ImageSharp.Drawing.Paths/project.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Drawing.Paths", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project" - }, - "ImageSharp.Drawing": { - "target": "project" - }, - "SixLabors.Shapes": "0.1.0-alpha0007", - "StyleCop.Analyzers": { - "version": "1.0.0", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Drawing.Text/ImageSharp.Drawing.Text.xproj b/src/ImageSharp.Drawing.Text/ImageSharp.Drawing.Text.xproj deleted file mode 100644 index 4dfb394cfb..0000000000 --- a/src/ImageSharp.Drawing.Text/ImageSharp.Drawing.Text.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 329d7698-65bc-48ad-a16f-428682964493 - ImageSharp.Drawing - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Drawing.Text/Properties/AssemblyInfo.cs b/src/ImageSharp.Drawing.Text/Properties/AssemblyInfo.cs deleted file mode 100644 index fba25a9dba..0000000000 --- a/src/ImageSharp.Drawing.Text/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// -// Copyright (c) James Jackson-South and contributors. -// Licensed under the Apache License, Version 2.0. -// - -// Common values read from `AssemblyInfo.Common.cs` diff --git a/src/ImageSharp.Drawing.Text/project.json b/src/ImageSharp.Drawing.Text/project.json deleted file mode 100644 index 66d0e7d269..0000000000 --- a/src/ImageSharp.Drawing.Text/project.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Drawing.Text", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project" - }, - "SixLabors.Fonts": "0.1.0-alpha0001", - "ImageSharp.Drawing.Paths": { - "target": "project" - }, - "StyleCop.Analyzers": { - "version": "1.0.0", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj new file mode 100644 index 0000000000..cc1c526ae3 --- /dev/null +++ b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj @@ -0,0 +1,51 @@ + + + An extension to ImageSharp that allows the drawing of images, paths, and text. + ImageSharp.Drawing + 1.0.0-alpha3 + James Jackson-South and contributors + netstandard1.1 + true + true + ImageSharp.Drawing + ImageSharp.Drawing + Image Draw Shape Path Font + https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png + https://github.com/JimBobSquarePants/ImageSharp + http://www.apache.org/licenses/LICENSE-2.0 + git + https://github.com/JimBobSquarePants/ImageSharp + false + false + false + false + false + false + false + false + false + full + portable + True + + + + + + + + + + + All + + + + + + ..\..\ImageSharp.ruleset + + + true + + \ No newline at end of file diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.xproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.xproj deleted file mode 100644 index 488f86bc7a..0000000000 --- a/src/ImageSharp.Drawing/ImageSharp.Drawing.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2e33181e-6e28-4662-a801-e2e7dc206029 - ImageSharp.Drawing - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Drawing.Paths/DrawBeziers.cs b/src/ImageSharp.Drawing/Paths/DrawBeziers.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/DrawBeziers.cs rename to src/ImageSharp.Drawing/Paths/DrawBeziers.cs diff --git a/src/ImageSharp.Drawing.Paths/DrawLines.cs b/src/ImageSharp.Drawing/Paths/DrawLines.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/DrawLines.cs rename to src/ImageSharp.Drawing/Paths/DrawLines.cs diff --git a/src/ImageSharp.Drawing.Paths/DrawPath.cs b/src/ImageSharp.Drawing/Paths/DrawPath.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/DrawPath.cs rename to src/ImageSharp.Drawing/Paths/DrawPath.cs diff --git a/src/ImageSharp.Drawing.Paths/DrawPolygon.cs b/src/ImageSharp.Drawing/Paths/DrawPolygon.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/DrawPolygon.cs rename to src/ImageSharp.Drawing/Paths/DrawPolygon.cs diff --git a/src/ImageSharp.Drawing.Paths/DrawRectangle.cs b/src/ImageSharp.Drawing/Paths/DrawRectangle.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/DrawRectangle.cs rename to src/ImageSharp.Drawing/Paths/DrawRectangle.cs diff --git a/src/ImageSharp.Drawing.Paths/FillPaths.cs b/src/ImageSharp.Drawing/Paths/FillPaths.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/FillPaths.cs rename to src/ImageSharp.Drawing/Paths/FillPaths.cs diff --git a/src/ImageSharp.Drawing.Paths/FillPolygon.cs b/src/ImageSharp.Drawing/Paths/FillPolygon.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/FillPolygon.cs rename to src/ImageSharp.Drawing/Paths/FillPolygon.cs diff --git a/src/ImageSharp.Drawing.Paths/FillRectangle.cs b/src/ImageSharp.Drawing/Paths/FillRectangle.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/FillRectangle.cs rename to src/ImageSharp.Drawing/Paths/FillRectangle.cs diff --git a/src/ImageSharp.Drawing.Paths/RectangleExtensions.cs b/src/ImageSharp.Drawing/Paths/RectangleExtensions.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/RectangleExtensions.cs rename to src/ImageSharp.Drawing/Paths/RectangleExtensions.cs diff --git a/src/ImageSharp.Drawing.Paths/ShapePath.cs b/src/ImageSharp.Drawing/Paths/ShapePath.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/ShapePath.cs rename to src/ImageSharp.Drawing/Paths/ShapePath.cs diff --git a/src/ImageSharp.Drawing.Paths/ShapeRegion.cs b/src/ImageSharp.Drawing/Paths/ShapeRegion.cs similarity index 100% rename from src/ImageSharp.Drawing.Paths/ShapeRegion.cs rename to src/ImageSharp.Drawing/Paths/ShapeRegion.cs diff --git a/src/ImageSharp.Drawing.Text/DrawText.cs b/src/ImageSharp.Drawing/Text/DrawText.cs similarity index 100% rename from src/ImageSharp.Drawing.Text/DrawText.cs rename to src/ImageSharp.Drawing/Text/DrawText.cs diff --git a/src/ImageSharp.Drawing.Text/GlyphBuilder.cs b/src/ImageSharp.Drawing/Text/GlyphBuilder.cs similarity index 100% rename from src/ImageSharp.Drawing.Text/GlyphBuilder.cs rename to src/ImageSharp.Drawing/Text/GlyphBuilder.cs diff --git a/src/ImageSharp.Drawing.Text/TextGraphicsOptions.cs b/src/ImageSharp.Drawing/Text/TextGraphicsOptions.cs similarity index 100% rename from src/ImageSharp.Drawing.Text/TextGraphicsOptions.cs rename to src/ImageSharp.Drawing/Text/TextGraphicsOptions.cs diff --git a/src/ImageSharp.Drawing/project.json b/src/ImageSharp.Drawing/project.json deleted file mode 100644 index 98cf20c1d7..0000000000 --- a/src/ImageSharp.Drawing/project.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Drawing", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project" - }, - "ImageSharp.Processing": { - "target": "project" - }, - "StyleCop.Analyzers": { - "version": "1.0.0", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.xproj b/src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.xproj deleted file mode 100644 index 94916399bd..0000000000 --- a/src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c77661b9-f793-422e-8e27-ac60ecc5f215 - ImageSharp.Formats.Bmp - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Formats.Bmp/Properties/AssemblyInfo.cs b/src/ImageSharp.Formats.Bmp/Properties/AssemblyInfo.cs deleted file mode 100644 index d6e98c6d6c..0000000000 --- a/src/ImageSharp.Formats.Bmp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// -// Copyright (c) James Jackson-South and contributors. -// Licensed under the Apache License, Version 2.0. -// - -// Common values read from `AssemblyInfo.Common.cs` \ No newline at end of file diff --git a/src/ImageSharp.Formats.Bmp/project.json b/src/ImageSharp.Formats.Bmp/project.json deleted file mode 100644 index 0c96fd7df5..0000000000 --- a/src/ImageSharp.Formats.Bmp/project.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Formats.Bmp", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project", - "version": "1.0.0-*" - }, - "StyleCop.Analyzers": { - "version": "1.1.0-beta001", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.xproj b/src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.xproj deleted file mode 100644 index d11c20c482..0000000000 --- a/src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 27ad4b5f-ecc4-4c63-9ecb-04ec772fdb6f - ImageSharp.Formats.Gif - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Formats.Gif/Properties/AssemblyInfo.cs b/src/ImageSharp.Formats.Gif/Properties/AssemblyInfo.cs deleted file mode 100644 index d6e98c6d6c..0000000000 --- a/src/ImageSharp.Formats.Gif/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// -// Copyright (c) James Jackson-South and contributors. -// Licensed under the Apache License, Version 2.0. -// - -// Common values read from `AssemblyInfo.Common.cs` \ No newline at end of file diff --git a/src/ImageSharp.Formats.Gif/project.json b/src/ImageSharp.Formats.Gif/project.json deleted file mode 100644 index 6fe75dbcb1..0000000000 --- a/src/ImageSharp.Formats.Gif/project.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Formats.Gif", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project", - "version": "1.0.0-*" - }, - "StyleCop.Analyzers": { - "version": "1.1.0-beta001", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.xproj b/src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.xproj deleted file mode 100644 index a22dc5ea34..0000000000 --- a/src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7213767c-0003-41ca-ab18-0223cfa7ce4b - ImageSharp.Formats - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Formats.Jpeg/Properties/AssemblyInfo.cs b/src/ImageSharp.Formats.Jpeg/Properties/AssemblyInfo.cs deleted file mode 100644 index d6e98c6d6c..0000000000 --- a/src/ImageSharp.Formats.Jpeg/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// -// Copyright (c) James Jackson-South and contributors. -// Licensed under the Apache License, Version 2.0. -// - -// Common values read from `AssemblyInfo.Common.cs` \ No newline at end of file diff --git a/src/ImageSharp.Formats.Jpeg/project.json b/src/ImageSharp.Formats.Jpeg/project.json deleted file mode 100644 index 2d84ff053c..0000000000 --- a/src/ImageSharp.Formats.Jpeg/project.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Formats.Jpeg", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project", - "version": "1.0.0-*" - }, - "StyleCop.Analyzers": { - "version": "1.1.0-beta001", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.xproj b/src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.xproj deleted file mode 100644 index f12901d6bc..0000000000 --- a/src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 556abdcf-ed93-4327-be98-f6815f78b9b8 - ImageSharp.Formats.Png - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Formats.Png/Properties/AssemblyInfo.cs b/src/ImageSharp.Formats.Png/Properties/AssemblyInfo.cs deleted file mode 100644 index d6e98c6d6c..0000000000 --- a/src/ImageSharp.Formats.Png/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// -// Copyright (c) James Jackson-South and contributors. -// Licensed under the Apache License, Version 2.0. -// - -// Common values read from `AssemblyInfo.Common.cs` \ No newline at end of file diff --git a/src/ImageSharp.Formats.Png/project.json b/src/ImageSharp.Formats.Png/project.json deleted file mode 100644 index a56397fb02..0000000000 --- a/src/ImageSharp.Formats.Png/project.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Formats.Png", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project", - "version": "1.0.0-*" - }, - "StyleCop.Analyzers": { - "version": "1.1.0-beta001", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Processing/ImageSharp.Processing.xproj b/src/ImageSharp.Processing/ImageSharp.Processing.xproj deleted file mode 100644 index 1fdba5ce9a..0000000000 --- a/src/ImageSharp.Processing/ImageSharp.Processing.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a623cfe9-9d2b-4528-ad1f-2e834b061134 - ImageSharp.Processing - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Processing/Properties/AssemblyInfo.cs b/src/ImageSharp.Processing/Properties/AssemblyInfo.cs deleted file mode 100644 index d6e98c6d6c..0000000000 --- a/src/ImageSharp.Processing/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// -// Copyright (c) James Jackson-South and contributors. -// Licensed under the Apache License, Version 2.0. -// - -// Common values read from `AssemblyInfo.Common.cs` \ No newline at end of file diff --git a/src/ImageSharp.Processing/project.json b/src/ImageSharp.Processing/project.json deleted file mode 100644 index 910d5fc830..0000000000 --- a/src/ImageSharp.Processing/project.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp.Processing", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project" - }, - "StyleCop.Analyzers": { - "version": "1.1.0-beta001", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs index daf68d81b4..e9120aa479 100644 --- a/src/ImageSharp/Configuration.cs +++ b/src/ImageSharp/Configuration.cs @@ -78,10 +78,10 @@ namespace ImageSharp Configuration config = new Configuration(); // lets try auto loading the known image formats - config.TryAddImageFormat("ImageSharp.Formats.PngFormat, ImageSharp.Formats.Png"); - config.TryAddImageFormat("ImageSharp.Formats.JpegFormat, ImageSharp.Formats.Jpeg"); - config.TryAddImageFormat("ImageSharp.Formats.GifFormat, ImageSharp.Formats.Gif"); - config.TryAddImageFormat("ImageSharp.Formats.BmpFormat, ImageSharp.Formats.Bmp"); + config.AddImageFormat(new Formats.PngFormat()); + config.AddImageFormat(new Formats.JpegFormat()); + config.AddImageFormat(new Formats.GifFormat()); + config.AddImageFormat(new Formats.BmpFormat()); return config; } diff --git a/src/ImageSharp.Formats.Bmp/BmpBitsPerPixel.cs b/src/ImageSharp/Formats/Bmp/BmpBitsPerPixel.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpBitsPerPixel.cs rename to src/ImageSharp/Formats/Bmp/BmpBitsPerPixel.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpCompression.cs b/src/ImageSharp/Formats/Bmp/BmpCompression.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpCompression.cs rename to src/ImageSharp/Formats/Bmp/BmpCompression.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpDecoder.cs b/src/ImageSharp/Formats/Bmp/BmpDecoder.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpDecoder.cs rename to src/ImageSharp/Formats/Bmp/BmpDecoder.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpDecoderCore.cs rename to src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpEncoder.cs b/src/ImageSharp/Formats/Bmp/BmpEncoder.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpEncoder.cs rename to src/ImageSharp/Formats/Bmp/BmpEncoder.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpEncoderCore.cs rename to src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpEncoderOptions.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpEncoderOptions.cs rename to src/ImageSharp/Formats/Bmp/BmpEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpFileHeader.cs b/src/ImageSharp/Formats/Bmp/BmpFileHeader.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpFileHeader.cs rename to src/ImageSharp/Formats/Bmp/BmpFileHeader.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpFormat.cs b/src/ImageSharp/Formats/Bmp/BmpFormat.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpFormat.cs rename to src/ImageSharp/Formats/Bmp/BmpFormat.cs diff --git a/src/ImageSharp.Formats.Bmp/BmpInfoHeader.cs b/src/ImageSharp/Formats/Bmp/BmpInfoHeader.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/BmpInfoHeader.cs rename to src/ImageSharp/Formats/Bmp/BmpInfoHeader.cs diff --git a/src/ImageSharp.Formats.Bmp/IBmpEncoderOptions.cs b/src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/IBmpEncoderOptions.cs rename to src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Bmp/ImageExtensions.cs b/src/ImageSharp/Formats/Bmp/ImageExtensions.cs similarity index 100% rename from src/ImageSharp.Formats.Bmp/ImageExtensions.cs rename to src/ImageSharp/Formats/Bmp/ImageExtensions.cs diff --git a/src/ImageSharp.Formats.Bmp/README.md b/src/ImageSharp/Formats/Bmp/README.md similarity index 100% rename from src/ImageSharp.Formats.Bmp/README.md rename to src/ImageSharp/Formats/Bmp/README.md diff --git a/src/ImageSharp.Formats.Gif/DisposalMethod.cs b/src/ImageSharp/Formats/Gif/DisposalMethod.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/DisposalMethod.cs rename to src/ImageSharp/Formats/Gif/DisposalMethod.cs diff --git a/src/ImageSharp.Formats.Gif/GifConstants.cs b/src/ImageSharp/Formats/Gif/GifConstants.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifConstants.cs rename to src/ImageSharp/Formats/Gif/GifConstants.cs diff --git a/src/ImageSharp.Formats.Gif/GifDecoder.cs b/src/ImageSharp/Formats/Gif/GifDecoder.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifDecoder.cs rename to src/ImageSharp/Formats/Gif/GifDecoder.cs diff --git a/src/ImageSharp.Formats.Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifDecoderCore.cs rename to src/ImageSharp/Formats/Gif/GifDecoderCore.cs diff --git a/src/ImageSharp.Formats.Gif/GifDecoderOptions.cs b/src/ImageSharp/Formats/Gif/GifDecoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifDecoderOptions.cs rename to src/ImageSharp/Formats/Gif/GifDecoderOptions.cs diff --git a/src/ImageSharp.Formats.Gif/GifEncoder.cs b/src/ImageSharp/Formats/Gif/GifEncoder.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifEncoder.cs rename to src/ImageSharp/Formats/Gif/GifEncoder.cs diff --git a/src/ImageSharp.Formats.Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifEncoderCore.cs rename to src/ImageSharp/Formats/Gif/GifEncoderCore.cs diff --git a/src/ImageSharp.Formats.Gif/GifEncoderOptions.cs b/src/ImageSharp/Formats/Gif/GifEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifEncoderOptions.cs rename to src/ImageSharp/Formats/Gif/GifEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Gif/GifFormat.cs b/src/ImageSharp/Formats/Gif/GifFormat.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/GifFormat.cs rename to src/ImageSharp/Formats/Gif/GifFormat.cs diff --git a/src/ImageSharp.Formats.Gif/IGifDecoderOptions.cs b/src/ImageSharp/Formats/Gif/IGifDecoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/IGifDecoderOptions.cs rename to src/ImageSharp/Formats/Gif/IGifDecoderOptions.cs diff --git a/src/ImageSharp.Formats.Gif/IGifEncoderOptions.cs b/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/IGifEncoderOptions.cs rename to src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Gif/ImageExtensions.cs b/src/ImageSharp/Formats/Gif/ImageExtensions.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/ImageExtensions.cs rename to src/ImageSharp/Formats/Gif/ImageExtensions.cs diff --git a/src/ImageSharp.Formats.Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/LzwDecoder.cs rename to src/ImageSharp/Formats/Gif/LzwDecoder.cs diff --git a/src/ImageSharp.Formats.Gif/LzwEncoder.cs b/src/ImageSharp/Formats/Gif/LzwEncoder.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/LzwEncoder.cs rename to src/ImageSharp/Formats/Gif/LzwEncoder.cs diff --git a/src/ImageSharp.Formats.Gif/PackedField.cs b/src/ImageSharp/Formats/Gif/PackedField.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/PackedField.cs rename to src/ImageSharp/Formats/Gif/PackedField.cs diff --git a/src/ImageSharp.Formats.Gif/README.md b/src/ImageSharp/Formats/Gif/README.md similarity index 100% rename from src/ImageSharp.Formats.Gif/README.md rename to src/ImageSharp/Formats/Gif/README.md diff --git a/src/ImageSharp.Formats.Gif/Sections/GifGraphicsControlExtension.cs b/src/ImageSharp/Formats/Gif/Sections/GifGraphicsControlExtension.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/Sections/GifGraphicsControlExtension.cs rename to src/ImageSharp/Formats/Gif/Sections/GifGraphicsControlExtension.cs diff --git a/src/ImageSharp.Formats.Gif/Sections/GifImageDescriptor.cs b/src/ImageSharp/Formats/Gif/Sections/GifImageDescriptor.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/Sections/GifImageDescriptor.cs rename to src/ImageSharp/Formats/Gif/Sections/GifImageDescriptor.cs diff --git a/src/ImageSharp.Formats.Gif/Sections/GifLogicalScreenDescriptor.cs b/src/ImageSharp/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs similarity index 100% rename from src/ImageSharp.Formats.Gif/Sections/GifLogicalScreenDescriptor.cs rename to src/ImageSharp/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Block8x8F.Generated.cs b/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.Generated.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Block8x8F.Generated.cs rename to src/ImageSharp/Formats/Jpeg/Components/Block8x8F.Generated.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Block8x8F.Generated.tt b/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.Generated.tt similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Block8x8F.Generated.tt rename to src/ImageSharp/Formats/Jpeg/Components/Block8x8F.Generated.tt diff --git a/src/ImageSharp.Formats.Jpeg/Components/Block8x8F.cs b/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Block8x8F.cs rename to src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/BlockQuad.cs b/src/ImageSharp/Formats/Jpeg/Components/BlockQuad.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/BlockQuad.cs rename to src/ImageSharp/Formats/Jpeg/Components/BlockQuad.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/DCT.cs b/src/ImageSharp/Formats/Jpeg/Components/DCT.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/DCT.cs rename to src/ImageSharp/Formats/Jpeg/Components/DCT.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/Bits.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/Bits.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/Bits.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/Bits.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/Bytes.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/Bytes.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/Bytes.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/Component.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/Component.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/Component.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/Component.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/ComponentScan.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ComponentScan.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/ComponentScan.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/ComponentScan.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/DecodedBlock.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/DecodedBlock.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/DecodedBlock.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/DecodedBlock.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/DecodedBlockArray.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/DecodedBlockArray.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/DecodedBlockArray.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/DecodedBlockArray.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/DecoderErrorCode.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/DecoderErrorCode.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/DecoderErrorCode.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/DecoderErrorCode.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/DecoderThrowHelper.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/DecoderThrowHelper.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/DecoderThrowHelper.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/DecoderThrowHelper.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/EOFException.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/EOFException.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/EOFException.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/EOFException.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/HuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTree.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/HuffmanTree.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTree.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/InputProcessor.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/InputProcessor.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/InputProcessor.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegBlockProcessor.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockProcessor.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegBlockProcessor.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockProcessor.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegPixelArea.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegPixelArea.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegPixelArea.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.ComputationData.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.ComputationData.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.ComputationData.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.DataPointers.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.DataPointers.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.DataPointers.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.DataPointers.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.md b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.md similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.md rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.md diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/MissingFF00Exception.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/MissingFF00Exception.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/MissingFF00Exception.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/MissingFF00Exception.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/YCbCrImage.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/YCbCrImage.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Decoder/YCbCrImage.cs rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/YCbCrImage.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Encoder/HuffIndex.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffIndex.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Encoder/HuffIndex.cs rename to src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffIndex.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Encoder/HuffmanLut.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanLut.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Encoder/HuffmanLut.cs rename to src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanLut.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Encoder/HuffmanSpec.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanSpec.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Encoder/HuffmanSpec.cs rename to src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanSpec.cs diff --git a/src/ImageSharp.Formats.Jpeg/Components/Encoder/QuantIndex.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/QuantIndex.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Components/Encoder/QuantIndex.cs rename to src/ImageSharp/Formats/Jpeg/Components/Encoder/QuantIndex.cs diff --git a/src/ImageSharp.Formats.Jpeg/IJpegEncoderOptions.cs b/src/ImageSharp/Formats/Jpeg/IJpegEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/IJpegEncoderOptions.cs rename to src/ImageSharp/Formats/Jpeg/IJpegEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Jpeg/ImageExtensions.cs b/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/ImageExtensions.cs rename to src/ImageSharp/Formats/Jpeg/ImageExtensions.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegConstants.cs b/src/ImageSharp/Formats/Jpeg/JpegConstants.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegConstants.cs rename to src/ImageSharp/Formats/Jpeg/JpegConstants.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegDecoder.cs rename to src/ImageSharp/Formats/Jpeg/JpegDecoder.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegDecoderCore.cs rename to src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegEncoder.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegEncoder.cs rename to src/ImageSharp/Formats/Jpeg/JpegEncoder.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegEncoderCore.cs rename to src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegEncoderOptions.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegEncoderOptions.cs rename to src/ImageSharp/Formats/Jpeg/JpegEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegFormat.cs b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegFormat.cs rename to src/ImageSharp/Formats/Jpeg/JpegFormat.cs diff --git a/src/ImageSharp.Formats.Jpeg/JpegSubsample.cs b/src/ImageSharp/Formats/Jpeg/JpegSubsample.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/JpegSubsample.cs rename to src/ImageSharp/Formats/Jpeg/JpegSubsample.cs diff --git a/src/ImageSharp.Formats.Jpeg/README.md b/src/ImageSharp/Formats/Jpeg/README.md similarity index 100% rename from src/ImageSharp.Formats.Jpeg/README.md rename to src/ImageSharp/Formats/Jpeg/README.md diff --git a/src/ImageSharp.Formats.Jpeg/UnzigData.cs b/src/ImageSharp/Formats/Jpeg/UnzigData.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/UnzigData.cs rename to src/ImageSharp/Formats/Jpeg/UnzigData.cs diff --git a/src/ImageSharp.Formats.Jpeg/Utils/JpegUtils.cs b/src/ImageSharp/Formats/Jpeg/Utils/JpegUtils.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Utils/JpegUtils.cs rename to src/ImageSharp/Formats/Jpeg/Utils/JpegUtils.cs diff --git a/src/ImageSharp.Formats.Jpeg/Utils/MutableSpan.cs b/src/ImageSharp/Formats/Jpeg/Utils/MutableSpan.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Utils/MutableSpan.cs rename to src/ImageSharp/Formats/Jpeg/Utils/MutableSpan.cs diff --git a/src/ImageSharp.Formats.Jpeg/Utils/MutableSpanExtensions.cs b/src/ImageSharp/Formats/Jpeg/Utils/MutableSpanExtensions.cs similarity index 100% rename from src/ImageSharp.Formats.Jpeg/Utils/MutableSpanExtensions.cs rename to src/ImageSharp/Formats/Jpeg/Utils/MutableSpanExtensions.cs diff --git a/src/ImageSharp.Formats.Png/Filters/AverageFilter.cs b/src/ImageSharp/Formats/Png/Filters/AverageFilter.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Filters/AverageFilter.cs rename to src/ImageSharp/Formats/Png/Filters/AverageFilter.cs diff --git a/src/ImageSharp.Formats.Png/Filters/FilterType.cs b/src/ImageSharp/Formats/Png/Filters/FilterType.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Filters/FilterType.cs rename to src/ImageSharp/Formats/Png/Filters/FilterType.cs diff --git a/src/ImageSharp.Formats.Png/Filters/NoneFilter.cs b/src/ImageSharp/Formats/Png/Filters/NoneFilter.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Filters/NoneFilter.cs rename to src/ImageSharp/Formats/Png/Filters/NoneFilter.cs diff --git a/src/ImageSharp.Formats.Png/Filters/PaethFilter.cs b/src/ImageSharp/Formats/Png/Filters/PaethFilter.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Filters/PaethFilter.cs rename to src/ImageSharp/Formats/Png/Filters/PaethFilter.cs diff --git a/src/ImageSharp.Formats.Png/Filters/SubFilter.cs b/src/ImageSharp/Formats/Png/Filters/SubFilter.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Filters/SubFilter.cs rename to src/ImageSharp/Formats/Png/Filters/SubFilter.cs diff --git a/src/ImageSharp.Formats.Png/Filters/UpFilter.cs b/src/ImageSharp/Formats/Png/Filters/UpFilter.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Filters/UpFilter.cs rename to src/ImageSharp/Formats/Png/Filters/UpFilter.cs diff --git a/src/ImageSharp.Formats.Png/IPngDecoderOptions.cs b/src/ImageSharp/Formats/Png/IPngDecoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Png/IPngDecoderOptions.cs rename to src/ImageSharp/Formats/Png/IPngDecoderOptions.cs diff --git a/src/ImageSharp.Formats.Png/IPngEncoderOptions.cs b/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Png/IPngEncoderOptions.cs rename to src/ImageSharp/Formats/Png/IPngEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Png/ImageExtensions.cs b/src/ImageSharp/Formats/Png/ImageExtensions.cs similarity index 100% rename from src/ImageSharp.Formats.Png/ImageExtensions.cs rename to src/ImageSharp/Formats/Png/ImageExtensions.cs diff --git a/src/ImageSharp.Formats.Png/PngChunk.cs b/src/ImageSharp/Formats/Png/PngChunk.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngChunk.cs rename to src/ImageSharp/Formats/Png/PngChunk.cs diff --git a/src/ImageSharp.Formats.Png/PngChunkTypes.cs b/src/ImageSharp/Formats/Png/PngChunkTypes.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngChunkTypes.cs rename to src/ImageSharp/Formats/Png/PngChunkTypes.cs diff --git a/src/ImageSharp.Formats.Png/PngColorType.cs b/src/ImageSharp/Formats/Png/PngColorType.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngColorType.cs rename to src/ImageSharp/Formats/Png/PngColorType.cs diff --git a/src/ImageSharp.Formats.Png/PngDecoder.cs b/src/ImageSharp/Formats/Png/PngDecoder.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngDecoder.cs rename to src/ImageSharp/Formats/Png/PngDecoder.cs diff --git a/src/ImageSharp.Formats.Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngDecoderCore.cs rename to src/ImageSharp/Formats/Png/PngDecoderCore.cs diff --git a/src/ImageSharp.Formats.Png/PngDecoderOptions.cs b/src/ImageSharp/Formats/Png/PngDecoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngDecoderOptions.cs rename to src/ImageSharp/Formats/Png/PngDecoderOptions.cs diff --git a/src/ImageSharp.Formats.Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngEncoder.cs rename to src/ImageSharp/Formats/Png/PngEncoder.cs diff --git a/src/ImageSharp.Formats.Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngEncoderCore.cs rename to src/ImageSharp/Formats/Png/PngEncoderCore.cs diff --git a/src/ImageSharp.Formats.Png/PngEncoderOptions.cs b/src/ImageSharp/Formats/Png/PngEncoderOptions.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngEncoderOptions.cs rename to src/ImageSharp/Formats/Png/PngEncoderOptions.cs diff --git a/src/ImageSharp.Formats.Png/PngFormat.cs b/src/ImageSharp/Formats/Png/PngFormat.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngFormat.cs rename to src/ImageSharp/Formats/Png/PngFormat.cs diff --git a/src/ImageSharp.Formats.Png/PngHeader.cs b/src/ImageSharp/Formats/Png/PngHeader.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngHeader.cs rename to src/ImageSharp/Formats/Png/PngHeader.cs diff --git a/src/ImageSharp.Formats.Png/PngInterlaceMode.cs b/src/ImageSharp/Formats/Png/PngInterlaceMode.cs similarity index 100% rename from src/ImageSharp.Formats.Png/PngInterlaceMode.cs rename to src/ImageSharp/Formats/Png/PngInterlaceMode.cs diff --git a/src/ImageSharp.Formats.Png/README.md b/src/ImageSharp/Formats/Png/README.md similarity index 100% rename from src/ImageSharp.Formats.Png/README.md rename to src/ImageSharp/Formats/Png/README.md diff --git a/src/ImageSharp.Formats.Png/Zlib/Adler32.cs b/src/ImageSharp/Formats/Png/Zlib/Adler32.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Zlib/Adler32.cs rename to src/ImageSharp/Formats/Png/Zlib/Adler32.cs diff --git a/src/ImageSharp.Formats.Png/Zlib/Crc32.cs b/src/ImageSharp/Formats/Png/Zlib/Crc32.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Zlib/Crc32.cs rename to src/ImageSharp/Formats/Png/Zlib/Crc32.cs diff --git a/src/ImageSharp.Formats.Png/Zlib/IChecksum.cs b/src/ImageSharp/Formats/Png/Zlib/IChecksum.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Zlib/IChecksum.cs rename to src/ImageSharp/Formats/Png/Zlib/IChecksum.cs diff --git a/src/ImageSharp.Formats.Png/Zlib/README.md b/src/ImageSharp/Formats/Png/Zlib/README.md similarity index 100% rename from src/ImageSharp.Formats.Png/Zlib/README.md rename to src/ImageSharp/Formats/Png/Zlib/README.md diff --git a/src/ImageSharp.Formats.Png/Zlib/ZlibDeflateStream.cs b/src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Zlib/ZlibDeflateStream.cs rename to src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs diff --git a/src/ImageSharp.Formats.Png/Zlib/ZlibInflateStream.cs b/src/ImageSharp/Formats/Png/Zlib/ZlibInflateStream.cs similarity index 100% rename from src/ImageSharp.Formats.Png/Zlib/ZlibInflateStream.cs rename to src/ImageSharp/Formats/Png/Zlib/ZlibInflateStream.cs diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj new file mode 100644 index 0000000000..de3e764734 --- /dev/null +++ b/src/ImageSharp/ImageSharp.csproj @@ -0,0 +1,56 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp + 1.0.0-alpha3 + James Jackson-South and contributors + netstandard1.3;netstandard1.1 + true + true + ImageSharp + ImageSharp + Image Resize Crop Gif Jpg Jpeg Bitmap Png Core + https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png + https://github.com/JimBobSquarePants/ImageSharp + http://www.apache.org/licenses/LICENSE-2.0 + git + https://github.com/JimBobSquarePants/ImageSharp + false + false + false + false + false + false + false + false + false + full + portable + True + IOperation + + + + + + + + All + + + + + + + + ..\..\ImageSharp.ruleset + + + true + + + + TextTemplatingFileGenerator + + + \ No newline at end of file diff --git a/src/ImageSharp/ImageSharp.xproj b/src/ImageSharp/ImageSharp.xproj deleted file mode 100644 index bf2f6a67bc..0000000000 --- a/src/ImageSharp/ImageSharp.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2aa31a1f-142c-43f4-8687-09abca4b3a26 - ImageSharp - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - True - - - - - - \ No newline at end of file diff --git a/src/ImageSharp.Processing/Binarization/BinaryThreshold.cs b/src/ImageSharp/Processing/Binarization/BinaryThreshold.cs similarity index 100% rename from src/ImageSharp.Processing/Binarization/BinaryThreshold.cs rename to src/ImageSharp/Processing/Binarization/BinaryThreshold.cs diff --git a/src/ImageSharp.Processing/Binarization/Dither.cs b/src/ImageSharp/Processing/Binarization/Dither.cs similarity index 100% rename from src/ImageSharp.Processing/Binarization/Dither.cs rename to src/ImageSharp/Processing/Binarization/Dither.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/BlackWhite.cs b/src/ImageSharp/Processing/ColorMatrix/BlackWhite.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/BlackWhite.cs rename to src/ImageSharp/Processing/ColorMatrix/BlackWhite.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/ColorBlindness.cs b/src/ImageSharp/Processing/ColorMatrix/ColorBlindness.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/ColorBlindness.cs rename to src/ImageSharp/Processing/ColorMatrix/ColorBlindness.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Grayscale.cs b/src/ImageSharp/Processing/ColorMatrix/Grayscale.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Grayscale.cs rename to src/ImageSharp/Processing/ColorMatrix/Grayscale.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Hue.cs b/src/ImageSharp/Processing/ColorMatrix/Hue.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Hue.cs rename to src/ImageSharp/Processing/ColorMatrix/Hue.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Kodachrome.cs b/src/ImageSharp/Processing/ColorMatrix/Kodachrome.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Kodachrome.cs rename to src/ImageSharp/Processing/ColorMatrix/Kodachrome.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Lomograph.cs b/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Lomograph.cs rename to src/ImageSharp/Processing/ColorMatrix/Lomograph.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Options/ColorBlindness.cs b/src/ImageSharp/Processing/ColorMatrix/Options/ColorBlindness.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Options/ColorBlindness.cs rename to src/ImageSharp/Processing/ColorMatrix/Options/ColorBlindness.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Options/GrayscaleMode.cs b/src/ImageSharp/Processing/ColorMatrix/Options/GrayscaleMode.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Options/GrayscaleMode.cs rename to src/ImageSharp/Processing/ColorMatrix/Options/GrayscaleMode.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Polaroid.cs b/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Polaroid.cs rename to src/ImageSharp/Processing/ColorMatrix/Polaroid.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Saturation.cs b/src/ImageSharp/Processing/ColorMatrix/Saturation.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Saturation.cs rename to src/ImageSharp/Processing/ColorMatrix/Saturation.cs diff --git a/src/ImageSharp.Processing/ColorMatrix/Sepia.cs b/src/ImageSharp/Processing/ColorMatrix/Sepia.cs similarity index 100% rename from src/ImageSharp.Processing/ColorMatrix/Sepia.cs rename to src/ImageSharp/Processing/ColorMatrix/Sepia.cs diff --git a/src/ImageSharp.Processing/Convolution/BoxBlur.cs b/src/ImageSharp/Processing/Convolution/BoxBlur.cs similarity index 100% rename from src/ImageSharp.Processing/Convolution/BoxBlur.cs rename to src/ImageSharp/Processing/Convolution/BoxBlur.cs diff --git a/src/ImageSharp.Processing/Convolution/DetectEdges.cs b/src/ImageSharp/Processing/Convolution/DetectEdges.cs similarity index 100% rename from src/ImageSharp.Processing/Convolution/DetectEdges.cs rename to src/ImageSharp/Processing/Convolution/DetectEdges.cs diff --git a/src/ImageSharp.Processing/Convolution/GaussianBlur.cs b/src/ImageSharp/Processing/Convolution/GaussianBlur.cs similarity index 100% rename from src/ImageSharp.Processing/Convolution/GaussianBlur.cs rename to src/ImageSharp/Processing/Convolution/GaussianBlur.cs diff --git a/src/ImageSharp.Processing/Convolution/GaussianSharpen.cs b/src/ImageSharp/Processing/Convolution/GaussianSharpen.cs similarity index 100% rename from src/ImageSharp.Processing/Convolution/GaussianSharpen.cs rename to src/ImageSharp/Processing/Convolution/GaussianSharpen.cs diff --git a/src/ImageSharp.Processing/Convolution/Options/EdgeDetection.cs b/src/ImageSharp/Processing/Convolution/Options/EdgeDetection.cs similarity index 100% rename from src/ImageSharp.Processing/Convolution/Options/EdgeDetection.cs rename to src/ImageSharp/Processing/Convolution/Options/EdgeDetection.cs diff --git a/src/ImageSharp.Processing/Effects/Alpha.cs b/src/ImageSharp/Processing/Effects/Alpha.cs similarity index 100% rename from src/ImageSharp.Processing/Effects/Alpha.cs rename to src/ImageSharp/Processing/Effects/Alpha.cs diff --git a/src/ImageSharp.Processing/Effects/BackgroundColor.cs b/src/ImageSharp/Processing/Effects/BackgroundColor.cs similarity index 100% rename from src/ImageSharp.Processing/Effects/BackgroundColor.cs rename to src/ImageSharp/Processing/Effects/BackgroundColor.cs diff --git a/src/ImageSharp.Processing/Effects/Brightness.cs b/src/ImageSharp/Processing/Effects/Brightness.cs similarity index 100% rename from src/ImageSharp.Processing/Effects/Brightness.cs rename to src/ImageSharp/Processing/Effects/Brightness.cs diff --git a/src/ImageSharp.Processing/Effects/Contrast.cs b/src/ImageSharp/Processing/Effects/Contrast.cs similarity index 100% rename from src/ImageSharp.Processing/Effects/Contrast.cs rename to src/ImageSharp/Processing/Effects/Contrast.cs diff --git a/src/ImageSharp.Processing/Effects/Invert.cs b/src/ImageSharp/Processing/Effects/Invert.cs similarity index 100% rename from src/ImageSharp.Processing/Effects/Invert.cs rename to src/ImageSharp/Processing/Effects/Invert.cs diff --git a/src/ImageSharp.Processing/Effects/OilPainting.cs b/src/ImageSharp/Processing/Effects/OilPainting.cs similarity index 100% rename from src/ImageSharp.Processing/Effects/OilPainting.cs rename to src/ImageSharp/Processing/Effects/OilPainting.cs diff --git a/src/ImageSharp.Processing/Effects/Pixelate.cs b/src/ImageSharp/Processing/Effects/Pixelate.cs similarity index 100% rename from src/ImageSharp.Processing/Effects/Pixelate.cs rename to src/ImageSharp/Processing/Effects/Pixelate.cs diff --git a/src/ImageSharp.Processing/Overlays/Glow.cs b/src/ImageSharp/Processing/Overlays/Glow.cs similarity index 100% rename from src/ImageSharp.Processing/Overlays/Glow.cs rename to src/ImageSharp/Processing/Overlays/Glow.cs diff --git a/src/ImageSharp.Processing/Overlays/Vignette.cs b/src/ImageSharp/Processing/Overlays/Vignette.cs similarity index 100% rename from src/ImageSharp.Processing/Overlays/Vignette.cs rename to src/ImageSharp/Processing/Overlays/Vignette.cs diff --git a/src/ImageSharp.Processing/Processors/Binarization/BinaryThresholdProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Binarization/BinaryThresholdProcessor.cs rename to src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs rename to src/ImageSharp/Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Binarization/OrderedDitherProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/OrderedDitherProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Binarization/OrderedDitherProcessor.cs rename to src/ImageSharp/Processing/Processors/Binarization/OrderedDitherProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/README.md b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/README.md similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/README.md rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/README.md diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/ColorMatrixFilter.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorMatrixFilter.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/ColorMatrixFilter.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/ColorMatrixFilter.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/HueProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/HueProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/HueProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/HueProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/IColorMatrixFilter.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/IColorMatrixFilter.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/IColorMatrixFilter.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/IColorMatrixFilter.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/KodachromeProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/KodachromeProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/KodachromeProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/KodachromeProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/LomographProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/LomographProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/PolaroidProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/PolaroidProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/SaturationProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/SaturationProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/SaturationProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/SaturationProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/ColorMatrix/SepiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/SepiaProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/ColorMatrix/SepiaProcessor.cs rename to src/ImageSharp/Processing/Processors/ColorMatrix/SepiaProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/BoxBlurProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/BoxBlurProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/Convolution2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/Convolution2DProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/Convolution2PassProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/ConvolutionProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/ConvolutionProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/GaussianBlurProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/GaussianBlurProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Convolution/GaussianSharpenProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Convolution/GaussianSharpenProcessor.cs rename to src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Effects/AlphaProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/AlphaProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Effects/AlphaProcessor.cs rename to src/ImageSharp/Processing/Processors/Effects/AlphaProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Effects/BackgroundColorProcessor.cs rename to src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Effects/BrightnessProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BrightnessProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Effects/BrightnessProcessor.cs rename to src/ImageSharp/Processing/Processors/Effects/BrightnessProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Effects/ContrastProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Effects/ContrastProcessor.cs rename to src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Effects/InvertProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/InvertProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Effects/InvertProcessor.cs rename to src/ImageSharp/Processing/Processors/Effects/InvertProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Effects/OilPaintingProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Effects/OilPaintingProcessor.cs rename to src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Effects/PixelateProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Effects/PixelateProcessor.cs rename to src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Overlays/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Overlays/GlowProcessor.cs rename to src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Overlays/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Overlays/VignetteProcessor.cs rename to src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/CompandingResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CompandingResizeProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/CompandingResizeProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/CompandingResizeProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/CropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/CropProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/EntropyCropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/EntropyCropProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/FlipProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/Matrix3x2Processor.cs b/src/ImageSharp/Processing/Processors/Transforms/Matrix3x2Processor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/Matrix3x2Processor.cs rename to src/ImageSharp/Processing/Processors/Transforms/Matrix3x2Processor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/ResamplingWeightedProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/ResamplingWeightedProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/ResizeProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/RotateProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/RotateProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs diff --git a/src/ImageSharp.Processing/Processors/Transforms/SkewProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs similarity index 100% rename from src/ImageSharp.Processing/Processors/Transforms/SkewProcessor.cs rename to src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs diff --git a/src/ImageSharp.Processing/Transforms/AutoOrient.cs b/src/ImageSharp/Processing/Transforms/AutoOrient.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/AutoOrient.cs rename to src/ImageSharp/Processing/Transforms/AutoOrient.cs diff --git a/src/ImageSharp.Processing/Transforms/Crop.cs b/src/ImageSharp/Processing/Transforms/Crop.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Crop.cs rename to src/ImageSharp/Processing/Transforms/Crop.cs diff --git a/src/ImageSharp.Processing/Transforms/EntropyCrop.cs b/src/ImageSharp/Processing/Transforms/EntropyCrop.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/EntropyCrop.cs rename to src/ImageSharp/Processing/Transforms/EntropyCrop.cs diff --git a/src/ImageSharp.Processing/Transforms/Flip.cs b/src/ImageSharp/Processing/Transforms/Flip.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Flip.cs rename to src/ImageSharp/Processing/Transforms/Flip.cs diff --git a/src/ImageSharp.Processing/Transforms/Options/AnchorPosition.cs b/src/ImageSharp/Processing/Transforms/Options/AnchorPosition.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Options/AnchorPosition.cs rename to src/ImageSharp/Processing/Transforms/Options/AnchorPosition.cs diff --git a/src/ImageSharp.Processing/Transforms/Options/FlipType.cs b/src/ImageSharp/Processing/Transforms/Options/FlipType.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Options/FlipType.cs rename to src/ImageSharp/Processing/Transforms/Options/FlipType.cs diff --git a/src/ImageSharp.Processing/Transforms/Options/Orientation.cs b/src/ImageSharp/Processing/Transforms/Options/Orientation.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Options/Orientation.cs rename to src/ImageSharp/Processing/Transforms/Options/Orientation.cs diff --git a/src/ImageSharp.Processing/Transforms/Options/ResizeHelper.cs b/src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Options/ResizeHelper.cs rename to src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs diff --git a/src/ImageSharp.Processing/Transforms/Options/ResizeMode.cs b/src/ImageSharp/Processing/Transforms/Options/ResizeMode.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Options/ResizeMode.cs rename to src/ImageSharp/Processing/Transforms/Options/ResizeMode.cs diff --git a/src/ImageSharp.Processing/Transforms/Options/ResizeOptions.cs b/src/ImageSharp/Processing/Transforms/Options/ResizeOptions.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Options/ResizeOptions.cs rename to src/ImageSharp/Processing/Transforms/Options/ResizeOptions.cs diff --git a/src/ImageSharp.Processing/Transforms/Options/RotateType.cs b/src/ImageSharp/Processing/Transforms/Options/RotateType.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Options/RotateType.cs rename to src/ImageSharp/Processing/Transforms/Options/RotateType.cs diff --git a/src/ImageSharp.Processing/Transforms/Pad.cs b/src/ImageSharp/Processing/Transforms/Pad.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Pad.cs rename to src/ImageSharp/Processing/Transforms/Pad.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/BicubicResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/BicubicResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/BicubicResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/BicubicResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/BoxResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/BoxResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/BoxResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/BoxResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/CatmullRomResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/CatmullRomResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/CatmullRomResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/CatmullRomResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/HermiteResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/HermiteResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/HermiteResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/HermiteResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/IResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/IResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/IResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/IResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/Lanczos2Resampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos2Resampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/Lanczos2Resampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/Lanczos2Resampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/Lanczos3Resampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos3Resampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/Lanczos3Resampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/Lanczos3Resampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/Lanczos5Resampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos5Resampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/Lanczos5Resampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/Lanczos5Resampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/Lanczos8Resampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos8Resampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/Lanczos8Resampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/Lanczos8Resampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/MitchellNetravaliResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/MitchellNetravaliResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/MitchellNetravaliResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/MitchellNetravaliResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/NearestNeighborResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/NearestNeighborResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/NearestNeighborResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/NearestNeighborResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/RobidouxResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/RobidouxResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/RobidouxResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/RobidouxResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/RobidouxSharpResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/RobidouxSharpResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/RobidouxSharpResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/RobidouxSharpResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/SplineResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/SplineResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/SplineResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/SplineResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/TriangleResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/TriangleResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/TriangleResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/TriangleResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resamplers/WelchResampler.cs b/src/ImageSharp/Processing/Transforms/Resamplers/WelchResampler.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resamplers/WelchResampler.cs rename to src/ImageSharp/Processing/Transforms/Resamplers/WelchResampler.cs diff --git a/src/ImageSharp.Processing/Transforms/Resize.cs b/src/ImageSharp/Processing/Transforms/Resize.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Resize.cs rename to src/ImageSharp/Processing/Transforms/Resize.cs diff --git a/src/ImageSharp.Processing/Transforms/Rotate.cs b/src/ImageSharp/Processing/Transforms/Rotate.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Rotate.cs rename to src/ImageSharp/Processing/Transforms/Rotate.cs diff --git a/src/ImageSharp.Processing/Transforms/RotateFlip.cs b/src/ImageSharp/Processing/Transforms/RotateFlip.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/RotateFlip.cs rename to src/ImageSharp/Processing/Transforms/RotateFlip.cs diff --git a/src/ImageSharp.Processing/Transforms/Skew.cs b/src/ImageSharp/Processing/Transforms/Skew.cs similarity index 100% rename from src/ImageSharp.Processing/Transforms/Skew.cs rename to src/ImageSharp/Processing/Transforms/Skew.cs diff --git a/src/ImageSharp/Properties/AssemblyInfo.cs b/src/ImageSharp/Properties/AssemblyInfo.cs index 407a17b85a..e791dff5a5 100644 --- a/src/ImageSharp/Properties/AssemblyInfo.cs +++ b/src/ImageSharp/Properties/AssemblyInfo.cs @@ -5,9 +5,4 @@ using System.Runtime.CompilerServices; // Ensure the other projects can see the internal helpers -[assembly: InternalsVisibleTo("ImageSharp.Drawing")] -[assembly: InternalsVisibleTo("ImageSharp.Formats.Bmp")] -[assembly: InternalsVisibleTo("ImageSharp.Formats.Gif")] -[assembly: InternalsVisibleTo("ImageSharp.Formats.Jpeg")] -[assembly: InternalsVisibleTo("ImageSharp.Formats.Png")] -[assembly: InternalsVisibleTo("ImageSharp.Processing")] \ No newline at end of file +[assembly: InternalsVisibleTo("ImageSharp.Drawing")] \ No newline at end of file diff --git a/src/ImageSharp/project.json b/src/ImageSharp/project.json deleted file mode 100644 index 6519a3f6b8..0000000000 --- a/src/ImageSharp/project.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "version": "1.0.0-alpha2-*", - "title": "ImageSharp", - "description": "A cross-platform library for the processing of image files; written in C#", - "authors": [ - "James Jackson-South and contributors" - ], - "packOptions": { - "owners": [ - "James Jackson-South and contributors" - ], - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "iconUrl": "https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/build/icons/imagesharp-logo-128.png", - "requireLicenseAcceptance": false, - "repository": { - "type": "git", - "url": "https://github.com/JimBobSquarePants/ImageSharp" - }, - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true, - "xmlDoc": true, - "additionalArguments": [ "/additionalfile:../Shared/stylecop.json", "/ruleset:../../ImageSharp.ruleset" ], - "compile": [ - "../Shared/*.cs" - ] - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true, - "optimize": true - } - } - }, - "dependencies": { - "StyleCop.Analyzers": { - "version": "1.1.0-beta001", - "type": "build" - }, - "System.Buffers": "4.0.0", - "System.Runtime.CompilerServices.Unsafe": "4.0.0" - }, - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "netstandard1.1": { - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Numerics.Vectors": "4.1.1", - "System.ObjectModel": "4.0.12", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Tasks.Parallel": "4.0.1" - } - }, - "net45": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" } - } - }, - "net461": { - "dependencies": { - "System.Numerics.Vectors": "4.1.1", - "System.Threading.Tasks.Parallel": "4.0.0" - }, - "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.Numerics": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs index 11f16769b1..252ef3eae0 100644 --- a/src/Shared/AssemblyInfo.Common.cs +++ b/src/Shared/AssemblyInfo.Common.cs @@ -33,7 +33,8 @@ using System.Runtime.CompilerServices; [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyInformationalVersion("1.0.0.0")] -// Ensure the internals can be tested. +// Ensure the internals can be built and tested. +[assembly: InternalsVisibleTo("ImageSharp.Drawing")] [assembly: InternalsVisibleTo("ImageSharp.Benchmarks")] [assembly: InternalsVisibleTo("ImageSharp.Tests")] [assembly: InternalsVisibleTo("ImageSharp.Sandbox46")] \ No newline at end of file diff --git a/tests/CodeCoverage/CodeCoverage.cmd b/tests/CodeCoverage/CodeCoverage.cmd index e4fe3f9382..1e16d5c14a 100644 --- a/tests/CodeCoverage/CodeCoverage.cmd +++ b/tests/CodeCoverage/CodeCoverage.cmd @@ -1,18 +1,17 @@ @echo off + cd tests\CodeCoverage nuget restore packages.config -PackagesDirectory . -cd ..\ImageSharp.Tests - -dotnet restore - cd .. cd .. +dotnet restore ImageSharp.sln +dotnet build ImageSharp.sln --no-incremental -c release /p:codecov=true rem The -threshold options prevents this taking ages... -tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test tests\ImageSharp.Tests -c Release -f net451" -threshold:10 -register:user -filter:"+[ImageSharp*]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -returntargetcode -output:.\ImageSharp.Coverage.xml +tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\ImageSharp.Tests\ImageSharp.Tests.csproj --no-build -c release /p:codecov=true" -register:user -threshold:10 -oldStyle -safemode:off -output:.\ImageSharp.Coverage.xml -hideskipped:All -returntargetcode -filter:"+[ImageSharp*]*" if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/tests/ImageSharp.Benchmarks/Benchmark.cmd b/tests/ImageSharp.Benchmarks/Benchmark.cmd deleted file mode 100644 index f777e5b8f6..0000000000 --- a/tests/ImageSharp.Benchmarks/Benchmark.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -dotnet run --configuration Release -pause diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj new file mode 100644 index 0000000000..b2070c0dee --- /dev/null +++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj @@ -0,0 +1,17 @@ + + + Exe + net461 + win7-x64 + True + false + + + + + + + + + + \ No newline at end of file diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.xproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.xproj deleted file mode 100644 index 184faefd81..0000000000 --- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 299d8e18-102c-42de-adbf-79098ee706a8 - ImageSharp.Benchmarks - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - \ No newline at end of file diff --git a/tests/ImageSharp.Benchmarks/Properties/AssemblyInfo.cs b/tests/ImageSharp.Benchmarks/Properties/AssemblyInfo.cs deleted file mode 100644 index 39f8b862d7..0000000000 --- a/tests/ImageSharp.Benchmarks/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using BenchmarkDotNet.Attributes; -using ImageSharp.Benchmarks; - -// 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.Benchmarks")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ImageSharp.Benchmarks")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[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("299d8e18-102c-42de-adbf-79098ee706a8")] - -[assembly: Config(typeof(Config))] \ No newline at end of file diff --git a/tests/ImageSharp.Benchmarks/project.json b/tests/ImageSharp.Benchmarks/project.json deleted file mode 100644 index 6a8be9f896..0000000000 --- a/tests/ImageSharp.Benchmarks/project.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "ImageSharp.Benchmarks Console Application", - "authors": [ "James.South" ], - "packOptions": { - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "emitEntryPoint": true, - "allowUnsafe": true - }, - "dependencies": { - "ImageSharp": { - "target": "project" - }, - "ImageSharp.Drawing": { - "target": "project" - }, - "ImageSharp.Drawing.Paths": { - "target": "project" - }, - "ImageSharp.Formats.Jpeg": { - "target": "project" - }, - "ImageSharp.Formats.Png": { - "target": "project" - }, - "ImageSharp.Formats.Bmp": { - "target": "project" - }, - "ImageSharp.Formats.Gif": { - "target": "project" - }, - "ImageSharp.Processing": { - "target": "project" - } - }, - "commands": { - "ImageSharp.Benchmarks": "ImageSharp.Benchmarks" - }, - "frameworks": { - "net46": { - "dependencies": { - "BenchmarkDotNet.Diagnostics.Windows": "0.10.1" - }, - "frameworkAssemblies": { - "System.Drawing": "" - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0-*" - }, - "BenchmarkDotNet": "0.10.2", - "CoreCompat.System.Drawing": "1.0.0-beta006", - "runtime.linux-x64.CoreCompat.System.Drawing": "1.0.0-beta009", - "System.Reflection": "4.3.0" - } - } - } -} diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj index 02318d0b43..23a5c59a30 100644 --- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj +++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj @@ -1,369 +1,32 @@ - - - - + - Debug - AnyCPU - {96188137-5FA6-4924-AB6E-4EFF79C6E0BB} Exe - Properties - ImageSharp - ImageSharp.Sandbox46 - v4.6.1 - 512 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - false - - - pdbonly - true - bin\Release\ - TRACE;BENCHMARKING - prompt - 4 - true + net461 + win7-x64 + True false - - - ImageSharp.Sandbox46.Program + ImageSharp.Sandbox46 + A cross-platform library for processing of image files written in C# + Copyright © James Jackson-South and contributors. + James Jackson-South and contributors + James Jackson-South - - ..\..\packages\BenchmarkDotNet.0.10.2\lib\net45\BenchmarkDotNet.dll - True - - - ..\..\packages\BenchmarkDotNet.Core.0.10.2\lib\net45\BenchmarkDotNet.Core.dll - True - - - ..\..\packages\BenchmarkDotNet.Diagnostics.Windows.0.10.2\lib\net45\BenchmarkDotNet.Diagnostics.Windows.dll - True - - - ..\..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.2\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll - True - - - - ..\..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll - True - - - ..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - ..\..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - True - - - - ..\..\packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - True - - - ..\..\packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll - True - - - ..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll - True - - - ..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - - - ..\..\packages\System.Numerics.Vectors.4.1.1\lib\net46\System.Numerics.Vectors.dll - True - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - True - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - - - ..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll - True - - - ..\..\packages\System.Threading.Tasks.Extensions.4.0.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll - True - - - - - - - - - ..\..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll - True - - - ..\..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll - True - - - ..\..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll - True - - - ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\net45\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\net45\xunit.execution.desktop.dll - True - + + - - ..\..\src\ImageSharp\bin\$(Configuration)\net461\ImageSharp.dll - - - ..\..\src\ImageSharp.Drawing\bin\$(Configuration)\net461\ImageSharp.Drawing.dll - - - ..\..\src\ImageSharp.Drawing.Paths\bin\$(Configuration)\net461\ImageSharp.Drawing.Paths.dll - - - ..\..\src\ImageSharp.Drawing.Paths\bin\$(Configuration)\net461\SixLabors.Shapes.dll - - - ..\..\src\ImageSharp.Formats.Bmp\bin\$(Configuration)\net461\ImageSharp.Formats.Bmp.dll - - - ..\..\src\ImageSharp.Formats.Gif\bin\$(Configuration)\net461\ImageSharp.Formats.Gif.dll - - - ..\..\src\ImageSharp.Formats.Jpeg\bin\$(Configuration)\net461\ImageSharp.Formats.Jpeg.dll - - - ..\..\src\ImageSharp.Formats.Png\bin\$(Configuration)\net461\ImageSharp.Formats.Png.dll - - - ..\..\src\ImageSharp.Processing\bin\$(Configuration)\net461\ImageSharp.Processing.dll - + + + + - - Tests\Colors\BulkPixelOperationsTests.cs - - - Tests\Common\BufferPointerTests.cs - - - Tests\Common\PinnedBufferTests.cs - - - Tests\Drawing\PolygonTests.cs - - - Tests\FileTestBase.cs - - - Tests\Formats\Jpg\BadEofJpegTests.cs - - - Tests\Formats\Jpg\Block8x8FTests.cs - - - Tests\Formats\Jpg\JpegDecoderTests.cs - - - Tests\Formats\Jpg\JpegEncoderTests.cs - - - Tests\Formats\Jpg\JpegProfilingBenchmarks.cs - - - Tests\Formats\Jpg\JpegUtilityTestFixture.cs - - - Tests\Formats\Jpg\JpegUtilsTests.cs - - - Tests\Formats\Jpg\ReferenceImplementations.cs - - - Tests\Formats\Jpg\ReferenceImplementationsTests.cs - - - Tests\Formats\Jpg\YCbCrImageTests.cs - - - Tests\MetaData\ImagePropertyTests.cs - - - Tests\Image\ImageTests.cs - - - Tests\Image\PixelAccessorTests.cs - - - Tests\Processors\Filters\ResizeTests.cs - - - Tests\TestBase.cs - - - Tests\TestFile.cs - - - Tests\TestImages.cs - - - Tests\TestUtilities\ApproximateFloatComparer.cs - - - Tests\TestUtilities\Attributes\ImageDataAttributeBase.cs - - - Tests\TestUtilities\Attributes\WithBlankImageAttribute.cs - - - Tests\TestUtilities\Attributes\WithFileAttribute.cs - - - Tests\TestUtilities\Attributes\WithFileCollectionAttribute.cs - - - Tests\TestUtilities\Attributes\WithMemberFactoryAttribute.cs - - - Tests\TestUtilities\Attributes\WithSolidFilledImagesAttribute.cs - - - Tests\TestUtilities\Factories\GenericFactory.cs - - - Tests\TestUtilities\Factories\ImageFactory.cs - - - Tests\TestUtilities\ImageProviders\BlankProvider.cs - - - Tests\TestUtilities\ImageProviders\FileProvider.cs - - - Tests\TestUtilities\ImageProviders\LambdaProvider.cs - - - Tests\TestUtilities\ImageProviders\SolidProvider.cs - - - Tests\TestUtilities\ImageProviders\TestImageProvider.cs - - - Tests\TestUtilities\ImagingTestCaseUtility.cs - - - Tests\TestUtilities\MeasureFixture.cs - - - Tests\TestUtilities\PixelTypes.cs - - - Tests\TestUtilities\Tests\TestImageProviderTests.cs - - - Tests\TestUtilities\Tests\TestUtilityExtensionsTests.cs - - - Tests\TestUtilities\TestUtilityExtensions.cs - - - + + + - - - - - - - - - - - - - + - - - - 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}. - - - - - - \ No newline at end of file diff --git a/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs b/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs index 51b205188d..a10fc12fe7 100644 --- a/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs +++ b/tests/ImageSharp.Sandbox46/Properties/AssemblyInfo.cs @@ -6,16 +6,6 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ImageSharp.Sandbox46")] -[assembly: AssemblyDescription("A cross-platform library for processing of image files written in C#")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ImageSharp.Sandbox46")] -[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 // COM, set the ComVisible attribute to true on that type. diff --git a/tests/ImageSharp.Sandbox46/packages.config b/tests/ImageSharp.Sandbox46/packages.config deleted file mode 100644 index 426f5f1b52..0000000000 --- a/tests/ImageSharp.Sandbox46/packages.config +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj new file mode 100644 index 0000000000..c6f916e00c --- /dev/null +++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj @@ -0,0 +1,22 @@ + + + netcoreapp1.1 + True + full + portable + True + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.xproj b/tests/ImageSharp.Tests/ImageSharp.Tests.xproj deleted file mode 100644 index d2c2d15a03..0000000000 --- a/tests/ImageSharp.Tests/ImageSharp.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f836e8e6-b4d9-4208-8346-140c74678b91 - ImageSharp.Tests - .\obj - .\bin\ - v4.5.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Properties/AssemblyInfo.cs b/tests/ImageSharp.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 3d57ceff5c..0000000000 --- a/tests/ImageSharp.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -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.Tests")] -[assembly: AssemblyDescription("A cross-platform library for processing of image files written in C#")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ImageSharp.Tests")] -[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 -// 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("f836e8e6-b4d9-4208-8346-140c74678b91")] diff --git a/tests/ImageSharp.Tests/TestBase.cs b/tests/ImageSharp.Tests/TestBase.cs index 2b92591eb7..c7514d5aee 100644 --- a/tests/ImageSharp.Tests/TestBase.cs +++ b/tests/ImageSharp.Tests/TestBase.cs @@ -6,6 +6,8 @@ namespace ImageSharp.Tests { using System.IO; + using System.Reflection; + using ImageSharp.Formats; /// @@ -23,7 +25,9 @@ namespace ImageSharp.Tests /// protected string CreateOutputDirectory(string path, params string[] pathParts) { - path = Path.Combine("TestOutput", path); + string assemblyLocation = typeof(TestFile).GetTypeInfo().Assembly.Location; + assemblyLocation = Path.GetDirectoryName(assemblyLocation); + path = Path.GetFullPath(Path.Combine(assemblyLocation, "../../../TestOutput", path)); if (pathParts != null && pathParts.Length > 0) { diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs index 0c9cc5f47c..42340dc44c 100644 --- a/tests/ImageSharp.Tests/TestFile.cs +++ b/tests/ImageSharp.Tests/TestFile.cs @@ -154,7 +154,8 @@ namespace ImageSharp.Tests "TestImages/Formats/", // Here for code coverage tests. "tests/ImageSharp.Tests/TestImages/Formats/", // from travis/build script "../../../ImageSharp.Tests/TestImages/Formats/", // from Sandbox46 - "../../../../TestImages/Formats/" + "../../../../TestImages/Formats/", + "../../../TestImages/Formats/" }; directories = directories.SelectMany(x => new[] diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs index 09c81b7610..1acb9e1492 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs @@ -154,7 +154,7 @@ namespace ImageSharp.Tests TestImageProvider.Blank(10, 20), TestImageProvider.Blank( 10, - 20) + 20), }; [Theory] diff --git a/tests/ImageSharp.Tests/project.json b/tests/ImageSharp.Tests/project.json deleted file mode 100644 index 7c67a5c706..0000000000 --- a/tests/ImageSharp.Tests/project.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "ImageSharp.Tests Class Library", - "authors": [ "James Jackson-South and contributors" ], - "packOptions": { - "projectUrl": "https://github.com/JimBobSquarePants/ImageSharp", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0", - "tags": [ - "Image Resize Crop Gif Jpg Jpeg Bitmap Png Core" - ] - }, - "buildOptions": { - "allowUnsafe": true - }, - "configurations": { - "Release": { - "buildOptions": { - "warningsAsErrors": true - } - } - }, - "dependencies": { - "ImageSharp": { - "target": "project" - }, - "xunit": "2.2.0-*", - "dotnet-test-xunit": "2.2.0-*", - "ImageSharp.Drawing": { - "target": "project" - }, - "ImageSharp.Drawing.Paths": { - "target": "project" - }, - "ImageSharp.Drawing.Text": { - "target": "project" - }, - "ImageSharp.Formats.Png": { - "target": "project" - }, - "ImageSharp.Formats.Jpeg": { - "target": "project" - }, - "ImageSharp.Formats.Bmp": { - "target": "project" - }, - "ImageSharp.Formats.Gif": { - "target": "project" - }, - "ImageSharp.Processing": { - "target": "project" - }, - //alpha supports netstandard - "Moq": "4.6.38-alpha" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-*" - }, - "Microsoft.CodeCoverage": "1.0.2" - } - }, - "net451": { - "dependencies": { - } - } - }, - "testRunner": "xunit" -} \ No newline at end of file