From 31b4a9598d72fc56a2ec135ae9aa9c7066e64791 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sun, 5 Oct 2014 14:14:03 -0700 Subject: [PATCH] Fixup references --- samples/HelloWorld/project.json | 28 +++--- samples/SelfHostServer/project.json | 34 ++----- .../project.json | 88 +++++++++---------- src/Microsoft.Net.Http.Server/project.json | 84 +++++++++--------- src/Microsoft.Net.WebSockets/project.json | 74 ++++++++-------- .../project.json | 41 +++++---- .../project.json | 9 +- 7 files changed, 168 insertions(+), 190 deletions(-) diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index 4f4c0e622f..063d259840 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -1,18 +1,18 @@ { - "dependencies": { - "Microsoft.Net.Http.Server" : "" - }, - "frameworks": { - "aspnet50": { }, - "aspnetcore50" : { - "dependencies": { - "System.Collections": "4.0.10.0", - "System.Console" : "4.0.0.0", - "System.Globalization": "4.0.10.0", - "System.IO" : "4.0.0.0", - "System.Runtime" : "4.0.20.0", - "System.Threading.Tasks": "4.0.10.0" + "dependencies": { + "Microsoft.Net.Http.Server": "1.0.0-*" + }, + "frameworks": { + "aspnet50": { }, + "aspnetcore50": { + "dependencies": { + "System.Collections": "4.0.10.0", + "System.Console": "4.0.0.0", + "System.Globalization": "4.0.10.0", + "System.IO": "4.0.0.0", + "System.Runtime": "4.0.20.0", + "System.Threading.Tasks": "4.0.10.0" + } } } - } } diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 4ae5346393..cbb2e6e7f1 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,31 +1,11 @@ { - "dependencies": { - "Microsoft.AspNet.Hosting": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Server.WebListener": "", - "Microsoft.Net.Http.Server": "" - }, - "commands": { "web": "Microsoft.AspNet.Hosting --server=Microsoft.AspNet.Server.WebListener --server.urls=http://localhost:8080" }, - "frameworks": { - "aspnet50": { + "dependencies": { + "Microsoft.AspNet.Http": "1.0.0-*", + "Microsoft.AspNet.Server.WebListener": "1.0.0-*" }, - "aspnetcore50": { - "dependencies": { - "System.Collections": "4.0.10.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", - "System.IO": "4.0.10.0", - "System.IO.FileSystem": "4.0.0.0", - "System.Linq": "4.0.0.0", - "System.Reflection": "4.0.10.0", - "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.Threading.Tasks": "4.0.10.0" - } + "commands": { "web": "Microsoft.AspNet.Hosting --server=Microsoft.AspNet.Server.WebListener --server.urls=http://localhost:8080" }, + "frameworks": { + "aspnet50": { }, + "aspnetcore50": { } } - } } diff --git a/src/Microsoft.AspNet.Server.WebListener/project.json b/src/Microsoft.AspNet.Server.WebListener/project.json index 591611cf37..52f87abd62 100644 --- a/src/Microsoft.AspNet.Server.WebListener/project.json +++ b/src/Microsoft.AspNet.Server.WebListener/project.json @@ -1,47 +1,47 @@ { - "version": "1.0.0-*", - "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.HttpFeature": "1.0.0-*", - "Microsoft.Framework.ConfigurationModel": "1.0.0-*", - "Microsoft.Framework.Logging": "1.0.0-*", - "Microsoft.Net.Http.Server" : "", - "Microsoft.Net.WebSocketAbstractions": "1.0.0-*" - }, - "compilationOptions": { - "allowUnsafe": true - }, - "frameworks": { - "aspnet50": {}, - "aspnetcore50": { - "dependencies": { - "Microsoft.Win32.Primitives": "4.0.0.0", - "System.Collections": "4.0.10.0", - "System.Collections.Concurrent": "4.0.0.0", - "System.Diagnostics.Contracts": "4.0.0.0", - "System.Diagnostics.Debug": "4.0.10.0", - "System.Diagnostics.Tools": "4.0.0.0", - "System.Globalization": "4.0.10.0", - "System.IO": "4.0.10.0", - "System.Linq": "4.0.0.0", - "System.Net.Primitives": "4.0.10.0", - "System.Reflection": "4.0.10.0", - "System.Resources.ResourceManager": "4.0.0.0", - "System.Runtime": "4.0.20.0", - "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.Handles": "4.0.0.0", - "System.Runtime.InteropServices": "4.0.20.0", - "System.Security.Claims": "1.0.0-*", - "System.Security.Cryptography.X509Certificates": "4.0.0.0", - "System.Security.Principal": "4.0.0.0", - "System.Text.Encoding": "4.0.10.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" - } + "version": "1.0.0-*", + "dependencies": { + "Microsoft.AspNet.FeatureModel": "1.0.0-*", + "Microsoft.AspNet.Http": "1.0.0-*", + "Microsoft.AspNet.HttpFeature": { "version": "1.0.0-*", "type": "build" }, + "Microsoft.Framework.ConfigurationModel": "1.0.0-*", + "Microsoft.Framework.Logging": "1.0.0-*", + "Microsoft.Net.Http.Server": "1.0.0-*", + "Microsoft.Net.WebSocketAbstractions": "1.0.0-*" + }, + "compilationOptions": { + "allowUnsafe": true + }, + "frameworks": { + "aspnet50": { }, + "aspnetcore50": { + "dependencies": { + "Microsoft.Win32.Primitives": "4.0.0.0", + "System.Collections": "4.0.10.0", + "System.Collections.Concurrent": "4.0.0.0", + "System.Diagnostics.Contracts": "4.0.0.0", + "System.Diagnostics.Debug": "4.0.10.0", + "System.Diagnostics.Tools": "4.0.0.0", + "System.Globalization": "4.0.10.0", + "System.IO": "4.0.10.0", + "System.Linq": "4.0.0.0", + "System.Net.Primitives": "4.0.10.0", + "System.Reflection": "4.0.10.0", + "System.Resources.ResourceManager": "4.0.0.0", + "System.Runtime": "4.0.20.0", + "System.Runtime.Extensions": "4.0.10.0", + "System.Runtime.Handles": "4.0.0.0", + "System.Runtime.InteropServices": "4.0.20.0", + "System.Security.Claims": "1.0.0-*", + "System.Security.Cryptography.X509Certificates": "4.0.0.0", + "System.Security.Principal": "4.0.0.0", + "System.Text.Encoding": "4.0.10.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" + } + } } - } } diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index 1cede4c5cd..0788160c08 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -1,45 +1,45 @@ { - "version": "1.0.0-*", - "dependencies": { - "Microsoft.Framework.Logging": "1.0.0-*", - "Microsoft.Net.WebSockets": "" - }, - "compilationOptions": { - "allowUnsafe": true - }, - "frameworks": { - "net45": { }, - "aspnet50": { }, - "aspnetcore50": { - "dependencies": { - "Microsoft.Net.WebSocketAbstractions": "1.0.0-*", - "Microsoft.Win32.Primitives": "4.0.0.0", - "System.Collections": "4.0.10.0", - "System.Collections.Concurrent": "4.0.0.0", - "System.Diagnostics.Contracts": "4.0.0.0", - "System.Diagnostics.Debug": "4.0.10.0", - "System.Diagnostics.Tools": "4.0.0.0", - "System.Globalization": "4.0.10.0", - "System.IO": "4.0.10.0", - "System.IO.FileSystem": "4.0.0.0", - "System.Linq": "4.0.0.0", - "System.Net.Primitives": "4.0.10.0", - "System.Reflection": "4.0.10.0", - "System.Resources.ResourceManager": "4.0.0.0", - "System.Runtime": "4.0.20.0", - "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.Handles": "4.0.0.0", - "System.Runtime.InteropServices": "4.0.20.0", - "System.Security.Claims": "1.0.0-*", - "System.Security.Cryptography.X509Certificates": "4.0.0.0", - "System.Security.Principal": "4.0.0.0", - "System.Text.Encoding": "4.0.10.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" - } + "version": "1.0.0-*", + "dependencies": { + "Microsoft.Framework.Logging": "1.0.0-*", + "Microsoft.Net.WebSockets": "1.0.0-*" + }, + "compilationOptions": { + "allowUnsafe": true + }, + "frameworks": { + "net45": { }, + "aspnet50": { }, + "aspnetcore50": { + "dependencies": { + "Microsoft.Net.WebSocketAbstractions": "1.0.0-*", + "Microsoft.Win32.Primitives": "4.0.0.0", + "System.Collections": "4.0.10.0", + "System.Collections.Concurrent": "4.0.0.0", + "System.Diagnostics.Contracts": "4.0.0.0", + "System.Diagnostics.Debug": "4.0.10.0", + "System.Diagnostics.Tools": "4.0.0.0", + "System.Globalization": "4.0.10.0", + "System.IO": "4.0.10.0", + "System.IO.FileSystem": "4.0.0.0", + "System.Linq": "4.0.0.0", + "System.Net.Primitives": "4.0.10.0", + "System.Reflection": "4.0.10.0", + "System.Resources.ResourceManager": "4.0.0.0", + "System.Runtime": "4.0.20.0", + "System.Runtime.Extensions": "4.0.10.0", + "System.Runtime.Handles": "4.0.0.0", + "System.Runtime.InteropServices": "4.0.20.0", + "System.Security.Claims": "1.0.0-*", + "System.Security.Cryptography.X509Certificates": "4.0.0.0", + "System.Security.Principal": "4.0.0.0", + "System.Text.Encoding": "4.0.10.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" + } + } } - } } diff --git a/src/Microsoft.Net.WebSockets/project.json b/src/Microsoft.Net.WebSockets/project.json index c997ebc250..289e8628ab 100644 --- a/src/Microsoft.Net.WebSockets/project.json +++ b/src/Microsoft.Net.WebSockets/project.json @@ -1,40 +1,40 @@ { - "version": "1.0.0-*", - "dependencies": { + "version": "1.0.0-*", + "dependencies": { "Microsoft.Net.WebSocketAbstractions": "1.0.0-*" - }, - "compilationOptions" : { "allowUnsafe": true }, - "frameworks": { - "net45" : { }, - "aspnetcore50" : { - "dependencies": { - "Microsoft.Win32.Primitives": "4.0.0.0", - "System.Collections": "4.0.10.0", - "System.Collections.Concurrent": "4.0.0.0", - "System.Diagnostics.Contracts": "4.0.0.0", - "System.Diagnostics.Debug": "4.0.10.0", - "System.Diagnostics.Tools": "4.0.0.0", - "System.Globalization": "4.0.10.0", - "System.IO": "4.0.10.0", - "System.Linq": "4.0.0.0", - "System.Net.Primitives": "4.0.10.0", - "System.Reflection": "4.0.10.0", - "System.Resources.ResourceManager": "4.0.0.0", - "System.Runtime": "4.0.20.0", - "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.Handles": "4.0.0.0", - "System.Runtime.InteropServices": "4.0.20.0", - "System.Security.Cryptography.Encryption": "4.0.0.0", - "System.Security.Cryptography.Hashing.Algorithms": "4.0.0.0", - "System.Security.Principal": "4.0.0.0", - "System.Text.Encoding": "4.0.10.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.Timer": "4.0.0.0", - "System.Threading.ThreadPool": "4.0.10.0" - } - } - } + }, + "compilationOptions": { "allowUnsafe": true }, + "frameworks": { + "net45": { }, + "aspnetcore50": { + "dependencies": { + "Microsoft.Win32.Primitives": "4.0.0.0", + "System.Collections": "4.0.10.0", + "System.Collections.Concurrent": "4.0.0.0", + "System.Diagnostics.Contracts": "4.0.0.0", + "System.Diagnostics.Debug": "4.0.10.0", + "System.Diagnostics.Tools": "4.0.0.0", + "System.Globalization": "4.0.10.0", + "System.IO": "4.0.10.0", + "System.Linq": "4.0.0.0", + "System.Net.Primitives": "4.0.10.0", + "System.Reflection": "4.0.10.0", + "System.Resources.ResourceManager": "4.0.0.0", + "System.Runtime": "4.0.20.0", + "System.Runtime.Extensions": "4.0.10.0", + "System.Runtime.Handles": "4.0.0.0", + "System.Runtime.InteropServices": "4.0.20.0", + "System.Security.Cryptography.Encryption": "4.0.0.0", + "System.Security.Cryptography.Hashing.Algorithms": "4.0.0.0", + "System.Security.Principal": "4.0.0.0", + "System.Text.Encoding": "4.0.10.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.Timer": "4.0.0.0", + "System.Threading.ThreadPool": "4.0.10.0" + } + } + } } diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json index edff879192..612efee8b1 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json @@ -1,26 +1,25 @@ { - "commands": { - "test": "Xunit.KRunner" - }, - "dependencies": { - "Microsoft.AspNet.FeatureModel" : "1.0.0-*", - "Microsoft.AspNet.Hosting": "1.0.0-*", - "Microsoft.AspNet.Http" : "1.0.0-*", - "Microsoft.AspNet.HttpFeature" : "1.0.0-*", - "Microsoft.AspNet.PipelineCore" : "1.0.0-*", - "Microsoft.AspNet.Server.WebListener" : "", - "Microsoft.Framework.ConfigurationModel": "1.0.0-*", - "Microsoft.Framework.Logging": "1.0.0-*", - "Microsoft.Net.Http.Server" : "", - "Xunit.KRunner": "1.0.0-*" - }, - "frameworks": { + "commands": { + "test": "Xunit.KRunner" + }, + "dependencies": { + "Microsoft.AspNet.FeatureModel": "1.0.0-*", + "Microsoft.AspNet.Hosting": "1.0.0-*", + "Microsoft.AspNet.Http": "1.0.0-*", + "Microsoft.AspNet.HttpFeature": "1.0.0-*", + "Microsoft.AspNet.PipelineCore": "1.0.0-*", + "Microsoft.AspNet.Server.WebListener": "", + "Microsoft.Framework.ConfigurationModel": "1.0.0-*", + "Microsoft.Framework.Logging": "1.0.0-*", + "Microsoft.Net.Http.Server": "1.0.0-*", + "Xunit.KRunner": "1.0.0-*" + }, + "frameworks": { "aspnet50": { - "dependencies": { - "System.Net.Http": "", - "System.Net.Http.WebRequest": "", - "System.Runtime": "" + "frameworkAssemblies": { + "System.Net.Http": "4.0.0.0", + "System.Net.Http.WebRequest": "4.0.0.0" } } - } + } } diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index 37f11f8ff3..91d2dad8aa 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -3,15 +3,14 @@ "test": "Xunit.KRunner" }, "dependencies": { - "System.Net.Http": "4.0.0.0", - "System.Runtime": "4.0.20.0", "Microsoft.Net.Http.Server": "1.0.0-*", "Xunit.KRunner": "1.0.0-*" }, "frameworks": { - "net45": { - dependencies: { - "System.Net.Http.WebRequest": "" + "aspnet50": { + frameworkAssemblies: { + "System.Net.Http": "4.0.0.0", + "System.Net.Http.WebRequest": "4.0.0.0" } } }