Renaming Microsoft.Framework.* -> Microsoft.Extensions.*

samples/HotAddSample/Startup.cs

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

samples/HotAddSample/project.json

@@ -2,7 +2,7 @@
     "version": "1.0.0-*",
     "dependencies": {
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
-        "Microsoft.Framework.Logging.Console": "1.0.0-*"
+        "Microsoft.Extensions.Logging.Console": "1.0.0-*"
     },
     "commands": {
         "web": "Microsoft.AspNet.Server.WebListener --server.urls http://localhost:12345"

samples/SelfHostServer/Startup.cs

@@ -5,7 +5,7 @@ using System.Threading;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Server;
 
 namespace SelfHostServer

samples/SelfHostServer/project.json

@@ -1,7 +1,7 @@
 {
     "dependencies": {
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
-        "Microsoft.Framework.Logging.Console": "1.0.0-*"
+        "Microsoft.Extensions.Logging.Console": "1.0.0-*"
     },
     "commands": { "web": "Microsoft.AspNet.Server.WebListener --server.urls http://localhost:8080" },
     "frameworks": {

src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs

@@ -26,7 +26,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Authentication;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 using Microsoft.Net.Http.Server;
 using Microsoft.Net.WebSockets;

src/Microsoft.AspNet.Server.WebListener/LogHelper.cs

@@ -24,7 +24,7 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Server.WebListener
 {

src/Microsoft.AspNet.Server.WebListener/MessagePump.cs

@@ -20,7 +20,7 @@ using System.Diagnostics.Contracts;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Server;
 
 namespace Microsoft.AspNet.Server.WebListener

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

@@ -41,8 +41,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Hosting.Server;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Server.Features;
-using Microsoft.Framework.Configuration;
+using Microsoft.Extensions.Configuration;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Server;
 
 namespace Microsoft.AspNet.Server.WebListener

src/Microsoft.Net.Http.Server/AuthenticationManager.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");
@@ -27,7 +27,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Claims;
 using System.Security.Principal;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/LogHelper.cs

@@ -23,7 +23,7 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.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,7 +25,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/RequestProcessing/HeaderCollection.cs

@@ -1,10 +1,10 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/RequestProcessing/HeaderParser.cs

@@ -1,9 +1,9 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs

@@ -33,7 +33,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/RequestProcessing/RequestContext.cs

@@ -30,7 +30,7 @@ using System.Runtime.InteropServices;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Net.WebSockets;
 
 namespace Microsoft.Net.Http.Server

src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.cs

@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.tt

@@ -1,4 +1,4 @@
-<#@ template language="C#" #>
+<#@ template language="C#" #>
 <#@ assembly name="System.Core.dll" #>
 <#@ import namespace="System.Linq" #>
 <#
@@ -68,7 +68,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.cs

@@ -39,7 +39,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/RequestProcessing/Response.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");
@@ -32,8 +32,8 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using static Microsoft.Net.Http.Server.UnsafeNclNativeMethods;
 
 namespace Microsoft.Net.Http.Server

src/Microsoft.Net.Http.Server/WebListener.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");
@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 using System.Security.Authentication.ExtendedProtection;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Net.Http.Server
 {

src/Microsoft.Net.Http.Server/project.json

@@ -2,8 +2,8 @@
     "version": "1.0.0-*",
     "description": "Implementation of WebListener, a successor to HttpListener. It is used in the WebListener server package.",
     "dependencies": {
-        "Microsoft.Framework.Logging.Abstractions": "1.0.0-*",
+        "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.Primitives": "1.0.0-*",
+        "Microsoft.Extensions.Primitives": "1.0.0-*",
         "Microsoft.Net.WebSockets": "1.0.0-*"
     },
     "compilationOptions": {

test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs

@@ -22,7 +22,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener

test/Microsoft.Net.Http.Server.FunctionalTests/RequestHeaderTests.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.Linq;
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Microsoft.Net.Http.Server