From dfa9c927b79506319cb1f78245a001019d9f62da Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Mon, 7 Nov 2016 14:00:41 -0800 Subject: [PATCH] clean up project.jsons and NuGet.config (#9) * clean up project.jsons and NuGet.config * clean up netstandard references * clean up netstandard tfm * change WebSockets descriptions --- NuGet.config | 3 +- .../project.json | 21 ++++++++ src/Microsoft.AspNetCore.SignalR/project.json | 25 ++++++++- src/Microsoft.AspNetCore.Sockets/project.json | 21 ++++++++ .../project.json | 48 ++++++++++++------ .../project.json | 46 +++++++++++------ .../project.json | 3 +- .../project.json | 6 ++- .../project.json | 1 + test/WebSocketsTestApp/project.json | 6 +-- tools/Key.snk | Bin 0 -> 596 bytes 11 files changed, 141 insertions(+), 39 deletions(-) create mode 100644 tools/Key.snk diff --git a/NuGet.config b/NuGet.config index 2db375e2c0..de2d11a3d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,8 +1,9 @@ + - \ 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 f9f71c70d6..29ae356ccf 100644 --- a/src/Microsoft.AspNetCore.SignalR.Redis/project.json +++ b/src/Microsoft.AspNetCore.SignalR.Redis/project.json @@ -1,10 +1,31 @@ { "version": "1.0.0-*", + "description": "Redis for ASP.NET Core SignalR.", + + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/signalr" + }, + "tags": [ + "aspnetcore", + "signalr" + ] + }, + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + "nowarn": [ + "CS1591" + ], + "xmlDoc": true + }, "dependencies": { "Microsoft.AspNetCore.SignalR": { "target": "project" }, + "NETStandard.Library": "1.6.1-*", "StackExchange.Redis": "1.1.*" }, diff --git a/src/Microsoft.AspNetCore.SignalR/project.json b/src/Microsoft.AspNetCore.SignalR/project.json index cb3f8229ec..ff5dd81364 100644 --- a/src/Microsoft.AspNetCore.SignalR/project.json +++ b/src/Microsoft.AspNetCore.SignalR/project.json @@ -1,11 +1,32 @@ { "version": "1.0.0-*", + "description": "Real-time communication framework for ASP.NET Core.", + + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/signalr" + }, + "tags": [ + "aspnetcore", + "signalr" + ] + }, + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + "nowarn": [ + "CS1591" + ], + "xmlDoc": true + }, "dependencies": { - "Newtonsoft.Json": "9.0.1", "Microsoft.AspNetCore.Sockets": { "target": "project" - } + }, + "NETStandard.Library": "1.6.1-*", + "Newtonsoft.Json": "9.0.1" }, "frameworks": { diff --git a/src/Microsoft.AspNetCore.Sockets/project.json b/src/Microsoft.AspNetCore.Sockets/project.json index 72175223a5..47264d75dd 100644 --- a/src/Microsoft.AspNetCore.Sockets/project.json +++ b/src/Microsoft.AspNetCore.Sockets/project.json @@ -1,5 +1,26 @@ { "version": "0.1.0-*", + "description": "Components for providing real-time bi-directional communication across the Web.", + + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/signalr" + }, + "tags": [ + "aspnetcore", + "signalr" + ] + }, + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + "nowarn": [ + "CS1591" + ], + "xmlDoc": true + }, + "dependencies": { "Channels": "0.2.0-beta-*", "Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0-*", diff --git a/src/Microsoft.AspNetCore.WebSockets.Internal/project.json b/src/Microsoft.AspNetCore.WebSockets.Internal/project.json index 648fc40ba5..5371235486 100644 --- a/src/Microsoft.AspNetCore.WebSockets.Internal/project.json +++ b/src/Microsoft.AspNetCore.WebSockets.Internal/project.json @@ -1,19 +1,35 @@ { - "version": "0.1.0-*", - "buildOptions": { - "warningsAsErrors": true - }, - "description": "Low-allocation Push-oriented WebSockets Middleware based on Channels", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "1.1.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", - "Microsoft.Extensions.WebSockets.Internal": "0.1.0-*", - "NETStandard.Library": "1.6.1-*" - }, + "version": "0.1.0-*", + "description": "WebSockets support for ASP.NET Core.", - "frameworks": { - "net46": {}, - "netstandard1.3": { - } - } + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/signalr" + }, + "tags": [ + "aspnetcore", + "signalr" + ] + }, + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + "nowarn": [ + "CS1591" + ], + "xmlDoc": true + }, + + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "1.1.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", + "Microsoft.Extensions.WebSockets.Internal": "0.1.0-*", + "NETStandard.Library": "1.6.1-*" + }, + + "frameworks": { + "net46": {}, + "netstandard1.3": {} + } } diff --git a/src/Microsoft.Extensions.WebSockets.Internal/project.json b/src/Microsoft.Extensions.WebSockets.Internal/project.json index b444d29b9a..4bb1ed4244 100644 --- a/src/Microsoft.Extensions.WebSockets.Internal/project.json +++ b/src/Microsoft.Extensions.WebSockets.Internal/project.json @@ -1,18 +1,34 @@ { - "version": "0.1.0-*", - "buildOptions": { - "warningsAsErrors": true, - "allowUnsafe": true - }, - "description": "Low-allocation Push-oriented WebSockets based on Channels", - "dependencies": { - "Channels": "0.2.0-beta-*", - "Channels.Text.Primitives": "0.2.0-beta-*", - "NETStandard.Library": "1.6.0" - }, + "version": "0.1.0-*", + "description": "WebSockets client and server components.", - "frameworks": { - "net46": {}, - "netstandard1.3": {} - } + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/signalr" + }, + "tags": [ + "aspnetcore", + "signalr" + ] + }, + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + "nowarn": [ + "CS1591" + ], + "xmlDoc": true + }, + + "description": "Low-allocation Push-oriented WebSockets based on Channels", + "dependencies": { + "Channels": "0.2.0-beta-*", + "Channels.Text.Primitives": "0.2.0-beta-*", + "NETStandard.Library": "1.6.1-*" + }, + + "frameworks": { + "netstandard1.3": {} + } } diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/project.json b/test/Microsoft.AspNetCore.Sockets.Tests/project.json index c6ef6c82e4..e99e32ef0c 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/project.json +++ b/test/Microsoft.AspNetCore.Sockets.Tests/project.json @@ -2,6 +2,7 @@ "buildOptions": { "warningsAsErrors": true }, + "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Http": "1.1.0-*", @@ -22,4 +23,4 @@ "net46": {} }, "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 526a646659..f167b5bc56 100644 --- a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json +++ b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/project.json @@ -1,4 +1,8 @@ { + "buildOptions": { + "warningsAsErrors": true + }, + "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-*", @@ -20,4 +24,4 @@ } } } -} \ 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 bcc773a0ed..2e70ec8a06 100644 --- a/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json +++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/project.json @@ -2,6 +2,7 @@ "buildOptions": { "warningsAsErrors": true }, + "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.Extensions.WebSockets.Internal": "0.1.0-*", diff --git a/test/WebSocketsTestApp/project.json b/test/WebSocketsTestApp/project.json index dd7831c3de..84dd93141c 100644 --- a/test/WebSocketsTestApp/project.json +++ b/test/WebSocketsTestApp/project.json @@ -25,9 +25,9 @@ } }, "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true + "warningsAsErrors": true }, + "runtimeOptions": { "configProperties": { "System.GC.Server": true @@ -44,4 +44,4 @@ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } -} \ No newline at end of file +} diff --git a/tools/Key.snk b/tools/Key.snk new file mode 100644 index 0000000000000000000000000000000000000000..e10e4889c125d3120cd9e81582243d70f7cbb806 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ literal 0 HcmV?d00001