diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json b/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json index 86f0d6b15a..202ffdb370 100644 --- a/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json +++ b/test/Microsoft.AspNetCore.SignalR.Test.Server/project.json @@ -8,7 +8,9 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", "Microsoft.Extensions.Logging.Console": "1.2.0-*", - "Microsoft.AspNetCore.SignalR": "1.0.0-*", + "Microsoft.AspNetCore.SignalR": { + "target": "project" + }, "Microsoft.AspNetCore.StaticFiles": "1.2.0-*" }, diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs b/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs index 88056fc93a..23b59d26b6 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs +++ b/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs @@ -2,8 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO.Pipelines; +using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Internal; +using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Sockets.Tests @@ -13,7 +16,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests [Fact] public void ReservedConnectionsHaveConnectionId() { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var connectionManager = new ConnectionManager(lifetime); var state = connectionManager.ReserveConnection(); @@ -27,7 +30,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests [Fact] public void ReservedConnectionsCanBeRetrieved() { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var connectionManager = new ConnectionManager(lifetime); var state = connectionManager.ReserveConnection(); @@ -45,7 +48,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests using (var factory = new PipelineFactory()) using (var connection = new HttpConnection(factory)) { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var connectionManager = new ConnectionManager(lifetime); var state = connectionManager.AddNewConnection(connection); @@ -66,7 +69,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests using (var factory = new PipelineFactory()) using (var connection = new HttpConnection(factory)) { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var connectionManager = new ConnectionManager(lifetime); var state = connectionManager.AddNewConnection(connection); @@ -90,7 +93,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests using (var factory = new PipelineFactory()) using (var connection = new HttpConnection(factory)) { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var connectionManager = new ConnectionManager(lifetime); var state = connectionManager.AddNewConnection(connection); diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs b/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs index aa7a731fb3..ad7b1adc1f 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs +++ b/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs @@ -8,9 +8,11 @@ using System.IO.Pipelines; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Internal; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Internal; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; using Xunit; @@ -21,7 +23,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests [Fact] public async Task GetIdReservesConnectionIdAndReturnsIt() { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var manager = new ConnectionManager(lifetime); using (var factory = new PipelineFactory()) { @@ -43,7 +45,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests [Fact] public async Task SendingToReservedConnectionsThatHaveNotConnectedThrows() { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var manager = new ConnectionManager(lifetime); var state = manager.ReserveConnection(); @@ -66,7 +68,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests [Fact] public async Task SendingToUnknownConnectionIdThrows() { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var manager = new ConnectionManager(lifetime); using (var factory = new PipelineFactory()) { @@ -87,7 +89,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests [Fact] public async Task SendingWithoutConnectionIdThrows() { - var lifetime = new ApplicationLifetime(); + var lifetime = new ApplicationLifetime(new Logger(new LoggerFactory()), Enumerable.Empty()); var manager = new ConnectionManager(lifetime); using (var factory = new PipelineFactory()) { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/project.json b/test/Microsoft.AspNetCore.Sockets.Tests/project.json index 9fac3b002f..9797dbaecb 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/project.json +++ b/test/Microsoft.AspNetCore.Sockets.Tests/project.json @@ -11,9 +11,11 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Http": "1.2.0-*", - "Microsoft.AspNetCore.Sockets": "0.1.0-*", - "Microsoft.AspNetCore.Hosting": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", + "Microsoft.AspNetCore.Sockets": { + "target": "project" + }, + "Microsoft.AspNetCore.Hosting": "1.2.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", "xunit": "2.2.0-*" }, "frameworks": {