From 8b26f1d319748af89062c755bf7fd0595fa7a4a2 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Mon, 5 May 2014 21:05:21 -0700
Subject: [PATCH] Move IBuilder and related components to the Ms.AspNet.Builder
 namespace.

---
 src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs         | 4 ++--
 src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs         | 3 ++-
 src/Microsoft.AspNet.Http/Extensions/MapOptions.cs            | 4 +++-
 src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs     | 4 ++--
 src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs     | 3 ++-
 src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs        | 3 ++-
 src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs         | 2 +-
 src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs         | 2 +-
 src/Microsoft.AspNet.Http/IBuilder.cs                         | 2 +-
 src/Microsoft.AspNet.Http/IServerInformation.cs               | 2 +-
 src/Microsoft.AspNet.Http/RequestDelegate.cs                  | 3 ++-
 src/Microsoft.AspNet.Owin/OwinExtensions.cs                   | 2 +-
 src/Microsoft.AspNet.PipelineCore/Builder.cs                  | 2 +-
 test/Microsoft.AspNet.Http.Tests/Fakes.cs                     | 2 +-
 test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs    | 3 ++-
 .../MapPredicateMiddlewareTests.cs                            | 3 ++-
 test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs      | 2 +-
 17 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs
index fa071712da..95a6af45d1 100644
--- a/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs
@@ -17,9 +17,9 @@
 
 using System;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Extensions;
