From 13e595ee1840c781364392e546ed68d5375cbdfb Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Tue, 6 May 2014 12:09:02 -0700 Subject: [PATCH] Fix Logging dependency. --- src/Microsoft.AspNet.Server.WebListener/LogHelper.cs | 2 +- src/Microsoft.AspNet.Server.WebListener/MessagePump.cs | 2 +- src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs | 2 +- src/Microsoft.AspNet.Server.WebListener/project.json | 2 +- src/Microsoft.Net.Server/LogHelper.cs | 2 +- src/Microsoft.Net.Server/Project.json | 2 +- src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs | 2 +- src/Microsoft.Net.Server/WebListener.cs | 2 +- .../project.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs index 2b73eee9c2..28559308b6 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.AspNet.Logging; +using Microsoft.Framework.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 5893617bec..bcf7ba653f 100644 --- a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs +++ b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs @@ -19,7 +19,7 @@ using System; using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Logging; +using Microsoft.Framework.Logging; using Microsoft.Net.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 9b2f4d9697..dc991bac57 100644 --- a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs +++ b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs @@ -42,7 +42,7 @@ using Microsoft.AspNet.Http; using Microsoft.Framework.ConfigurationModel; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Logging; +using Microsoft.Framework.Logging; using Microsoft.Net.Server; namespace Microsoft.AspNet.Server.WebListener diff --git a/src/Microsoft.AspNet.Server.WebListener/project.json b/src/Microsoft.AspNet.Server.WebListener/project.json index d81533884c..f7726aaf2e 100644 --- a/src/Microsoft.AspNet.Server.WebListener/project.json +++ b/src/Microsoft.AspNet.Server.WebListener/project.json @@ -6,7 +6,7 @@ "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.AspNet.HttpFeature": "0.1-alpha-*", "Microsoft.AspNet.FeatureModel": "0.1-alpha-*", - "Microsoft.AspNet.Logging": "0.1-alpha-*", + "Microsoft.Framework.Logging": "0.1-alpha-*", "Microsoft.AspNet.Hosting": "0.1-alpha-*" }, "compilationOptions": { diff --git a/src/Microsoft.Net.Server/LogHelper.cs b/src/Microsoft.Net.Server/LogHelper.cs index d97a11aea9..5b7efd1830 100644 --- a/src/Microsoft.Net.Server/LogHelper.cs +++ b/src/Microsoft.Net.Server/LogHelper.cs @@ -24,7 +24,7 @@ using System; using System.Diagnostics; using System.Globalization; -using Microsoft.AspNet.Logging; +using Microsoft.Framework.Logging; namespace Microsoft.Net.Server { diff --git a/src/Microsoft.Net.Server/Project.json b/src/Microsoft.Net.Server/Project.json index d948282b13..ed01ca0d23 100644 --- a/src/Microsoft.Net.Server/Project.json +++ b/src/Microsoft.Net.Server/Project.json @@ -1,7 +1,7 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Logging": "0.1-alpha-*" + "Microsoft.Framework.Logging": "0.1-alpha-*" }, "compilationOptions": { "allowUnsafe": true diff --git a/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs b/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs index 84e3c3ce61..ca09228b6d 100644 --- a/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs +++ b/src/Microsoft.Net.Server/RequestProcessing/RequestContext.cs @@ -28,7 +28,7 @@ using System.Runtime.InteropServices; using System.Security.Principal; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Logging; +using Microsoft.Framework.Logging; namespace Microsoft.Net.Server { diff --git a/src/Microsoft.Net.Server/WebListener.cs b/src/Microsoft.Net.Server/WebListener.cs index 47b987fa41..6fc5ce742e 100644 --- a/src/Microsoft.Net.Server/WebListener.cs +++ b/src/Microsoft.Net.Server/WebListener.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; using System.Security.Authentication.ExtendedProtection; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Logging; +using Microsoft.Framework.Logging; namespace Microsoft.Net.Server { diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json index 743f55652b..ae4b58fe2c 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json @@ -16,7 +16,7 @@ "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*", "Microsoft.AspNet.FeatureModel" : "0.1-alpha-*", "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*", - "Microsoft.AspNet.Logging": "0.1-alpha-*", + "Microsoft.Framework.Logging": "0.1-alpha-*", "Microsoft.AspNet.Hosting": "0.1-alpha-*" }, "configurations": {