diff --git a/Routing.sln b/Routing.sln index 952acd5783..f81f8a3bf1 100644 --- a/Routing.sln +++ b/Routing.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24711.0 @@ -28,10 +27,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routin EndProject 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.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.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 Debug|Any CPU = Debug|Any CPU @@ -120,30 +115,6 @@ Global {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 - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Debug|x86.ActiveCfg = Debug|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Debug|x86.Build.0 = Debug|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Release|Any CPU.Build.0 = Release|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Release|x86.ActiveCfg = Release|Any CPU - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F}.Release|x86.Build.0 = Release|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Debug|x86.ActiveCfg = Debug|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Debug|x86.Build.0 = Debug|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Release|Any CPU.Build.0 = Release|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Release|x86.ActiveCfg = Release|Any CPU - {FD0151B4-7153-49A8-9D90-62A252420230}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -156,7 +127,5 @@ Global {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} - {579C3FD2-DFFA-4B64-BFC3-130C11F3568F} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} - {FD0151B4-7153-49A8-9D90-62A252420230} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} EndGlobalSection EndGlobal diff --git a/src/Microsoft.AspNetCore.Routing.Extensions/Microsoft.AspNetCore.Routing.Extensions.xproj b/src/Microsoft.AspNetCore.Routing.Extensions/Microsoft.AspNetCore.Routing.Extensions.xproj deleted file mode 100644 index 817909a13f..0000000000 --- a/src/Microsoft.AspNetCore.Routing.Extensions/Microsoft.AspNetCore.Routing.Extensions.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 579c3fd2-dffa-4b64-bfc3-130c11f3568f - Microsoft.AspNetCore.Routing.Extensions - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - 2.0 - - - diff --git a/src/Microsoft.AspNetCore.Routing.Extensions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Routing.Extensions/Properties/AssemblyInfo.cs deleted file mode 100644 index e0f545c6b5..0000000000 --- a/src/Microsoft.AspNetCore.Routing.Extensions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -// 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.Reflection; -using System.Resources; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Routing.Extensions/project.json b/src/Microsoft.AspNetCore.Routing.Extensions/project.json deleted file mode 100644 index cb802e7c7f..0000000000 --- a/src/Microsoft.AspNetCore.Routing.Extensions/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "description": "ASP.NET 5 extension methods for routing requests to application logic and for generating links.", - "version": "1.0.0-*", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/routing" - }, - "compilationOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Microsoft.AspNetCore.Routing": "1.0.0-*" - }, - "frameworks": { - "net451": { }, - "dotnet5.4": { } - } -} diff --git a/src/Microsoft.AspNetCore.Routing.Extensions/RequestDelegateRouteBuilderExtensions.cs b/src/Microsoft.AspNetCore.Routing/RequestDelegateRouteBuilderExtensions.cs similarity index 99% rename from src/Microsoft.AspNetCore.Routing.Extensions/RequestDelegateRouteBuilderExtensions.cs rename to src/Microsoft.AspNetCore.Routing/RequestDelegateRouteBuilderExtensions.cs index 16d250cb5c..56473cd6b0 100644 --- a/src/Microsoft.AspNetCore.Routing.Extensions/RequestDelegateRouteBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Routing/RequestDelegateRouteBuilderExtensions.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.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Constraints; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Builder +namespace Microsoft.AspNetCore.Routing { public static class RequestDelegateRouteBuilderExtensions { 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 deleted file mode 100644 index 5ed149866a..0000000000 --- a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/Microsoft.AspNetCore.Routing.Extensions.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fd0151b4-7153-49a8-9d90-62a252420230 - Microsoft.AspNetCore.Routing.Extensions.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/project.json b/test/Microsoft.AspNetCore.Routing.Extensions.Tests/project.json deleted file mode 100644 index a82d1edbdc..0000000000 --- a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "compilationOptions": { - "warningsAsErrors": true - }, - "dependencies": { - "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": "1.0.0-*", - "Microsoft.Extensions.Logging.Testing": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*", - "xunit": "2.1.0" - }, - "frameworks": { - "dnxcore50": { - "dependencies": { - "moq.netcore": "4.4.0-beta8", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - }, - "imports": "portable-net451+win8" - }, - "dnx451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Threading.Tasks": "" - }, - "dependencies": { - "Moq": "4.2.1312.1622", - "xunit.runner.console": "2.1.0" - } - } - }, - "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - } -} diff --git a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/RequestDelegateRouteBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RequestDelegateRouteBuilderExtensionsTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Routing.Extensions.Tests/RequestDelegateRouteBuilderExtensionsTest.cs rename to test/Microsoft.AspNetCore.Routing.Tests/RequestDelegateRouteBuilderExtensionsTest.cs index f3e974cb69..dec6e9bcdc 100644 --- a/test/Microsoft.AspNetCore.Routing.Extensions.Tests/RequestDelegateRouteBuilderExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RequestDelegateRouteBuilderExtensionsTest.cs @@ -3,14 +3,15 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Internal; -using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Builder +namespace Microsoft.AspNetCore.Routing { // 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.Tests/project.json b/test/Microsoft.AspNetCore.Routing.Tests/project.json index 85c3bf972e..a971835526 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/project.json +++ b/test/Microsoft.AspNetCore.Routing.Tests/project.json @@ -7,6 +7,7 @@ "Microsoft.AspNetCore.Routing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*", + "Microsoft.Extensions.Logging": "1.0.0-*", "Microsoft.Extensions.Logging.Testing": "1.0.0-*", "Microsoft.Extensions.WebEncoders": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*",