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:39 -07:00
parent c971250f2e 31732c3d91
commit 2fbbeb75c6
6 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Microsoft.AspNetCore.Cryptography.Internal/project.json
View File

@ -9,9 +9,9 @@
"type": "git", "type": "git",
"url": "git://github.com/aspnet/dataprotection" "url": "git://github.com/aspnet/dataprotection"
}, },
"dependencies": { }, "dependencies": {},
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"netstandard1.3": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Diagnostics.Debug": "4.0.11-*", "System.Diagnostics.Debug": "4.0.11-*",
@ -20,10 +20,7 @@
"System.Runtime.InteropServices": "4.1.0-*", "System.Runtime.InteropServices": "4.1.0-*",
"System.Security.Cryptography.Primitives": "4.0.0-*", "System.Security.Cryptography.Primitives": "4.0.0-*",
"System.Threading": "4.0.11-*" "System.Threading": "4.0.11-*"
}, }
"imports": [
"dotnet5.4"
]
} }
}, },
"compilationOptions": { "compilationOptions": {

7
src/Microsoft.AspNetCore.Cryptography.KeyDerivation/project.json
View File

@ -13,16 +13,13 @@
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*" "Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"netstandard1.3": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Runtime.Extensions": "4.1.0-*", "System.Runtime.Extensions": "4.1.0-*",
"System.Security.Cryptography.Algorithms": "4.1.0-*", "System.Security.Cryptography.Algorithms": "4.1.0-*",
"System.Text.Encoding.Extensions": "4.0.11-*" "System.Text.Encoding.Extensions": "4.0.11-*"
}, }
"imports": [
"dotnet5.4"
]
} }
}, },
"compilationOptions": { "compilationOptions": {

7
src/Microsoft.AspNetCore.DataProtection.Abstractions/project.json
View File

@ -17,15 +17,12 @@
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*" "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"netstandard1.3": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.ComponentModel": "4.0.1-*", "System.ComponentModel": "4.0.1-*",
"System.Diagnostics.Debug": "4.0.11-*" "System.Diagnostics.Debug": "4.0.11-*"
}, }
"imports": [
"dotnet5.4"
]
} }
}, },
"compilationOptions": { "compilationOptions": {

8
src/Microsoft.AspNetCore.DataProtection.Extensions/project.json
View File

@ -18,12 +18,8 @@
"Microsoft.Extensions.DependencyInjection": "1.0.0-*" "Microsoft.Extensions.DependencyInjection": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"netstandard1.3": { "netstandard1.3": {}
"imports": [
"dotnet5.4"
]
}
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,

9
src/Microsoft.AspNetCore.DataProtection.Sources/project.json
View File

@ -9,17 +9,14 @@
"type": "git", "type": "git",
"url": "git://github.com/aspnet/dataprotection" "url": "git://github.com/aspnet/dataprotection"
}, },
"dependencies": { }, "dependencies": {},
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"netstandard1.3": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Security.Cryptography.Primitives": "4.0.0-*", "System.Security.Cryptography.Primitives": "4.0.0-*",
"System.Text.Encoding.Extensions": "4.0.11-*" "System.Text.Encoding.Extensions": "4.0.11-*"
}, }
"imports": [
"dotnet5.4"
]
} }
}, },
"shared": "**\\*.cs", "shared": "**\\*.cs",

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

@ -23,7 +23,9 @@
"frameworks": { "frameworks": {
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Runtime": { "type": "build" }, "System.Runtime": {
"type": "build"
},
"System.Security": "", "System.Security": "",
"System.Xml": "", "System.Xml": "",
"System.Xml.Linq": "" "System.Xml.Linq": ""
@ -36,10 +38,7 @@
"System.Security.Claims": "4.0.1-*", "System.Security.Claims": "4.0.1-*",
"System.Security.Principal.Windows": "4.0.0-*", "System.Security.Principal.Windows": "4.0.0-*",
"System.Xml.XDocument": "4.0.11-*" "System.Xml.XDocument": "4.0.11-*"
}, }
"imports": [
"dotnet5.4"
]
} }
}, },
"compilationOptions": { "compilationOptions": {