From 343d69828649ffca6b0e8bb46aac414c2e7fb6ea Mon Sep 17 00:00:00 2001 From: Victor Hurdugaci Date: Wed, 29 Jul 2015 01:04:59 -0700 Subject: [PATCH] React to DNX renames --- src/Kestrel/ServerFactory.cs | 2 +- .../KestrelEngine.cs | 6 +++--- src/Microsoft.AspNet.Server.Kestrel/project.json | 2 +- .../EngineTests.cs | 8 ++++---- .../MultipleLoopTests.cs | 13 +++++-------- .../NetworkingTests.cs | 8 ++++---- .../Microsoft.AspNet.Server.KestrelTests/Program.cs | 2 +- .../ShutdownNotImplemented.cs | 2 +- .../TestServer.cs | 8 ++++---- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/Kestrel/ServerFactory.cs b/src/Kestrel/ServerFactory.cs index 784b1cdbdd..2c4b960306 100644 --- a/src/Kestrel/ServerFactory.cs +++ b/src/Kestrel/ServerFactory.cs @@ -7,8 +7,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Server.Kestrel; +using Microsoft.Dnx.Runtime; using Microsoft.Framework.Configuration; -using Microsoft.Framework.Runtime; namespace Kestrel { diff --git a/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs b/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs index 49d3ac0a0b..465dbd0cf7 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Server.Kestrel.Networking; using System.Collections.Generic; +using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.Framework.Runtime; -using System.IO; +using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.Dnx.Runtime; namespace Microsoft.AspNet.Server.Kestrel { diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNet.Server.Kestrel/project.json index fb04e22a0b..cbcb1444df 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/project.json +++ b/src/Microsoft.AspNet.Server.Kestrel/project.json @@ -6,7 +6,7 @@ "url": "git://github.com/aspnet/kestrelhttpserver" }, "dependencies": { - "Microsoft.Framework.Runtime.Abstractions": "1.0.0-beta7-*" + "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta7-*" }, "frameworks": { "dnx451": { }, diff --git a/test/Microsoft.AspNet.Server.KestrelTests/EngineTests.cs b/test/Microsoft.AspNet.Server.KestrelTests/EngineTests.cs index 98be42db2e..4ca8ae6648 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/EngineTests.cs +++ b/test/Microsoft.AspNet.Server.KestrelTests/EngineTests.cs @@ -1,16 +1,16 @@ // 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.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.Framework.Runtime; -using Microsoft.Framework.Runtime.Infrastructure; using System; using System.IO; using System.Net; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; +using Microsoft.AspNet.Server.Kestrel; +using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.Dnx.Runtime; +using Microsoft.Dnx.Runtime.Infrastructure; using Xunit; namespace Microsoft.AspNet.Server.KestrelTests diff --git a/test/Microsoft.AspNet.Server.KestrelTests/MultipleLoopTests.cs b/test/Microsoft.AspNet.Server.KestrelTests/MultipleLoopTests.cs index f9e53b1d81..35f4f334e6 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/MultipleLoopTests.cs +++ b/test/Microsoft.AspNet.Server.KestrelTests/MultipleLoopTests.cs @@ -1,15 +1,12 @@ -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Networking; -using Microsoft.Framework.Runtime; -using Microsoft.Framework.Runtime.Infrastructure; -using System; -using System.Collections.Generic; -using System.Linq; +using System; using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading; -using System.Threading.Tasks; +using Microsoft.AspNet.Server.Kestrel; +using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.Dnx.Runtime; +using Microsoft.Dnx.Runtime.Infrastructure; using Xunit; namespace Microsoft.AspNet.Server.KestrelTests diff --git a/test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs b/test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs index 2cf9c71d05..f5f4b42d6c 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs +++ b/test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs @@ -1,15 +1,15 @@ // 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.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Networking; -using Microsoft.Framework.Runtime; -using Microsoft.Framework.Runtime.Infrastructure; using System; using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading.Tasks; +using Microsoft.AspNet.Server.Kestrel; +using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.Dnx.Runtime; +using Microsoft.Dnx.Runtime.Infrastructure; using Xunit; namespace Microsoft.AspNet.Server.KestrelTests diff --git a/test/Microsoft.AspNet.Server.KestrelTests/Program.cs b/test/Microsoft.AspNet.Server.KestrelTests/Program.cs index 2cfa625390..1baf869b8c 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/Program.cs +++ b/test/Microsoft.AspNet.Server.KestrelTests/Program.cs @@ -1,8 +1,8 @@ // 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.Framework.Runtime; using System; +using Microsoft.Dnx.Runtime; namespace Microsoft.AspNet.Server.KestrelTests { diff --git a/test/Microsoft.AspNet.Server.KestrelTests/ShutdownNotImplemented.cs b/test/Microsoft.AspNet.Server.KestrelTests/ShutdownNotImplemented.cs index 58697d9a3e..5d32828583 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/ShutdownNotImplemented.cs +++ b/test/Microsoft.AspNet.Server.KestrelTests/ShutdownNotImplemented.cs @@ -3,7 +3,7 @@ using System; using System.Threading; -using Microsoft.Framework.Runtime; +using Microsoft.Dnx.Runtime; namespace Microsoft.AspNet.Server.KestrelTests { diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestServer.cs b/test/Microsoft.AspNet.Server.KestrelTests/TestServer.cs index dba5cddcde..b299d26246 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/TestServer.cs +++ b/test/Microsoft.AspNet.Server.KestrelTests/TestServer.cs @@ -1,12 +1,12 @@ // 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.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.Framework.Runtime; -using Microsoft.Framework.Runtime.Infrastructure; using System; using System.Threading.Tasks; +using Microsoft.AspNet.Server.Kestrel; +using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.Dnx.Runtime; +using Microsoft.Dnx.Runtime.Infrastructure; namespace Microsoft.AspNet.Server.KestrelTests {