From 893b73e1bc953a13736f7807ccd1724f0ff18919 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Sun, 29 Jan 2017 19:58:37 +1100 Subject: [PATCH] Working build --- ImageSharp.sln | 157 ++++++++++++++---- build/build.csproj | 26 +++ build/build.xproj | 25 --- build/project.json | 22 --- global.json | 6 - .../ImageSharp.Drawing.csproj | 66 ++++++++ .../ImageSharp.Drawing.xproj | 25 --- src/ImageSharp.Drawing/project.json | 97 ----------- .../ImageSharp.Formats.Bmp.csproj | 65 ++++++++ .../ImageSharp.Formats.Bmp.xproj | 25 --- src/ImageSharp.Formats.Bmp/project.json | 93 ----------- .../ImageSharp.Formats.Gif.csproj | 65 ++++++++ .../ImageSharp.Formats.Gif.xproj | 25 --- src/ImageSharp.Formats.Gif/project.json | 93 ----------- .../ImageSharp.Formats.Jpeg.csproj | 65 ++++++++ .../ImageSharp.Formats.Jpeg.xproj | 25 --- src/ImageSharp.Formats.Jpeg/project.json | 93 ----------- .../ImageSharp.Formats.Png.csproj | 65 ++++++++ .../ImageSharp.Formats.Png.xproj | 25 --- src/ImageSharp.Formats.Png/project.json | 93 ----------- .../ImageSharp.Processing.csproj | 65 ++++++++ .../ImageSharp.Processing.xproj | 25 --- src/ImageSharp.Processing/project.json | 93 ----------- src/ImageSharp/ImageSharp.csproj | 62 +++++++ src/ImageSharp/ImageSharp.xproj | 25 --- src/ImageSharp/project.json | 89 ---------- tests/ImageSharp.Benchmarks/Benchmark.cmd | 3 - .../ImageSharp.Benchmarks.csproj | 22 +++ .../ImageSharp.Benchmarks.xproj | 19 --- tests/ImageSharp.Benchmarks/Program.cs | 2 - .../Properties/AssemblyInfo.cs | 27 --- tests/ImageSharp.Benchmarks/project.json | 59 ------- .../ImageSharp.Tests/ImageSharp.Tests.csproj | 23 +++ tests/ImageSharp.Tests/ImageSharp.Tests.xproj | 22 --- .../Properties/AssemblyInfo.cs | 23 --- tests/ImageSharp.Tests/TestBase.cs | 6 +- tests/ImageSharp.Tests/project.json | 70 -------- 37 files changed, 653 insertions(+), 1138 deletions(-) create mode 100644 build/build.csproj delete mode 100644 build/build.xproj delete mode 100644 build/project.json delete mode 100644 global.json create mode 100644 src/ImageSharp.Drawing/ImageSharp.Drawing.csproj delete mode 100644 src/ImageSharp.Drawing/ImageSharp.Drawing.xproj delete mode 100644 src/ImageSharp.Drawing/project.json create mode 100644 src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.csproj delete mode 100644 src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.xproj delete mode 100644 src/ImageSharp.Formats.Bmp/project.json create mode 100644 src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.csproj delete mode 100644 src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.xproj delete mode 100644 src/ImageSharp.Formats.Gif/project.json create mode 100644 src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.csproj delete mode 100644 src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.xproj delete mode 100644 src/ImageSharp.Formats.Jpeg/project.json create mode 100644 src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.csproj delete mode 100644 src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.xproj delete mode 100644 src/ImageSharp.Formats.Png/project.json create mode 100644 src/ImageSharp.Processing/ImageSharp.Processing.csproj delete mode 100644 src/ImageSharp.Processing/ImageSharp.Processing.xproj delete mode 100644 src/ImageSharp.Processing/project.json create mode 100644 src/ImageSharp/ImageSharp.csproj delete mode 100644 src/ImageSharp/ImageSharp.xproj delete mode 100644 src/ImageSharp/project.json delete mode 100644 tests/ImageSharp.Benchmarks/Benchmark.cmd create mode 100644 tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj delete mode 100644 tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.xproj delete mode 100644 tests/ImageSharp.Benchmarks/Properties/AssemblyInfo.cs delete mode 100644 tests/ImageSharp.Benchmarks/project.json create mode 100644 tests/ImageSharp.Tests/ImageSharp.Tests.csproj delete mode 100644 tests/ImageSharp.Tests/ImageSharp.Tests.xproj delete mode 100644 tests/ImageSharp.Tests/Properties/AssemblyInfo.cs delete mode 100644 tests/ImageSharp.Tests/project.json diff --git a/ImageSharp.sln b/ImageSharp.sln index f1e9fb104..97021cffe 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.26127.0 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,31 +25,32 @@ 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}" +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("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Bmp", "src\ImageSharp.Formats.Bmp\ImageSharp.Formats.Bmp.xproj", "{C77661B9-F793-422E-8E27-AC60ECC5F215}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp", "src\ImageSharp\ImageSharp.csproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Gif", "src\ImageSharp.Formats.Gif\ImageSharp.Formats.Gif.xproj", "{27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{2E33181E-6E28-4662-A801-E2E7DC206029}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Jpeg", "src\ImageSharp.Formats.Jpeg\ImageSharp.Formats.Jpeg.xproj", "{7213767C-0003-41CA-AB18-0223CFA7CE4B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "build", "build\build.csproj", "{575A5002-DD9F-4335-AA47-1DD87FA13645}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Formats.Png", "src\ImageSharp.Formats.Png\ImageSharp.Formats.Png.xproj", "{556ABDCF-ED93-4327-BE98-F6815F78B9B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Formats.Bmp", "src\ImageSharp.Formats.Bmp\ImageSharp.Formats.Bmp.csproj", "{C77661B9-F793-422E-8E27-AC60ECC5F215}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageSharp.Processing", "src\ImageSharp.Processing\ImageSharp.Processing.xproj", "{A623CFE9-9D2B-4528-AD1F-2E834B061134}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Formats.Gif", "src\ImageSharp.Formats.Gif\ImageSharp.Formats.Gif.csproj", "{27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}" 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 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Formats.Jpeg", "src\ImageSharp.Formats.Jpeg\ImageSharp.Formats.Jpeg.csproj", "{7213767C-0003-41CA-AB18-0223CFA7CE4B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Formats.Png", "src\ImageSharp.Formats.Png\ImageSharp.Formats.Png.csproj", "{556ABDCF-ED93-4327-BE98-F6815F78B9B8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Processing", "src\ImageSharp.Processing\ImageSharp.Processing.csproj", "{A623CFE9-9D2B-4528-AD1F-2E834B061134}" 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} @@ -65,64 +60,159 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Sandbox46", "tes {A623CFE9-9D2B-4528-AD1F-2E834B061134} = {A623CFE9-9D2B-4528-AD1F-2E834B061134} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Tests", "tests\ImageSharp.Tests\ImageSharp.Tests.csproj", "{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Benchmarks", "tests\ImageSharp.Benchmarks\ImageSharp.Benchmarks.csproj", "{2BF743D8-2A06-412D-96D7-F448F00C5EA5}" +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|x64 + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|x64.Build.0 = Debug|x64 + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|x86.ActiveCfg = Debug|x86 + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Debug|x86.Build.0 = Debug|x86 {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|x64 + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|x64.Build.0 = Release|x64 + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|x86.ActiveCfg = Release|x86 + {2AA31A1F-142C-43F4-8687-09ABCA4B3A26}.Release|x86.Build.0 = Release|x86 {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|x64 + {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.Build.0 = Debug|x64 + {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.ActiveCfg = Debug|x86 + {2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.Build.0 = Debug|x86 {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|x64 + {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.Build.0 = Release|x64 + {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.ActiveCfg = Release|x86 + {2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.Build.0 = Release|x86 {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|x64 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|x64.Build.0 = Debug|x64 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|x86.ActiveCfg = Debug|x86 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Debug|x86.Build.0 = Debug|x86 {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 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x64.ActiveCfg = Release|x64 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x64.Build.0 = Release|x64 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x86.ActiveCfg = Release|x86 + {575A5002-DD9F-4335-AA47-1DD87FA13645}.Release|x86.Build.0 = Release|x86 {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}.Debug|x64.ActiveCfg = Debug|x64 + {C77661B9-F793-422E-8E27-AC60ECC5F215}.Debug|x64.Build.0 = Debug|x64 + {C77661B9-F793-422E-8E27-AC60ECC5F215}.Debug|x86.ActiveCfg = Debug|x86 + {C77661B9-F793-422E-8E27-AC60ECC5F215}.Debug|x86.Build.0 = Debug|x86 {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 + {C77661B9-F793-422E-8E27-AC60ECC5F215}.Release|x64.ActiveCfg = Release|x64 + {C77661B9-F793-422E-8E27-AC60ECC5F215}.Release|x64.Build.0 = Release|x64 + {C77661B9-F793-422E-8E27-AC60ECC5F215}.Release|x86.ActiveCfg = Release|x86 + {C77661B9-F793-422E-8E27-AC60ECC5F215}.Release|x86.Build.0 = Release|x86 {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}.Debug|x64.ActiveCfg = Debug|x64 + {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Debug|x64.Build.0 = Debug|x64 + {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Debug|x86.ActiveCfg = Debug|x86 + {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Debug|x86.Build.0 = Debug|x86 {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 + {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Release|x64.ActiveCfg = Release|x64 + {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Release|x64.Build.0 = Release|x64 + {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Release|x86.ActiveCfg = Release|x86 + {27AD4B5F-ECC4-4C63-9ECB-04EC772FDB6F}.Release|x86.Build.0 = Release|x86 {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}.Debug|x64.ActiveCfg = Debug|x64 + {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Debug|x64.Build.0 = Debug|x64 + {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Debug|x86.ActiveCfg = Debug|x86 + {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Debug|x86.Build.0 = Debug|x86 {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 + {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Release|x64.ActiveCfg = Release|x64 + {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Release|x64.Build.0 = Release|x64 + {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Release|x86.ActiveCfg = Release|x86 + {7213767C-0003-41CA-AB18-0223CFA7CE4B}.Release|x86.Build.0 = Release|x86 {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}.Debug|x64.ActiveCfg = Debug|x64 + {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Debug|x64.Build.0 = Debug|x64 + {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Debug|x86.ActiveCfg = Debug|x86 + {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Debug|x86.Build.0 = Debug|x86 {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 + {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Release|x64.ActiveCfg = Release|x64 + {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Release|x64.Build.0 = Release|x64 + {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Release|x86.ActiveCfg = Release|x86 + {556ABDCF-ED93-4327-BE98-F6815F78B9B8}.Release|x86.Build.0 = Release|x86 {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}.Debug|x64.ActiveCfg = Debug|x64 + {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Debug|x64.Build.0 = Debug|x64 + {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Debug|x86.ActiveCfg = Debug|x86 + {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Debug|x86.Build.0 = Debug|x86 {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 + {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Release|x64.ActiveCfg = Release|x64 + {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Release|x64.Build.0 = Release|x64 + {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Release|x86.ActiveCfg = Release|x86 + {A623CFE9-9D2B-4528-AD1F-2E834B061134}.Release|x86.Build.0 = Release|x86 {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 + {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 + {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|x64 + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.Build.0 = Debug|x64 + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.ActiveCfg = Debug|x86 + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.Build.0 = Debug|x86 + {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|x64 + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.Build.0 = Release|x64 + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.ActiveCfg = Release|x86 + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.Build.0 = Release|x86 + {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|x64 + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|x64.Build.0 = Debug|x64 + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|x86.ActiveCfg = Debug|x86 + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Debug|x86.Build.0 = Debug|x86 + {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|x64 + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x64.Build.0 = Release|x64 + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x86.ActiveCfg = Release|x86 + {2BF743D8-2A06-412D-96D7-F448F00C5EA5}.Release|x86.Build.0 = Release|x86 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} @@ -130,7 +220,8 @@ Global {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} {96188137-5FA6-4924-AB6E-4EFF79C6E0BB} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} + {EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} + {2BF743D8-2A06-412D-96D7-F448F00C5EA5} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} EndGlobalSection EndGlobal diff --git a/build/build.csproj b/build/build.csproj new file mode 100644 index 000000000..38e641599 --- /dev/null +++ b/build/build.csproj @@ -0,0 +1,26 @@ + + + net46 + win7-x64 + portable + true + build + Exe + build + ..\ImageSharp.ruleset + + + + + + + + + All + + + + + + + \ No newline at end of file diff --git a/build/build.xproj b/build/build.xproj deleted file mode 100644 index 3b85ca872..000000000 --- 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 cf95cc8a0..000000000 --- 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/global.json b/global.json deleted file mode 100644 index 7346bdc28..000000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src" ], - "sdk": { - "version": "1.0.0-preview2-003121" - } -} \ 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 000000000..fc36e7ed5 --- /dev/null +++ b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj @@ -0,0 +1,66 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp.Drawing + 1.0.0-alpha1 + James Jackson-South and contributors + netstandard1.1;net45;net461 + true + true + ImageSharp.Drawing + ImageSharp.Drawing + 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 + + + + + + + + + + + + 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 488f86bc7..000000000 --- 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/project.json b/src/ImageSharp.Drawing/project.json deleted file mode 100644 index 04a560170..000000000 --- a/src/ImageSharp.Drawing/project.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "version": "1.0.0-alpha1-*", - "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", - "version": "1.0.0-*" - }, - "ImageSharp.Processing": { - "target": "project", - "version": "1.0.0-*" - }, - "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", - "System.Numerics.Vectors": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.csproj b/src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.csproj new file mode 100644 index 000000000..9caa41643 --- /dev/null +++ b/src/ImageSharp.Formats.Bmp/ImageSharp.Formats.Bmp.csproj @@ -0,0 +1,65 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp.Formats.Bmp + 1.0.0-alpha1 + James Jackson-South and contributors + netstandard1.1;net45;net461 + true + true + ImageSharp.Formats.Bmp + ImageSharp.Formats.Bmp + 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 + + + + + + + + + + + All + + + + + + + + + + + + + + + + ..\..\ImageSharp.ruleset + + + true + + + + + + + + + \ 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 94916399b..000000000 --- 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/project.json b/src/ImageSharp.Formats.Bmp/project.json deleted file mode 100644 index 575e414aa..000000000 --- a/src/ImageSharp.Formats.Bmp/project.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "version": "1.0.0-alpha1-*", - "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", - "System.Numerics.Vectors": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.csproj b/src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.csproj new file mode 100644 index 000000000..2890e58a8 --- /dev/null +++ b/src/ImageSharp.Formats.Gif/ImageSharp.Formats.Gif.csproj @@ -0,0 +1,65 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp.Formats.Gif + 1.0.0-alpha1 + James Jackson-South and contributors + netstandard1.1;net45;net461 + true + true + ImageSharp.Formats.Gif + ImageSharp.Formats.Gif + 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 + + + + + + + + + + + All + + + + + + + + + + + + + + + + ..\..\ImageSharp.ruleset + + + true + + + + + + + + + \ 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 d11c20c48..000000000 --- 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/project.json b/src/ImageSharp.Formats.Gif/project.json deleted file mode 100644 index e12d3c733..000000000 --- a/src/ImageSharp.Formats.Gif/project.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "version": "1.0.0-alpha1-*", - "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", - "System.Numerics.Vectors": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.csproj b/src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.csproj new file mode 100644 index 000000000..e249c58f2 --- /dev/null +++ b/src/ImageSharp.Formats.Jpeg/ImageSharp.Formats.Jpeg.csproj @@ -0,0 +1,65 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp.Formats.Jpeg + 1.0.0-alpha1 + James Jackson-South and contributors + netstandard1.1;net45;net461 + true + true + ImageSharp.Formats.Jpeg + ImageSharp.Formats.Jpeg + 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 + + + + + + + + + + + All + + + + + + + + + + + + + + + + ..\..\ImageSharp.ruleset + + + true + + + + + + + + + \ 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 a22dc5ea3..000000000 --- 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/project.json b/src/ImageSharp.Formats.Jpeg/project.json deleted file mode 100644 index de16f6c1c..000000000 --- a/src/ImageSharp.Formats.Jpeg/project.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "version": "1.0.0-alpha1-*", - "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", - "System.Numerics.Vectors": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.csproj b/src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.csproj new file mode 100644 index 000000000..83a48cd2f --- /dev/null +++ b/src/ImageSharp.Formats.Png/ImageSharp.Formats.Png.csproj @@ -0,0 +1,65 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp.Formats.Png + 1.0.0-alpha1 + James Jackson-South and contributors + netstandard1.1;net45;net461 + true + true + ImageSharp.Formats.Png + ImageSharp.Formats.Png + 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 + + + + + + + + + + + All + + + + + + + + + + + + + + + + ..\..\ImageSharp.ruleset + + + true + + + + + + + + + \ 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 f12901d6b..000000000 --- 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/project.json b/src/ImageSharp.Formats.Png/project.json deleted file mode 100644 index eac71d8c7..000000000 --- a/src/ImageSharp.Formats.Png/project.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "version": "1.0.0-alpha1-*", - "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", - "System.Numerics.Vectors": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp.Processing/ImageSharp.Processing.csproj b/src/ImageSharp.Processing/ImageSharp.Processing.csproj new file mode 100644 index 000000000..cd051d1b8 --- /dev/null +++ b/src/ImageSharp.Processing/ImageSharp.Processing.csproj @@ -0,0 +1,65 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp.Processing + 1.0.0-alpha1 + James Jackson-South and contributors + netstandard1.1;net45;net461 + true + true + ImageSharp.Processing + ImageSharp.Processing + 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 + + + + + + + + + + + All + + + + + + + + + + + + + + + + ..\..\ImageSharp.ruleset + + + true + + + + + + + + + \ 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 1fdba5ce9..000000000 --- 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/project.json b/src/ImageSharp.Processing/project.json deleted file mode 100644 index 2ff224fa4..000000000 --- a/src/ImageSharp.Processing/project.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "version": "1.0.0-alpha1-*", - "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", - "version": "1.0.0-alpha1" - }, - "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", - "System.Numerics.Vectors": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj new file mode 100644 index 000000000..da8586a3e --- /dev/null +++ b/src/ImageSharp/ImageSharp.csproj @@ -0,0 +1,62 @@ + + + A cross-platform library for the processing of image files; written in C# + ImageSharp + 1.0.0-alpha1 + James Jackson-South and contributors + netstandard1.1;net45;net461 + 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 + + + + + + + + All + + + + + + + + + + + + + + + + ..\..\ImageSharp.ruleset + + + true + + + + + + + + + \ No newline at end of file diff --git a/src/ImageSharp/ImageSharp.xproj b/src/ImageSharp/ImageSharp.xproj deleted file mode 100644 index bf2f6a67b..000000000 --- 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/project.json b/src/ImageSharp/project.json deleted file mode 100644 index 117d32090..000000000 --- a/src/ImageSharp/project.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "version": "1.0.0-alpha1-*", - "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.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", - "System.Numerics.Vectors": "4.0.0.0" - } - } - } -} \ No newline at end of file diff --git a/tests/ImageSharp.Benchmarks/Benchmark.cmd b/tests/ImageSharp.Benchmarks/Benchmark.cmd deleted file mode 100644 index f777e5b8f..000000000 --- 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 000000000..142825c55 --- /dev/null +++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj @@ -0,0 +1,22 @@ + + + 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 184faefd8..000000000 --- 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/Program.cs b/tests/ImageSharp.Benchmarks/Program.cs index 8c609f015..7ecf63274 100644 --- a/tests/ImageSharp.Benchmarks/Program.cs +++ b/tests/ImageSharp.Benchmarks/Program.cs @@ -7,8 +7,6 @@ namespace ImageSharp.Benchmarks { using BenchmarkDotNet.Running; - using ImageSharp.Formats; - public class Program { /// diff --git a/tests/ImageSharp.Benchmarks/Properties/AssemblyInfo.cs b/tests/ImageSharp.Benchmarks/Properties/AssemblyInfo.cs deleted file mode 100644 index 39f8b862d..000000000 --- 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 8650a8af4..000000000 --- a/tests/ImageSharp.Benchmarks/project.json +++ /dev/null @@ -1,59 +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": { - "BenchmarkDotNet.Diagnostics.Windows": "0.10.1", - "ImageSharp": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Drawing": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Jpeg": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Png": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Bmp": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Gif": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Processing": { - "target": "project", - "version": "1.0.0-*" - } - }, - "commands": { - "ImageSharp.Benchmarks": "ImageSharp.Benchmarks" - }, - "frameworks": { - "net46": { - "dependencies": { - }, - "frameworkAssemblies": { - "System.Drawing": "" - } - } - } -} diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj new file mode 100644 index 000000000..198f0f33f --- /dev/null +++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj @@ -0,0 +1,23 @@ + + + netcoreapp1.0 + 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 d2c2d15a0..000000000 --- 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 3d57ceff5..000000000 --- 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 2b92591eb..c7514d5ae 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/project.json b/tests/ImageSharp.Tests/project.json deleted file mode 100644 index 9f9c0c715..000000000 --- a/tests/ImageSharp.Tests/project.json +++ /dev/null @@ -1,70 +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", - "version": "1.0.0-*" - }, - "xunit": "2.2.0-*", - "dotnet-test-xunit": "2.2.0-*", - "ImageSharp.Drawing": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Png": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Jpeg": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Bmp": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Formats.Gif": { - "target": "project", - "version": "1.0.0-*" - }, - "ImageSharp.Processing": { - "target": "project", - "version": "1.0.0-*" - } - }, - "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