Rename AspNet 5 file contents.

See https://github.com/aspnet/Announcements/issues/144 for more information.

NuGetPackageVerifier.json

@@ -9,7 +9,7 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.Server.WebListener": { },
+            "Microsoft.AspNetCore.Server.WebListener": { },
             "Microsoft.Net.Http.Server": { },
             "Microsoft.Net.WebSockets.Server": { }
         }

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

samples/HotAddSample/Startup.cs

@@ -1,9 +1,9 @@
 using System;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Server.Features;
+using Microsoft.AspNetCore.Server.Features;
 using Microsoft.Extensions.Logging;
 
 namespace HotAddSample

samples/HotAddSample/hosting.json

@@ -1,4 +1,4 @@
-{
+{
-  "server": "Microsoft.AspNet.Server.WebListener",
+  "server": "Microsoft.AspNetCore.Server.WebListener",
   "server.urls": "http://localhost:12345"
 }

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": {

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.AspNetCore.Builder;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Server;
 

samples/SelfHostServer/hosting.json

@@ -1,4 +1,4 @@
-{
+{
-  "server": "Microsoft.AspNet.Server.WebListener",
+  "server": "Microsoft.AspNetCore.Server.WebListener",
   "server.urls": "http://localhost:8080"
 }

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": {

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
     {

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.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Features.Authentication;
+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,

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
 {
     /// <summary>
     /// Represents a wrapper for RequestHeaders and ResponseHeaders.
@@ -144,7 +144,7 @@ namespace Microsoft.AspNet.Server.WebListener
         /// <summary>
         /// Copies the <see cref="T:HeaderDictionary" /> elements to a one-dimensional Array instance at the specified index.
         /// </summary>
-        /// <param name="array">The one-dimensional Array that is the destination of the specified objects copied from the <see cref="T:Microsoft.AspNet.Http.Internal.HeaderDictionary" />.</param>
+        /// <param name="array">The one-dimensional Array that is the destination of the specified objects copied from the <see cref="T:Microsoft.AspNetCore.Http.Internal.HeaderDictionary" />.</param>
         /// <param name="arrayIndex">The zero-based index in <paramref name="array" /> at which copying begins.</param>
         public void CopyTo(KeyValuePair<string, StringValues>[] array, int arrayIndex)
         {

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
     {

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
     {

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.AspNetCore.Hosting.Server;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Server.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
     {

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
     {

src/Microsoft.AspNetCore.Server.WebListener/ServerFactory.cs

@@ -36,13 +36,13 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNet.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Server.Features;
+using Microsoft.AspNetCore.Server.Features;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     /// <summary>
     /// Implements the setup process for this server.

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.AspNetCore.Http.Features;
-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 sealed class StandardFeatureCollection : IFeatureCollection
     {

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-*"
   },

src/Microsoft.Net.WebSockets.Server/Legacy/WebSocketHttpListenerDuplexStream.cs

@@ -21,7 +21,7 @@
 // </copyright>
 //------------------------------------------------------------------------------
 /*
-namespace Microsoft.AspNet.WebSockets
+namespace Microsoft.AspNetCore.WebSockets
 {
     using Microsoft.Net;
     using System;

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.AspNetCore.Http.Features.Authentication;
-using Microsoft.AspNet.Testing.xunit;
+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
     {

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.AspNetCore.Hosting.Server;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     internal class DummyApplication : IHttpApplication<HttpContext>
     {

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
     {

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.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     public class OpaqueUpgradeTests
     {

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.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     public class RequestBodyTests
     {

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.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     public class RequestHeaderTests
     {

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.AspNetCore.Hosting.Server;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+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
     {

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.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     public class ResponseBodyTests
     {

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.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Server.WebListener.FunctionalTests
+namespace Microsoft.AspNetCore.Server.WebListener.FunctionalTests
 {
     public class ResponseCachingTests
     {

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
     {

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
     {

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.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     public class ResponseTests
     {

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.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+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
     {

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.AspNetCore.Hosting.Server;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.Server.Features;
+using Microsoft.AspNetCore.Server.Features;
 using Microsoft.Net.Http.Server;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     internal static class Utilities
     {

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.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
-namespace Microsoft.AspNet.Server.WebListener
+namespace Microsoft.AspNetCore.Server.WebListener
 {
     public class WebSocketTests
     {

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.AspNetCore.Server.WebListener": "1.0.0-*",
-    "Microsoft.AspNet.Testing": "1.0.0-*"
+    "Microsoft.AspNetCore.Testing": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": {

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

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

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

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

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

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
 {

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;

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

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": {