diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 3c2d007f30..e087c17fa1 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,7 +9,7 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.AspNet.Server.WebListener": { }, + "Microsoft.AspNetCore.Server.WebListener": { }, "Microsoft.Net.Http.Server": { }, "Microsoft.Net.WebSockets.Server": { } } diff --git a/WebListener.sln b/WebListener.sln index 618e975e97..5570995d52 100644 --- a/WebListener.sln +++ b/WebListener.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 @@ -19,9 +19,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SelfHostServer", "samples\S EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.WebSockets.Server", "src\Microsoft.Net.WebSockets.Server\Microsoft.Net.WebSockets.Server.xproj", "{E788AEAE-2CB4-4BFA-8746-D0BB7E93A1BB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.WebListener.FunctionalTests", "test\Microsoft.AspNet.Server.WebListener.FunctionalTests\Microsoft.AspNet.Server.WebListener.FunctionalTests.xproj", "{4492FF4C-9032-411D-853F-46B01755E504}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.WebListener.FunctionalTests", "test\Microsoft.AspNetCore.Server.WebListener.FunctionalTests\Microsoft.AspNetCore.Server.WebListener.FunctionalTests.xproj", "{4492FF4C-9032-411D-853F-46B01755E504}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.WebListener", "src\Microsoft.AspNet.Server.WebListener\Microsoft.AspNet.Server.WebListener.xproj", "{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.WebListener", "src\Microsoft.AspNetCore.Server.WebListener\Microsoft.AspNetCore.Server.WebListener.xproj", "{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Server.FunctionalTests", "test\Microsoft.Net.Http.Server.FunctionalTests\Microsoft.Net.Http.Server.FunctionalTests.xproj", "{DCB6E0B1-223D-44E6-8696-4767E5B6E6A1}" EndProject diff --git a/samples/HotAddSample/Startup.cs b/samples/HotAddSample/Startup.cs index aff6a0de15..d2ef0cbfd0 100644 --- a/samples/HotAddSample/Startup.cs +++ b/samples/HotAddSample/Startup.cs @@ -1,9 +1,9 @@ using System; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Features; using Microsoft.Extensions.Logging; namespace HotAddSample diff --git a/samples/HotAddSample/hosting.json b/samples/HotAddSample/hosting.json index 2efa8f78a3..598af3d3a8 100644 --- a/samples/HotAddSample/hosting.json +++ b/samples/HotAddSample/hosting.json @@ -1,4 +1,4 @@ -{ - "server": "Microsoft.AspNet.Server.WebListener", +{ + "server": "Microsoft.AspNetCore.Server.WebListener", "server.urls": "http://localhost:12345" } diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index 4b5d9cf38d..22f851418f 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "compilationOptions": { diff --git a/samples/SelfHostServer/Startup.cs b/samples/SelfHostServer/Startup.cs index 73eac09160..9ee6194f07 100644 --- a/samples/SelfHostServer/Startup.cs +++ b/samples/SelfHostServer/Startup.cs @@ -2,10 +2,10 @@ using System; using System.Net.WebSockets; using System.Text; using System.Threading; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Server; diff --git a/samples/SelfHostServer/hosting.json b/samples/SelfHostServer/hosting.json index 6ac58d83c9..c1733ee469 100644 --- a/samples/SelfHostServer/hosting.json +++ b/samples/SelfHostServer/hosting.json @@ -1,4 +1,4 @@ -{ - "server": "Microsoft.AspNet.Server.WebListener", +{ + "server": "Microsoft.AspNetCore.Server.WebListener", "server.urls": "http://localhost:8080" } diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index d0e19d44c0..8fd986fded 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "compilationOptions": { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/AuthenticationHandler.cs b/src/Microsoft.AspNetCore.Server.WebListener/AuthenticationHandler.cs index 458e5a2009..b1f9aec312 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/AuthenticationHandler.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/AuthenticationHandler.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. +// Copyright (c) Microsoft Open Technologies, Inc. // All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,10 +25,10 @@ using System; using System.Collections.Generic; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features.Authentication; +using Microsoft.AspNetCore.Http.Features.Authentication; using Microsoft.Net.Http.Server; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal class AuthenticationHandler : IAuthenticationHandler { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNetCore.Server.WebListener/FeatureContext.cs index a74869fe13..4068da2818 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/FeatureContext.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/FeatureContext.cs @@ -23,13 +23,13 @@ using System.Security.Claims; using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Features.Authentication; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Features.Authentication; using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Server; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal class FeatureContext : IHttpRequestFeature, diff --git a/src/Microsoft.AspNetCore.Server.WebListener/HeaderDictionary.cs b/src/Microsoft.AspNetCore.Server.WebListener/HeaderDictionary.cs index 7c78b196f7..b71a1bd876 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/HeaderDictionary.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/HeaderDictionary.cs @@ -4,10 +4,10 @@ using System; using System.Collections; using System.Collections.Generic; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { /// /// Represents a wrapper for RequestHeaders and ResponseHeaders. @@ -144,7 +144,7 @@ namespace Microsoft.AspNet.Server.WebListener /// /// Copies the elements to a one-dimensional Array instance at the specified index. /// - /// The one-dimensional Array that is the destination of the specified objects copied from the . + /// The one-dimensional Array that is the destination of the specified objects copied from the . /// The zero-based index in at which copying begins. public void CopyTo(KeyValuePair[] array, int arrayIndex) { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/Helpers.cs b/src/Microsoft.AspNetCore.Server.WebListener/Helpers.cs index 4520aa2adf..f9ff181782 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/Helpers.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/Helpers.cs @@ -24,7 +24,7 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal static class Helpers { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNetCore.Server.WebListener/LogHelper.cs index 5db901b922..a2ee73f12e 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/LogHelper.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/LogHelper.cs @@ -25,7 +25,7 @@ using System; using System.Diagnostics; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal static class LogHelper { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/MessagePump.cs b/src/Microsoft.AspNetCore.Server.WebListener/MessagePump.cs index 9cb66bc7ba..cb2bca862d 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/MessagePump.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/MessagePump.cs @@ -20,13 +20,13 @@ using System.Collections.Generic; using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Features; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Features; using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Server; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal class MessagePump : IServer { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/ServerAddressesFeature.cs b/src/Microsoft.AspNetCore.Server.WebListener/ServerAddressesFeature.cs index d617baa7ea..f7ca6cc178 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/ServerAddressesFeature.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/ServerAddressesFeature.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. +// Copyright (c) Microsoft Open Technologies, Inc. // All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,9 +16,9 @@ // permissions and limitations under the License. using System.Collections.Generic; -using Microsoft.AspNet.Server.Features; +using Microsoft.AspNetCore.Server.Features; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal class ServerAddressesFeature : IServerAddressesFeature { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNetCore.Server.WebListener/ServerFactory.cs index 1e72371d8a..b37bfb7dd8 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/ServerFactory.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/ServerFactory.cs @@ -36,13 +36,13 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Features; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Features; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { /// /// Implements the setup process for this server. diff --git a/src/Microsoft.AspNetCore.Server.WebListener/StandardFeatureCollection.cs b/src/Microsoft.AspNetCore.Server.WebListener/StandardFeatureCollection.cs index 161ea17a4a..eccf7418e5 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/StandardFeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.WebListener/StandardFeatureCollection.cs @@ -18,11 +18,11 @@ using System; using System.Collections; using System.Collections.Generic; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Features.Authentication; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Features.Authentication; using Microsoft.Net.Http.Server; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal sealed class StandardFeatureCollection : IFeatureCollection { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index de325e677c..44917648c5 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "description": "ASP.NET 5 self-host web server.", "dependencies": { - "Microsoft.AspNet.Hosting": "1.0.0-*", + "Microsoft.AspNetCore.Hosting": "1.0.0-*", "Microsoft.Net.Http.Headers": "1.0.0-*", "Microsoft.Net.Http.Server": "1.0.0-*" }, diff --git a/src/Microsoft.Net.WebSockets.Server/Legacy/WebSocketHttpListenerDuplexStream.cs b/src/Microsoft.Net.WebSockets.Server/Legacy/WebSocketHttpListenerDuplexStream.cs index 1e23d2ec6e..be72c5f88e 100644 --- a/src/Microsoft.Net.WebSockets.Server/Legacy/WebSocketHttpListenerDuplexStream.cs +++ b/src/Microsoft.Net.WebSockets.Server/Legacy/WebSocketHttpListenerDuplexStream.cs @@ -21,7 +21,7 @@ // //------------------------------------------------------------------------------ /* -namespace Microsoft.AspNet.WebSockets +namespace Microsoft.AspNetCore.WebSockets { using Microsoft.Net; using System; diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/AuthenticationTests.cs index 2b5d570844..7606cc1bc9 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/AuthenticationTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/AuthenticationTests.cs @@ -20,12 +20,12 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Http.Features.Authentication; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; using AuthenticationSchemes = Microsoft.Net.Http.Server.AuthenticationSchemes; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class AuthenticationTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/DummyApplication.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/DummyApplication.cs index 21c4aed52f..a8863fbaf2 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/DummyApplication.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/DummyApplication.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. +// Copyright (c) Microsoft Open Technologies, Inc. // All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,12 +17,12 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal class DummyApplication : IHttpApplication { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs index 3027f4bc70..7616dc5392 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/HttpsTests.cs @@ -21,10 +21,10 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class HttpsTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs index 0db487cd09..191208da1e 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs @@ -22,12 +22,12 @@ using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class OpaqueUpgradeTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs index 58a1de5318..f11949a4e7 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. +// Copyright (c) Microsoft Open Technologies, Inc. // All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,11 +23,11 @@ using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class RequestBodyTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestHeaderTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestHeaderTests.cs index 62f7a36708..d6da222f14 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestHeaderTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestHeaderTests.cs @@ -20,12 +20,12 @@ using System.Net.Http; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; using Microsoft.Extensions.Primitives; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class RequestHeaderTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestTests.cs index 167771032e..6f57582cb9 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. +// Copyright (c) Microsoft Open Technologies, Inc. // All Rights Reserved // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,13 +21,13 @@ using System.Net.Http; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Net.Http.Server; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class RequestTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseBodyTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseBodyTests.cs index 68a214cc83..42224e5df3 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseBodyTests.cs @@ -23,12 +23,12 @@ using System.Net.Http; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class ResponseBodyTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseCachingTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseCachingTests.cs index 0c713606f8..70b44128e3 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseCachingTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseCachingTests.cs @@ -1,14 +1,14 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; using Xunit; -namespace Microsoft.AspNet.Server.WebListener.FunctionalTests +namespace Microsoft.AspNetCore.Server.WebListener.FunctionalTests { public class ResponseCachingTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs index 65cc7ba379..4ec53b2a36 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs @@ -22,11 +22,11 @@ using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Primitives; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class ResponseHeaderTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs index 48ef151349..3c39c77764 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs @@ -24,10 +24,10 @@ using System.Net.Http; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class ResponseSendFileTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseTests.cs index 516b2dc87f..ad63957536 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseTests.cs @@ -19,11 +19,11 @@ using System; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class ResponseTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs index 15ca0a7754..37660b5380 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ServerTests.cs @@ -24,12 +24,12 @@ using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Net.Http.Server; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class ServerTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Utilities.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Utilities.cs index 597f9aaf32..97521f74bd 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Utilities.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/Utilities.cs @@ -16,14 +16,14 @@ // permissions and limitations under the License. using System; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Server.Features; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Server.Features; using Microsoft.Net.Http.Server; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { internal static class Utilities { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/WebSocketTests.cs b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/WebSocketTests.cs index c39ae4b1d8..c34936f454 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/WebSocketTests.cs +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/WebSocketTests.cs @@ -20,12 +20,12 @@ using System.Net.Http; using System.Net.WebSockets; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Server.WebListener +namespace Microsoft.AspNetCore.Server.WebListener { public class WebSocketTests { diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index 39978ebf9c..68da4685aa 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -4,8 +4,8 @@ "test": "xunit.runner.aspnet" }, "dependencies": { - "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*" + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*" }, "frameworks": { "dnx451": { diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/AuthenticationTests.cs index 8281eb53fa..2721e6cab1 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/AuthenticationTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/AuthenticationTests.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.Net.Http.Server diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs index da14565de8..d85688e521 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.IO; @@ -6,7 +6,7 @@ using System.Net.Http; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.Net.Http.Server diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs index 95ebe7e7a6..ec1b6a8006 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using System.Net.Http; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.Net.Http.Server diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseCachingTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseCachingTests.cs index 0d9d9e9638..5f739c7d91 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseCachingTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ResponseCachingTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.IO; @@ -6,7 +6,7 @@ using System.Linq; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.Net.Http.Server diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs index a388436b1c..9de25a8e0c 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.IO; @@ -8,7 +8,7 @@ using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.Net.Http.Server diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/SkipOffDomainAttribute.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/SkipOffDomainAttribute.cs index 5b8ed56e53..737d9e1f94 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/SkipOffDomainAttribute.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/SkipOffDomainAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; namespace Microsoft.Net.Http.Server { diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/Utilities.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/Utilities.cs index c8bad49ad6..d9240c02bc 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/Utilities.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/Utilities.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; @@ -8,7 +8,7 @@ namespace Microsoft.Net.Http.Server { // When tests projects are run in parallel, overlapping port ranges can cause a race condition when looking for free // ports during dynamic port allocation. To avoid this, make sure the port range here is different from the range in - // Microsoft.AspNet.Server.WebListener. + // Microsoft.AspNetCore.Server.WebListener. private const int BasePort = 8001; private const int MaxPort = 11000; private static int NextPort = BasePort; diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/WebSocketTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/WebSocketTests.cs index 083d02601f..6271d2ae93 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/WebSocketTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/WebSocketTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. using System; using System.Net.Http; @@ -6,7 +6,7 @@ using System.Net.WebSockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.Net.Http.Server diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index 017ab2aa10..8407d48b4d 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.Net.Http.Server": "1.0.0-*", "Microsoft.Net.WebSockets.Server": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": {