diff --git a/samples/IISSample/Startup.cs b/samples/IISSample/Startup.cs index 9e7cdf6afb..08cbac2110 100644 --- a/samples/IISSample/Startup.cs +++ b/samples/IISSample/Startup.cs @@ -1,7 +1,7 @@ -using System; +using System; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace IISSample { diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json index b7b968402a..0a6ff38be0 100644 --- a/samples/IISSample/project.json +++ b/samples/IISSample/project.json @@ -1,4 +1,4 @@ -{ +{ "webroot": "wwwroot", "version": "1.0.0-*", @@ -6,7 +6,7 @@ "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "commands": { diff --git a/src/Microsoft.AspNet.IISPlatformHandler/IISPlatformHandlerMiddleware.cs b/src/Microsoft.AspNet.IISPlatformHandler/IISPlatformHandlerMiddleware.cs index 5984a26d4c..1348711e93 100644 --- a/src/Microsoft.AspNet.IISPlatformHandler/IISPlatformHandlerMiddleware.cs +++ b/src/Microsoft.AspNet.IISPlatformHandler/IISPlatformHandlerMiddleware.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -8,8 +8,8 @@ using System.Security.Principal; using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Primitives; namespace Microsoft.AspNet.IISPlatformHandler { diff --git a/src/Microsoft.AspNet.IISPlatformHandler/project.json b/src/Microsoft.AspNet.IISPlatformHandler/project.json index 1a916ca57d..f2df648e4c 100644 --- a/src/Microsoft.AspNet.IISPlatformHandler/project.json +++ b/src/Microsoft.AspNet.IISPlatformHandler/project.json @@ -7,7 +7,7 @@ }, "dependencies": { "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.Framework.SecurityHelper.Sources": { + "Microsoft.Extensions.SecurityHelper.Sources": { "type": "build", "version": "1.0.0-*" } diff --git a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs index 15b977624c..27eb3106c4 100644 --- a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs +++ b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs @@ -7,7 +7,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; using Xunit.Sdk; diff --git a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HttpsTest.cs b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HttpsTest.cs index 71df50ee76..5bb3760d04 100644 --- a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HttpsTest.cs +++ b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HttpsTest.cs @@ -8,7 +8,7 @@ using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; using Xunit.Sdk; diff --git a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs index f5243e6409..6402bc0718 100644 --- a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs @@ -8,7 +8,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; using Xunit.Sdk; diff --git a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/project.json b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/project.json index 9869ba4f72..07663dee48 100644 --- a/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/project.json @@ -7,7 +7,7 @@ }, "dependencies": { "Microsoft.AspNet.Server.Testing": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/TestSites/StartupHelloWorld.cs b/test/TestSites/StartupHelloWorld.cs index f6f500ed50..55f4833df3 100644 --- a/test/TestSites/StartupHelloWorld.cs +++ b/test/TestSites/StartupHelloWorld.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace TestSites { diff --git a/test/TestSites/StartupHttpsHelloWorld.cs b/test/TestSites/StartupHttpsHelloWorld.cs index 77ad91157c..46d7f0e4b5 100644 --- a/test/TestSites/StartupHttpsHelloWorld.cs +++ b/test/TestSites/StartupHttpsHelloWorld.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace TestSites { diff --git a/test/TestSites/StartupNtlmAuthentication.cs b/test/TestSites/StartupNtlmAuthentication.cs index ee396e0e16..42db680d11 100644 --- a/test/TestSites/StartupNtlmAuthentication.cs +++ b/test/TestSites/StartupNtlmAuthentication.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace TestSites { diff --git a/test/TestSites/project.json b/test/TestSites/project.json index ce27d60f30..e68f7073eb 100644 --- a/test/TestSites/project.json +++ b/test/TestSites/project.json @@ -6,9 +6,9 @@ "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", - "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-*", - "Microsoft.Framework.Configuration.Json": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*", + "Microsoft.Extensions.Configuration.Json": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": {