Merge branch 'sort-dependencies' into dev

This commit is contained in:
Wei Wang 2014-05-07 17:44:02 -07:00
commit 990481e48e
6 changed files with 22 additions and 22 deletions

View File

@ -3,9 +3,9 @@
"dependencies": { "dependencies": {
"Microsoft.AspNet.Identity": "", "Microsoft.AspNet.Identity": "",
"Microsoft.Data.Entity": "0.1-alpha-*", "Microsoft.Data.Entity": "0.1-alpha-*",
"Microsoft.Data.Entity.InMemory": "0.1-alpha-*",
"Microsoft.Data.Entity.Relational": "0.1-alpha-*", "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
"Microsoft.Data.Entity.SqlServer": "0.1-alpha-*", "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
"Microsoft.Data.Entity.InMemory": "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*", "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"System.Security.Claims" : "0.1-alpha-*" "System.Security.Claims" : "0.1-alpha-*"
@ -13,9 +13,9 @@
"configurations": { "configurations": {
"net45": { "net45": {
"dependencies": { "dependencies": {
"System.Runtime": "",
"System.Collections": "", "System.Collections": "",
"System.Data": "" "System.Data": "",
"System.Runtime": ""
} }
}, },
"k10": { "k10": {

View File

@ -1,11 +1,11 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"System.Security.Claims" : "0.1-alpha-*",
"Microsoft.AspNet.Http" : "0.1-alpha-*", "Microsoft.AspNet.Http" : "0.1-alpha-*",
"Microsoft.AspNet.Identity" : "", "Microsoft.AspNet.Identity" : "",
"Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*", "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection" : "0.1-alpha-*" "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
"System.Security.Claims" : "0.1-alpha-*"
}, },
"configurations": { "configurations": {
"net45": {}, "net45": {},

View File

@ -13,25 +13,25 @@
"Microsoft.Data.Entity.Migrations": "0.1-alpha-*", "Microsoft.Data.Entity.Migrations": "0.1-alpha-*",
"Microsoft.Data.Entity.Relational": "0.1-alpha-*", "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
"Microsoft.Data.Entity.SqlServer": "0.1-alpha-*", "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
"Remotion.Linq": "1.15.13.0",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection": "0.1-alpha-*", "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Microsoft.Framework.Logging": "0.1-alpha-*", "Microsoft.Framework.Logging": "0.1-alpha-*",
"Remotion.Linq": "1.15.13.0",
"System.Security.Claims": "0.1-alpha-*", "System.Security.Claims": "0.1-alpha-*",
"Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*", "xunit.abstractions": "2.0.0-aspnet-*",
"xunit.assert": "2.0.0-aspnet-*", "xunit.assert": "2.0.0-aspnet-*",
"xunit.core": "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-*"
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"configurations": { "configurations": {
"net45": { "net45": {
"dependencies": { "dependencies": {
"Moq" : "4.2.1312.1622", "Moq" : "4.2.1312.1622",
"System.Runtime": "",
"System.Collections": "", "System.Collections": "",
"System.Data": "" "System.Data": "",
"System.Runtime": ""
} }
} }
}, },

View File

@ -9,19 +9,19 @@
"Microsoft.AspNet.Testing" : "0.1-alpha-*", "Microsoft.AspNet.Testing" : "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
"Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*", "xunit.abstractions": "2.0.0-aspnet-*",
"xunit.assert": "2.0.0-aspnet-*", "xunit.assert": "2.0.0-aspnet-*",
"xunit.core": "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-*"
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"configurations": { "configurations": {
"net45": { "net45": {
"dependencies": { "dependencies": {
"Moq" : "4.2.1312.1622", "Moq" : "4.2.1312.1622",
"System.Runtime": "", "System.Collections": "",
"System.Collections": "" "System.Runtime": ""
} }
} }
}, },

View File

@ -1,12 +1,12 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.FeatureModel" : "0.1-alpha-*",
"Microsoft.AspNet.Http" : "0.1-alpha-*", "Microsoft.AspNet.Http" : "0.1-alpha-*",
"Microsoft.AspNet.HttpFeature" : "0.1-alpha-*",
"Microsoft.AspNet.Identity" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "0.1-alpha-*",
"Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*", "Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*",
"Microsoft.AspNet.Identity.Security" : "0.1-alpha-*", "Microsoft.AspNet.Identity.Security" : "0.1-alpha-*",
"Microsoft.AspNet.HttpFeature" : "0.1-alpha-*",
"Microsoft.AspNet.FeatureModel" : "0.1-alpha-*",
"Microsoft.AspNet.PipelineCore" : "0.1-alpha-*", "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*",
"Microsoft.AspNet.RequestContainer" : "0.1-alpha-*", "Microsoft.AspNet.RequestContainer" : "0.1-alpha-*",
"Microsoft.AspNet.Security" : "0.1-alpha-*", "Microsoft.AspNet.Security" : "0.1-alpha-*",
@ -16,11 +16,11 @@
"Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
"Microsoft.Framework.Logging" : "0.1-alpha-*", "Microsoft.Framework.Logging" : "0.1-alpha-*",
"System.Security.Claims" : "0.1-alpha-*", "System.Security.Claims" : "0.1-alpha-*",
"Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*", "xunit.abstractions": "2.0.0-aspnet-*",
"xunit.assert": "2.0.0-aspnet-*", "xunit.assert": "2.0.0-aspnet-*",
"xunit.core": "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-*"
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"configurations": { "configurations": {

View File

@ -5,19 +5,19 @@
"Microsoft.AspNet.Testing" : "0.1-alpha-*", "Microsoft.AspNet.Testing" : "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*",
"Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
"Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*", "xunit.abstractions": "2.0.0-aspnet-*",
"xunit.assert": "2.0.0-aspnet-*", "xunit.assert": "2.0.0-aspnet-*",
"xunit.core": "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-*"
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"configurations": { "configurations": {
"net45": { "net45": {
"dependencies": { "dependencies": {
"Moq" : "4.2.1312.1622", "Moq" : "4.2.1312.1622",
"System.Runtime": "", "System.Collections": "",
"System.Collections": "" "System.Runtime": ""
} }
} }
}, },