From a4816ab78293acb1f08c686143139ebfd8c3477d Mon Sep 17 00:00:00 2001 From: David Fowler Date: Tue, 6 May 2014 00:02:26 -0700 Subject: [PATCH] React to renames --- src/Microsoft.AspNet.Hosting/Builder/BuilderFactory.cs | 3 ++- src/Microsoft.AspNet.Hosting/Builder/IBuilderFactory.cs | 1 + src/Microsoft.AspNet.Hosting/HostingContext.cs | 1 + src/Microsoft.AspNet.Hosting/PipelineInstance.cs | 1 + src/Microsoft.AspNet.Hosting/Server/IServerFactory.cs | 1 + src/Microsoft.AspNet.Hosting/Startup/IStartupLoader.cs | 1 + src/Microsoft.AspNet.Hosting/Startup/IStartupManager.cs | 1 + src/Microsoft.AspNet.Hosting/Startup/NullStartupLoader.cs | 1 + src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs | 1 + src/Microsoft.AspNet.Hosting/Startup/StartupManager.cs | 1 + src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs | 1 + src/Microsoft.AspNet.RequestContainer/ContainerMiddleware.cs | 1 + src/Microsoft.AspNet.TestHost/TestServer.cs | 1 + test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartup.cs | 1 + .../Fakes/FakeStartupWithServices.cs | 1 + test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs | 1 + test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs | 1 + test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs | 1 + 18 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNet.Hosting/Builder/BuilderFactory.cs b/src/Microsoft.AspNet.Hosting/Builder/BuilderFactory.cs index 64eaba6302..01a04d5df5 100644 --- a/src/Microsoft.AspNet.Hosting/Builder/BuilderFactory.cs +++ b/src/Microsoft.AspNet.Hosting/Builder/BuilderFactory.cs @@ -16,6 +16,7 @@ // permissions and limitations under the License. using System; +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Builder @@ -31,7 +32,7 @@ namespace Microsoft.AspNet.Hosting.Builder public IBuilder CreateBuilder() { - return new PipelineCore.Builder(_serviceProvider); + return new Microsoft.AspNet.Builder.Builder(_serviceProvider); } } } diff --git a/src/Microsoft.AspNet.Hosting/Builder/IBuilderFactory.cs b/src/Microsoft.AspNet.Hosting/Builder/IBuilderFactory.cs index 4e80cc8730..ab9c2d3ba3 100644 --- a/src/Microsoft.AspNet.Hosting/Builder/IBuilderFactory.cs +++ b/src/Microsoft.AspNet.Hosting/Builder/IBuilderFactory.cs @@ -15,6 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Builder diff --git a/src/Microsoft.AspNet.Hosting/HostingContext.cs b/src/Microsoft.AspNet.Hosting/HostingContext.cs index bb85c4d25f..b682e1a8c1 100644 --- a/src/Microsoft.AspNet.Hosting/HostingContext.cs +++ b/src/Microsoft.AspNet.Hosting/HostingContext.cs @@ -19,6 +19,7 @@ using System; using Microsoft.AspNet.Http; using Microsoft.Framework.ConfigurationModel; using Microsoft.AspNet.Hosting.Server; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.Hosting { diff --git a/src/Microsoft.AspNet.Hosting/PipelineInstance.cs b/src/Microsoft.AspNet.Hosting/PipelineInstance.cs index 40c656b9be..c1a4977c24 100644 --- a/src/Microsoft.AspNet.Hosting/PipelineInstance.cs +++ b/src/Microsoft.AspNet.Hosting/PipelineInstance.cs @@ -20,6 +20,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Hosting.Builder; using Microsoft.AspNet.Hosting.Server; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.Hosting { diff --git a/src/Microsoft.AspNet.Hosting/Server/IServerFactory.cs b/src/Microsoft.AspNet.Hosting/Server/IServerFactory.cs index 83a1c67c19..21d3f06fbe 100644 --- a/src/Microsoft.AspNet.Hosting/Server/IServerFactory.cs +++ b/src/Microsoft.AspNet.Hosting/Server/IServerFactory.cs @@ -17,6 +17,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.Framework.ConfigurationModel; diff --git a/src/Microsoft.AspNet.Hosting/Startup/IStartupLoader.cs b/src/Microsoft.AspNet.Hosting/Startup/IStartupLoader.cs index e06ea4fa1b..e8eaede1c7 100644 --- a/src/Microsoft.AspNet.Hosting/Startup/IStartupLoader.cs +++ b/src/Microsoft.AspNet.Hosting/Startup/IStartupLoader.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Startup diff --git a/src/Microsoft.AspNet.Hosting/Startup/IStartupManager.cs b/src/Microsoft.AspNet.Hosting/Startup/IStartupManager.cs index 82e14d4b01..7d4655f36f 100644 --- a/src/Microsoft.AspNet.Hosting/Startup/IStartupManager.cs +++ b/src/Microsoft.AspNet.Hosting/Startup/IStartupManager.cs @@ -16,6 +16,7 @@ // permissions and limitations under the License. using System; +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Startup diff --git a/src/Microsoft.AspNet.Hosting/Startup/NullStartupLoader.cs b/src/Microsoft.AspNet.Hosting/Startup/NullStartupLoader.cs index 1ce1553cc8..c70dad2e65 100644 --- a/src/Microsoft.AspNet.Hosting/Startup/NullStartupLoader.cs +++ b/src/Microsoft.AspNet.Hosting/Startup/NullStartupLoader.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Startup diff --git a/src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs b/src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs index 2c13cc06c8..70adf45faa 100644 --- a/src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs +++ b/src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs @@ -21,6 +21,7 @@ using System.Linq; using System.Reflection; using Microsoft.AspNet.Http; using Microsoft.AspNet.DependencyInjection; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.Hosting.Startup { diff --git a/src/Microsoft.AspNet.Hosting/Startup/StartupManager.cs b/src/Microsoft.AspNet.Hosting/Startup/StartupManager.cs index e94d71a184..16a6a4e2bb 100644 --- a/src/Microsoft.AspNet.Hosting/Startup/StartupManager.cs +++ b/src/Microsoft.AspNet.Hosting/Startup/StartupManager.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Startup diff --git a/src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs b/src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs index e16de29de2..b4127db07f 100644 --- a/src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs +++ b/src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs @@ -23,6 +23,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.AspNet.RequestContainer; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet { diff --git a/src/Microsoft.AspNet.RequestContainer/ContainerMiddleware.cs b/src/Microsoft.AspNet.RequestContainer/ContainerMiddleware.cs index 02105f8290..edef5e2f37 100644 --- a/src/Microsoft.AspNet.RequestContainer/ContainerMiddleware.cs +++ b/src/Microsoft.AspNet.RequestContainer/ContainerMiddleware.cs @@ -22,6 +22,7 @@ using System.Runtime.Remoting.Messaging; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.DependencyInjection; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.RequestContainer { diff --git a/src/Microsoft.AspNet.TestHost/TestServer.cs b/src/Microsoft.AspNet.TestHost/TestServer.cs index 4c6092ac27..ebd87322b4 100644 --- a/src/Microsoft.AspNet.TestHost/TestServer.cs +++ b/src/Microsoft.AspNet.TestHost/TestServer.cs @@ -27,6 +27,7 @@ using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Hosting.Startup; using Microsoft.Net.Runtime; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.TestHost { diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartup.cs b/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartup.cs index eeb7b22470..1df444a0af 100644 --- a/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartup.cs +++ b/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartup.cs @@ -15,6 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Fakes diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartupWithServices.cs b/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartupWithServices.cs index cef3346562..2150b21ea7 100644 --- a/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartupWithServices.cs +++ b/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeStartupWithServices.cs @@ -15,6 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Hosting.Fakes diff --git a/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs b/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs index c4ba4895c5..7bdd75f9c2 100644 --- a/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs +++ b/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs @@ -24,6 +24,7 @@ using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.AspNet.Hosting.Server; using Xunit; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.Hosting { diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs b/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs index 3c7a156069..6a8dbbe2a3 100644 --- a/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs +++ b/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs @@ -25,6 +25,7 @@ using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.Net.Runtime; using Xunit; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.TestHost.Tests { diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs index 351a74ff01..91e30a1cb2 100644 --- a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs +++ b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs @@ -24,6 +24,7 @@ using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.Net.Runtime; using Xunit; +using Microsoft.AspNet.Builder; namespace Microsoft.AspNet.TestHost.Tests {