From 0c48454ad2f55011a4b314e78360144d19119902 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Tue, 6 May 2014 10:39:14 -0700
Subject: [PATCH] Fix HttpAbstractions dependency issues.

---
 DiagnosticsPages.sln                                          | 3 +++
 samples/ErrorPageSample/Startup.cs                            | 3 +--
 samples/ErrorPageSample/project.json                          | 2 +-
 samples/WelcomePageSample/Startup.cs                          | 2 +-
 samples/WelcomePageSample/project.json                        | 2 +-
 src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs | 2 +-
 src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs | 3 ++-
 src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs    | 2 +-
 src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs       | 4 ++--
 src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs       | 3 ++-
 src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs            | 2 +-
 src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs        | 2 --
 src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs      | 2 +-
 src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs     | 4 ++--
 src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs     | 3 ++-
 src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs        | 2 +-
 src/Microsoft.AspNet.Diagnostics/project.json                 | 2 +-
 17 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/DiagnosticsPages.sln b/DiagnosticsPages.sln
index 87fd04d83a..efade4376d 100644
--- a/DiagnosticsPages.sln
+++ b/DiagnosticsPages.sln
@@ -27,6 +27,7 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|x86.ActiveCfg = Debug|x86
 		{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|x86.Build.0 = Debug|x86
 		{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Release|Any CPU.ActiveCfg = Release|x86
@@ -46,6 +47,7 @@ Global
 		{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Release|x86.Build.0 = Release|x86
 		{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|x86.ActiveCfg = Debug|x86
 		{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|x86.Build.0 = Debug|x86
 		{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|Any CPU.ActiveCfg = Release|x86
@@ -55,6 +57,7 @@ Global
 		{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|x86.Build.0 = Release|x86
 		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|x86.ActiveCfg = Debug|x86
 		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|x86.Build.0 = Debug|x86
 		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Release|Any CPU.ActiveCfg = Release|x86
diff --git a/samples/ErrorPageSample/Startup.cs b/samples/ErrorPageSample/Startup.cs
index bed1d3cc07..096cfbfed9 100644
--- a/samples/ErrorPageSample/Startup.cs
+++ b/samples/ErrorPageSample/Startup.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.AspNet;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
 
 namespace ErrorPageSample
 {
diff --git a/samples/ErrorPageSample/project.json b/samples/ErrorPageSample/project.json
index 26a23b8136..f7f3c958ca 100644
--- a/samples/ErrorPageSample/project.json
+++ b/samples/ErrorPageSample/project.json
@@ -4,7 +4,7 @@
     "Helios" :  "0.1-alpha-*",
     "Microsoft.AspNet.Diagnostics": "",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
+    "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
     "Microsoft.AspNet.Hosting": "0.1-alpha-*"
   },
diff --git a/samples/WelcomePageSample/Startup.cs b/samples/WelcomePageSample/Startup.cs
index ca9ccc7148..b5c2bcad83 100644
--- a/samples/WelcomePageSample/Startup.cs
+++ b/samples/WelcomePageSample/Startup.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNet;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
 
 namespace WelcomePageSample
 {
diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json
index 90691ce5ab..be23811ac0 100644
--- a/samples/WelcomePageSample/project.json
+++ b/samples/WelcomePageSample/project.json
@@ -4,7 +4,7 @@
     "Helios" :  "0.1-alpha-*",
     "Microsoft.AspNet.Diagnostics": "",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
+    "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
     "Microsoft.AspNet.Hosting": "0.1-alpha-*"
   },
diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
index a68c2ca0a2..b8c6a6f712 100644
--- a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.Diagnostics;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// IBuilder extensions for the DiagnosticsPageMiddleware.
diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs
index 7c71a0d745..dc2c75f541 100644
--- a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs
@@ -4,8 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics.Views;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs
index 3ba61f8ee0..0e6053fe41 100644
--- a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs
@@ -2,7 +2,7 @@
 
 #if DEBUG
 
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
index 4f3576538a..1583d98a03 100644
--- a/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.Diagnostics;
+using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// IBuilder extension methods for the ErrorPageMiddleware.
diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
index 774b9d8bdf..6222a335e9 100644
--- a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
@@ -7,8 +7,9 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics.Views;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
index 934bf7096b..3a09de614c 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Abstractions;
 using System;
 using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Diagnostics.Views
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs
index b08261c64a..f63f2c7219 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs
@@ -16,8 +16,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Microsoft.AspNet.Diagnostics.Views
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs
index cb2f5f63c8..3bc18ba436 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Abstractions;
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Diagnostics.Views
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
index 711bb33b17..37605a8dac 100644
--- a/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Diagnostics;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// IBuilder extensions for the WelcomePageMiddleware.
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs
index 0236abeaa6..f2937f13ed 100644
--- a/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs
@@ -4,7 +4,8 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Diagnostics.Views;
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs
index 1ea64b6b2d..9b03cb9dc9 100644
--- a/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/project.json b/src/Microsoft.AspNet.Diagnostics/project.json
index 2cfdfd0974..0f3037642e 100644
--- a/src/Microsoft.AspNet.Diagnostics/project.json
+++ b/src/Microsoft.AspNet.Diagnostics/project.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
-    "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
+    "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.AspNet.FeatureModel": "0.1-alpha-*"
   },
   "configurations": {