Update project.json versions

This commit is contained in:
BrennanConroy 2016-11-30 12:20:33 -08:00
parent e6b34fdce3
commit a96370ea35
4 changed files with 22 additions and 13 deletions

View File

@ -8,7 +8,9 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
"Microsoft.Extensions.Logging.Console": "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-*" "Microsoft.AspNetCore.StaticFiles": "1.2.0-*"
}, },

View File

@ -2,8 +2,11 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.IO.Pipelines; using System.IO.Pipelines;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Internal; using Microsoft.AspNetCore.Hosting.Internal;
using Microsoft.Extensions.Logging;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Sockets.Tests namespace Microsoft.AspNetCore.Sockets.Tests
@ -13,7 +16,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
[Fact] [Fact]
public void ReservedConnectionsHaveConnectionId() public void ReservedConnectionsHaveConnectionId()
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var connectionManager = new ConnectionManager(lifetime); var connectionManager = new ConnectionManager(lifetime);
var state = connectionManager.ReserveConnection(); var state = connectionManager.ReserveConnection();
@ -27,7 +30,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
[Fact] [Fact]
public void ReservedConnectionsCanBeRetrieved() public void ReservedConnectionsCanBeRetrieved()
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var connectionManager = new ConnectionManager(lifetime); var connectionManager = new ConnectionManager(lifetime);
var state = connectionManager.ReserveConnection(); var state = connectionManager.ReserveConnection();
@ -45,7 +48,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
using (var factory = new PipelineFactory()) using (var factory = new PipelineFactory())
using (var connection = new HttpConnection(factory)) using (var connection = new HttpConnection(factory))
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var connectionManager = new ConnectionManager(lifetime); var connectionManager = new ConnectionManager(lifetime);
var state = connectionManager.AddNewConnection(connection); var state = connectionManager.AddNewConnection(connection);
@ -66,7 +69,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
using (var factory = new PipelineFactory()) using (var factory = new PipelineFactory())
using (var connection = new HttpConnection(factory)) using (var connection = new HttpConnection(factory))
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var connectionManager = new ConnectionManager(lifetime); var connectionManager = new ConnectionManager(lifetime);
var state = connectionManager.AddNewConnection(connection); var state = connectionManager.AddNewConnection(connection);
@ -90,7 +93,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
using (var factory = new PipelineFactory()) using (var factory = new PipelineFactory())
using (var connection = new HttpConnection(factory)) using (var connection = new HttpConnection(factory))
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var connectionManager = new ConnectionManager(lifetime); var connectionManager = new ConnectionManager(lifetime);
var state = connectionManager.AddNewConnection(connection); var state = connectionManager.AddNewConnection(connection);

View File

@ -8,9 +8,11 @@ using System.IO.Pipelines;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Internal; using Microsoft.AspNetCore.Hosting.Internal;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Http.Internal;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Primitives; using Microsoft.Extensions.Primitives;
using Xunit; using Xunit;
@ -21,7 +23,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
[Fact] [Fact]
public async Task GetIdReservesConnectionIdAndReturnsIt() public async Task GetIdReservesConnectionIdAndReturnsIt()
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var manager = new ConnectionManager(lifetime); var manager = new ConnectionManager(lifetime);
using (var factory = new PipelineFactory()) using (var factory = new PipelineFactory())
{ {
@ -43,7 +45,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
[Fact] [Fact]
public async Task SendingToReservedConnectionsThatHaveNotConnectedThrows() public async Task SendingToReservedConnectionsThatHaveNotConnectedThrows()
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var manager = new ConnectionManager(lifetime); var manager = new ConnectionManager(lifetime);
var state = manager.ReserveConnection(); var state = manager.ReserveConnection();
@ -66,7 +68,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
[Fact] [Fact]
public async Task SendingToUnknownConnectionIdThrows() public async Task SendingToUnknownConnectionIdThrows()
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var manager = new ConnectionManager(lifetime); var manager = new ConnectionManager(lifetime);
using (var factory = new PipelineFactory()) using (var factory = new PipelineFactory())
{ {
@ -87,7 +89,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests
[Fact] [Fact]
public async Task SendingWithoutConnectionIdThrows() public async Task SendingWithoutConnectionIdThrows()
{ {
var lifetime = new ApplicationLifetime(); var lifetime = new ApplicationLifetime(new Logger<ApplicationLifetime>(new LoggerFactory()), Enumerable.Empty<IApplicationLifetimeEvents>());
var manager = new ConnectionManager(lifetime); var manager = new ConnectionManager(lifetime);
using (var factory = new PipelineFactory()) using (var factory = new PipelineFactory())
{ {

View File

@ -11,9 +11,11 @@
"dependencies": { "dependencies": {
"dotnet-test-xunit": "2.2.0-*", "dotnet-test-xunit": "2.2.0-*",
"Microsoft.AspNetCore.Http": "1.2.0-*", "Microsoft.AspNetCore.Http": "1.2.0-*",
"Microsoft.AspNetCore.Sockets": "0.1.0-*", "Microsoft.AspNetCore.Sockets": {
"Microsoft.AspNetCore.Hosting": "1.1.0-*", "target": "project"
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", },
"Microsoft.AspNetCore.Hosting": "1.2.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
"xunit": "2.2.0-*" "xunit": "2.2.0-*"
}, },
"frameworks": { "frameworks": {