From 1492b41af0d1ee1f1535df356e7ab2e3210446a5 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 5 Dec 2016 09:03:58 -0800 Subject: [PATCH] Updating to 4.4 CoreFx packages --- global.json | 2 +- samples/ChatSample/project.json | 15 ++++----------- samples/ClientSample/project.json | 9 ++++----- samples/SocialWeather/project.json | 19 +++++++------------ samples/SocketsSample/project.json | 19 ++++++++----------- .../project.json | 9 +++------ src/Microsoft.AspNetCore.SignalR/project.json | 10 ++++------ src/Microsoft.AspNetCore.Sockets/project.json | 8 +++----- .../project.json | 9 +++------ .../project.json | 7 ++----- .../project.json | 14 ++++---------- .../project.json | 5 ++--- .../project.json | 9 ++++----- .../project.json | 7 +++---- test/WebSocketsTestApp/project.json | 9 ++++----- 15 files changed, 56 insertions(+), 95 deletions(-) diff --git a/global.json b/global.json index 67e54ff84b..ec96aa7abe 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ "test" ], "sdk": { - "version": "1.0.0-preview2-1-003177" + "version": "1.0.0-preview2-1-003180" } } \ No newline at end of file diff --git a/samples/ChatSample/project.json b/samples/ChatSample/project.json index 9a51ca8562..aa13fd24c6 100644 --- a/samples/ChatSample/project.json +++ b/samples/ChatSample/project.json @@ -1,9 +1,8 @@ -{ +{ "userSecretsId": "aspnet-ChatSample-f11cf018-e0a8-49fa-b749-4c0eb5c9150b", - "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.2.0-*", "type": "platform" }, "Microsoft.AspNetCore.Authentication.Cookies": "1.2.0-*", @@ -32,7 +31,7 @@ "Microsoft.Extensions.Configuration.UserSecrets": "1.2.0-*", "Microsoft.EntityFrameworkCore.Tools": { "version": "1.2.0-*", - "type": "build" + "type": "build" }, "Microsoft.Extensions.Logging": "1.2.0-*", "Microsoft.Extensions.Logging.Console": "1.2.0-*", @@ -48,7 +47,6 @@ }, "Microsoft.AspNetCore.SignalR": "1.0.0-*" }, - "tools": { "BundlerMinifier.Core": "2.0.238", "Microsoft.AspNetCore.Razor.Tools": "1.2.0-*", @@ -62,24 +60,20 @@ ] } }, - "frameworks": { "netcoreapp1.1": { "imports": "portable-net45+win8" } }, - "buildOptions": { "emitEntryPoint": true, "preserveCompilationContext": true }, - "runtimeOptions": { "configProperties": { "System.GC.Server": true } }, - "publishOptions": { "include": [ "wwwroot", @@ -89,7 +83,6 @@ "web.config" ] }, - "scripts": { "precompile": [ "dotnet bundle", "npm install", @@ -97,4 +90,4 @@ "prepublish": [ "bower install" ], "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } -} +} \ No newline at end of file diff --git a/samples/ClientSample/project.json b/samples/ClientSample/project.json index b385a0b72a..42ed0db89c 100644 --- a/samples/ClientSample/project.json +++ b/samples/ClientSample/project.json @@ -1,19 +1,18 @@ -{ +{ "buildOptions": { "emitEntryPoint": true }, - "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.2.0-*", "type": "platform" }, + "System.Net.WebSockets.Client": "4.4.0-*", "Microsoft.Extensions.Logging.Console": "1.2.0-*", "Microsoft.Extensions.Logging": "1.2.0-*", "Microsoft.AspNetCore.SignalR.Client": "1.0.0-*" }, - "frameworks": { "netcoreapp1.1": {} } -} +} \ No newline at end of file diff --git a/samples/SocialWeather/project.json b/samples/SocialWeather/project.json index 1028521d36..57ca0eb14b 100644 --- a/samples/SocialWeather/project.json +++ b/samples/SocialWeather/project.json @@ -1,7 +1,7 @@ -{ +{ "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-preview1-001100-00", + "version": "1.2.0-*", "type": "platform" }, "Microsoft.AspNetCore.Diagnostics": "1.1.0-*", @@ -13,35 +13,30 @@ "Microsoft.AspNetCore.StaticFiles": "1.1.0-*", "Google.Protobuf": "3.1.0" }, - "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" }, - "frameworks": { - "netcoreapp1.1": { - } + "netcoreapp1.1": {} }, - "buildOptions": { "emitEntryPoint": true, "preserveCompilationContext": true }, - "runtimeOptions": { "configProperties": { "System.GC.Server": true } }, - "publishOptions": { "include": [ "wwwroot", "web.config" ] }, - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + "postpublish": [ + "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" + ] } -} +} \ No newline at end of file diff --git a/samples/SocketsSample/project.json b/samples/SocketsSample/project.json index 285b15fb63..04b0e95800 100644 --- a/samples/SocketsSample/project.json +++ b/samples/SocketsSample/project.json @@ -1,8 +1,8 @@ -{ +{ "dependencies": { "Microsoft.AspNetCore.SignalR.Redis": "1.0.0-*", "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.2.0-*", "type": "platform" }, "Newtonsoft.Json": "9.0.1", @@ -14,39 +14,36 @@ "Microsoft.Extensions.Logging.Console": "1.2.0-*", "Google.Protobuf": "3.1.0" }, - "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" }, - "frameworks": { "netcoreapp1.1": { "imports": "portable-net45+win8+wp8+wpa81" } }, - "buildOptions": { "emitEntryPoint": true, "preserveCompilationContext": true }, - "runtimeOptions": { "configProperties": { "System.GC.Server": true } }, - "publishOptions": { "include": [ "wwwroot", "web.config" ] }, - "scripts": { "precompile": [ "npm install", - "npm run gulp -- --gulpfile %project:Directory%/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir %project:Directory%/wwwroot/lib/signalr-client/" ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + "npm run gulp -- --gulpfile %project:Directory%/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir %project:Directory%/wwwroot/lib/signalr-client/" + ], + "postpublish": [ + "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" + ] } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SignalR.Redis/project.json b/src/Microsoft.AspNetCore.SignalR.Redis/project.json index 37b39ad97a..ff69895311 100644 --- a/src/Microsoft.AspNetCore.SignalR.Redis/project.json +++ b/src/Microsoft.AspNetCore.SignalR.Redis/project.json @@ -1,7 +1,6 @@ -{ +{ "version": "1.0.0-*", "description": "Redis for ASP.NET Core SignalR.", - "packOptions": { "repository": { "type": "git", @@ -20,7 +19,6 @@ ], "xmlDoc": true }, - "dependencies": { "Microsoft.AspNetCore.SignalR": { "target": "project" @@ -29,12 +27,11 @@ "version": "1.2.0-*", "type": "build" }, - "NETStandard.Library": "1.6.1-*", + "NETStandard.Library": "1.6.2-*", "StackExchange.Redis.StrongName": "1.1.605" }, - "frameworks": { "netstandard1.6": {}, "net451": {} } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SignalR/project.json b/src/Microsoft.AspNetCore.SignalR/project.json index e0aabd450e..ee4102c1a2 100644 --- a/src/Microsoft.AspNetCore.SignalR/project.json +++ b/src/Microsoft.AspNetCore.SignalR/project.json @@ -1,7 +1,6 @@ -{ +{ "version": "1.0.0-*", "description": "Real-time communication framework for ASP.NET Core.", - "packOptions": { "repository": { "type": "git", @@ -20,7 +19,6 @@ ], "xmlDoc": true }, - "dependencies": { "Microsoft.AspNetCore.Sockets": { "target": "project" @@ -30,11 +28,11 @@ "version": "1.2.0-*", "type": "build" }, - "NETStandard.Library": "1.6.1-*" + "NETStandard.Library": "1.6.2-*", + "Newtonsoft.Json": "9.0.1" }, - "frameworks": { "netstandard1.3": {}, "net451": {} } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Sockets/project.json b/src/Microsoft.AspNetCore.Sockets/project.json index 731b928fbe..fedef9034d 100644 --- a/src/Microsoft.AspNetCore.Sockets/project.json +++ b/src/Microsoft.AspNetCore.Sockets/project.json @@ -1,7 +1,6 @@ -{ +{ "version": "0.1.0-*", "description": "Components for providing real-time bi-directional communication across the Web.", - "packOptions": { "repository": { "type": "git", @@ -20,7 +19,6 @@ ], "xmlDoc": true }, - "dependencies": { "System.IO.Pipelines": "0.1.0-*", "Microsoft.AspNetCore.Hosting.Abstractions": "1.2.0-*", @@ -30,10 +28,10 @@ "version": "1.2.0-*", "type": "build" }, - "NETStandard.Library": "1.6.1-*" + "NETStandard.Library": "1.6.2-*" }, "frameworks": { "netstandard1.3": {}, "net451": {} } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.WebSockets.Internal/project.json b/src/Microsoft.AspNetCore.WebSockets.Internal/project.json index ab8372a468..258d02fb3e 100644 --- a/src/Microsoft.AspNetCore.WebSockets.Internal/project.json +++ b/src/Microsoft.AspNetCore.WebSockets.Internal/project.json @@ -1,7 +1,6 @@ -{ +{ "version": "0.1.0-*", "description": "WebSockets support for ASP.NET Core.", - "packOptions": { "repository": { "type": "git", @@ -20,18 +19,16 @@ ], "xmlDoc": true }, - "dependencies": { "Microsoft.AspNetCore.Http.Abstractions": "1.2.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.2.0-*", "Microsoft.Extensions.WebSockets.Internal": { "target": "project" }, - "NETStandard.Library": "1.6.1-*" + "NETStandard.Library": "1.6.2-*" }, - "frameworks": { "net451": {}, "netstandard1.3": {} } -} +} \ No newline at end of file diff --git a/src/Microsoft.Extensions.WebSockets.Internal/project.json b/src/Microsoft.Extensions.WebSockets.Internal/project.json index 65fc47ff74..7b0b9a135a 100644 --- a/src/Microsoft.Extensions.WebSockets.Internal/project.json +++ b/src/Microsoft.Extensions.WebSockets.Internal/project.json @@ -1,7 +1,6 @@ { "version": "0.1.0-*", "description": "Low-allocation Push-oriented WebSockets based on Channels", - "packOptions": { "repository": { "type": "git", @@ -21,7 +20,6 @@ "xmlDoc": true, "allowUnsafe": true }, - "dependencies": { "System.IO.Pipelines": "0.1.0-*", "System.IO.Pipelines.Text.Primitives": "0.1.0-*", @@ -29,11 +27,10 @@ "version": "1.2.0-*", "type": "build" }, - "NETStandard.Library": "1.6.1-*" + "NETStandard.Library": "1.6.2-*" }, - "frameworks": { "netstandard1.3": {}, "net451": {} } -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json b/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json index 7126f27c0b..24659e92cc 100644 --- a/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json +++ b/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json @@ -1,7 +1,7 @@ -{ +{ "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.2.0-*", "type": "platform" }, "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", @@ -11,37 +11,31 @@ "Microsoft.AspNetCore.SignalR": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, - "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" }, - "frameworks": { - "netcoreapp1.1": { } + "netcoreapp1.1": {} }, - "buildOptions": { "emitEntryPoint": true, "preserveCompilationContext": true }, - "runtimeOptions": { "configProperties": { "System.GC.Server": true } }, - "publishOptions": { "include": [ "wwwroot", "web.config" ] }, - "scripts": { "precompile": [ "npm install", "npm run gulp -- --gulpfile %project:Directory%/gulpfile.js copy-jasmine", "npm run gulp -- --gulpfile %project:Directory%/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir %project:Directory%/wwwroot/lib/signalr-client/" ], "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/project.json b/test/Microsoft.AspNetCore.Sockets.Tests/project.json index 42ff6cee45..c645d479c8 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/project.json +++ b/test/Microsoft.AspNetCore.Sockets.Tests/project.json @@ -7,7 +7,6 @@ "../Microsoft.Extensions.WebSockets.Internal.Tests/WebSocketPair.cs" ] }, - "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Http": "1.2.0-*", @@ -20,7 +19,7 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.2.0-*", "type": "platform" } } @@ -28,4 +27,4 @@ "net451": {} }, "testRunner": "xunit" -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json index d37ae74b1d..2cd371c5a7 100644 --- a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json +++ b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json @@ -2,7 +2,6 @@ "buildOptions": { "warningsAsErrors": true }, - "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-*", @@ -16,13 +15,13 @@ "frameworks": { "netcoreapp1.1": { "dependencies": { - "System.Diagnostics.FileVersionInfo": "4.3.0-*", + "System.Diagnostics.FileVersionInfo": "4.4.0-*", "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.2.0-*", "type": "platform" } } }, - "net451": { } + "net451": {} } -} +} \ No newline at end of file diff --git a/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json b/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json index 23429863c0..53ddb52b57 100644 --- a/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json +++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json @@ -1,8 +1,7 @@ -{ +{ "buildOptions": { "warningsAsErrors": true }, - "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.Extensions.TaskCache.Sources": { @@ -17,11 +16,11 @@ "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.2.0-*", "type": "platform" } } }, "net451": {} } -} +} \ No newline at end of file diff --git a/test/WebSocketsTestApp/project.json b/test/WebSocketsTestApp/project.json index e906c46e38..32a4897472 100644 --- a/test/WebSocketsTestApp/project.json +++ b/test/WebSocketsTestApp/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.2.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", @@ -9,8 +9,8 @@ "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", "Microsoft.Extensions.Logging.Console": "1.2.0-*", "Microsoft.NETCore.App": { - "version": "1.1.0-*", - "type": "platform" + "version": "1.2.0-*", + "type": "platform" } }, "tools": { @@ -22,7 +22,6 @@ "buildOptions": { "warningsAsErrors": true }, - "runtimeOptions": { "configProperties": { "System.GC.Server": true @@ -39,4 +38,4 @@ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } -} +} \ No newline at end of file