diff --git a/build/artifacts.props b/build/artifacts.props index debe7bdcd4df..09e81d54248e 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -124,7 +124,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 4dcc51c6d8bc..d2c3796a2678 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -13,7 +13,6 @@ - diff --git a/build/submodules.props b/build/submodules.props index f6c0e55b495b..fb83300b4ef7 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -60,7 +60,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index c949b4b702e3..65c44f8d83c6 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -340,6 +340,24 @@ + + + 2.1.1 + + + + + + + 2.1.1 + + + + + + + + 2.1.3 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 5b87da3ce898..cbbaa33b9440 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -37,6 +37,8 @@ + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 011eeb7b52ce..139d310165bd 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -17,25 +17,28 @@ - + + + + - + @@ -44,8 +47,8 @@ - + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 5552823cf62c..67cd71ef8d9b 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -25,6 +25,8 @@ + + diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props index 0c9dbc1f376b..e1cf0cae8a6f 100644 --- a/eng/dependencies.temp.props +++ b/eng/dependencies.temp.props @@ -6,6 +6,5 @@ This is required to provide dependencies for samples and tests. - diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs b/src/Http/Routing.Abstractions/src/IRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs rename to src/Http/Routing.Abstractions/src/IRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs b/src/Http/Routing.Abstractions/src/IRouteHandler.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs rename to src/Http/Routing.Abstractions/src/IRouteHandler.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs b/src/Http/Routing.Abstractions/src/IRouter.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs rename to src/Http/Routing.Abstractions/src/IRouter.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs b/src/Http/Routing.Abstractions/src/IRoutingFeature.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs rename to src/Http/Routing.Abstractions/src/IRoutingFeature.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj similarity index 64% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj rename to src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj index 633a49d503ed..edb292bb22cc 100644 --- a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj +++ b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj @@ -12,7 +12,7 @@ Microsoft.AspNetCore.Routing.RouteData - - + + diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/AssemblyInfo.cs b/src/Http/Routing.Abstractions/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/AssemblyInfo.cs rename to src/Http/Routing.Abstractions/src/Properties/AssemblyInfo.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs b/src/Http/Routing.Abstractions/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs rename to src/Http/Routing.Abstractions/src/Properties/Resources.Designer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Resources.resx b/src/Http/Routing.Abstractions/src/Resources.resx similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Resources.resx rename to src/Http/Routing.Abstractions/src/Resources.resx diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs b/src/Http/Routing.Abstractions/src/RouteContext.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs rename to src/Http/Routing.Abstractions/src/RouteContext.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs b/src/Http/Routing.Abstractions/src/RouteData.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs rename to src/Http/Routing.Abstractions/src/RouteData.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs b/src/Http/Routing.Abstractions/src/RouteDirection.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs rename to src/Http/Routing.Abstractions/src/RouteDirection.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs b/src/Http/Routing.Abstractions/src/RouteValueDictionary.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs rename to src/Http/Routing.Abstractions/src/RouteValueDictionary.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs b/src/Http/Routing.Abstractions/src/RoutingHttpContextExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs rename to src/Http/Routing.Abstractions/src/RoutingHttpContextExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs b/src/Http/Routing.Abstractions/src/VirtualPathContext.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs rename to src/Http/Routing.Abstractions/src/VirtualPathContext.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs b/src/Http/Routing.Abstractions/src/VirtualPathData.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs rename to src/Http/Routing.Abstractions/src/VirtualPathData.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json b/src/Http/Routing.Abstractions/src/baseline.netcore.json similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json rename to src/Http/Routing.Abstractions/src/baseline.netcore.json diff --git a/src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj b/src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj new file mode 100644 index 000000000000..b4f123d947cc --- /dev/null +++ b/src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj @@ -0,0 +1,11 @@ + + + + $(StandardTestTfms) + + + + + + + diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteDataTest.cs b/src/Http/Routing.Abstractions/test/RouteDataTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteDataTest.cs rename to src/Http/Routing.Abstractions/test/RouteDataTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs b/src/Http/Routing.Abstractions/test/RouteValueDictionaryTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs rename to src/Http/Routing.Abstractions/test/RouteValueDictionaryTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs b/src/Http/Routing.Abstractions/test/VirtualPathDataTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs rename to src/Http/Routing.Abstractions/test/VirtualPathDataTests.cs diff --git a/src/Http/Routing.sln b/src/Http/Routing.sln new file mode 100644 index 000000000000..12dd032b9354 --- /dev/null +++ b/src/Http/Routing.sln @@ -0,0 +1,137 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing", "Routing", "{240298B6-6729-4844-9B30-B8BC0CD12772}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Performance", "Routing\perf\Microsoft.AspNetCore.Routing.Performance.csproj", "{D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing", "Routing\src\Microsoft.AspNetCore.Routing.csproj", "{A69248B5-2ACE-4B52-B0B0-63AD54D52543}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B2D195B-4997-4CCE-9846-4A848A6F258D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.FunctionalTests", "Routing\test\FunctionalTests\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", "{5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.Web", "Routing\test\testassets\RoutingSample.Web\RoutingSample.Web.csproj", "{D411FC83-9EE6-401D-8242-47CD7347E42E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Tests", "Routing\test\UnitTests\Microsoft.AspNetCore.Routing.Tests.csproj", "{3F9CEBB1-A50D-4869-B555-81E572E62D18}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing.Abstractions", "Routing.Abstractions", "{485B8E11-FC7C-464F-8CB2-A164DAB30D58}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Abstractions", "Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "Routing.Abstractions\test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", "{32C5C558-E104-4DC4-9311-890697DE8D65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x64.ActiveCfg = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x64.Build.0 = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x86.ActiveCfg = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x86.Build.0 = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|Any CPU.Build.0 = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x64.ActiveCfg = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x64.Build.0 = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x86.ActiveCfg = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x86.Build.0 = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x64.ActiveCfg = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x64.Build.0 = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x86.ActiveCfg = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x86.Build.0 = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|Any CPU.Build.0 = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x64.ActiveCfg = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x64.Build.0 = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x86.ActiveCfg = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x86.Build.0 = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x64.ActiveCfg = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x64.Build.0 = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x86.ActiveCfg = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x86.Build.0 = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|Any CPU.Build.0 = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x64.ActiveCfg = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x64.Build.0 = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x86.ActiveCfg = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x86.Build.0 = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x64.ActiveCfg = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x64.Build.0 = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x86.ActiveCfg = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x86.Build.0 = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|Any CPU.Build.0 = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x64.ActiveCfg = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x64.Build.0 = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x86.ActiveCfg = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x86.Build.0 = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x64.ActiveCfg = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x64.Build.0 = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x86.Build.0 = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|Any CPU.Build.0 = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x64.ActiveCfg = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x64.Build.0 = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x86.ActiveCfg = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x86.Build.0 = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x64.ActiveCfg = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x64.Build.0 = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x86.ActiveCfg = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x86.Build.0 = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|Any CPU.Build.0 = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x64.ActiveCfg = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x64.Build.0 = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x86.ActiveCfg = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x86.Build.0 = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x64.ActiveCfg = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x64.Build.0 = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x86.ActiveCfg = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x86.Build.0 = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|Any CPU.Build.0 = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x64.ActiveCfg = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x64.Build.0 = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x86.ActiveCfg = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F} = {240298B6-6729-4844-9B30-B8BC0CD12772} + {A69248B5-2ACE-4B52-B0B0-63AD54D52543} = {240298B6-6729-4844-9B30-B8BC0CD12772} + {8B2D195B-4997-4CCE-9846-4A848A6F258D} = {240298B6-6729-4844-9B30-B8BC0CD12772} + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22} = {8B2D195B-4997-4CCE-9846-4A848A6F258D} + {CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5} = {8B2D195B-4997-4CCE-9846-4A848A6F258D} + {D411FC83-9EE6-401D-8242-47CD7347E42E} = {CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5} + {3F9CEBB1-A50D-4869-B555-81E572E62D18} = {8B2D195B-4997-4CCE-9846-4A848A6F258D} + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0} = {485B8E11-FC7C-464F-8CB2-A164DAB30D58} + {32C5C558-E104-4DC4-9311-890697DE8D65} = {485B8E11-FC7C-464F-8CB2-A164DAB30D58} + EndGlobalSection +EndGlobal diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs b/src/Http/Routing/perf/Configs/CoreConfig.cs similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs rename to src/Http/Routing/perf/Configs/CoreConfig.cs diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj similarity index 51% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj rename to src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj index 453925e5136f..61461ddc6e88 100644 --- a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj +++ b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj @@ -10,13 +10,13 @@ - + - - - + + + diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Program.cs b/src/Http/Routing/perf/Program.cs similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Program.cs rename to src/Http/Routing/perf/Program.cs diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs b/src/Http/Routing/perf/RoutingBenchmark.cs similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs rename to src/Http/Routing/perf/RoutingBenchmark.cs diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/readme.md b/src/Http/Routing/perf/readme.md similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/readme.md rename to src/Http/Routing/perf/readme.md diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs b/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs rename to src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs b/src/Http/Routing/src/Constraints/BoolRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs rename to src/Http/Routing/src/Constraints/BoolRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs b/src/Http/Routing/src/Constraints/CompositeRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs rename to src/Http/Routing/src/Constraints/CompositeRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs b/src/Http/Routing/src/Constraints/DateTimeRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs rename to src/Http/Routing/src/Constraints/DateTimeRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs b/src/Http/Routing/src/Constraints/DecimalRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs rename to src/Http/Routing/src/Constraints/DecimalRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs b/src/Http/Routing/src/Constraints/DoubleRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs rename to src/Http/Routing/src/Constraints/DoubleRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs b/src/Http/Routing/src/Constraints/FloatRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs rename to src/Http/Routing/src/Constraints/FloatRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs b/src/Http/Routing/src/Constraints/GuidRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs rename to src/Http/Routing/src/Constraints/GuidRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs b/src/Http/Routing/src/Constraints/HttpMethodRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs rename to src/Http/Routing/src/Constraints/HttpMethodRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs b/src/Http/Routing/src/Constraints/IntRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs rename to src/Http/Routing/src/Constraints/IntRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/LengthRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs rename to src/Http/Routing/src/Constraints/LengthRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs b/src/Http/Routing/src/Constraints/LongRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs rename to src/Http/Routing/src/Constraints/LongRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/MaxLengthRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MaxLengthRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs b/src/Http/Routing/src/Constraints/MaxRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MaxRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/MinLengthRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MinLengthRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs b/src/Http/Routing/src/Constraints/MinRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MinRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs b/src/Http/Routing/src/Constraints/OptionalRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs rename to src/Http/Routing/src/Constraints/OptionalRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs b/src/Http/Routing/src/Constraints/RangeRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RangeRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs b/src/Http/Routing/src/Constraints/RegexInlineRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RegexInlineRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs b/src/Http/Routing/src/Constraints/RegexRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RegexRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs b/src/Http/Routing/src/Constraints/RequiredRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RequiredRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/StringRouteConstraint.cs b/src/Http/Routing/src/Constraints/StringRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/StringRouteConstraint.cs rename to src/Http/Routing/src/Constraints/StringRouteConstraint.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs b/src/Http/Routing/src/DecisionTree/DecisionCriterion.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs rename to src/Http/Routing/src/DecisionTree/DecisionCriterion.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs b/src/Http/Routing/src/DecisionTree/DecisionCriterionValue.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs rename to src/Http/Routing/src/DecisionTree/DecisionCriterionValue.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs b/src/Http/Routing/src/DecisionTree/DecisionCriterionValueEqualityComparer.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs rename to src/Http/Routing/src/DecisionTree/DecisionCriterionValueEqualityComparer.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs b/src/Http/Routing/src/DecisionTree/DecisionTreeBuilder.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs rename to src/Http/Routing/src/DecisionTree/DecisionTreeBuilder.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs b/src/Http/Routing/src/DecisionTree/DecisionTreeNode.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs rename to src/Http/Routing/src/DecisionTree/DecisionTreeNode.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs b/src/Http/Routing/src/DecisionTree/IClassifier.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs rename to src/Http/Routing/src/DecisionTree/IClassifier.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs b/src/Http/Routing/src/DecisionTree/ItemDescriptor.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs rename to src/Http/Routing/src/DecisionTree/ItemDescriptor.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs b/src/Http/Routing/src/DefaultInlineConstraintResolver.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs rename to src/Http/Routing/src/DefaultInlineConstraintResolver.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs b/src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs rename to src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs b/src/Http/Routing/src/IInlineConstraintResolver.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs rename to src/Http/Routing/src/IInlineConstraintResolver.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/INamedRouter.cs b/src/Http/Routing/src/INamedRouter.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/INamedRouter.cs rename to src/Http/Routing/src/INamedRouter.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs b/src/Http/Routing/src/IRouteBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs rename to src/Http/Routing/src/IRouteBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs b/src/Http/Routing/src/IRouteCollection.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs rename to src/Http/Routing/src/IRouteCollection.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs b/src/Http/Routing/src/InlineRouteParameterParser.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs rename to src/Http/Routing/src/InlineRouteParameterParser.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs b/src/Http/Routing/src/Internal/BufferValue.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs rename to src/Http/Routing/src/Internal/BufferValue.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs b/src/Http/Routing/src/Internal/LinkGenerationDecisionTree.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs rename to src/Http/Routing/src/Internal/LinkGenerationDecisionTree.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/OutboundMatchResult.cs b/src/Http/Routing/src/Internal/OutboundMatchResult.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/OutboundMatchResult.cs rename to src/Http/Routing/src/Internal/OutboundMatchResult.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs b/src/Http/Routing/src/Internal/PathTokenizer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs rename to src/Http/Routing/src/Internal/PathTokenizer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs b/src/Http/Routing/src/Internal/RoutingMarkerService.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs rename to src/Http/Routing/src/Internal/RoutingMarkerService.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs b/src/Http/Routing/src/Internal/SegmentState.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs rename to src/Http/Routing/src/Internal/SegmentState.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs b/src/Http/Routing/src/Internal/UriBuilderContextPooledObjectPolicy.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs rename to src/Http/Routing/src/Internal/UriBuilderContextPooledObjectPolicy.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs b/src/Http/Routing/src/Internal/UriBuildingContext.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs rename to src/Http/Routing/src/Internal/UriBuildingContext.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs b/src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs rename to src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs b/src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs rename to src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs b/src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs rename to src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs b/src/Http/Routing/src/MapRouteRouteBuilderExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs rename to src/Http/Routing/src/MapRouteRouteBuilderExtensions.cs diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj new file mode 100644 index 000000000000..a244399882b7 --- /dev/null +++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj @@ -0,0 +1,22 @@ + + + ASP.NET Core middleware for routing requests to application logic and for generating links. +Commonly used types: +Microsoft.AspNetCore.Routing.Route +Microsoft.AspNetCore.Routing.RouteCollection + netstandard2.0 + $(NoWarn);CS1591 + true + aspnetcore;routing + + + + + + + + + + + + diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Properties/AssemblyInfo.cs b/src/Http/Routing/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Properties/AssemblyInfo.cs rename to src/Http/Routing/src/Properties/AssemblyInfo.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs b/src/Http/Routing/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs rename to src/Http/Routing/src/Properties/Resources.Designer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RequestDelegateRouteBuilderExtensions.cs b/src/Http/Routing/src/RequestDelegateRouteBuilderExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RequestDelegateRouteBuilderExtensions.cs rename to src/Http/Routing/src/RequestDelegateRouteBuilderExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Resources.resx b/src/Http/Routing/src/Resources.resx similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Resources.resx rename to src/Http/Routing/src/Resources.resx diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Route.cs b/src/Http/Routing/src/Route.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Route.cs rename to src/Http/Routing/src/Route.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteBase.cs b/src/Http/Routing/src/RouteBase.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteBase.cs rename to src/Http/Routing/src/RouteBase.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs b/src/Http/Routing/src/RouteBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs rename to src/Http/Routing/src/RouteBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteCollection.cs b/src/Http/Routing/src/RouteCollection.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteCollection.cs rename to src/Http/Routing/src/RouteCollection.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs b/src/Http/Routing/src/RouteConstraintBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs rename to src/Http/Routing/src/RouteConstraintBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs b/src/Http/Routing/src/RouteConstraintMatcher.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs rename to src/Http/Routing/src/RouteConstraintMatcher.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteCreationException.cs b/src/Http/Routing/src/RouteCreationException.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteCreationException.cs rename to src/Http/Routing/src/RouteCreationException.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteHandler.cs b/src/Http/Routing/src/RouteHandler.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteHandler.cs rename to src/Http/Routing/src/RouteHandler.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteOptions.cs b/src/Http/Routing/src/RouteOptions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteOptions.cs rename to src/Http/Routing/src/RouteOptions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs b/src/Http/Routing/src/RouteValueEqualityComparer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs rename to src/Http/Routing/src/RouteValueEqualityComparer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouterMiddleware.cs b/src/Http/Routing/src/RouterMiddleware.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouterMiddleware.cs rename to src/Http/Routing/src/RouterMiddleware.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RoutingBuilderExtensions.cs b/src/Http/Routing/src/RoutingBuilderExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RoutingBuilderExtensions.cs rename to src/Http/Routing/src/RoutingBuilderExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RoutingFeature.cs b/src/Http/Routing/src/RoutingFeature.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RoutingFeature.cs rename to src/Http/Routing/src/RoutingFeature.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs b/src/Http/Routing/src/Template/InlineConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs rename to src/Http/Routing/src/Template/InlineConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs b/src/Http/Routing/src/Template/RoutePrecedence.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs rename to src/Http/Routing/src/Template/RoutePrecedence.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs b/src/Http/Routing/src/Template/RouteTemplate.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs rename to src/Http/Routing/src/Template/RouteTemplate.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs b/src/Http/Routing/src/Template/TemplateBinder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs rename to src/Http/Routing/src/Template/TemplateBinder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs b/src/Http/Routing/src/Template/TemplateMatcher.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs rename to src/Http/Routing/src/Template/TemplateMatcher.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs b/src/Http/Routing/src/Template/TemplateParser.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs rename to src/Http/Routing/src/Template/TemplateParser.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs b/src/Http/Routing/src/Template/TemplatePart.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs rename to src/Http/Routing/src/Template/TemplatePart.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs b/src/Http/Routing/src/Template/TemplateSegment.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs rename to src/Http/Routing/src/Template/TemplateSegment.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs b/src/Http/Routing/src/Template/TemplateValuesResult.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs rename to src/Http/Routing/src/Template/TemplateValuesResult.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundMatch.cs b/src/Http/Routing/src/Tree/InboundMatch.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundMatch.cs rename to src/Http/Routing/src/Tree/InboundMatch.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundRouteEntry.cs b/src/Http/Routing/src/Tree/InboundRouteEntry.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundRouteEntry.cs rename to src/Http/Routing/src/Tree/InboundRouteEntry.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundMatch.cs b/src/Http/Routing/src/Tree/OutboundMatch.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundMatch.cs rename to src/Http/Routing/src/Tree/OutboundMatch.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundRouteEntry.cs b/src/Http/Routing/src/Tree/OutboundRouteEntry.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundRouteEntry.cs rename to src/Http/Routing/src/Tree/OutboundRouteEntry.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs b/src/Http/Routing/src/Tree/TreeRouteBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs rename to src/Http/Routing/src/Tree/TreeRouteBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs b/src/Http/Routing/src/Tree/TreeRouter.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs rename to src/Http/Routing/src/Tree/TreeRouter.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs b/src/Http/Routing/src/Tree/UrlMatchingNode.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs rename to src/Http/Routing/src/Tree/UrlMatchingNode.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs b/src/Http/Routing/src/Tree/UrlMatchingTree.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs rename to src/Http/Routing/src/Tree/UrlMatchingTree.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/baseline.netcore.json b/src/Http/Routing/src/baseline.netcore.json similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/baseline.netcore.json rename to src/Http/Routing/src/baseline.netcore.json diff --git a/src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj b/src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj new file mode 100644 index 000000000000..9946534e6484 --- /dev/null +++ b/src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj @@ -0,0 +1,16 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingSampleTest.cs b/src/Http/Routing/test/FunctionalTests/RoutingSampleTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingSampleTest.cs rename to src/Http/Routing/test/FunctionalTests/RoutingSampleTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingTestFixture.cs b/src/Http/Routing/test/FunctionalTests/RoutingTestFixture.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingTestFixture.cs rename to src/Http/Routing/test/FunctionalTests/RoutingTestFixture.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/WebHostBuilderExtensionsTest.cs b/src/Http/Routing/test/FunctionalTests/WebHostBuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/WebHostBuilderExtensionsTest.cs rename to src/Http/Routing/test/FunctionalTests/WebHostBuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/BuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs rename to src/Http/Routing/test/UnitTests/BuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs b/src/Http/Routing/test/UnitTests/ConstraintMatcherTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs rename to src/Http/Routing/test/UnitTests/ConstraintMatcherTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/AlphaRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/AlphaRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/BoolRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/BoolRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/CompositeRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/CompositeRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs b/src/Http/Routing/test/UnitTests/Constraints/ConstraintsTestHelper.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs rename to src/Http/Routing/test/UnitTests/Constraints/ConstraintsTestHelper.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/DateTimeRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/DateTimeRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/DecimalRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/DecimalRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/DoubleRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/DoubleRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/FloatRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/FloatRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/GuidRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/GuidRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/HttpMethodRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/HttpMethodRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs b/src/Http/Routing/test/UnitTests/Constraints/IntRouteConstraintsTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/IntRouteConstraintsTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/LengthRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/LengthRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/LongRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/LongRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MaxLengthRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MaxLengthRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MaxRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MaxRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MinLengthRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MinLengthRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MinRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MinRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RangeRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RangeRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RegexInlineRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RegexInlineRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RegexRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RegexRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RequiredRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RequiredRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/StringRouteConstraintTest.cs b/src/Http/Routing/test/UnitTests/Constraints/StringRouteConstraintTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/StringRouteConstraintTest.cs rename to src/Http/Routing/test/UnitTests/Constraints/StringRouteConstraintTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs b/src/Http/Routing/test/UnitTests/DecisionTreeBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs rename to src/Http/Routing/test/UnitTests/DecisionTreeBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs b/src/Http/Routing/test/UnitTests/DefaultInlineConstraintResolverTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs rename to src/Http/Routing/test/UnitTests/DefaultInlineConstraintResolverTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs b/src/Http/Routing/test/UnitTests/InlineRouteParameterParserTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs rename to src/Http/Routing/test/UnitTests/InlineRouteParameterParserTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs b/src/Http/Routing/test/UnitTests/Internal/LinkGenerationDecisionTreeTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs rename to src/Http/Routing/test/UnitTests/Internal/LinkGenerationDecisionTreeTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs b/src/Http/Routing/test/UnitTests/Internal/PathTokenizerTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs rename to src/Http/Routing/test/UnitTests/Internal/PathTokenizerTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs b/src/Http/Routing/test/UnitTests/Logging/WriteContext.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs rename to src/Http/Routing/test/UnitTests/Logging/WriteContext.cs diff --git a/src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj b/src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj new file mode 100644 index 000000000000..934cf34b664d --- /dev/null +++ b/src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj @@ -0,0 +1,19 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RequestDelegateRouteBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/RequestDelegateRouteBuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RequestDelegateRouteBuilderExtensionsTest.cs rename to src/Http/Routing/test/UnitTests/RequestDelegateRouteBuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs b/src/Http/Routing/test/UnitTests/RouteBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs rename to src/Http/Routing/test/UnitTests/RouteBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs b/src/Http/Routing/test/UnitTests/RouteCollectionTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs rename to src/Http/Routing/test/UnitTests/RouteCollectionTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs b/src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs rename to src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.cs b/src/Http/Routing/test/UnitTests/RouteOptionsTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.cs rename to src/Http/Routing/test/UnitTests/RouteOptionsTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs b/src/Http/Routing/test/UnitTests/RouteTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs rename to src/Http/Routing/test/UnitTests/RouteTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs b/src/Http/Routing/test/UnitTests/RouterMiddlewareTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs rename to src/Http/Routing/test/UnitTests/RouterMiddlewareTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RoutingBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/RoutingBuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RoutingBuilderExtensionsTest.cs rename to src/Http/Routing/test/UnitTests/RoutingBuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs b/src/Http/Routing/test/UnitTests/Template/RoutePrecedenceTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs rename to src/Http/Routing/test/UnitTests/Template/RoutePrecedenceTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs rename to src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateMatcherTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.cs rename to src/Http/Routing/test/UnitTests/Template/TemplateMatcherTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateParserTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs rename to src/Http/Routing/test/UnitTests/Template/TemplateParserTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs b/src/Http/Routing/test/UnitTests/TemplateParserDefaultValuesTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs rename to src/Http/Routing/test/UnitTests/TemplateParserDefaultValuesTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouteBuilderTest.cs b/src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouteBuilderTest.cs rename to src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs b/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs rename to src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs diff --git a/src/Routing/samples/RoutingSample.Web/PrefixRoute.cs b/src/Http/Routing/test/testassets/RoutingSample.Web/PrefixRoute.cs similarity index 100% rename from src/Routing/samples/RoutingSample.Web/PrefixRoute.cs rename to src/Http/Routing/test/testassets/RoutingSample.Web/PrefixRoute.cs diff --git a/src/Routing/samples/RoutingSample.Web/Program.cs b/src/Http/Routing/test/testassets/RoutingSample.Web/Program.cs similarity index 100% rename from src/Routing/samples/RoutingSample.Web/Program.cs rename to src/Http/Routing/test/testassets/RoutingSample.Web/Program.cs diff --git a/src/Routing/samples/RoutingSample.Web/RouteBuilderExtensions.cs b/src/Http/Routing/test/testassets/RoutingSample.Web/RouteBuilderExtensions.cs similarity index 100% rename from src/Routing/samples/RoutingSample.Web/RouteBuilderExtensions.cs rename to src/Http/Routing/test/testassets/RoutingSample.Web/RouteBuilderExtensions.cs diff --git a/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj b/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj new file mode 100644 index 000000000000..7d737c943980 --- /dev/null +++ b/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp2.1;netcoreapp2.0 + $(TargetFrameworks);net461 + + + + + + + + + diff --git a/src/Routing/.gitignore b/src/Routing/.gitignore deleted file mode 100644 index 5f8dfa9f4806..000000000000 --- a/src/Routing/.gitignore +++ /dev/null @@ -1,41 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -.vs/ -.build/ -.testPublish/ -bower_components/ -node_modules/ -**/wwwroot/lib/ -debugSettings.json -project.lock.json -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.settings -*.sln.ide -node_modules -**/[Cc]ompiler/[Rr]esources/**/*.js -*launchSettings.json -global.json -BenchmarkDotNet.Artifacts/ diff --git a/src/Routing/Directory.Build.props b/src/Routing/Directory.Build.props deleted file mode 100644 index f1986d9953cf..000000000000 --- a/src/Routing/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - true - - diff --git a/src/Routing/Directory.Build.targets b/src/Routing/Directory.Build.targets deleted file mode 100644 index 53b3f6e1daba..000000000000 --- a/src/Routing/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/Routing/NuGetPackageVerifier.json b/src/Routing/NuGetPackageVerifier.json deleted file mode 100644 index 9ed455034c0d..000000000000 --- a/src/Routing/NuGetPackageVerifier.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "adx-nonshipping": { - "rules": [], - "packages": { - "Microsoft.AspNetCore.Routing.DecisionTree.Sources": {} - } - }, - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/Routing/README.md b/src/Routing/README.md deleted file mode 100644 index 3c0794570b92..000000000000 --- a/src/Routing/README.md +++ /dev/null @@ -1,10 +0,0 @@ -ASP.NET Routing -=== - -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/fe4o5h1s9ve86nyv/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Routing/branch/dev) - -Travis: [![Travis](https://travis-ci.org/aspnet/Routing.svg?branch=dev)](https://travis-ci.org/aspnet/Routing) - -Contains routing middleware for routing requests to application logic. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. diff --git a/src/Routing/Routing.sln b/src/Routing/Routing.sln deleted file mode 100644 index 13657187fa1c..000000000000 --- a/src/Routing/Routing.sln +++ /dev/null @@ -1,165 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27106.3000 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0E966C37-7334-4D96-AAF6-9F49FBD166E3}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{95359B4B-4C85-4B44-A75B-0621905C4CF6}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "src\Microsoft.AspNetCore.Routing\Microsoft.AspNetCore.Routing.csproj", "{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Tests", "test\Microsoft.AspNetCore.Routing.Tests\Microsoft.AspNetCore.Routing.Tests.csproj", "{636D79ED-7B32-487C-BDA5-D2A1AAA97371}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingSample.Web", "samples\RoutingSample.Web\RoutingSample.Web.csproj", "{DB94E647-C73A-4F52-A126-AA7544CCF33B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C430C499-382D-47BD-B351-CF8F89C08CD2}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - NuGet.config = NuGet.config - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests", "test\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj", "{09C2933C-23AC-41B7-994D-E8A5184A629C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "src\Microsoft.AspNetCore.Routing.Abstractions\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{ED253B01-24F1-43D1-AA0B-079391E105A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", "{741B0B05-CE96-473B-B962-6B0A347DF79A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.FunctionalTests", "test\Microsoft.AspNetCore.Routing.FunctionalTests\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", "{5C73140B-41F3-466F-A07B-3614E4D80DF9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6DC6B416-C8C4-4BFA-8C1E-A55A6D7EFD08}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - build\Key.snk = build\Key.snk - build\repo.props = build\repo.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Performance", "benchmarks\Microsoft.AspNetCore.Routing.Performance\Microsoft.AspNetCore.Routing.Performance.csproj", "{F3D86714-4E64-41A6-9B36-A47B3683CF5D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{D5F39F59-5725-4127-82E7-67028D006185}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|x86.ActiveCfg = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Any CPU.Build.0 = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|x86.ActiveCfg = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Any CPU.Build.0 = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|x86.ActiveCfg = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Any CPU.ActiveCfg = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Any CPU.Build.0 = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|x86.ActiveCfg = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|x86.ActiveCfg = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Any CPU.Build.0 = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|x86.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|x86.ActiveCfg = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|x86.Build.0 = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Any CPU.Build.0 = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|x86.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|x86.Build.0 = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|x86.Build.0 = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Any CPU.Build.0 = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|x86.ActiveCfg = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|x86.Build.0 = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|x86.ActiveCfg = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|x86.Build.0 = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Any CPU.Build.0 = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|x86.ActiveCfg = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|x86.Build.0 = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|x86.Build.0 = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Any CPU.Build.0 = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|x86.ActiveCfg = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|x86.Build.0 = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|x86.ActiveCfg = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|x86.Build.0 = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Any CPU.Build.0 = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|x86.ActiveCfg = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} - {636D79ED-7B32-487C-BDA5-D2A1AAA97371} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {DB94E647-C73A-4F52-A126-AA7544CCF33B} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E} - {09C2933C-23AC-41B7-994D-E8A5184A629C} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {ED253B01-24F1-43D1-AA0B-079391E105A9} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} - {741B0B05-CE96-473B-B962-6B0A347DF79A} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {5C73140B-41F3-466F-A07B-3614E4D80DF9} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {F3D86714-4E64-41A6-9B36-A47B3683CF5D} = {D5F39F59-5725-4127-82E7-67028D006185} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {36C8D815-B7F1-479D-894B-E606FB8DECDA} - EndGlobalSection -EndGlobal diff --git a/src/Routing/build/Key.snk b/src/Routing/build/Key.snk deleted file mode 100644 index e10e4889c125..000000000000 Binary files a/src/Routing/build/Key.snk and /dev/null differ diff --git a/src/Routing/build/dependencies.props b/src/Routing/build/dependencies.props deleted file mode 100644 index 6aafe4467fcf..000000000000 --- a/src/Routing/build/dependencies.props +++ /dev/null @@ -1,46 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 0.10.13 - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 15.6.1 - 4.7.49 - 2.0.3 - 0.8.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.2 - 2.1.1 - 2.1.0 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/Routing/build/repo.props b/src/Routing/build/repo.props deleted file mode 100644 index 1dc8b8100d75..000000000000 --- a/src/Routing/build/repo.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/Routing/build/sources.props b/src/Routing/build/sources.props deleted file mode 100644 index 9215df9751b4..000000000000 --- a/src/Routing/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/Routing/samples/RoutingSample.Web/RoutingSample.Web.csproj b/src/Routing/samples/RoutingSample.Web/RoutingSample.Web.csproj deleted file mode 100644 index 9c3e55c557cb..000000000000 --- a/src/Routing/samples/RoutingSample.Web/RoutingSample.Web.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.1;netcoreapp2.0 - $(TargetFrameworks);net461 - - - - - - - - - - - - diff --git a/src/Routing/src/Directory.Build.props b/src/Routing/src/Directory.Build.props deleted file mode 100644 index 1e0980f66331..000000000000 --- a/src/Routing/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj b/src/Routing/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj deleted file mode 100644 index f1e3d36a555e..000000000000 --- a/src/Routing/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - ASP.NET Core middleware for routing requests to application logic and for generating links. -Commonly used types: -Microsoft.AspNetCore.Routing.Route -Microsoft.AspNetCore.Routing.RouteCollection - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;routing - - - - - - - - - - - - - - - - - - - diff --git a/src/Routing/test/Directory.Build.props b/src/Routing/test/Directory.Build.props deleted file mode 100644 index 02caa062ac77..000000000000 --- a/src/Routing/test/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 - $(StandardTestTfms);net461 - - - - - - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj b/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj deleted file mode 100644 index fce9e366fc3b..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj b/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj deleted file mode 100644 index 3d127f0370d0..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj b/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj deleted file mode 100644 index ee8a57c08f76..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj b/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj deleted file mode 100644 index ee389c233d3b..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - diff --git a/src/Routing/version.props b/src/Routing/version.props deleted file mode 100644 index 669c874829da..000000000000 --- a/src/Routing/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - -