From 70d674410e8ba3d91e427ffd3ed09564f2e2d394 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 22 Jan 2016 12:24:38 -0800 Subject: [PATCH] Rename AspNet 5 file contents. See https://github.com/aspnet/Announcements/issues/144 for more information. --- NuGetPackageVerifier.json | 8 ++++---- Routing.sln | 18 +++++++++--------- samples/RoutingSample.Web/PrefixRoute.cs | 2 +- .../RouteBuilderExtensions.cs | 2 +- samples/RoutingSample.Web/Startup.cs | 8 ++++---- samples/RoutingSample.Web/hosting.json | 4 ++-- samples/RoutingSample.Web/project.json | 6 +++--- .../IRouteConstraint.cs | 4 ++-- .../IRouteHandler.cs | 6 +++--- .../IRouter.cs | 2 +- .../IRoutingFeature.cs | 4 ++-- ...osoft.AspNetCore.Routing.Abstractions.xproj | 4 ++-- .../RouteContext.cs | 4 ++-- .../RouteData.cs | 2 +- .../RouteDirection.cs | 2 +- .../RouteValueDictionary.cs | 2 +- .../RoutingHttpContextExtensions.cs | 6 +++--- .../VirtualPathContext.cs | 4 ++-- .../VirtualPathData.cs | 2 +- .../project.json | 4 ++-- .../DecisionCriterion.cs | 2 +- .../DecisionCriterionValue.cs | 2 +- .../DecisionCriterionValueEqualityComparer.cs | 2 +- .../DecisionTreeBuilder.cs | 2 +- .../DecisionTreeNode.cs | 2 +- .../IClassifier.cs | 2 +- .../ItemDescriptor.cs | 2 +- ...pNetCore.Routing.DecisionTree.Sources.xproj | 4 ++-- ...crosoft.AspNetCore.Routing.Extensions.xproj | 4 ++-- .../RequestDelegateRouteBuilderExtensions.cs | 10 +++++----- .../project.json | 4 ++-- .../BuilderExtensions.cs | 6 +++--- .../Constraints/AlphaRouteConstraint.cs | 2 +- .../Constraints/BoolRouteConstraint.cs | 4 ++-- .../Constraints/CompositeRouteConstraint.cs | 4 ++-- .../Constraints/DateTimeRouteConstraint.cs | 4 ++-- .../Constraints/DecimalRouteConstraint.cs | 4 ++-- .../Constraints/DoubleRouteConstraint.cs | 4 ++-- .../Constraints/FloatRouteConstraint.cs | 4 ++-- .../Constraints/GuidRouteConstraint.cs | 4 ++-- .../Constraints/HttpMethodRouteConstraint.cs | 6 +++--- .../Constraints/IntRouteConstraint.cs | 4 ++-- .../Constraints/LengthRouteConstraint.cs | 4 ++-- .../Constraints/LongRouteConstraint.cs | 4 ++-- .../Constraints/MaxLengthRouteConstraint.cs | 4 ++-- .../Constraints/MaxRouteConstraint.cs | 4 ++-- .../Constraints/MinLengthRouteConstraint.cs | 4 ++-- .../Constraints/MinRouteConstraint.cs | 4 ++-- .../Constraints/OptionalRouteConstraint.cs | 4 ++-- .../Constraints/RangeRouteConstraint.cs | 4 ++-- .../Constraints/RegexInlineRouteConstraint.cs | 2 +- .../Constraints/RegexRouteConstraint.cs | 4 ++-- .../Constraints/RequiredRouteConstraint.cs | 4 ++-- .../DefaultInlineConstraintResolver.cs | 2 +- .../RoutingServiceCollectionExtensions.cs | 4 ++-- .../IInlineConstraintResolver.cs | 2 +- .../INamedRouter.cs | 2 +- .../IRouteBuilder.cs | 4 ++-- .../IRouteCollection.cs | 2 +- .../InlineRouteParameterParser.cs | 4 ++-- .../Internal/BufferValue.cs | 4 ++-- .../Internal/LinkGenerationDecisionTree.cs | 6 +++--- .../Internal/LinkGenerationMatch.cs | 4 ++-- .../Internal/PathTokenizer.cs | 6 +++--- .../Internal/RoutingMarkerService.cs | 4 ++-- .../Internal/SegmentState.cs | 4 ++-- .../Internal/TaskCache.cs | 4 ++-- .../UriBuilderContextPooledObjectPolicy.cs | 4 ++-- .../Internal/UriBuildingContext.cs | 4 ++-- .../RouteConstraintMatcherExtensions.cs | 4 ++-- .../RouterMiddlewareLoggerExtensions.cs | 4 ++-- .../Logging/TreeRouterLoggerExtensions.cs | 4 ++-- .../MapRouteRouteBuilderExtensions.cs | 4 ++-- .../Properties/Resources.Designer.cs | 4 ++-- src/Microsoft.AspNetCore.Routing/Route.cs | 2 +- src/Microsoft.AspNetCore.Routing/RouteBase.cs | 12 ++++++------ .../RouteBuilder.cs | 6 +++--- .../RouteCollection.cs | 4 ++-- .../RouteConstraintBuilder.cs | 4 ++-- .../RouteConstraintMatcher.cs | 6 +++--- .../RouteHandler.cs | 8 ++++---- .../RouteOptions.cs | 4 ++-- .../RouteValueEqualityComparer.cs | 2 +- .../RouterMiddleware.cs | 8 ++++---- .../Template/InlineConstraint.cs | 2 +- .../Template/RoutePrecedence.cs | 2 +- .../Template/RouteTemplate.cs | 2 +- .../Template/TemplateBinder.cs | 4 ++-- .../Template/TemplateMatcher.cs | 6 +++--- .../Template/TemplateParser.cs | 2 +- .../Template/TemplatePart.cs | 2 +- .../Template/TemplateSegment.cs | 2 +- .../Template/TemplateValuesResult.cs | 2 +- .../Tree/TreeRouteBuilder.cs | 4 ++-- .../Tree/TreeRouteLinkGenerationEntry.cs | 4 ++-- .../Tree/TreeRouteMatchingEntry.cs | 4 ++-- .../Tree/TreeRouter.cs | 8 ++++---- .../Tree/UrlMatchingNode.cs | 4 ++-- .../Tree/UrlMatchingTree.cs | 4 ++-- src/Microsoft.AspNetCore.Routing/project.json | 6 +++--- ...etCore.Mvc.Routing.Abstractions.Tests.xproj | 4 ++-- .../RouteValueDictionaryTests.cs | 4 ++-- .../VirtualPathDataTests.cs | 2 +- .../project.json | 6 +++--- .../DecisionTreeBuilderTest.cs | 2 +- ...re.Routing.DecisionTree.Sources.Tests.xproj | 4 ++-- .../project.json | 8 ++++---- ...t.AspNetCore.Routing.Extensions.Tests.xproj | 4 ++-- ...equestDelegateRouteBuilderExtensionsTest.cs | 10 +++++----- .../project.json | 8 ++++---- .../BuilderExtensionsTest.cs | 6 +++--- .../ConstraintMatcherTest.cs | 6 +++--- .../Constraints/AlphaRouteConstraintTests.cs | 4 ++-- .../Constraints/BoolRouteConstraintTests.cs | 6 +++--- .../CompositeRouteConstraintTests.cs | 6 +++--- .../Constraints/ConstraintsTestHelper.cs | 4 ++-- .../DateTimeRouteConstraintTests.cs | 4 ++-- .../Constraints/DecimalRouteConstraintTests.cs | 4 ++-- .../Constraints/DoubleRouteConstraintTests.cs | 4 ++-- .../Constraints/FloatRouteConstraintTests.cs | 4 ++-- .../Constraints/GuidRouteConstraintTests.cs | 4 ++-- .../HttpMethodRouteConstraintTests.cs | 6 +++--- .../Constraints/IntRouteConstraintsTests.cs | 4 ++-- .../Constraints/LengthRouteConstraintTests.cs | 6 +++--- .../Constraints/LongRouteConstraintTests.cs | 4 ++-- .../MaxLengthRouteConstraintTests.cs | 6 +++--- .../Constraints/MaxRouteConstraintTests.cs | 4 ++-- .../MinLengthRouteConstraintTests.cs | 6 +++--- .../Constraints/MinRouteConstraintTests.cs | 4 ++-- .../Constraints/RangeRouteConstraintTests.cs | 6 +++--- .../RegexInlineRouteConstraintTests.cs | 8 ++++---- .../Constraints/RegexRouteConstraintTests.cs | 8 ++++---- .../RequiredRouteConstraintTests.cs | 6 +++--- .../DefaultInlineConstraintResolverTest.cs | 6 +++--- .../InlineRouteParameterParserTests.cs | 6 +++--- .../Internal/LinkGenerationDecisionTreeTest.cs | 8 ++++---- .../Internal/PathTokenizerTest.cs | 6 +++--- .../Logging/WriteContext.cs | 2 +- .../RouteBuilderTest.cs | 6 +++--- .../RouteCollectionTest.cs | 6 +++--- .../RouteConstraintBuilderTest.cs | 8 ++++---- .../RouteOptionsTests.cs | 4 ++-- .../RouteTest.cs | 14 +++++++------- .../RouterMiddlewareTest.cs | 8 ++++---- .../Template/RoutePrecedenceTests.cs | 2 +- .../Template/TemplateBinderTests.cs | 4 ++-- .../Template/TemplateMatcherTests.cs | 4 ++-- .../Template/TemplateParserTests.cs | 4 ++-- .../TemplateParserDefaultValuesTests.cs | 6 +++--- .../Tree/TreeRouterTest.cs | 8 ++++---- .../project.json | 6 +++--- 151 files changed, 346 insertions(+), 346 deletions(-) diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 787d2fec4b..0608d58376 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,15 +9,15 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.AspNet.Routing.Abstractions": { }, - "Microsoft.AspNet.Routing.Extensions": { }, - "Microsoft.AspNet.Routing": { } + "Microsoft.AspNetCore.Routing.Abstractions": { }, + "Microsoft.AspNetCore.Routing.Extensions": { }, + "Microsoft.AspNetCore.Routing": { } } }, "adx-nonshipping": { "rules": [], "packages": { - "Microsoft.AspNet.Routing.DecisionTree.Sources": { } + "Microsoft.AspNetCore.Routing.DecisionTree.Sources": { } } }, "Default": { // Rules to run for packages not listed in any other set. diff --git a/Routing.sln b/Routing.sln index cebcc0d01f..952acd5783 100644 --- a/Routing.sln +++ b/Routing.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24711.0 @@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C3AD EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{95359B4B-4C85-4B44-A75B-0621905C4CF6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing", "src\Microsoft.AspNet.Routing\Microsoft.AspNet.Routing.xproj", "{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing", "src\Microsoft.AspNetCore.Routing\Microsoft.AspNetCore.Routing.xproj", "{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing.Tests", "test\Microsoft.AspNet.Routing.Tests\Microsoft.AspNet.Routing.Tests.xproj", "{636D79ED-7B32-487C-BDA5-D2A1AAA97371}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.Tests", "test\Microsoft.AspNetCore.Routing.Tests\Microsoft.AspNetCore.Routing.Tests.xproj", "{636D79ED-7B32-487C-BDA5-D2A1AAA97371}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RoutingSample.Web", "samples\RoutingSample.Web\RoutingSample.Web.xproj", "{DB94E647-C73A-4F52-A126-AA7544CCF33B}" EndProject @@ -20,17 +20,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing.DecisionTree.Sources", "src\Microsoft.AspNet.Routing.DecisionTree.Sources\Microsoft.AspNet.Routing.DecisionTree.Sources.xproj", "{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.DecisionTree.Sources", "src\Microsoft.AspNetCore.Routing.DecisionTree.Sources\Microsoft.AspNetCore.Routing.DecisionTree.Sources.xproj", "{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing.DecisionTree.Sources.Tests", "test\Microsoft.AspNet.Routing.DecisionTree.Sources.Tests\Microsoft.AspNet.Routing.DecisionTree.Sources.Tests.xproj", "{09C2933C-23AC-41B7-994D-E8A5184A629C}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests", "test\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.xproj", "{09C2933C-23AC-41B7-994D-E8A5184A629C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing.Abstractions", "src\Microsoft.AspNet.Routing.Abstractions\Microsoft.AspNet.Routing.Abstractions.xproj", "{ED253B01-24F1-43D1-AA0B-079391E105A9}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.Abstractions", "src\Microsoft.AspNetCore.Routing.Abstractions\Microsoft.AspNetCore.Routing.Abstractions.xproj", "{ED253B01-24F1-43D1-AA0B-079391E105A9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Routing.Abstractions.Tests", "test\Microsoft.AspNet.Mvc.Routing.Abstractions.Tests\Microsoft.AspNet.Mvc.Routing.Abstractions.Tests.xproj", "{741B0B05-CE96-473B-B962-6B0A347DF79A}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.xproj", "{741B0B05-CE96-473B-B962-6B0A347DF79A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing.Extensions", "src\Microsoft.AspNet.Routing.Extensions\Microsoft.AspNet.Routing.Extensions.xproj", "{579C3FD2-DFFA-4B64-BFC3-130C11F3568F}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.Extensions", "src\Microsoft.AspNetCore.Routing.Extensions\Microsoft.AspNetCore.Routing.Extensions.xproj", "{579C3FD2-DFFA-4B64-BFC3-130C11F3568F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing.Extensions.Tests", "test\Microsoft.AspNet.Routing.Extensions.Tests\Microsoft.AspNet.Routing.Extensions.Tests.xproj", "{FD0151B4-7153-49A8-9D90-62A252420230}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.Extensions.Tests", "test\Microsoft.AspNetCore.Routing.Extensions.Tests\Microsoft.AspNetCore.Routing.Extensions.Tests.xproj", "{FD0151B4-7153-49A8-9D90-62A252420230}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/RoutingSample.Web/PrefixRoute.cs b/samples/RoutingSample.Web/PrefixRoute.cs index 70d2f6d80c..908e8a5462 100644 --- a/samples/RoutingSample.Web/PrefixRoute.cs +++ b/samples/RoutingSample.Web/PrefixRoute.cs @@ -3,7 +3,7 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Routing; +using Microsoft.AspNetCore.Routing; namespace RoutingSample.Web { diff --git a/samples/RoutingSample.Web/RouteBuilderExtensions.cs b/samples/RoutingSample.Web/RouteBuilderExtensions.cs index f2317dbcf1..d81735bbc2 100644 --- a/samples/RoutingSample.Web/RouteBuilderExtensions.cs +++ b/samples/RoutingSample.Web/RouteBuilderExtensions.cs @@ -1,7 +1,7 @@ // 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.Routing; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; namespace RoutingSample.Web diff --git a/samples/RoutingSample.Web/Startup.cs b/samples/RoutingSample.Web/Startup.cs index 1ea3d395b6..335ac54bf9 100644 --- a/samples/RoutingSample.Web/Startup.cs +++ b/samples/RoutingSample.Web/Startup.cs @@ -3,10 +3,10 @@ using System.Globalization; using System.Threading; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; namespace RoutingSample.Web diff --git a/samples/RoutingSample.Web/hosting.json b/samples/RoutingSample.Web/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/RoutingSample.Web/hosting.json +++ b/samples/RoutingSample.Web/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/RoutingSample.Web/project.json b/samples/RoutingSample.Web/project.json index 7bdfe23758..b6bbb9bb0c 100644 --- a/samples/RoutingSample.Web/project.json +++ b/samples/RoutingSample.Web/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNet.Routing.Extensions": "1.0.0-*" + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Routing.Extensions": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs index 0da713865e..00eb916510 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs @@ -1,9 +1,9 @@ // 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.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Defines the contract that a class must implement in order to check whether a URL parameter diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs index 584cebf321..15aaaeda8b 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Defines a contract for a handler of a route. diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs index 4d159efe0e..06a62bc9ba 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public interface IRouter { diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs index a74b321db4..bf1897c8ee 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// A feature interface for routing functionality. diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.xproj b/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.xproj index b3605717bf..5818066429 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.xproj +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ ed253b01-24f1-43d1-aa0b-079391e105a9 - Microsoft.AspNet.Routing.Abstractions + Microsoft.AspNetCore.Routing.Abstractions ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs index 804e0a5378..767f39b1ec 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// A context object for . diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs index aaedaf3e9f..2d2131c8d7 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Information about the current routing path. diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs index 316d085164..f19ac2b4ec 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Indicates whether ASP.NET routing is processing a URL from an HTTP request or generating a URL. diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs index 08d05a4154..1031ad2ec3 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// An type for route values. diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs index 7441555df4..de121852ab 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Extension methods for related to routing. diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs index e6d86db08c..036aa445f8 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs @@ -1,9 +1,9 @@ // 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.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// A context for virtual path generation operations. diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs b/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs index 27fa15b6a3..d6a2db1232 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Represents information about the route and virtual path that are the result of diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/project.json b/src/Microsoft.AspNetCore.Routing.Abstractions/project.json index fb32415e68..c829d87b3e 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "ASP.NET 5 abstractions for routing requests to application logic and for generating links.", "version": "1.0.0-*", "repository": { @@ -10,7 +10,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.AspNet.Http.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*", "Microsoft.Extensions.PropertyHelper.Sources": { "type": "build", "version": "1.0.0-*" diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs index 5283e73d03..efc9c742d2 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { internal class DecisionCriterion { diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs index 4bf8131e73..e5ed7a69f8 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { internal struct DecisionCriterionValue { diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs index a678312b92..949b7b613c 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { internal class DecisionCriterionValueEqualityComparer : IEqualityComparer { diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs index 56b28c446c..76792f6793 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { // This code generates a minimal tree of decision criteria that map known categorical data // (key-value-pairs) to a set of inputs. Action Selection is the best example of how this diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs index 08f5c95c01..1be3064c62 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { // Data structure representing a node in a decision tree. These are created in DecisionTreeBuilder // and walked to find a set of items matching some input criteria. diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs index 7c7749a6ed..3008fdfa75 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { internal interface IClassifier { diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs index df07429180..84a6279c27 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { internal class ItemDescriptor { diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/Microsoft.AspNetCore.Routing.DecisionTree.Sources.xproj b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/Microsoft.AspNetCore.Routing.DecisionTree.Sources.xproj index 1cdad83d4a..580c2d5ca1 100644 --- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/Microsoft.AspNetCore.Routing.DecisionTree.Sources.xproj +++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/Microsoft.AspNetCore.Routing.DecisionTree.Sources.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ abd5aa59-6000-4a3d-a54f-4b636f725ae8 - Microsoft.AspNet.Routing.DecisionTree + Microsoft.AspNetCore.Routing.DecisionTree ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNetCore.Routing.Extensions/Microsoft.AspNetCore.Routing.Extensions.xproj b/src/Microsoft.AspNetCore.Routing.Extensions/Microsoft.AspNetCore.Routing.Extensions.xproj index 5ad562b4eb..817909a13f 100644 --- a/src/Microsoft.AspNetCore.Routing.Extensions/Microsoft.AspNetCore.Routing.Extensions.xproj +++ b/src/Microsoft.AspNetCore.Routing.Extensions/Microsoft.AspNetCore.Routing.Extensions.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ 579c3fd2-dffa-4b64-bfc3-130c11f3568f - Microsoft.AspNet.Routing.Extensions + Microsoft.AspNetCore.Routing.Extensions ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNetCore.Routing.Extensions/RequestDelegateRouteBuilderExtensions.cs b/src/Microsoft.AspNetCore.Routing.Extensions/RequestDelegateRouteBuilderExtensions.cs index 4624bf6d66..16d250cb5c 100644 --- a/src/Microsoft.AspNetCore.Routing.Extensions/RequestDelegateRouteBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing.Extensions/RequestDelegateRouteBuilderExtensions.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Routing.Constraints; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public static class RequestDelegateRouteBuilderExtensions { diff --git a/src/Microsoft.AspNetCore.Routing.Extensions/project.json b/src/Microsoft.AspNetCore.Routing.Extensions/project.json index 6d1132e6d4..cb802e7c7f 100644 --- a/src/Microsoft.AspNetCore.Routing.Extensions/project.json +++ b/src/Microsoft.AspNetCore.Routing.Extensions/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "ASP.NET 5 extension methods for routing requests to application logic and for generating links.", "version": "1.0.0-*", "repository": { @@ -10,7 +10,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.AspNet.Routing": "1.0.0-*" + "Microsoft.AspNetCore.Routing": "1.0.0-*" }, "frameworks": { "net451": { }, diff --git a/src/Microsoft.AspNetCore.Routing/BuilderExtensions.cs b/src/Microsoft.AspNetCore.Routing/BuilderExtensions.cs index 748c621c86..0963019f2d 100644 --- a/src/Microsoft.AspNetCore.Routing/BuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing/BuilderExtensions.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Routing; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Routing.Internal; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Extension methods for adding the middleware to an . diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs index 2f7e505b8f..7f2748e5c3 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to contain only lowercase or uppercase letters A through Z in the English alphabet. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs index 05b620c426..a65e88ef67 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only Boolean values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs index 20db00d7ad..5acff08294 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route by several child constraints. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs index 4bc3f982aa..9015dc64be 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs index b237fb62a7..ff29d98574 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only decimal values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs index 5f51e73572..e7259d0bf3 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only 64-bit floating-point values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs index da4a3e72c8..5db0e65c28 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only 32-bit floating-point values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs index 142991dbc6..00d451767f 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs index d211f06ce5..d01140157d 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains the HTTP method of request or a route. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs index d714504aa2..83b08533bd 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only 32-bit integer values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs index 891e87dd76..f876c03cbc 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to be a string of a given length or within a given range of lengths. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs index ea178ce423..a76a4de885 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to represent only 64-bit integer values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs index 59ec40255e..42dde182ed 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to be a string with a maximum length. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs index 65b225ee2c..e43dac85fe 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to be an integer with a maximum value. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs index ec20c6e873..1ea64ae216 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to be a string with a minimum length. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs index 0490dd20ad..68357c59e7 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constrains a route parameter to be a long with a minimum value. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs index 6e8d310a42..3990376410 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Defines a constraint on an optional parameter. If the parameter is present, then it is constrained by InnerConstraint. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs index 8121e436f4..301a75f15a 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constraints a route parameter to be an integer within a given range of values. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs index 3fd9b8fcb4..f0a9bc9875 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Represents a regex constraint which can be used as an inlineConstraint. diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs index 3e9785999d..fb3d2390fe 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs @@ -4,9 +4,9 @@ using System; using System.Globalization; using System.Text.RegularExpressions; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { public class RegexRouteConstraint : IRouteConstraint { diff --git a/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs b/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs index c3cb229547..e03d618565 100644 --- a/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs @@ -3,9 +3,9 @@ using System; using System.Globalization; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { /// /// Constraints a route parameter that must have a value. diff --git a/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs b/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs index 18027fd8c0..5d335f0dd9 100644 --- a/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs +++ b/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Reflection; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// The default implementation of . Resolves constraints by parsing diff --git a/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs index 7774071da4..2425ed668c 100644 --- a/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs @@ -3,8 +3,8 @@ using System; using System.Text.Encodings.Web; -using Microsoft.AspNet.Routing; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Routing.Internal; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.ObjectPool; diff --git a/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs b/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs index 4f86d57dcc..d4e0fd028f 100644 --- a/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs +++ b/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Defines an abstraction for resolving inline constraints as instances of . diff --git a/src/Microsoft.AspNetCore.Routing/INamedRouter.cs b/src/Microsoft.AspNetCore.Routing/INamedRouter.cs index d954cec89d..b04b7d2f56 100644 --- a/src/Microsoft.AspNetCore.Routing/INamedRouter.cs +++ b/src/Microsoft.AspNetCore.Routing/INamedRouter.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public interface INamedRouter : IRouter { diff --git a/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs b/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs index ed36d59d07..2969342724 100644 --- a/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs +++ b/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Builder; +using Microsoft.AspNetCore.Builder; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// Defines a contract for a route builder in an application. A route builder specifies the routes for diff --git a/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs b/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs index 02cb1e01b7..084f0aef67 100644 --- a/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs +++ b/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public interface IRouteCollection : IRouter { diff --git a/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs b/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs index 39129ecd7f..78131eba97 100644 --- a/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs +++ b/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Routing.Template; +using Microsoft.AspNetCore.Routing.Template; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public static class InlineRouteParameterParser { diff --git a/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs b/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs index b6165be207..578c396b4d 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { public struct BufferValue { diff --git a/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs b/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs index 5c82fcb0de..6cd1b66b1f 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Routing.DecisionTree; -using Microsoft.AspNet.Routing.Tree; +using Microsoft.AspNetCore.Routing.DecisionTree; +using Microsoft.AspNetCore.Routing.Tree; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { // A decision tree that matches link generation entries based on route data. public class LinkGenerationDecisionTree diff --git a/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationMatch.cs b/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationMatch.cs index d4c08d910b..e2ab6ea73f 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationMatch.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationMatch.cs @@ -1,9 +1,9 @@ // 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.Routing.Tree; +using Microsoft.AspNetCore.Routing.Tree; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { public struct LinkGenerationMatch { diff --git a/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs b/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs index ebd20ba467..9418989fdb 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { public struct PathTokenizer : IReadOnlyList { diff --git a/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs b/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs index aa23baeebc..b180294316 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Extensions.DependencyInjection; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { /// /// A marker class used to determine if all the routing services were added diff --git a/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs b/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs index 66a511f2bf..35076a0678 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { // Segments are treated as all-or-none. We should never output a partial segment. // If we add any subsegment of this segment to the generated URI, we have to add diff --git a/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs b/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs index 4278b001ee..dfdda56896 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System.Threading.Tasks; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { public static class TaskCache { diff --git a/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs b/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs index 77460600b3..0db44758d9 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using System.Text.Encodings.Web; using Microsoft.Extensions.ObjectPool; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { public class UriBuilderContextPooledObjectPolicy : IPooledObjectPolicy { diff --git a/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs b/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs index 5318915cb5..3b78fe8c78 100644 --- a/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs +++ b/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System.Collections.Generic; @@ -7,7 +7,7 @@ using System.IO; using System.Text; using System.Text.Encodings.Web; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { [DebuggerDisplay("{DebuggerToString(),nq}")] public class UriBuildingContext diff --git a/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs b/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs index 05fdb512f3..9a19250f30 100644 --- a/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Routing.Logging +namespace Microsoft.AspNetCore.Routing.Logging { internal static class RouteConstraintMatcherExtensions { diff --git a/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs b/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs index 9c4da61543..35f05272cd 100644 --- a/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Routing.Logging +namespace Microsoft.AspNetCore.Routing.Logging { internal static class RouterMiddlewareLoggerExtensions { diff --git a/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs b/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs index 60405cff9d..3f6af8e5dc 100644 --- a/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Routing.Logging +namespace Microsoft.AspNetCore.Routing.Logging { internal static class TreeRouterLoggerExtensions { diff --git a/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs b/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs index 04e6723f16..cf46749f3d 100644 --- a/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Routing; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Provides extension methods for to add routes. diff --git a/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs index bd68ed4e65..6abdc4ea48 100644 --- a/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Routing internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.Routing.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.AspNetCore.Routing.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// Value must be greater than or equal to {0}. diff --git a/src/Microsoft.AspNetCore.Routing/Route.cs b/src/Microsoft.AspNetCore.Routing/Route.cs index 9106ec00aa..3d38f922b3 100644 --- a/src/Microsoft.AspNetCore.Routing/Route.cs +++ b/src/Microsoft.AspNetCore.Routing/Route.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class Route : RouteBase { diff --git a/src/Microsoft.AspNetCore.Routing/RouteBase.cs b/src/Microsoft.AspNetCore.Routing/RouteBase.cs index f9b6c908e2..5dd5ef3411 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteBase.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteBase.cs @@ -1,19 +1,19 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using System.Collections.Generic; using System.Text.Encodings.Web; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Internal; -using Microsoft.AspNet.Routing.Logging; -using Microsoft.AspNet.Routing.Template; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Internal; +using Microsoft.AspNetCore.Routing.Logging; +using Microsoft.AspNetCore.Routing.Template; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.ObjectPool; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public abstract class RouteBase : IRouter, INamedRouter { diff --git a/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs b/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs index 6eb3476d47..0be4c51bfa 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing.Internal; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteBuilder : IRouteBuilder { diff --git a/src/Microsoft.AspNetCore.Routing/RouteCollection.cs b/src/Microsoft.AspNetCore.Routing/RouteCollection.cs index b2b07612f2..98a41320bd 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteCollection.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteCollection.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteCollection : IRouteCollection { diff --git a/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs b/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs index b26a76c6b4..1116222e5f 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// A builder for produding a mapping of keys to see . diff --git a/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs b/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs index a935ae7396..eb29d0fbd5 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Logging; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Logging; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public static class RouteConstraintMatcher { diff --git a/src/Microsoft.AspNetCore.Routing/RouteHandler.cs b/src/Microsoft.AspNetCore.Routing/RouteHandler.cs index fdb05ce9f1..c6dd3c868b 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteHandler.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteHandler.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Internal; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteHandler : IRouteHandler, IRouter { diff --git a/src/Microsoft.AspNetCore.Routing/RouteOptions.cs b/src/Microsoft.AspNetCore.Routing/RouteOptions.cs index 894b3eb249..1ae47ed13f 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteOptions.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteOptions.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteOptions { diff --git a/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs b/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs index 2710247f30..8ef887f728 100644 --- a/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs +++ b/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Globalization; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { /// /// An implementation that compares objects as-if diff --git a/src/Microsoft.AspNetCore.Routing/RouterMiddleware.cs b/src/Microsoft.AspNetCore.Routing/RouterMiddleware.cs index 2880e5a0a1..765fbd814c 100644 --- a/src/Microsoft.AspNetCore.Routing/RouterMiddleware.cs +++ b/src/Microsoft.AspNetCore.Routing/RouterMiddleware.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.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing; -using Microsoft.AspNet.Routing.Logging; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Routing.Logging; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public class RouterMiddleware { diff --git a/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs b/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs index 437e0a5c08..5c50eefb0e 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { /// /// The parsed representation of an inline constraint in a route parameter. diff --git a/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs b/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs index 9980394a05..1b506237bf 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Linq; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { /// /// Computes precedence for an attribute route template. diff --git a/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs b/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs index 69f1c89e48..3903d8bab0 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { [DebuggerDisplay("{DebuggerToString()}")] public class RouteTemplate diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs index 1b43576845..809a7a6913 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs @@ -6,10 +6,10 @@ using System.Collections; using System.Diagnostics; using System.Globalization; using System.Text.Encodings.Web; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Routing.Internal; using Microsoft.Extensions.ObjectPool; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { public class TemplateBinder { diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs index 5cb5ab372d..9709997c75 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Internal; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { public class TemplateMatcher { diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs index c463c954fe..ab38bf55f2 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { public static class TemplateParser { diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs index 1612ec1f0f..70f588a41a 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { [DebuggerDisplay("{DebuggerToString()}")] public class TemplatePart diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs index afb727608c..4a86526509 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { [DebuggerDisplay("{DebuggerToString()}")] public class TemplateSegment diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs index 6aeb85d515..2a7c46398f 100644 --- a/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs +++ b/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { /// /// The values used as inputs for constraints and link generation. diff --git a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs index 7a838d2dc7..d917428ed2 100644 --- a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs +++ b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System.Collections.Generic; @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Linq; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Routing.Tree +namespace Microsoft.AspNetCore.Routing.Tree { public class TreeRouteBuilder { diff --git a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteLinkGenerationEntry.cs b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteLinkGenerationEntry.cs index 4a9ad4a1a8..659283a773 100644 --- a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteLinkGenerationEntry.cs +++ b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteLinkGenerationEntry.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Routing.Template; +using Microsoft.AspNetCore.Routing.Template; -namespace Microsoft.AspNet.Routing.Tree +namespace Microsoft.AspNetCore.Routing.Tree { /// /// Used to build a . Represents an individual URL-generating route that will be diff --git a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteMatchingEntry.cs b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteMatchingEntry.cs index 520ec5e2c7..ad3ecffbae 100644 --- a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteMatchingEntry.cs +++ b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteMatchingEntry.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Routing.Template; +using Microsoft.AspNetCore.Routing.Template; -namespace Microsoft.AspNet.Routing.Tree +namespace Microsoft.AspNetCore.Routing.Tree { /// /// Used to build an . Represents an individual URL-matching route that will be diff --git a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs index 2474ac02b8..4fd5a28222 100644 --- a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs +++ b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; @@ -6,12 +6,12 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Routing.Internal; -using Microsoft.AspNet.Routing.Logging; +using Microsoft.AspNetCore.Routing.Internal; +using Microsoft.AspNetCore.Routing.Logging; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Routing.Tree +namespace Microsoft.AspNetCore.Routing.Tree { /// /// An implementation for attribute routing. diff --git a/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs b/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs index 240de8a347..6d82adefb2 100644 --- a/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs +++ b/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using System.Collections.Generic; -namespace Microsoft.AspNet.Routing.Tree +namespace Microsoft.AspNetCore.Routing.Tree { public class UrlMatchingNode { diff --git a/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs b/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs index 7888124651..c7459fc0b6 100644 --- a/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs +++ b/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. -namespace Microsoft.AspNet.Routing.Tree +namespace Microsoft.AspNetCore.Routing.Tree { public class UrlMatchingTree { diff --git a/src/Microsoft.AspNetCore.Routing/project.json b/src/Microsoft.AspNetCore.Routing/project.json index e50fade45d..3e8387e6ba 100644 --- a/src/Microsoft.AspNetCore.Routing/project.json +++ b/src/Microsoft.AspNetCore.Routing/project.json @@ -10,9 +10,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.AspNet.Routing.Abstractions": "1.0.0-*", - "Microsoft.AspNet.Routing.DecisionTree.Sources": { + "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", + "Microsoft.AspNetCore.Routing.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Routing.DecisionTree.Sources": { "type": "build", "version": "1.0.0-*" }, diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.xproj b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.xproj index 3759a51630..0dff911d89 100644 --- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.xproj +++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 741b0b05-ce96-473b-b962-6b0a347df79a - Microsoft.AspNet.Mvc.Routing.Abstractions.Tests + Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs index 299c90ff8c..f624da6eee 100644 --- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs @@ -4,10 +4,10 @@ using System; using System.Linq; using System.Collections.Generic; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Testing; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class RouteValueDictionaryTests { diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs index 54c876fc87..b0917796c6 100644 --- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs @@ -4,7 +4,7 @@ using Moq; using Xunit; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class VirtualPathDataTests { diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json index f29067c927..14ee76f013 100644 --- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json @@ -1,10 +1,10 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, "dependencies": { - "Microsoft.AspNet.Routing.Abstractions": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Routing.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.1.0" }, "frameworks": { diff --git a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs index 68904645c4..5e28fd8917 100644 --- a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Xunit; -namespace Microsoft.AspNet.Routing.DecisionTree +namespace Microsoft.AspNetCore.Routing.DecisionTree { public class DecisionTreeBuilderTest { diff --git a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.xproj b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.xproj index 36ad4bad60..94583c9fd5 100644 --- a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.xproj +++ b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 09c2933c-23ac-41b7-994d-e8a5184a629c - Microsoft.AspNet.Routing.DecisionTree.Tests + Microsoft.AspNetCore.Routing.DecisionTree.Tests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json index e22b52fdd5..82804aff15 100644 --- a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json +++ b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json @@ -1,14 +1,14 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, "dependencies": { - "Microsoft.AspNet.Routing": "1.0.0-*", - "Microsoft.AspNet.Routing.DecisionTree.Sources": { + "Microsoft.AspNetCore.Routing": "1.0.0-*", + "Microsoft.AspNetCore.Routing.DecisionTree.Sources": { "type": "build", "version": "1.0.0-*" }, - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.1.0" }, "frameworks": { diff --git a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/Microsoft.AspNetCore.Routing.Extensions.Tests.xproj b/test/Microsoft.AspNetCore.Routing.Extensions.Tests/Microsoft.AspNetCore.Routing.Extensions.Tests.xproj index b3b50c729b..5ed149866a 100644 --- a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/Microsoft.AspNetCore.Routing.Extensions.Tests.xproj +++ b/test/Microsoft.AspNetCore.Routing.Extensions.Tests/Microsoft.AspNetCore.Routing.Extensions.Tests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ fd0151b4-7153-49a8-9d90-62a252420230 - Microsoft.AspNet.Routing.Extensions.Tests + Microsoft.AspNetCore.Routing.Extensions.Tests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/RequestDelegateRouteBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.Routing.Extensions.Tests/RequestDelegateRouteBuilderExtensionsTest.cs index e9303e26b4..f3e974cb69 100644 --- a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/RequestDelegateRouteBuilderExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Extensions.Tests/RequestDelegateRouteBuilderExtensionsTest.cs @@ -1,16 +1,16 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Routing; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Moq; using Xunit; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { // These are really more like integration tests. They verify that these extensions // add routes that behave as advertised. diff --git a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/project.json b/test/Microsoft.AspNetCore.Routing.Extensions.Tests/project.json index 126e4e64fb..80364c24ca 100644 --- a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/project.json +++ b/test/Microsoft.AspNetCore.Routing.Extensions.Tests/project.json @@ -1,11 +1,11 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Routing.Extensions": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Http": "1.0.0-*", + "Microsoft.AspNetCore.Routing.Extensions": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.Logging.Testing": "1.0.0-*", "xunit": "2.1.0" diff --git a/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs index 4546e880e6..ca297f89d2 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; -using Microsoft.AspNet.Routing; +using Microsoft.AspNetCore.Routing; using Moq; using Xunit; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public class BuilderExtensionsTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs index 5856b87c7d..0f96a1e845 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Logging; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Logging; using Microsoft.Extensions.Logging.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class ConstraintMatcherTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs index aa01c1dcc1..2ba9ef5c27 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs @@ -1,10 +1,10 @@ // 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.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class AlphaRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs index 8ec74daec5..32a2aa595e 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Constraints; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class BoolRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs index 8b837977be..b4df74c262 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs @@ -3,12 +3,12 @@ using System; using System.Linq.Expressions; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Constraints; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class CompositeRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs index edd5a0c7ae..a86c7f4910 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Moq; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class ConstraintsTestHelper { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs index fcb4b391ac..5ef942d184 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class DateTimeRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs index 3dc764288e..c8233a95be 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class DecimalRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs index 0a6c5c7f8b..7f3a2c065d 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs @@ -1,10 +1,10 @@ // 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.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class DoubleRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs index ab52d3a8a8..0fd1710c1c 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs @@ -1,10 +1,10 @@ // 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.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class FloatRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs index 3c7331b27d..d53218a83b 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class GuidRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs index 649351fbc6..d06af49fad 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Http.Internal; +using Microsoft.AspNetCore.Http.Internal; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Constraints +namespace Microsoft.AspNetCore.Routing.Constraints { public class HttpMethodRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs index e5225ee097..ff70fe21b7 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs @@ -1,10 +1,10 @@ // 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.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class IntRouteConstraintsTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs index 268ac9013f..707056a01c 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs @@ -1,11 +1,11 @@ // 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.Routing.Constraints; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Testing; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class LengthRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs index 439eff07da..99977ee753 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs @@ -1,10 +1,10 @@ // 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.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class LongRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs index 281ad6b669..5d603705e2 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs @@ -1,11 +1,11 @@ // 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.Routing.Constraints; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Testing; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class MaxLengthRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs index 32119487fa..dc962d0948 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs @@ -1,10 +1,10 @@ // 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.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class MaxRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs index ffdc1e675c..c8e7bab2de 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs @@ -1,11 +1,11 @@ // 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.Routing.Constraints; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Testing; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class MinLengthRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs index 642599e4d6..b21b2ded74 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs @@ -1,10 +1,10 @@ // 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.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Constraints; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class MinRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs index 1f3ae2675c..95cd97a863 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs @@ -1,11 +1,11 @@ // 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.Routing.Constraints; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Testing; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class RangeRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs index 554ce53922..2c430d17b1 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs @@ -1,13 +1,13 @@ // 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.Http; -using Microsoft.AspNet.Routing.Constraints; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class RegexInlineRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs index 913501605e..e8dc1e34dc 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Text.RegularExpressions; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Constraints; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class RegexRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs index 0e5477f599..a437f77096 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.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.Http; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Constraints; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class RequiredRouteConstraintTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs index e1a6a7369c..128d50ee35 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs @@ -3,14 +3,14 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Constraints; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Constraints; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class DefaultInlineConstraintResolverTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs index 16b9ab1a7b..03295564d2 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs @@ -4,13 +4,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Template; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Template; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class InlineRouteParameterParserTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs index b4d6b2882e..bd5853b272 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Routing.Template; -using Microsoft.AspNet.Routing.Tree; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Routing.Template; +using Microsoft.AspNetCore.Routing.Tree; using Xunit; -namespace Microsoft.AspNet.Routing.Internal.Routing +namespace Microsoft.AspNetCore.Routing.Internal.Routing { public class LinkGenerationDecisionTreeTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs index ff73825624..78b9685e63 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; using Xunit; -namespace Microsoft.AspNet.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Internal { public class PathTokenizerTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs b/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs index 1fb13d7f79..4a5fa51e04 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class WriteContext { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs index 8813a0dbb9..06dc31f5a2 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 System; -using Microsoft.AspNet.Builder; +using Microsoft.AspNetCore.Builder; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteBuilderTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs index 4710767351..bf57183e5d 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; @@ -14,7 +14,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteCollectionTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs index d8405419dc..8aceb54da0 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs @@ -3,14 +3,14 @@ using System; using System.Linq; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Constraints; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteConstraintBuilderTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.cs index df9275bb2e..6dc6ceb2ad 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.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.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class RouteOptionsTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs index 7f036544af..9ca95e5611 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs @@ -5,19 +5,19 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Routing.Constraints; -using Microsoft.AspNet.Routing.Internal; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Routing.Constraints; +using Microsoft.AspNetCore.Routing.Internal; +using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouteTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs index 3a3fa0b0d9..62f62debca 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs @@ -3,13 +3,13 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Internal; using Microsoft.Extensions.Logging.Testing; using Xunit; -namespace Microsoft.AspNet.Routing +namespace Microsoft.AspNetCore.Routing { public class RouterMiddlewareTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs index e3117adb52..936b1df3d3 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Template +namespace Microsoft.AspNetCore.Routing.Template { public class RoutePrecedenceTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs index 7e102f0bf9..fc4186561b 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs @@ -5,14 +5,14 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text.Encodings.Web; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Routing.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; using Microsoft.Extensions.WebEncoders.Testing; using Xunit; -namespace Microsoft.AspNet.Routing.Template.Tests +namespace Microsoft.AspNetCore.Routing.Template.Tests { public class TemplateBinderTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.cs index b64d91a216..627322aec4 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.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.Collections.Generic; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNet.Routing.Template.Tests +namespace Microsoft.AspNetCore.Routing.Template.Tests { public class TemplateMatcherTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs index 9c92b1b52d..d43b279c97 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs @@ -4,13 +4,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Testing; +using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Template.Tests +namespace Microsoft.AspNetCore.Routing.Template.Tests { public class TemplateRouteParserTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs index 4b1c97d8cd..10c5651e84 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Routing.Internal; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tests +namespace Microsoft.AspNetCore.Routing.Tests { public class TemplateParserDefaultValuesTests { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs index 2b33138ebc..37c741db79 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Text.Encodings.Web; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Routing.Internal; -using Microsoft.AspNet.Routing.Template; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Routing.Internal; +using Microsoft.AspNetCore.Routing.Template; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.ObjectPool; @@ -17,7 +17,7 @@ using Microsoft.Extensions.WebEncoders.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Routing.Tree +namespace Microsoft.AspNetCore.Routing.Tree { public class TreeRouterTest { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/project.json b/test/Microsoft.AspNetCore.Routing.Tests/project.json index 45ea5cfcf8..30a794f048 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/project.json +++ b/test/Microsoft.AspNetCore.Routing.Tests/project.json @@ -3,9 +3,9 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Routing": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Http": "1.0.0-*", + "Microsoft.AspNetCore.Routing": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.Logging.Testing": "1.0.0-*", "Microsoft.Extensions.WebEncoders": "1.0.0-*",