From 4400ab4124ccf898ec0aa6ac11d7409bfa08af2f Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 3 Oct 2015 15:44:44 -0700 Subject: [PATCH] Renaming Microsoft.Framework.* -> Microsoft.Extensions.* --- samples/HotAddSample/Startup.cs | 4 ++-- samples/HotAddSample/project.json | 2 +- samples/SelfHostServer/Startup.cs | 2 +- samples/SelfHostServer/project.json | 2 +- src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs | 2 +- src/Microsoft.AspNet.Server.WebListener/LogHelper.cs | 2 +- src/Microsoft.AspNet.Server.WebListener/MessagePump.cs | 2 +- src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs | 4 ++-- src/Microsoft.Net.Http.Server/AuthenticationManager.cs | 4 ++-- src/Microsoft.Net.Http.Server/LogHelper.cs | 2 +- .../NativeInterop/UnsafeNativeMethods.cs | 4 ++-- .../RequestProcessing/HeaderCollection.cs | 4 ++-- .../RequestProcessing/HeaderParser.cs | 4 ++-- src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs | 2 +- .../RequestProcessing/RequestContext.cs | 2 +- .../RequestProcessing/RequestHeaders.Generated.cs | 2 +- .../RequestProcessing/RequestHeaders.Generated.tt | 4 ++-- .../RequestProcessing/RequestHeaders.cs | 2 +- src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs | 6 +++--- src/Microsoft.Net.Http.Server/WebListener.cs | 4 ++-- src/Microsoft.Net.Http.Server/project.json | 4 ++-- .../RequestHeaderTests.cs | 2 +- .../RequestHeaderTests.cs | 4 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/samples/HotAddSample/Startup.cs b/samples/HotAddSample/Startup.cs index e5026e9db9..c3e618e1df 100644 --- a/samples/HotAddSample/Startup.cs +++ b/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 { diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index 35533a5c39..ade404891b 100644 --- a/samples/HotAddSample/project.json +++ b/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" diff --git a/samples/SelfHostServer/Startup.cs b/samples/SelfHostServer/Startup.cs index f7d41f42e5..1af91636e5 100644 --- a/samples/SelfHostServer/Startup.cs +++ b/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 diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index cf63300858..ec72077179 100644 --- a/samples/SelfHostServer/project.json +++ b/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": { diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs index f40812631f..a9696e1311 100644 --- a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs index c742caa87d..727c2871f6 100644 --- a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs index 038f54176c..712fab8878 100644 --- a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs index 238c268df7..7600059041 100644 --- a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs +++ b/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.Framework.Logging; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Server; namespace Microsoft.AspNet.Server.WebListener diff --git a/src/Microsoft.Net.Http.Server/AuthenticationManager.cs b/src/Microsoft.Net.Http.Server/AuthenticationManager.cs index 321851995f..6a8d4f66c4 100644 --- a/src/Microsoft.Net.Http.Server/AuthenticationManager.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/LogHelper.cs b/src/Microsoft.Net.Http.Server/LogHelper.cs index a42ae0b0f3..cce8320132 100644 --- a/src/Microsoft.Net.Http.Server/LogHelper.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.cs b/src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.cs index c4464119a8..d6dcb837d3 100644 --- a/src/Microsoft.Net.Http.Server/NativeInterop/UnsafeNativeMethods.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderCollection.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderCollection.cs index 2190b3dd2f..23778ddec5 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderCollection.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderParser.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderParser.cs index d4694415d6..8f82c75178 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/HeaderParser.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs index 2043da2957..87186a1ef0 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestContext.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestContext.cs index 905fe8db18..4c0b0a0c14 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestContext.cs +++ b/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 diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.cs index 1326e7204d..695f07dd80 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.tt b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.tt index a029f29b02..3f345fcfbe 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.Generated.tt +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.cs index cc00e29da1..d35e06cc56 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/RequestHeaders.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs index 8648b3bce5..a23db82eaf 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs +++ b/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.Framework.Primitives; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Primitives; using static Microsoft.Net.Http.Server.UnsafeNclNativeMethods; namespace Microsoft.Net.Http.Server diff --git a/src/Microsoft.Net.Http.Server/WebListener.cs b/src/Microsoft.Net.Http.Server/WebListener.cs index c0e4d0676b..29ecb64eba 100644 --- a/src/Microsoft.Net.Http.Server/WebListener.cs +++ b/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 { diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index 61f5616c25..acd00516e8 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/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.Framework.Primitives": "1.0.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", + "Microsoft.Extensions.Primitives": "1.0.0-*", "Microsoft.Net.WebSockets": "1.0.0-*" }, "compilationOptions": { diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs index c8e1302986..d05ca0b4db 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs +++ b/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 diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/RequestHeaderTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/RequestHeaderTests.cs index dd47057415..54ad7c54eb 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/RequestHeaderTests.cs +++ b/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