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:56:15 -07:00
parent 655c7c3a12 a97ac1b23b
commit 01e4265183
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.AspNetCore.Html.Abstractions/project.json
View File

@ -1,14 +1,16 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET Core HTML abstractions used for building HTML content.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Html.HtmlEncodedString\r\nMicrosoft.AspNetCore.Html.IHtmlContent", "description": "ASP.NET Core HTML abstractions used for building HTML content.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Html.HtmlEncodedString\r\nMicrosoft.AspNetCore.Html.IHtmlContent",
"tags": [ "packOptions": {
"aspnetcore" "repository": {
], "type": "git",
"repository": { "url": "git://github.com/aspnet/htmlabstractions"
"type": "git", },
"url": "git://github.com/aspnet/htmlabstractions" "tags": [
"aspnetcore"
]
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [

16
src/Microsoft.Extensions.WebEncoders/project.json
View File

@ -1,14 +1,16 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Contains registration and configuration APIs to add the core framework encoders to a dependency injection container.", "description": "Contains registration and configuration APIs to add the core framework encoders to a dependency injection container.",
"tags": [ "packOptions": {
"aspnetcore" "repository": {
], "type": "git",
"repository": { "url": "git://github.com/aspnet/httpabstractions"
"type": "git", },
"url": "git://github.com/aspnet/httpabstractions" "tags": [
"aspnetcore"
]
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"allowUnsafe": true, "allowUnsafe": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",

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

@ -1,9 +1,10 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Html.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.Html.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
@ -18,7 +19,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": [

4
test/Microsoft.Extensions.WebEncoders.Tests/project.json
View File

@ -1,12 +1,13 @@
{ {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.Extensions.WebEncoders": "1.0.0-*", "Microsoft.Extensions.WebEncoders": "1.0.0-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"testRunner": "xunit", "testRunner": "xunit",
"compilationOptions": { "buildOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
@ -18,7 +19,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": [