From 131594667d82955d8c52f40cf6329eade980b2db Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 15 Aug 2016 16:24:28 -0700 Subject: [PATCH] Reacting to Microsoft.AspNetCore.Server.Testing rename --- .../Autobahn/AutobahnExpectations.cs | 2 +- .../Autobahn/AutobahnResult.cs | 4 +- .../Autobahn/AutobahnServerResult.cs | 2 +- .../Autobahn/AutobahnSpec.cs | 4 +- .../Autobahn/AutobahnTester.cs | 2 +- .../Autobahn/Executable.cs | 1 - .../Autobahn/ServerSpec.cs | 3 +- .../AutobahnTests.cs | 2 +- .../Properties/AssemblyInfo.cs | 1 - .../project.json | 38 +++++++++---------- 10 files changed, 26 insertions(+), 33 deletions(-) diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs index a8e7425461..a616d6f489 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Server.IntegrationTesting; namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn { diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs index 0e88a07917..df3c025741 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Server.Testing; using Newtonsoft.Json.Linq; namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs index a92892d111..8e53f8091d 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Newtonsoft.Json.Linq; namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs index 18218f3a61..0d48db4eab 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs index 13ecaee858..dce4083ff7 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using Xunit; diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs index 28fd671bb3..f404a79a0e 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs @@ -2,7 +2,6 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -using System.Text; using System.Threading.Tasks; namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs index e100794a91..6b149d14d2 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs @@ -1,5 +1,4 @@ -using System; -using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn { diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs index 89cbfd5bbd..58a38afc68 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn; using Microsoft.Extensions.Logging; diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Properties/AssemblyInfo.cs index 6e03af7061..72534b1587 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Properties/AssemblyInfo.cs +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json index 9054cd9eb8..8f3b299b5c 100644 --- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json +++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/project.json @@ -1,23 +1,23 @@ { - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Server.Testing": "0.2.0-*", - "Microsoft.AspNetCore.Testing": "1.1.0-*", - "Microsoft.Extensions.Logging": "1.1.0-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.1.0-*", - "System.Diagnostics.FileVersionInfo": "4.0.0", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "dependencies": { + "dotnet-test-xunit": "2.2.0-*", + "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-*", + "Microsoft.AspNetCore.Testing": "1.1.0-*", + "Microsoft.Extensions.Logging": "1.1.0-*", + "Microsoft.Extensions.Logging.Console": "1.1.0-*", + "Microsoft.Extensions.PlatformAbstractions": "1.1.0-*", + "System.Diagnostics.FileVersionInfo": "4.0.0", + "xunit": "2.2.0-*" + }, + "testRunner": "xunit", + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" } + } } + } }