diff --git a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs index 0542b5ae48..35e84bc492 100644 --- a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs +++ b/test/ServerComparison.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/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs b/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs index 64ea17eeaf..14a0364d51 100644 --- a/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/ServerComparison.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/ServerComparison.FunctionalTests/ResponseTests.cs b/test/ServerComparison.FunctionalTests/ResponseTests.cs index 06aab09552..3718e65bf7 100644 --- a/test/ServerComparison.FunctionalTests/ResponseTests.cs +++ b/test/ServerComparison.FunctionalTests/ResponseTests.cs @@ -9,7 +9,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 Microsoft.Net.Http.Headers; using Xunit; using Xunit.Sdk; diff --git a/test/ServerComparison.FunctionalTests/project.json b/test/ServerComparison.FunctionalTests/project.json index a217f8722e..e8bf5fd0e7 100644 --- a/test/ServerComparison.FunctionalTests/project.json +++ b/test/ServerComparison.FunctionalTests/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.AspNet.Server.IIS": "1.0.0-*", "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/ServerComparison.TestSites/StartupHelloWorld.cs b/test/ServerComparison.TestSites/StartupHelloWorld.cs index 85e7b693ef..c1d079342b 100644 --- a/test/ServerComparison.TestSites/StartupHelloWorld.cs +++ b/test/ServerComparison.TestSites/StartupHelloWorld.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace ServerComparison.TestSites { diff --git a/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs b/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs index fb8f64e6c8..2211c55ed6 100644 --- a/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs +++ b/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs @@ -4,7 +4,7 @@ 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 ServerComparison.TestSites diff --git a/test/ServerComparison.TestSites/StartupResponses.cs b/test/ServerComparison.TestSites/StartupResponses.cs index a71c3968f6..53e11362b4 100644 --- a/test/ServerComparison.TestSites/StartupResponses.cs +++ b/test/ServerComparison.TestSites/StartupResponses.cs @@ -1,9 +1,9 @@ -// 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 Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; namespace ServerComparison.TestSites diff --git a/test/ServerComparison.TestSites/project.json b/test/ServerComparison.TestSites/project.json index 4a87ba6a97..571afc71f6 100644 --- a/test/ServerComparison.TestSites/project.json +++ b/test/ServerComparison.TestSites/project.json @@ -1,4 +1,4 @@ -{ +{ "webroot": "wwwroot", "version": "1.0.0-*", @@ -7,8 +7,8 @@ "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", - "Microsoft.Framework.Configuration.Json": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*", + "Microsoft.Extensions.Configuration.Json": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.Net.Http.Headers": "1.0.0-*" },