From 9c5253a415b079975512367157f35b1f94fb61f4 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 7 May 2014 18:28:44 -0700 Subject: [PATCH] Sort dependencies and remove duplicates in dependencies --- samples/SelfHostServer/project.json | 8 +++---- .../project.json | 14 +++++------ src/Microsoft.Net.Server/Project.json | 6 ++--- .../project.json | 2 +- .../project.json | 24 +++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 9502a45614..9945c5dac2 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,10 +1,10 @@ { "version" : "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Http": "0.1-alpha-*", "Microsoft.AspNet.Hosting": "0.1-alpha-*", - "Microsoft.Net.Server": "", - "Microsoft.AspNet.Server.WebListener": "" + "Microsoft.AspNet.Http": "0.1-alpha-*", + "Microsoft.AspNet.Server.WebListener": "", + "Microsoft.Net.Server": "" }, "commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" }, "configurations": { @@ -12,8 +12,8 @@ }, "k10": { "dependencies": { - "System.Console": "4.0.0.0", "System.Collections": "4.0.0.0", + "System.Console": "4.0.0.0", "System.Diagnostics.Debug": "4.0.10.0", "System.Diagnostics.Tools": "4.0.0.0", "System.Globalization": "4.0.10.0", diff --git a/src/Microsoft.AspNet.Server.WebListener/project.json b/src/Microsoft.AspNet.Server.WebListener/project.json index bc18c897d1..459e0d16de 100644 --- a/src/Microsoft.AspNet.Server.WebListener/project.json +++ b/src/Microsoft.AspNet.Server.WebListener/project.json @@ -1,13 +1,13 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.Net.Server" : "", - "Microsoft.AspNet.Http": "0.1-alpha-*", - "Microsoft.AspNet.HttpFeature": "0.1-alpha-*", "Microsoft.AspNet.FeatureModel": "0.1-alpha-*", "Microsoft.AspNet.Hosting": "0.1-alpha-*", + "Microsoft.AspNet.Http": "0.1-alpha-*", + "Microsoft.AspNet.HttpFeature": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", - "Microsoft.Framework.Logging": "0.1-alpha-*" + "Microsoft.Framework.Logging": "0.1-alpha-*", + "Microsoft.Net.Server" : "" }, "compilationOptions": { "allowUnsafe": true @@ -16,6 +16,7 @@ "net45": {}, "k10": { "dependencies": { + "Microsoft.Win32.Primitives": "4.0.0.0", "System.Collections": "4.0.0.0", "System.Collections.Concurrent": "4.0.0.0", "System.Diagnostics.Contracts": "4.0.0.0", @@ -28,16 +29,15 @@ "System.Resources.ResourceManager": "4.0.0.0", "System.Runtime": "4.0.20.0", "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.InteropServices": "4.0.20.0", "System.Runtime.Handles": "4.0.0.0", + "System.Runtime.InteropServices": "4.0.20.0", "System.Security.Principal": "4.0.0.0", "System.Text.Encoding": "4.0.20.0", "System.Text.Encoding.Extensions": "4.0.10.0", "System.Threading": "4.0.0.0", "System.Threading.Overlapped": "4.0.0.0", "System.Threading.Tasks": "4.0.10.0", - "System.Threading.ThreadPool": "4.0.10.0", - "Microsoft.Win32.Primitives": "4.0.0.0" + "System.Threading.ThreadPool": "4.0.10.0" } } } diff --git a/src/Microsoft.Net.Server/Project.json b/src/Microsoft.Net.Server/Project.json index ed01ca0d23..a6363b7940 100644 --- a/src/Microsoft.Net.Server/Project.json +++ b/src/Microsoft.Net.Server/Project.json @@ -10,6 +10,7 @@ "net45": {}, "k10": { "dependencies": { + "Microsoft.Win32.Primitives": "4.0.0.0", "System.Collections": "4.0.0.0", "System.Collections.Concurrent": "4.0.0.0", "System.Diagnostics.Contracts": "4.0.0.0", @@ -25,8 +26,8 @@ "System.Resources.ResourceManager": "4.0.0.0", "System.Runtime": "4.0.20.0", "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.InteropServices": "4.0.20.0", "System.Runtime.Handles": "4.0.0.0", + "System.Runtime.InteropServices": "4.0.20.0", "System.Security.Cryptography.X509Certificates": "4.0.0.0", "System.Security.Principal": "4.0.0.0", "System.Text.Encoding": "4.0.20.0", @@ -34,8 +35,7 @@ "System.Threading": "4.0.0.0", "System.Threading.Overlapped": "4.0.0.0", "System.Threading.Tasks": "4.0.10.0", - "System.Threading.ThreadPool": "4.0.10.0", - "Microsoft.Win32.Primitives": "4.0.0.0" + "System.Threading.ThreadPool": "4.0.10.0" } } } diff --git a/test/Microsoft.AspNet.Security.Windows.Test/project.json b/test/Microsoft.AspNet.Security.Windows.Test/project.json index f1c9866edb..90274d6696 100644 --- a/test/Microsoft.AspNet.Security.Windows.Test/project.json +++ b/test/Microsoft.AspNet.Security.Windows.Test/project.json @@ -1,8 +1,8 @@ { "version" : "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Server.WebListener" : "", "Microsoft.AspNet.Security.Windows" : "", + "Microsoft.AspNet.Server.WebListener" : "", "xunit.abstractions": "2.0.0-aspnet-*", "xunit.assert": "2.0.0-aspnet-*", "xunit.core": "2.0.0-aspnet-*", diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json index ede15ba43b..57deecbd1e 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json @@ -4,27 +4,27 @@ "test": "Xunit.KRunner" }, "dependencies": { - "Xunit.KRunner": "0.1-alpha-*", + "Microsoft.AspNet.FeatureModel" : "0.1-alpha-*", + "Microsoft.AspNet.Hosting": "0.1-alpha-*", + "Microsoft.AspNet.Http" : "0.1-alpha-*", + "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*", + "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*", + "Microsoft.AspNet.Server.WebListener" : "", + "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", + "Microsoft.Framework.Logging": "0.1-alpha-*", + "Microsoft.Net.Server" : "", "xunit.abstractions": "2.0.0-aspnet-*", "xunit.assert": "2.0.0-aspnet-*", "xunit.core": "2.0.0-aspnet-*", "xunit.execution": "2.0.0-aspnet-*", - "Microsoft.AspNet.Server.WebListener" : "", - "Microsoft.Net.Server" : "", - "Microsoft.AspNet.Http" : "0.1-alpha-*", - "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*", - "Microsoft.AspNet.FeatureModel" : "0.1-alpha-*", - "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*", - "Microsoft.AspNet.Hosting": "0.1-alpha-*", - "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", - "Microsoft.Framework.Logging": "0.1-alpha-*" + "Xunit.KRunner": "0.1-alpha-*" }, "configurations": { "net45": { "dependencies": { - "System.Runtime": "", "System.Net.Http": "", - "System.Net.Http.WebRequest": "" + "System.Net.Http.WebRequest": "", + "System.Runtime": "" } } }