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

Merge branch 'sort-dependencies' into dev 

Conflicts:
	src/Microsoft.AspNet.Mvc.Core/project.json
	src/Microsoft.AspNet.Mvc.Razor.Host/project.json
	src/Microsoft.AspNet.Mvc.Razor/project.json
This commit is contained in:
Wei Wang 2014-05-08 11:16:25 -07:00
parent eb55375fc7 bc9cc68bf0
commit dc8b5010a0
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/MvcSample.Web/project.json
View File

@ -6,15 +6,15 @@
"dependencies": {
"Helios": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Microsoft.AspNet.Mvc": "",
"Microsoft.AspNet.Mvc.Core": "",
"Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.AspNet.Mvc.Razor": "",
"Microsoft.AspNet.Routing": "0.1-alpha-*",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
"Microsoft.DataAnnotations": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.AspNet.Mvc.Core": "",
"Microsoft.AspNet.Mvc": "",
"Microsoft.AspNet.Mvc.Razor": ""
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*"
},
"commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"configurations": {

8
src/Microsoft.AspNet.Mvc.Core/project.json
View File

@ -4,15 +4,15 @@
"warningsAsErrors": true
},
"dependencies": {
"Newtonsoft.Json": "5.0.8",
"Common": "",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.AspNet.Routing": "0.1-alpha-*",
"Microsoft.AspNet.Security": "0.1-alpha-*",
"Common": "",
"Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Microsoft.Framework.Runtime.Interfaces": "0.1-alpha-*",
"Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*"
"Newtonsoft.Json": "5.0.8"
},
"configurations": {
"net45": {},

10
src/Microsoft.AspNet.Mvc.Razor.Host/project.json
View File

@ -4,22 +4,22 @@
"warningsAsErrors": true
},
"dependencies": {
"Common": "",
"Microsoft.AspNet.FileSystems": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.Razor": "0.1-alpha-*",
"Common": "",
"Microsoft.AspNet.Mvc.Core" : "",
"Microsoft.AspNet.Mvc.ModelBinding" : "",
"Microsoft.AspNet.Razor": "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Microsoft.Framework.Runtime.Interfaces": "0.1-alpha-*"
},
"configurations": {
"net45": {
"dependencies": {
"System.Xml.Linq": "",
"System.Xml": "",
"System.Collections": "",
"System.Runtime": "",
"System.Collections": ""
"System.Xml": "",
"System.Xml.Linq": ""
}
},
"k10": {

16
src/Microsoft.AspNet.Mvc.Razor/project.json
View File

@ -4,24 +4,24 @@
"warningsAsErrors": false
},
"dependencies": {
"Common": "",
"K.Roslyn" : "0.1-alpha-*",
"Microsoft.AspNet.FileSystems": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.Core" : "",
"Microsoft.AspNet.Mvc.ModelBinding" : "",
"Microsoft.AspNet.Mvc.Razor.Host" : "",
"Microsoft.AspNet.Razor": "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Common": "",
"Microsoft.AspNet.Mvc.Core" : "",
"Microsoft.AspNet.Mvc.Razor.Host" : "",
"Microsoft.AspNet.Mvc.ModelBinding" : "",
"K.Roslyn" : "0.1-alpha-*",
"Microsoft.Framework.Runtime.Interfaces": "0.1-alpha-*"
},
"configurations": {
"net45": {
"dependencies": {
"System.Xml.Linq": "",
"System.Xml": "",
"System.Collections": "",
"System.Runtime": "",
"System.Collections": ""
"System.Xml": "",
"System.Xml.Linq": ""
}
},
"k10": {

16
src/Microsoft.AspNet.Mvc/project.json
View File

@ -4,18 +4,18 @@
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNet.Http" : "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
"Common": "",
"Microsoft.AspNet.FileSystems" : "0.1-alpha-*",
"Microsoft.AspNet.Http" : "0.1-alpha-*",
"Microsoft.AspNet.Mvc.Core": "",
"Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.AspNet.Mvc.Razor": "",
"Microsoft.AspNet.Mvc.Razor.Host": "",
"Microsoft.AspNet.Razor" : "0.1-alpha-*",
"Microsoft.AspNet.RequestContainer": "0.1-alpha-*",
"Microsoft.AspNet.Routing" : "0.1-alpha-*",
"Common": "",
"Microsoft.AspNet.Mvc.Core": "",
"Microsoft.AspNet.Mvc.Razor": "",
"Microsoft.AspNet.Mvc.Razor.Host": "",
"Microsoft.AspNet.Mvc.ModelBinding": ""
"Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection" : "0.1-alpha-*"
},
"configurations": {
"net45": {},

10
test/Microsoft.AspNet.Mvc.Core.Test/project.json
View File

@ -5,19 +5,19 @@
},
"dependencies": {
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.Core" : "",
"Microsoft.AspNet.Mvc" : "",
"Microsoft.AspNet.Mvc.Core" : "",
"Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
"Microsoft.AspNet.Routing": "0.1-alpha-*",
"Microsoft.AspNet.Testing": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Moq": "4.2.1312.1622",
"Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*",
"xunit.assert": "2.0.0-aspnet-*",
"xunit.core": "2.0.0-aspnet-*",
"xunit.execution": "2.0.0-aspnet-*"
"xunit.execution": "2.0.0-aspnet-*",
"Xunit.KRunner": "0.1-alpha-*"
},
"commands": {
"test": "Xunit.KRunner"

6
test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
View File

@ -5,17 +5,17 @@
},
"dependencies": {
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.ModelBinding" : "",
"Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
"Microsoft.AspNet.Testing": "0.1-alpha-*",
"Microsoft.DataAnnotations" : "0.1-alpha-*",
"Microsoft.AspNet.Mvc.ModelBinding" : "",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Newtonsoft.Json": "5.0.8",
"Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*",
"xunit.assert": "2.0.0-aspnet-*",
"xunit.core": "2.0.0-aspnet-*",
"xunit.execution": "2.0.0-aspnet-*"
"xunit.execution": "2.0.0-aspnet-*",
"Xunit.KRunner": "0.1-alpha-*"
},
"commands": {
"test": "Xunit.KRunner"

10
test/Microsoft.AspNet.Mvc.Razor.Test/project.json
View File

@ -4,18 +4,18 @@
"warningsAsErrors": false
},
"dependencies": {
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.FileSystems": "0.1-alpha-*",
"Microsoft.AspNet.Razor": "0.1-alpha-*",
"Microsoft.AspNet.Routing": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.Mvc.Core" : "",
"Microsoft.AspNet.Mvc.Razor" : "",
"Microsoft.AspNet.Razor": "0.1-alpha-*",
"Microsoft.AspNet.Routing": "0.1-alpha-*",
"Microsoft.AspNet.Testing" : "0.1-alpha-*",
"Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*",
"xunit.assert": "2.0.0-aspnet-*",
"xunit.core": "2.0.0-aspnet-*",
"xunit.execution": "2.0.0-aspnet-*"
"xunit.execution": "2.0.0-aspnet-*",
"Xunit.KRunner": "0.1-alpha-*"
},
"commands": {
"test": "Xunit.KRunner"