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-05-02 14:55:40 -07:00
parent 2762e492bc 5abd3bf076
commit e9369bfb99
12 changed files with 89 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,15 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Infrastructure for ASP.NET Core cryptographic packages. Applications and libraries should not reference this package directly.", "description": "Infrastructure for ASP.NET Core cryptographic packages. Applications and libraries should not reference this package directly.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"dataprotection" "type": "git",
], "url": "git://github.com/aspnet/dataprotection"
"repository": { },
"type": "git", "tags": [
"url": "git://github.com/aspnet/dataprotection" "aspnetcore",
"dataprotection"
]
}, },
"dependencies": {}, "dependencies": {},
"frameworks": { "frameworks": {
@ -23,7 +25,7 @@
} }
} }
}, },
"compilationOptions": { "buildOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",

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

@ -1,13 +1,15 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET Core utilities for key derivation.", "description": "ASP.NET Core utilities for key derivation.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"dataprotection" "type": "git",
], "url": "git://github.com/aspnet/dataprotection"
"repository": { },
"type": "git", "tags": [
"url": "git://github.com/aspnet/dataprotection" "aspnetcore",
"dataprotection"
]
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*" "Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*"
@ -22,7 +24,7 @@
} }
} }
}, },
"compilationOptions": { "buildOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",

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

@ -1,13 +1,15 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET Core data protection abstractions.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.DataProtection.IDataProtectionProvider\r\nMicrosoft.AspNetCore.DataProtection.IDataProtector", "description": "ASP.NET Core data protection abstractions.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.DataProtection.IDataProtectionProvider\r\nMicrosoft.AspNetCore.DataProtection.IDataProtector",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"dataprotection" "type": "git",
], "url": "git://github.com/aspnet/dataprotection"
"repository": { },
"type": "git", "tags": [
"url": "git://github.com/aspnet/dataprotection" "aspnetcore",
"dataprotection"
]
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.DataProtection.Sources": { "Microsoft.AspNetCore.DataProtection.Sources": {
@ -26,7 +28,7 @@
} }
} }
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [

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

@ -1,13 +1,15 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Additional APIs for ASP.NET Core data protection.", "description": "Additional APIs for ASP.NET Core data protection.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"dataprotection" "type": "git",
], "url": "git://github.com/aspnet/dataprotection"
"repository": { },
"type": "git", "tags": [
"url": "git://github.com/aspnet/dataprotection" "aspnetcore",
"dataprotection"
]
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.DataProtection": "1.0.0-*", "Microsoft.AspNetCore.DataProtection": "1.0.0-*",
@ -21,7 +23,7 @@
"net451": {}, "net451": {},
"netstandard1.3": {} "netstandard1.3": {}
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [

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

@ -1,13 +1,15 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET Core data protection shared code.", "description": "ASP.NET Core data protection shared code.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"dataprotection" "type": "git",
], "url": "git://github.com/aspnet/dataprotection"
"repository": { },
"type": "git", "tags": [
"url": "git://github.com/aspnet/dataprotection" "aspnetcore",
"dataprotection"
]
}, },
"dependencies": {}, "dependencies": {},
"frameworks": { "frameworks": {
@ -20,7 +22,7 @@
} }
}, },
"shared": "**\\*.cs", "shared": "**\\*.cs",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
} }

32
src/Microsoft.AspNetCore.DataProtection.SystemWeb/project.json
View File

@ -1,14 +1,21 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "A component to allow the ASP.NET Core data protection stack to work with the ASP.NET 4.x <machineKey> element.", "description": "A component to allow the ASP.NET Core data protection stack to work with the ASP.NET 4.x <machineKey> element.",
"tags": [ "packOptions": {
"aspnet", "repository": {
"aspnetcore", "type": "git",
"dataprotection" "url": "git://github.com/aspnet/dataprotection"
], },
"repository": { "tags": [
"type": "git", "aspnet",
"url": "git://github.com/aspnet/dataprotection" "aspnetcore",
"dataprotection"
],
"files": {
"mappings": {
"content/net451/": "web.config.transform"
}
}
}, },
"frameworks": { "frameworks": {
"net451": { "net451": {
@ -23,13 +30,12 @@
} }
} }
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
},
"packInclude": {
"content/net451/": "web.config.transform"
} }
} }

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

@ -1,13 +1,15 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET Core logic to protect and unprotect data, similar to DPAPI.", "description": "ASP.NET Core logic to protect and unprotect data, similar to DPAPI.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"dataprotection" "type": "git",
], "url": "git://github.com/aspnet/dataprotection"
"repository": { },
"type": "git", "tags": [
"url": "git://github.com/aspnet/dataprotection" "aspnetcore",
"dataprotection"
]
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*", "Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*",
@ -44,7 +46,7 @@
} }
} }
}, },
"compilationOptions": { "buildOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",

4
test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*", "Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*",
"Microsoft.AspNetCore.DataProtection.Test.Shared": { "Microsoft.AspNetCore.DataProtection.Test.Shared": {
@ -16,7 +17,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}, },
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"imports": [ "imports": [
@ -32,7 +32,7 @@
} }
}, },
"testRunner": "xunit", "testRunner": "xunit",
"compilationOptions": { "buildOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"warningsAsErrors": true "warningsAsErrors": true

4
test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*", "Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*",
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-*", "Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-*",
@ -14,7 +15,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}, },
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"imports": [ "imports": [
@ -30,7 +30,7 @@
} }
}, },
"testRunner": "xunit", "testRunner": "xunit",
"compilationOptions": { "buildOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"

4
test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*", "Microsoft.AspNetCore.Cryptography.Internal": "1.0.0-*",
"Microsoft.AspNetCore.DataProtection.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.DataProtection.Abstractions": "1.0.0-*",
@ -14,7 +15,6 @@
"type": "platform" "type": "platform"
}, },
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },
@ -35,7 +35,7 @@
}, },
"testRunner": "xunit", "testRunner": "xunit",
"compile": "../common/**/*.cs", "compile": "../common/**/*.cs",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
} }

4
test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.DataProtection.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.DataProtection.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.DataProtection.Extensions": "1.0.0-*", "Microsoft.AspNetCore.DataProtection.Extensions": "1.0.0-*",
@ -18,7 +19,6 @@
"type": "platform" "type": "platform"
}, },
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },
@ -38,7 +38,7 @@
} }
}, },
"testRunner": "xunit", "testRunner": "xunit",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
} }

4
test/Microsoft.AspNetCore.DataProtection.Test/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.DataProtection": "1.0.0-*", "Microsoft.AspNetCore.DataProtection": "1.0.0-*",
"Microsoft.AspNetCore.DataProtection.Test.Shared": { "Microsoft.AspNetCore.DataProtection.Test.Shared": {
@ -18,7 +19,6 @@
"type": "platform" "type": "platform"
}, },
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },
@ -37,7 +37,7 @@
} }
}, },
"testRunner": "xunit", "testRunner": "xunit",
"compilationOptions": { "buildOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"