+using Microsoft.AspNet.Builder.Extensions;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     public static class MapExtensions
     {
diff --git a/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs b/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs
index b8bf99c9a8..a6238081b6 100644
--- a/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/MapMiddleware.cs
@@ -16,8 +16,9 @@
 // permissions and limitations under the License.
 
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Http.Extensions
+namespace Microsoft.AspNet.Builder.Extensions
 {
     public class MapMiddleware
     {
diff --git a/src/Microsoft.AspNet.Http/Extensions/MapOptions.cs b/src/Microsoft.AspNet.Http/Extensions/MapOptions.cs
index d0611b9aa7..16bd8f0df5 100644
--- a/src/Microsoft.AspNet.Http/Extensions/MapOptions.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/MapOptions.cs
@@ -15,7 +15,9 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-namespace Microsoft.AspNet.Http.Extensions
+using Microsoft.AspNet.Http;
+
+namespace Microsoft.AspNet.Builder.Extensions
 {
     /// <summary>
     /// Options for the Map middleware
diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs
index d6201678c5..2ede36599e 100644
--- a/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Extensions;
+using Microsoft.AspNet.Builder.Extensions;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     using Predicate = Func<HttpContext, bool>;
     using PredicateAsync = Func<HttpContext, Task<bool>>;
diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs
index d9cf89dc10..1aeed9f340 100644
--- a/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenMiddleware.cs
@@ -16,8 +16,9 @@
 // permissions and limitations under the License.
 
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Http.Extensions
+namespace Microsoft.AspNet.Builder.Extensions
 {
     public class MapWhenMiddleware
     {
diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs
index 914d9ee56a..5d1b4ea0bf 100644
--- a/src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/MapWhenOptions.cs
@@ -17,8 +17,9 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Http.Extensions
+namespace Microsoft.AspNet.Builder.Extensions
 {
     /// <summary>
     /// Options for the MapWhen middleware
diff --git a/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs
index 5d1b9d1a1a..8f2de3eac1 100644
--- a/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs
@@ -18,7 +18,7 @@
 using System;
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     public static class RunExtensions
     {
diff --git a/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs
index 95fcbb6bbe..68879bb92f 100644
--- a/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs
+++ b/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs
@@ -19,7 +19,7 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     public static class UseExtensions
     {
diff --git a/src/Microsoft.AspNet.Http/IBuilder.cs b/src/Microsoft.AspNet.Http/IBuilder.cs
index 8a5331e903..c7ea6ccc5b 100644
--- a/src/Microsoft.AspNet.Http/IBuilder.cs
+++ b/src/Microsoft.AspNet.Http/IBuilder.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Builder
 {
     public interface IBuilder
     {
diff --git a/src/Microsoft.AspNet.Http/IServerInformation.cs b/src/Microsoft.AspNet.Http/IServerInformation.cs
index 48554d0a65..83d11d5b7e 100644
--- a/src/Microsoft.AspNet.Http/IServerInformation.cs
+++ b/src/Microsoft.AspNet.Http/IServerInformation.cs
@@ -15,7 +15,7 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Builder
 {
     // TODO: [AssemblyNeutral]
     public interface IServerInformation
diff --git a/src/Microsoft.AspNet.Http/RequestDelegate.cs b/src/Microsoft.AspNet.Http/RequestDelegate.cs
index fbfdc584b5..cfa81d7242 100644
--- a/src/Microsoft.AspNet.Http/RequestDelegate.cs
+++ b/src/Microsoft.AspNet.Http/RequestDelegate.cs
@@ -16,8 +16,9 @@
 // permissions and limitations under the License.
 
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Builder
 {
     public delegate Task RequestDelegate(HttpContext context);
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs
index d6790b35b1..e33824bf75 100644
--- a/src/Microsoft.AspNet.Owin/OwinExtensions.cs
+++ b/src/Microsoft.AspNet.Owin/OwinExtensions.cs
@@ -23,7 +23,7 @@ using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Owin;
 using Microsoft.AspNet.PipelineCore;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     using AppFunc = Func<IDictionary<string, object>, Task>;
     using CreateMiddleware = Func<
diff --git a/src/Microsoft.AspNet.PipelineCore/Builder.cs b/src/Microsoft.AspNet.PipelineCore/Builder.cs
index df93a7a3e3..f78fcccc5a 100644
--- a/src/Microsoft.AspNet.PipelineCore/Builder.cs
+++ b/src/Microsoft.AspNet.PipelineCore/Builder.cs
@@ -21,7 +21,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.PipelineCore
+namespace Microsoft.AspNet.Builder
 {
     public class Builder : IBuilder
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/Fakes.cs b/test/Microsoft.AspNet.Http.Tests/Fakes.cs
index 04cce33960..98297a0982 100644
--- a/test/Microsoft.AspNet.Http.Tests/Fakes.cs
+++ b/test/Microsoft.AspNet.Http.Tests/Fakes.cs
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.IO;
 using Microsoft.AspNet.HttpFeature;
 
-namespace Microsoft.AspNet.Http.Extensions
+namespace Microsoft.AspNet.Builder.Extensions
 {
     public class FakeHttpRequestFeature : IHttpRequestFeature
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs
index 0096fe7b56..9f5a09336f 100644
--- a/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs
@@ -17,12 +17,13 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
 using Microsoft.AspNet.PipelineCore;
 using Shouldly;
 using Xunit;
 
-namespace Microsoft.AspNet.Http.Extensions
+namespace Microsoft.AspNet.Builder.Extensions
 {
     public class MapPathMiddlewareTests
     {
diff --git a/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs
index d57293440b..63e83925bd 100644
--- a/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs
@@ -18,11 +18,12 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
 using Microsoft.AspNet.PipelineCore;
 using Xunit;
 
-namespace Microsoft.AspNet.Http.Extensions
+namespace Microsoft.AspNet.Builder.Extensions
 {
     using AppFunc = Func<IDictionary<string, object>, Task>;
     using Predicate = Func<HttpContext, bool>;
diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs
index 65a1e04edf..c41552bf79 100644
--- a/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs
+++ b/test/Microsoft.AspNet.PipelineCore.Tests/BuilderTests.cs
@@ -18,7 +18,7 @@
 using Microsoft.AspNet.Http;
 using Xunit;
 
-namespace Microsoft.AspNet.PipelineCore.Tests
+namespace Microsoft.AspNet.Builder.Tests
 {
     public class BuilderTests
     {