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

Merge branch 'release' into dev

This commit is contained in:
jacalvar 2016-04-30 16:21:38 -07:00
parent 0ff2f875d9 4d198f3d8f
commit 4d02a03658
7 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/MvcSandbox/project.json
View File

@ -8,6 +8,10 @@
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
@ -20,10 +24,10 @@
"wwwroot" "wwwroot"
], ],
"tools": { "tools": {
"dotnet-razor-tooling": { "Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": [ "imports": [
"net45" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]
} }
}, },

10
samples/MvcSubAreaSample.Web/project.json
View File

@ -7,6 +7,10 @@
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*" "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
@ -22,9 +26,9 @@
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}
} }
} }
}
}, },
"content": [ "content": [
"Views", "Views",
@ -36,10 +40,10 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50" "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
}, },
"dotnet-razor-tooling": { "Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": [ "imports": [
"net45" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]
} }
}, },

8
samples/TagHelperSample.Web/project.json
View File

@ -8,16 +8,20 @@
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*" "Microsoft.Extensions.Logging.Console": "1.0.0-*"
}, },
"tools": { "tools": {
"dotnet-razor-tooling": { "Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": [ "imports": [
"net45" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]
}, },
"Microsoft.AspNetCore.Server.IISIntegration.Tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": {

8
test/WebSites/BasicWebSite/project.json
View File

@ -8,6 +8,10 @@
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*", "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Session": "1.0.0-*", "Microsoft.AspNetCore.Session": "1.0.0-*",
@ -38,10 +42,10 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50" "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
}, },
"dotnet-razor-tooling": { "Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": [ "imports": [
"net45" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]
} }
}, },

12
test/WebSites/ControllersFromServicesWebSite/project.json
View File

@ -6,10 +6,14 @@
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"ControllersFromServicesClassLibrary": "1.0.0", "ControllersFromServicesClassLibrary": "1.0.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*" "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
@ -36,10 +40,10 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50" "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
}, },
"dotnet-razor-tooling": { "Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": [ "imports": [
"net45" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]
} }
}, },

13
test/WebSites/HtmlGenerationWebSite/project.json
View File

@ -6,9 +6,14 @@
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": { },
@ -35,10 +40,10 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50" "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
}, },
"dotnet-razor-tooling": { "Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": [ "imports": [
"net45" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]
} }
}, },

8
test/WebSites/TagHelpersWebSite/project.json
View File

@ -9,6 +9,10 @@
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0",
"Microsoft.AspNetCore.Razor.Tools": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*" "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
@ -37,10 +41,10 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50" "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
}, },
"dotnet-razor-tooling": { "Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",
"imports": [ "imports": [
"net45" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]
} }
}, },