From ddadcebaa451c5a118728e3a9b5dd74eeda1f229 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Thu, 19 Jan 2017 10:24:01 +0100 Subject: [PATCH] Add a .NET 4.6.1 profile to use its System.Numerics.Vectors The downgrade from 4.6.1 to 4.6 in the benchmark is required to force the System.Numerics.Vectors dependency to NuGet. The 4.6.1 version does not contain the used generic vector type. Closes #81 --- src/ImageSharp.Drawing/project.json | 18 ++++++++++++++++-- src/ImageSharp.Formats.Bmp/project.json | 18 +++++++++++++++--- src/ImageSharp.Formats.Gif/project.json | 18 +++++++++++++++--- src/ImageSharp.Formats.Jpeg/project.json | 18 +++++++++++++++--- src/ImageSharp.Formats.Png/project.json | 18 +++++++++++++++--- src/ImageSharp.Processing/project.json | 18 +++++++++++++++--- src/ImageSharp/project.json | 18 +++++++++++++++--- tests/ImageSharp.Benchmarks/project.json | 2 +- 8 files changed, 107 insertions(+), 21 deletions(-) diff --git a/src/ImageSharp.Drawing/project.json b/src/ImageSharp.Drawing/project.json index ece92f438..a73dee21b 100644 --- a/src/ImageSharp.Drawing/project.json +++ b/src/ImageSharp.Drawing/project.json @@ -51,7 +51,6 @@ "type": "build" }, "System.Buffers": "4.0.0", - "System.Numerics.Vectors": "4.1.1", "System.Runtime.CompilerServices.Unsafe": "4.0.0" }, "frameworks": { @@ -63,6 +62,7 @@ "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", @@ -76,7 +76,21 @@ }, "net45": { "dependencies": { - "System.Runtime": "4.0.0" + "System.Numerics.Vectors": "4.1.1", + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" + } + }, + "net461": { + "dependencies": { + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.20.0", + "System.Numerics": "4.0.0.0", + "System.Numerics.Vectors": "4.0.0.0" } } } diff --git a/src/ImageSharp.Formats.Bmp/project.json b/src/ImageSharp.Formats.Bmp/project.json index 4ed92c7e5..fe7f487e9 100644 --- a/src/ImageSharp.Formats.Bmp/project.json +++ b/src/ImageSharp.Formats.Bmp/project.json @@ -47,7 +47,6 @@ "type": "build" }, "System.Buffers": "4.0.0", - "System.Numerics.Vectors": "4.1.1", "System.Runtime.CompilerServices.Unsafe": "4.0.0" }, "frameworks": { @@ -59,6 +58,7 @@ "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", @@ -72,9 +72,21 @@ }, "net45": { "dependencies": { - "System.Runtime": "4.0.0", - "System.IO": "4.0.0", + "System.Numerics.Vectors": "4.1.1", "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" + } + }, + "net461": { + "dependencies": { + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.20.0", + "System.Numerics": "4.0.0.0", + "System.Numerics.Vectors": "4.0.0.0" } } } diff --git a/src/ImageSharp.Formats.Gif/project.json b/src/ImageSharp.Formats.Gif/project.json index c0710a3e4..395ea77b8 100644 --- a/src/ImageSharp.Formats.Gif/project.json +++ b/src/ImageSharp.Formats.Gif/project.json @@ -47,7 +47,6 @@ "type": "build" }, "System.Buffers": "4.0.0", - "System.Numerics.Vectors": "4.1.1", "System.Runtime.CompilerServices.Unsafe": "4.0.0" }, "frameworks": { @@ -59,6 +58,7 @@ "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", @@ -72,9 +72,21 @@ }, "net45": { "dependencies": { - "System.Runtime": "4.0.0", - "System.IO": "4.0.0", + "System.Numerics.Vectors": "4.1.1", "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" + } + }, + "net461": { + "dependencies": { + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.20.0", + "System.Numerics": "4.0.0.0", + "System.Numerics.Vectors": "4.0.0.0" } } } diff --git a/src/ImageSharp.Formats.Jpeg/project.json b/src/ImageSharp.Formats.Jpeg/project.json index 6366f507e..e0fdeeef2 100644 --- a/src/ImageSharp.Formats.Jpeg/project.json +++ b/src/ImageSharp.Formats.Jpeg/project.json @@ -47,7 +47,6 @@ "type": "build" }, "System.Buffers": "4.0.0", - "System.Numerics.Vectors": "4.1.1", "System.Runtime.CompilerServices.Unsafe": "4.0.0" }, "frameworks": { @@ -59,6 +58,7 @@ "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", @@ -72,9 +72,21 @@ }, "net45": { "dependencies": { - "System.Runtime": "4.0.0", - "System.IO": "4.0.0", + "System.Numerics.Vectors": "4.1.1", "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" + } + }, + "net461": { + "dependencies": { + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.20.0", + "System.Numerics": "4.0.0.0", + "System.Numerics.Vectors": "4.0.0.0" } } } diff --git a/src/ImageSharp.Formats.Png/project.json b/src/ImageSharp.Formats.Png/project.json index bce68ddca..17dac2171 100644 --- a/src/ImageSharp.Formats.Png/project.json +++ b/src/ImageSharp.Formats.Png/project.json @@ -47,7 +47,6 @@ "type": "build" }, "System.Buffers": "4.0.0", - "System.Numerics.Vectors": "4.1.1", "System.Runtime.CompilerServices.Unsafe": "4.0.0" }, "frameworks": { @@ -59,6 +58,7 @@ "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", @@ -72,9 +72,21 @@ }, "net45": { "dependencies": { - "System.Runtime": "4.0.0", - "System.IO": "4.0.0", + "System.Numerics.Vectors": "4.1.1", "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" + } + }, + "net461": { + "dependencies": { + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.20.0", + "System.Numerics": "4.0.0.0", + "System.Numerics.Vectors": "4.0.0.0" } } } diff --git a/src/ImageSharp.Processing/project.json b/src/ImageSharp.Processing/project.json index eb3ea59db..9b96b5312 100644 --- a/src/ImageSharp.Processing/project.json +++ b/src/ImageSharp.Processing/project.json @@ -47,7 +47,6 @@ "type": "build" }, "System.Buffers": "4.0.0", - "System.Numerics.Vectors": "4.1.1", "System.Runtime.CompilerServices.Unsafe": "4.0.0" }, "frameworks": { @@ -59,6 +58,7 @@ "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", @@ -72,9 +72,21 @@ }, "net45": { "dependencies": { - "System.Runtime": "4.0.0", - "System.IO": "4.0.0", + "System.Numerics.Vectors": "4.1.1", "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" + } + }, + "net461": { + "dependencies": { + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.20.0", + "System.Numerics": "4.0.0.0", + "System.Numerics.Vectors": "4.0.0.0" } } } diff --git a/src/ImageSharp/project.json b/src/ImageSharp/project.json index 8ddaa8bcc..28cb7b409 100644 --- a/src/ImageSharp/project.json +++ b/src/ImageSharp/project.json @@ -43,7 +43,6 @@ "type": "build" }, "System.Buffers": "4.0.0", - "System.Numerics.Vectors": "4.1.1", "System.Runtime.CompilerServices.Unsafe": "4.0.0" }, "frameworks": { @@ -55,6 +54,7 @@ "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", @@ -68,9 +68,21 @@ }, "net45": { "dependencies": { - "System.Runtime": "4.0.0", - "System.IO": "4.0.0", + "System.Numerics.Vectors": "4.1.1", "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" + } + }, + "net461": { + "dependencies": { + "System.Threading.Tasks.Parallel": "4.0.0" + }, + "frameworkAssemblies": { + "System.Runtime": "4.0.20.0", + "System.Numerics": "4.0.0.0", + "System.Numerics.Vectors": "4.0.0.0" } } } diff --git a/tests/ImageSharp.Benchmarks/project.json b/tests/ImageSharp.Benchmarks/project.json index 10790bc15..8650a8af4 100644 --- a/tests/ImageSharp.Benchmarks/project.json +++ b/tests/ImageSharp.Benchmarks/project.json @@ -48,7 +48,7 @@ "ImageSharp.Benchmarks": "ImageSharp.Benchmarks" }, "frameworks": { - "net461": { + "net46": { "dependencies": { }, "frameworkAssemblies": {