From 88999c70b4cac8cb366f2caace647846c18e0320 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Sun, 12 Mar 2017 10:18:18 +0000 Subject: [PATCH] update sandbox --- .travis.yml | 2 +- ImageSharp.sln | 15 + .../ImageSharp.Sandbox46.csproj | 405 +----------------- tests/ImageSharp.Sandbox46/packages.config | 61 --- 4 files changed, 29 insertions(+), 454 deletions(-) delete mode 100644 tests/ImageSharp.Sandbox46/packages.config diff --git a/.travis.yml b/.travis.yml index 507fd4b9df..af8d4ad9de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ matrix: dist: trusty sudo: required dotnet: 1.0.1 -# mono: latest + mono: latest # - os: osx # OSX 10.11 # osx_image: xcode7.3.1 # dotnet: 1.0.0-preview2-003121 diff --git a/ImageSharp.sln b/ImageSharp.sln index 320c01e9ca..9c729493b2 100644 --- a/ImageSharp.sln +++ b/ImageSharp.sln @@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Tests", "tests\I EndProject 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 @@ -113,6 +115,18 @@ Global {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 + {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 @@ -124,5 +138,6 @@ Global {575A5002-DD9F-4335-AA47-1DD87FA13645} = {E919DF0B-2607-4462-8FC0-5C98FE50F8C9} {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} EndGlobalSection EndGlobal diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj index 8837f8733a..e6a2e162fc 100644 --- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj +++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj @@ -1,403 +1,24 @@ - - - - + - 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 - - - - ..\..\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 - - - - - - - - - - - - - + + - - + + + + - - {2e33181e-6e28-4662-a801-e2e7dc206029} - ImageSharp.Drawing - - - {c77661b9-f793-422e-8e27-ac60ecc5f215} - ImageSharp.Formats.Bmp - - - {27ad4b5f-ecc4-4c63-9ecb-04ec772fdb6f} - ImageSharp.Formats.Gif - - - {7213767c-0003-41ca-ab18-0223cfa7ce4b} - ImageSharp.Formats.Jpeg - - - {556abdcf-ed93-4327-be98-f6815f78b9b8} - ImageSharp.Formats.Png - - - {a623cfe9-9d2b-4528-ad1f-2e834b061134} - ImageSharp.Processing - - - {2aa31a1f-142c-43f4-8687-09abca4b3a26} - ImageSharp - - - {2bf743d8-2a06-412d-96d7-f448f00c5ea5} - ImageSharp.Benchmarks - + + + - - - - 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/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