Browse Source
Merge branch 'master' into js/buffered-read
pull/1574/head
James Jackson-South
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
10 additions and
11 deletions
-
Directory.Build.targets
-
tests/Directory.Build.targets
-
tests/ImageSharp.Tests/Formats/Tga/TgaTestUtils.cs
-
tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
|
|
|
@ -25,12 +25,16 @@ |
|
|
|
<!--Src Dependencies--> |
|
|
|
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/> |
|
|
|
<PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" /> |
|
|
|
<PackageReference Update="System.Buffers" Version="4.5.0" /> |
|
|
|
<PackageReference Update="System.Buffers" Version="4.5.1" /> |
|
|
|
<PackageReference Update="System.IO.Compression" Version="4.3.0" /> |
|
|
|
<PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" /> |
|
|
|
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" /> |
|
|
|
<!-- |
|
|
|
Do no update System.Memory as it currently breaks the CI build |
|
|
|
with FileNotFoundException for SixLabors.ImageSharp.Tests.dll.config |
|
|
|
--> |
|
|
|
<PackageReference Update="System.Memory" Version="4.5.3" /> |
|
|
|
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7" /> |
|
|
|
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" /> |
|
|
|
<PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" /> |
|
|
|
<PackageReference Update="System.ValueTuple" Version="4.5.0" /> |
|
|
|
|
|
|
|
|
|
|
|
@ -25,14 +25,14 @@ |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<!--Test Dependencies--> |
|
|
|
<PackageReference Update="BenchmarkDotNet" Version="0.12.0" /> |
|
|
|
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.0" Condition="'$(OS)' == 'Windows_NT'" /> |
|
|
|
<PackageReference Update="Colourful" Version="2.0.3" /> |
|
|
|
<PackageReference Update="BenchmarkDotNet" Version="0.12.1" /> |
|
|
|
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" Condition="'$(OS)' == 'Windows_NT'" /> |
|
|
|
<PackageReference Update="Colourful" Version="2.0.5" /> |
|
|
|
<PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All"/> |
|
|
|
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.15.5" /> |
|
|
|
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20069.1" /> |
|
|
|
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0-preview-20200116-01" /> |
|
|
|
<PackageReference Update="Moq" Version="4.10.0" /> |
|
|
|
<PackageReference Update="Moq" Version="4.14.5" /> |
|
|
|
<PackageReference Update="Pfim" Version="0.9.1" /> |
|
|
|
<PackageReference Update="SharpZipLib" Version="1.2.0" /> |
|
|
|
<PackageReference Update="System.Drawing.Common" Version="4.7.0" /> |
|
|
|
|
|
|
|
@ -5,8 +5,6 @@ using System; |
|
|
|
using System.IO; |
|
|
|
|
|
|
|
using ImageMagick; |
|
|
|
|
|
|
|
using SixLabors.ImageSharp.Advanced; |
|
|
|
using SixLabors.ImageSharp.PixelFormats; |
|
|
|
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; |
|
|
|
using Xunit; |
|
|
|
|
|
|
|
@ -3,12 +3,9 @@ |
|
|
|
|
|
|
|
using System; |
|
|
|
using System.IO; |
|
|
|
using System.Runtime.CompilerServices; |
|
|
|
using System.Runtime.InteropServices; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using ImageMagick; |
|
|
|
|
|
|
|
using SixLabors.ImageSharp.Advanced; |
|
|
|
using SixLabors.ImageSharp.Formats; |
|
|
|
using SixLabors.ImageSharp.Memory; |
|
|
|
using SixLabors.ImageSharp.PixelFormats; |
|
|
|
|