Browse Source

Merge branch 'refs/heads/pr/364' into Core

# Conflicts:
#	src/ImageProcessorCore/project.json


Former-commit-id: e3755256bf6f52070b9531149247f33a12fc5b2c
Former-commit-id: 62b10b005875fcf43c12a396579b73fc88c4f221
Former-commit-id: d9c80607dbfaf5f846afc14a2ed28e57cc8e97c0
pull/1/head
James Jackson-South 11 years ago
parent
commit
c579fefe23
  1. 16
      src/ImageProcessorCore/project.json

16
src/ImageProcessorCore/project.json

@ -11,8 +11,10 @@
"compilationOptions": { "compilationOptions": {
"allowUnsafe": true "allowUnsafe": true
}, },
"projectUrl": "", "projectUrl": "https://github.com/JimBobSquarePants/ImageProcessor",
"licenseUrl": "", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"frameworks": {
"dotnet5.5": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-beta-23516", "System.Collections": "4.0.11-beta-23516",
"System.Linq": "4.0.1-beta-23516", "System.Linq": "4.0.1-beta-23516",
@ -25,12 +27,14 @@
"System.IO": "4.0.11-beta-23516", "System.IO": "4.0.11-beta-23516",
"Microsoft.NETCore": "5.0.1-beta-23516", "Microsoft.NETCore": "5.0.1-beta-23516",
"Microsoft.NETCore.Platforms": "1.0.1-beta-23516" "Microsoft.NETCore.Platforms": "1.0.1-beta-23516"
}
},
"net452": {
"dependencies": {
"System.Numerics.Vectors": "4.0.0"
}, },
"frameworks": {
"dotnet5.5": { },
"dnx46": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Runtime": "4.0.0.0" "System.Runtime": ""
} }
} }
} }

Loading…
Cancel
Save