From 7b2feab670091e092425ccd4aea573c14f5f16a2 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 7 May 2014 18:24:04 -0700 Subject: [PATCH 1/2] Sort dependencies and remove duplicates in dependencies --- samples/MvcSample.Web/project.json | 12 +++++------ src/Microsoft.AspNet.Mvc.Core/project.json | 8 ++++---- .../project.json | 18 ++++++++--------- src/Microsoft.AspNet.Mvc.Razor/project.json | 20 +++++++++---------- src/Microsoft.AspNet.Mvc/project.json | 16 +++++++-------- .../project.json | 10 +++++----- .../project.json | 6 +++--- .../project.json | 10 +++++----- 8 files changed, 49 insertions(+), 51 deletions(-) diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json index 9068dec973..1a242470d6 100644 --- a/samples/MvcSample.Web/project.json +++ b/samples/MvcSample.Web/project.json @@ -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": { diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json index db92037006..44b56bbea9 100644 --- a/src/Microsoft.AspNet.Mvc.Core/project.json +++ b/src/Microsoft.AspNet.Mvc.Core/project.json @@ -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.Net.Runtime.Interfaces": "0.1-alpha-*", - "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*" + "Newtonsoft.Json": "5.0.8" }, "configurations": { "net45": {}, diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json index a32765e9d2..b4ac500fae 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json @@ -4,27 +4,25 @@ "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.Bcl.Immutable": "1.1.18-beta-*", "Microsoft.CodeAnalysis.Common" : "0.7-beta-*", "Microsoft.CodeAnalysis.CSharp" : "0.7-beta-*", "Microsoft.Framework.DependencyInjection": "0.1-alpha-*", - "System.Reflection.Metadata.Ecma335": "0.7-beta-*", - "Microsoft.Bcl.Immutable": "1.1.18-beta-*", - "Microsoft.Net.Runtime.Interfaces": "0.1-alpha-*" - }, + "Microsoft.Net.Runtime.Interfaces": "0.1-alpha-*", + "System.Reflection.Metadata.Ecma335": "0.7-beta-*"}, "configurations": { "net45": { "dependencies": { - "System.Xml.Linq": "", - "System.Xml": "", + "System.Collections": "", "System.Runtime": "", - "System.Collections": "" - } + "System.Xml": "", + "System.Xml.Linq": ""} }, "k10": { "dependencies": { diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index a57a1fcd28..192ed2cd1e 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor/project.json @@ -4,27 +4,27 @@ "warningsAsErrors": false }, "dependencies": { + "Common": "", "Microsoft.AspNet.FileSystems": "0.1-alpha-*", "Microsoft.AspNet.Http": "0.1-alpha-*", - "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" : "", + "Microsoft.AspNet.Mvc.Razor.Host" : "", + "Microsoft.AspNet.Razor": "0.1-alpha-*", + "Microsoft.Bcl.Immutable": "1.1.18-beta-*", "Microsoft.CodeAnalysis.Common" : "0.7-beta-*", "Microsoft.CodeAnalysis.CSharp" : "0.7-beta-*", - "System.Reflection.Metadata.Ecma335": "0.7-beta-*", - "Microsoft.Bcl.Immutable": "1.1.18-beta-*", - "Microsoft.Net.Runtime.Interfaces": "0.1-alpha-*" + "Microsoft.Framework.DependencyInjection": "0.1-alpha-*", + "Microsoft.Net.Runtime.Interfaces": "0.1-alpha-*", + "System.Reflection.Metadata.Ecma335": "0.7-beta-*" }, "configurations": { "net45": { "dependencies": { - "System.Xml.Linq": "", - "System.Xml": "", + "System.Collections": "", "System.Runtime": "", - "System.Collections": "" + "System.Xml": "", + "System.Xml.Linq": "" } }, "k10": { diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json index eddc6e7823..1a18091288 100644 --- a/src/Microsoft.AspNet.Mvc/project.json +++ b/src/Microsoft.AspNet.Mvc/project.json @@ -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": {}, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/project.json b/test/Microsoft.AspNet.Mvc.Core.Test/project.json index b6c0f7f085..76acebefc2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Core.Test/project.json @@ -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" diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json index 88aac42885..f45672db90 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json @@ -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" diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json index 3d6dacc684..2531c340d5 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json @@ -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" From bc9cc68bf00661fe2d22c1c87d9818f06064ce73 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 8 May 2014 10:50:10 -0700 Subject: [PATCH 2/2] Fix position of brace --- src/Microsoft.AspNet.Mvc.Razor.Host/project.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json index b4ac500fae..9b2deef3ca 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json @@ -15,14 +15,16 @@ "Microsoft.CodeAnalysis.CSharp" : "0.7-beta-*", "Microsoft.Framework.DependencyInjection": "0.1-alpha-*", "Microsoft.Net.Runtime.Interfaces": "0.1-alpha-*", - "System.Reflection.Metadata.Ecma335": "0.7-beta-*"}, + "System.Reflection.Metadata.Ecma335": "0.7-beta-*" + }, "configurations": { "net45": { "dependencies": { "System.Collections": "", "System.Runtime": "", "System.Xml": "", - "System.Xml.Linq": ""} + "System.Xml.Linq": "" + } }, "k10": { "dependencies": {