huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-08 06:48:41 -07:00
parent e07008ddec b50cd32b8e
commit fd0505ffae
7 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Microsoft.AspNetCore.Http.Abstractions/project.json
View File

@ -27,7 +27,9 @@
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": { "type": "build" }
"System.Runtime": {
"type": "build"
}
}
},
"netstandard1.3": {
@ -36,10 +38,7 @@
"System.Linq.Expressions": "4.0.11-*",
"System.Reflection.TypeExtensions": "4.1.0-*",
"System.Runtime.InteropServices": "4.1.0-*"
},
"imports": [
"dotnet5.4"
]
}
}
}
}

7
src/Microsoft.AspNetCore.Http.Extensions/project.json
View File

@ -23,14 +23,11 @@
"System.Buffers": "4.0.0-*"
},
"frameworks": {
"net451": { },
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.IO.FileSystem": "4.0.1-*"
},
"imports": [
"dotnet5.4"
]
}
}
}
}

7
src/Microsoft.AspNetCore.Http.Features/project.json
View File

@ -20,7 +20,7 @@
"Microsoft.Extensions.Primitives": "1.0.0-*"
},
"frameworks": {
"net451": { },
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.Collections": "4.0.11-*",
@ -32,10 +32,7 @@
"System.Security.Claims": "4.0.1-*",
"System.Security.Cryptography.X509Certificates": "4.1.0-*",
"System.Security.Principal": "4.0.1-*"
},
"imports": [
"dotnet5.4"
]
}
}
}
}

7
src/Microsoft.AspNetCore.Http/project.json
View File

@ -25,14 +25,11 @@
"System.Buffers": "4.0.0-*"
},
"frameworks": {
"net451": { },
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.Threading": "4.0.11-*"
},
"imports": [
"dotnet5.4"
]
}
}
}
}

8
src/Microsoft.AspNetCore.Owin/project.json
View File

@ -22,11 +22,7 @@
"Microsoft.AspNetCore.Http": "1.0.0-*"
},
"frameworks": {
"net451": { },
"netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
"net451": {},
"netstandard1.3": {}
}
}

9
src/Microsoft.AspNetCore.WebUtilities/project.json
View File

@ -24,7 +24,9 @@
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": { "type": "build" }
"System.Runtime": {
"type": "build"
}
}
},
"netstandard1.3": {
@ -32,10 +34,7 @@
"System.Collections": "4.0.11-*",
"System.IO": "4.1.0-*",
"System.IO.FileSystem": "4.0.1-*"
},
"imports": [
"dotnet5.4"
]
}
}
}
}

7
src/Microsoft.Net.Http.Headers/project.json
View File

@ -16,7 +16,7 @@
],
"xmlDoc": true
},
"dependencies": { },
"dependencies": {},
"frameworks": {
"netstandard1.1": {
"dependencies": {
@ -28,10 +28,7 @@
"System.Runtime.Extensions": "4.1.0-*",
"System.Text.Encoding": "4.0.11-*",
"System.Buffers": "4.0.0-*"
},
"imports": [
"dotnet5.2"
]
}
}
}
}