From 8fcddc12e7ce746c465a520cdc0ea4501ebee69e Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 5 May 2014 16:54:45 -0700 Subject: [PATCH] Incorporate name changes --- samples/RoutingSample.Web/Startup.cs | 2 +- src/Microsoft.AspNet.Routing/BuilderExtensions.cs | 3 ++- src/Microsoft.AspNet.Routing/IRouteConstraint.cs | 2 +- src/Microsoft.AspNet.Routing/RegexConstraint.cs | 2 +- src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs | 2 +- src/Microsoft.AspNet.Routing/RouteContext.cs | 2 +- src/Microsoft.AspNet.Routing/RouterMiddleware.cs | 2 +- src/Microsoft.AspNet.Routing/VirtualPathContext.cs | 2 +- src/Microsoft.AspNet.Routing/project.json | 2 +- .../ConstraintMatcherTests.cs | 2 +- .../ConstraintsBuilderTests.cs | 2 +- .../RegexConstraintTests.cs | 5 +++-- .../Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs | 2 +- .../Template/TemplateRouteTests.cs | 8 ++++---- test/Microsoft.AspNet.Routing.Tests/project.json | 2 +- 15 files changed, 21 insertions(+), 19 deletions(-) diff --git a/samples/RoutingSample.Web/Startup.cs b/samples/RoutingSample.Web/Startup.cs index e4dd82c6b9..fc517b71d0 100644 --- a/samples/RoutingSample.Web/Startup.cs +++ b/samples/RoutingSample.Web/Startup.cs @@ -17,7 +17,7 @@ using System.Text.RegularExpressions; using Microsoft.AspNet; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.Routing; namespace RoutingSample.Web diff --git a/src/Microsoft.AspNet.Routing/BuilderExtensions.cs b/src/Microsoft.AspNet.Routing/BuilderExtensions.cs index e288ecc208..e04e96d819 100644 --- a/src/Microsoft.AspNet.Routing/BuilderExtensions.cs +++ b/src/Microsoft.AspNet.Routing/BuilderExtensions.cs @@ -15,7 +15,8 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet; +using Microsoft.AspNet.Http; using Microsoft.AspNet.Routing; namespace Microsoft.AspNet diff --git a/src/Microsoft.AspNet.Routing/IRouteConstraint.cs b/src/Microsoft.AspNet.Routing/IRouteConstraint.cs index ecd520833e..536dd8d8b8 100644 --- a/src/Microsoft.AspNet.Routing/IRouteConstraint.cs +++ b/src/Microsoft.AspNet.Routing/IRouteConstraint.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Routing { diff --git a/src/Microsoft.AspNet.Routing/RegexConstraint.cs b/src/Microsoft.AspNet.Routing/RegexConstraint.cs index f39750818f..48d7dad7a6 100644 --- a/src/Microsoft.AspNet.Routing/RegexConstraint.cs +++ b/src/Microsoft.AspNet.Routing/RegexConstraint.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Text.RegularExpressions; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Routing { diff --git a/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs b/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs index a75f815c4e..7a7a2bb5fc 100644 --- a/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs +++ b/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Routing { diff --git a/src/Microsoft.AspNet.Routing/RouteContext.cs b/src/Microsoft.AspNet.Routing/RouteContext.cs index 1ec226ec4e..c9335da7b1 100644 --- a/src/Microsoft.AspNet.Routing/RouteContext.cs +++ b/src/Microsoft.AspNet.Routing/RouteContext.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Routing { diff --git a/src/Microsoft.AspNet.Routing/RouterMiddleware.cs b/src/Microsoft.AspNet.Routing/RouterMiddleware.cs index fa31cbe085..965c41bc0b 100644 --- a/src/Microsoft.AspNet.Routing/RouterMiddleware.cs +++ b/src/Microsoft.AspNet.Routing/RouterMiddleware.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.Routing; namespace Microsoft.AspNet diff --git a/src/Microsoft.AspNet.Routing/VirtualPathContext.cs b/src/Microsoft.AspNet.Routing/VirtualPathContext.cs index bea7233468..db1bf11797 100644 --- a/src/Microsoft.AspNet.Routing/VirtualPathContext.cs +++ b/src/Microsoft.AspNet.Routing/VirtualPathContext.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; namespace Microsoft.AspNet.Routing { diff --git a/src/Microsoft.AspNet.Routing/project.json b/src/Microsoft.AspNet.Routing/project.json index 475a742a34..d0da85a6ec 100644 --- a/src/Microsoft.AspNet.Routing/project.json +++ b/src/Microsoft.AspNet.Routing/project.json @@ -1,7 +1,7 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Abstractions": "0.1-alpha-*", + "Microsoft.AspNet.Http": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*" }, "configurations": { diff --git a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTests.cs b/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTests.cs index 039a1bc975..9ca29798ca 100644 --- a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTests.cs @@ -17,7 +17,7 @@ #if NET45 using System.Collections.Generic; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs b/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs index 6488f85449..897a8660c3 100644 --- a/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Microsoft.AspNet.Testing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Routing.Tests/RegexConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/RegexConstraintTests.cs index 8dccfe55b0..b9d29dde77 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RegexConstraintTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/RegexConstraintTests.cs @@ -16,12 +16,13 @@ // permissions and limitations under the License. #if NET45 -using Moq; + using System.Globalization; using System.Text.RegularExpressions; using System.Threading; +using Microsoft.AspNet.Http; +using Moq; using Xunit; -using Microsoft.AspNet.Abstractions; namespace Microsoft.AspNet.Routing.Tests { diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs index fa31bf570a..586e3309a8 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs +++ b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs index e64c9b0d5b..85de0c742b 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTests.cs @@ -17,10 +17,10 @@ #if NET45 using System; -using Microsoft.AspNet.Testing; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Http; +using Microsoft.AspNet.Testing; using Moq; using Xunit; @@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests #endregion - #region Route Binding +#region Route Binding [Fact] public void GetVirtualPath_Success() @@ -397,7 +397,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests #endregion - #region Route Registration +#region Route Registration [Fact] public void RegisteringRouteWithInvalidConstraints_Throws() diff --git a/test/Microsoft.AspNet.Routing.Tests/project.json b/test/Microsoft.AspNet.Routing.Tests/project.json index 21520098dc..66519908db 100644 --- a/test/Microsoft.AspNet.Routing.Tests/project.json +++ b/test/Microsoft.AspNet.Routing.Tests/project.json @@ -1,7 +1,7 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.Abstractions" : "0.1-alpha-*", + "Microsoft.AspNet.Http" : "0.1-alpha-*", "Microsoft.AspNet.Routing" : "", "Microsoft.AspNet.Testing" : "0.1-alpha-*", "Xunit.KRunner": "0.1-alpha-*",