From 70c084b3447997b74f770634ec026d91ce99518a Mon Sep 17 00:00:00 2001 From: SteveSandersonMS Date: Wed, 18 May 2016 13:59:25 +0100 Subject: [PATCH] Simplify project.json/global.json files where possible --- global.json | 5 +---- samples/misc/ES2015Transpilation/project.json | 2 +- samples/misc/LatencyTest/project.json | 2 +- samples/misc/Webpack/project.json | 2 +- samples/react/ReactGrid/project.json | 2 +- .../project.json | 1 - src/Microsoft.AspNetCore.NodeServices/project.json | 12 ++++++------ src/Microsoft.AspNetCore.ReactServices/project.json | 1 - 8 files changed, 11 insertions(+), 16 deletions(-) diff --git a/global.json b/global.json index 6ca3c9b..983ba04 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,3 @@ { - "projects": ["src"], - "sdk": { - "version": "1.0.0-rc1-final" - } + "projects": ["src"] } diff --git a/samples/misc/ES2015Transpilation/project.json b/samples/misc/ES2015Transpilation/project.json index d92cd67..9188c66 100755 --- a/samples/misc/ES2015Transpilation/project.json +++ b/samples/misc/ES2015Transpilation/project.json @@ -12,7 +12,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc2-3002702", + "version": "1.0.0-rc2-*", "type": "platform" }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", diff --git a/samples/misc/LatencyTest/project.json b/samples/misc/LatencyTest/project.json index 780b662..1dd7f9c 100755 --- a/samples/misc/LatencyTest/project.json +++ b/samples/misc/LatencyTest/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc2-3002702", + "version": "1.0.0-rc2-*", "type": "platform" }, "Microsoft.AspNetCore.NodeServices": "1.0.0-*" diff --git a/samples/misc/Webpack/project.json b/samples/misc/Webpack/project.json index 04fe253..47ef89b 100755 --- a/samples/misc/Webpack/project.json +++ b/samples/misc/Webpack/project.json @@ -12,7 +12,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc2-3002702", + "version": "1.0.0-rc2-*", "type": "platform" }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", diff --git a/samples/react/ReactGrid/project.json b/samples/react/ReactGrid/project.json index 91d5ac8..616f2dc 100755 --- a/samples/react/ReactGrid/project.json +++ b/samples/react/ReactGrid/project.json @@ -9,7 +9,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc2-3002702", + "version": "1.0.0-rc2-*", "type": "platform" }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", diff --git a/src/Microsoft.AspNetCore.AngularServices/project.json b/src/Microsoft.AspNetCore.AngularServices/project.json index 40d0515..2de1792 100644 --- a/src/Microsoft.AspNetCore.AngularServices/project.json +++ b/src/Microsoft.AspNetCore.AngularServices/project.json @@ -10,7 +10,6 @@ }, "dependencies": { "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", - "Microsoft.AspNetCore.NodeServices": "1.0.0-*", "Microsoft.AspNetCore.SpaServices": "1.0.0-*" }, "frameworks": { diff --git a/src/Microsoft.AspNetCore.NodeServices/project.json b/src/Microsoft.AspNetCore.NodeServices/project.json index 22a8074..3223b3e 100644 --- a/src/Microsoft.AspNetCore.NodeServices/project.json +++ b/src/Microsoft.AspNetCore.NodeServices/project.json @@ -6,15 +6,15 @@ }, "authors": [ "Microsoft" ], "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, + "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", "Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", - "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", - "Newtonsoft.Json": "8.0.3", - "System.Diagnostics.Process": "4.1.0-*", - "System.Text.RegularExpressions": "4.0.0-*", - "System.Net.Http": "4.0.0-*", - "System.Console": "4.0.0-*" + "Newtonsoft.Json": "8.0.3" }, "frameworks": { "netcoreapp1.0": { diff --git a/src/Microsoft.AspNetCore.ReactServices/project.json b/src/Microsoft.AspNetCore.ReactServices/project.json index d08cdff..18e475a 100644 --- a/src/Microsoft.AspNetCore.ReactServices/project.json +++ b/src/Microsoft.AspNetCore.ReactServices/project.json @@ -10,7 +10,6 @@ }, "dependencies": { "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", - "Microsoft.AspNetCore.NodeServices": "1.0.0-*", "Microsoft.AspNetCore.SpaServices": "1.0.0-*" }, "frameworks": {