tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/JimBobSquarePants/ImageSharp

pull/97/head
Anton Firszov 9 years ago
parent
14550c983c 69d88ef972
commit
524579b9a2
8 changed files with 107 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/ImageSharp.Drawing/project.json
  2. 18
      src/ImageSharp.Formats.Bmp/project.json
  3. 18
      src/ImageSharp.Formats.Gif/project.json
  4. 18
      src/ImageSharp.Formats.Jpeg/project.json
  5. 18
      src/ImageSharp.Formats.Png/project.json
  6. 18
      src/ImageSharp.Processing/project.json
  7. 18
      src/ImageSharp/project.json
  8. 2
      tests/ImageSharp.Benchmarks/project.json

18
src/ImageSharp.Drawing/project.json
View File

@ -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"
}
}
}

18
src/ImageSharp.Formats.Bmp/project.json
View File

@ -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"
}
}
}

18
src/ImageSharp.Formats.Gif/project.json
View File

@ -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"
}
}
}

18
src/ImageSharp.Formats.Jpeg/project.json
View File

@ -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"
}
}
}

18
src/ImageSharp.Formats.Png/project.json
View File

@ -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"
}
}
}

18
src/ImageSharp.Processing/project.json
View File

@ -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"
}
}
}

18
src/ImageSharp/project.json
View File

@ -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"
}
}
}

2
tests/ImageSharp.Benchmarks/project.json
View File

@ -48,7 +48,7 @@
"ImageSharp.Benchmarks": "ImageSharp.Benchmarks"
},
"frameworks": {
"net461": {
"net46": {
"dependencies": {
},
"frameworkAssemblies": {

Write Preview
Loading…
Cancel
Save