diff --git a/appveyor.yml b/appveyor.yml index f316ece..37050fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,6 @@ build: verbosity: normal test_script: - nunit-console.exe bin\ReleaseTests\RouteJs\RouteJs.Tests.dll bin\ReleaseTests\RouteJs.Mvc5\RouteJs.Tests.Mvc5.dll bin\ReleaseTests\RouteJs.Mvc4\RouteJs.Tests.Mvc4.dll bin\ReleaseTests\RouteJs.Mvc3\RouteJs.Tests.Mvc3.dll bin\ReleaseTests\RouteJs.Mvc2\RouteJs.Tests.Mvc2.dll -- dotnet test src\RouteJs.Tests.AspNet +- dotnet test -c Release src\RouteJs.Tests.AspNet artifacts: - path: output\*.nupkg diff --git a/build.proj b/build.proj index 91bae08..cb33e7c 100644 --- a/build.proj +++ b/build.proj @@ -66,7 +66,7 @@ GetRoutes(RouteData routeData) /// Route information private AttributeRouteInfo ProcessAttributeRoute(ControllerActionDescriptor action) { - var constraint = action.RouteConstraints - .FirstOrDefault(c => c.RouteKey == TreeRouter.RouteGroupKey); - if (constraint == null || - constraint.KeyHandling != RouteKeyHandling.RequireKey || - constraint.RouteValue == null) + string constraint; + action.RouteValues.TryGetValue(TreeRouter.RouteGroupKey, out constraint); + if (string.IsNullOrEmpty(constraint)) { // This can happen if an ActionDescriptor has a route template, but doesn't have one of our // special route group constraints. This is a good indication that the user is using a 3rd party @@ -96,7 +94,7 @@ private AttributeRouteInfo ProcessAttributeRoute(ControllerActionDescriptor acti Defaults = GetDefaults(action, template), Optional = new List(), Order = action.AttributeRouteInfo.Order, - Precedence = RoutePrecedence.ComputeGenerated(template), + Precedence = RoutePrecedence.ComputeOutbound(template), }; _parser.Parse(template, info); @@ -149,7 +147,7 @@ private IDictionary GetDefaults(ControllerActionDescriptor actio ); defaults.Add("controller", action.ControllerName); - defaults.Add("action", action.Name); + defaults.Add("action", action.ActionName); return defaults; } diff --git a/src/RouteJs.AspNet/IRouteJsHelper.cs b/src/RouteJs.AspNet/IRouteJsHelper.cs index 98ac92f..7c5579e 100644 --- a/src/RouteJs.AspNet/IRouteJsHelper.cs +++ b/src/RouteJs.AspNet/IRouteJsHelper.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.Rendering; namespace RouteJs diff --git a/src/RouteJs.AspNet/RouteJsHelper.cs b/src/RouteJs.AspNet/RouteJsHelper.cs index 8707767..f1993ae 100644 --- a/src/RouteJs.AspNet/RouteJsHelper.cs +++ b/src/RouteJs.AspNet/RouteJsHelper.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Infrastructure; -using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Html; namespace RouteJs { diff --git a/src/RouteJs.AspNet/project.json b/src/RouteJs.AspNet/project.json index 38df055..a44fcfe 100644 --- a/src/RouteJs.AspNet/project.json +++ b/src/RouteJs.AspNet/project.json @@ -6,10 +6,10 @@ "description": "JavaScript URL routing for ASP.NET Core (vNext) and MVC 6. Allows you to use your ASP.NET MVC routes from JavaScript. Please refer to project site (http://dan.cx/projects/routejs) for more details, usage examples and sample code.", "dependencies": { - "Microsoft.AspNetCore.Http": "1.0.0-rc2-final", - "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-rc2-final", - "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final", - "Microsoft.AspNetCore.Routing": "1.0.0-rc2-final" + "Microsoft.AspNetCore.Html.Abstractions": "1.1.0", + "Microsoft.AspNetCore.Http": "1.1.0", + "Microsoft.AspNetCore.Mvc": "1.1.0", + "Microsoft.AspNetCore.Routing": "1.1.0" }, "frameworks": { "net451": { @@ -18,13 +18,13 @@ "pdb": "../../bin/RouteJs.AspNet/bin/{configuration}/net451/RouteJs.AspNet.pdb" } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "dnxcore50" ], "bin": { - "assembly": "../../bin/RouteJs.AspNet/bin/{configuration}/netstandard1.5/RouteJs.AspNet.dll", - "pdb": "../../bin/RouteJs.AspNet/bin/{configuration}/netstandard1.5/RouteJs.AspNet.pdb" + "assembly": "../../bin/RouteJs.AspNet/bin/{configuration}/netstandard1.6/RouteJs.AspNet.dll", + "pdb": "../../bin/RouteJs.AspNet/bin/{configuration}/netstandard1.6/RouteJs.AspNet.pdb" } } }, diff --git a/src/RouteJs.Samples.Mvc6/project.json b/src/RouteJs.Samples.Mvc6/project.json index b4669c6..38e5480 100644 --- a/src/RouteJs.Samples.Mvc6/project.json +++ b/src/RouteJs.Samples.Mvc6/project.json @@ -3,16 +3,16 @@ "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", "RouteJs.AspNet": { "target": "project" }, - "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final", - "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final", - "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final", - "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final" + "Microsoft.AspNetCore.Mvc": "1.1.0", + "Microsoft.AspNetCore.StaticFiles": "1.1.0", + "Microsoft.Extensions.Logging.Console": "1.1.0", + "Microsoft.Extensions.Logging.Debug": "1.1.0", + "Microsoft.AspNetCore.Diagnostics": "1.1.0" }, "tools": { diff --git a/src/RouteJs.Tests.AspNet/project.json b/src/RouteJs.Tests.AspNet/project.json index a83100a..b59f862 100644 --- a/src/RouteJs.Tests.AspNet/project.json +++ b/src/RouteJs.Tests.AspNet/project.json @@ -4,7 +4,8 @@ "authors": [ "Daniel Lo Nigro" ], "dependencies": { - "Microsoft.AspNetCore.Routing": "1.0.0-rc2-final", + "Microsoft.DotNet.InternalAbstractions": "1.0.0", + "Microsoft.AspNetCore.Routing": "1.1.0", "Moq": "4.2.1510.2205", "RouteJs.AspNet": { "target": "project" diff --git a/src/RouteJs.sln b/src/RouteJs.sln index 6ca2f5b..73dcdcb 100644 --- a/src/RouteJs.sln +++ b/src/RouteJs.sln @@ -1,153 +1,147 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{091DA9AC-BC24-4B65-8660-644746707D2B}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - .nuget\packages.config = .nuget\packages.config - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{5CE41205-373E-4F48-8F2C-3837AEAFB5E9}" - ProjectSection(SolutionItems) = preProject - ..\.editorconfig = ..\.editorconfig - ..\.gitignore = ..\.gitignore - ..\build.proj = ..\build.proj - ..\dev-build.bat = ..\dev-build.bat - global.json = global.json - ..\push.bat = ..\push.bat - ..\README.md = ..\README.md - ..\release-build.bat = ..\release-build.bat - ..\release-push.bat = ..\release-push.bat - tasks.proj = tasks.proj - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs", "RouteJs\RouteJs.csproj", "{C8FAAE56-4623-4055-85DB-16CE600212AA}" - ProjectSection(ProjectDependencies) = postProject - {1BF7B71F-F511-46CA-B543-074644AFB4CF} = {1BF7B71F-F511-46CA-B543-074644AFB4CF} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Samples.Mvc4", "RouteJs.Samples.Mvc4\RouteJs.Samples.Mvc4.csproj", "{097BB265-A0B0-4D4C-A5ED-B00873F93951}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests", "RouteJs.Tests\RouteJs.Tests.csproj", "{A39C65D1-0720-438C-A2A9-59333FFA5CB3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc4", "RouteJs.Mvc4\RouteJs.Mvc4.csproj", "{071DC743-8F40-475F-BF54-253C61B2C683}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc3", "RouteJs.Mvc3\RouteJs.Mvc3.csproj", "{8C9563A9-03AD-4427-BEA0-D8513247BE99}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc4", "RouteJs.Tests.Mvc4\RouteJs.Tests.Mvc4.csproj", "{07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc3", "RouteJs.Tests.Mvc3\RouteJs.Tests.Mvc3.csproj", "{F2F43C34-4174-4945-90E5-31F4DFD4AE54}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc2", "RouteJs.Mvc2\RouteJs.Mvc2.csproj", "{9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc2", "RouteJs.Tests.Mvc2\RouteJs.Tests.Mvc2.csproj", "{98458A6B-0850-4DC5-ADCD-33F140449751}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc5", "RouteJs.Mvc5\RouteJs.Mvc5.csproj", "{03021DFF-327A-4704-B61B-C4EFDAB093A0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc5", "RouteJs.Tests.Mvc5\RouteJs.Tests.Mvc5.csproj", "{4ADD30D9-DB17-4610-B453-B853C7F00BC2}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RouteJs.Samples.Mvc6", "RouteJs.Samples.Mvc6\RouteJs.Samples.Mvc6.xproj", "{61D6393D-CFBC-47ED-BE3E-437D9AB44D99}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RouteJs.AspNet", "RouteJs.AspNet\RouteJs.AspNet.xproj", "{1BF7B71F-F511-46CA-B543-074644AFB4CF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6262C463-7925-4D99-A4FE-363A1999119D}" - ProjectSection(SolutionItems) = preProject - RouteJs.Samples.Mvc6\global.json = RouteJs.Samples.Mvc6\global.json - RouteJs.AspNet\global.json = RouteJs.AspNet\global.json - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RouteJs.Tests.AspNet", "RouteJs.Tests.AspNet\RouteJs.Tests.AspNet.xproj", "{E7DEF2EB-671A-4DCE-838D-491D52192ADB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{B5177065-39AD-4563-9FD7-2F1FD9806CC7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{2E841511-4502-4C9A-8277-1FEDD2AF8314}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{68E3E691-8FC8-49CF-85C2-F0F00CB64674}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C8FAAE56-4623-4055-85DB-16CE600212AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8FAAE56-4623-4055-85DB-16CE600212AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8FAAE56-4623-4055-85DB-16CE600212AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8FAAE56-4623-4055-85DB-16CE600212AA}.Release|Any CPU.Build.0 = Release|Any CPU - {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Debug|Any CPU.Build.0 = Debug|Any CPU - {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Release|Any CPU.ActiveCfg = Release|Any CPU - {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Release|Any CPU.Build.0 = Release|Any CPU - {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Release|Any CPU.Build.0 = Release|Any CPU - {071DC743-8F40-475F-BF54-253C61B2C683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {071DC743-8F40-475F-BF54-253C61B2C683}.Debug|Any CPU.Build.0 = Debug|Any CPU - {071DC743-8F40-475F-BF54-253C61B2C683}.Release|Any CPU.ActiveCfg = Release|Any CPU - {071DC743-8F40-475F-BF54-253C61B2C683}.Release|Any CPU.Build.0 = Release|Any CPU - {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Release|Any CPU.Build.0 = Release|Any CPU - {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Release|Any CPU.Build.0 = Release|Any CPU - {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Release|Any CPU.Build.0 = Release|Any CPU - {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Release|Any CPU.Build.0 = Release|Any CPU - {98458A6B-0850-4DC5-ADCD-33F140449751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98458A6B-0850-4DC5-ADCD-33F140449751}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98458A6B-0850-4DC5-ADCD-33F140449751}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98458A6B-0850-4DC5-ADCD-33F140449751}.Release|Any CPU.Build.0 = Release|Any CPU - {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Release|Any CPU.Build.0 = Release|Any CPU - {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Release|Any CPU.Build.0 = Release|Any CPU - {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Release|Any CPU.Build.0 = Release|Any CPU - {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Release|Any CPU.Build.0 = Release|Any CPU - {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {C8FAAE56-4623-4055-85DB-16CE600212AA} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} - {097BB265-A0B0-4D4C-A5ED-B00873F93951} = {2E841511-4502-4C9A-8277-1FEDD2AF8314} - {A39C65D1-0720-438C-A2A9-59333FFA5CB3} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} - {071DC743-8F40-475F-BF54-253C61B2C683} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} - {8C9563A9-03AD-4427-BEA0-D8513247BE99} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} - {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} - {F2F43C34-4174-4945-90E5-31F4DFD4AE54} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} - {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} - {98458A6B-0850-4DC5-ADCD-33F140449751} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} - {03021DFF-327A-4704-B61B-C4EFDAB093A0} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} - {4ADD30D9-DB17-4610-B453-B853C7F00BC2} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} - {61D6393D-CFBC-47ED-BE3E-437D9AB44D99} = {2E841511-4502-4C9A-8277-1FEDD2AF8314} - {1BF7B71F-F511-46CA-B543-074644AFB4CF} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} - {E7DEF2EB-671A-4DCE-838D-491D52192ADB} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{091DA9AC-BC24-4B65-8660-644746707D2B}" + ProjectSection(SolutionItems) = preProject + .nuget\NuGet.Config = .nuget\NuGet.Config + .nuget\NuGet.exe = .nuget\NuGet.exe + .nuget\NuGet.targets = .nuget\NuGet.targets + .nuget\packages.config = .nuget\packages.config + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{5CE41205-373E-4F48-8F2C-3837AEAFB5E9}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + ..\.gitignore = ..\.gitignore + ..\build.proj = ..\build.proj + ..\dev-build.bat = ..\dev-build.bat + global.json = global.json + ..\push.bat = ..\push.bat + ..\README.md = ..\README.md + ..\release-build.bat = ..\release-build.bat + ..\release-push.bat = ..\release-push.bat + tasks.proj = tasks.proj + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs", "RouteJs\RouteJs.csproj", "{C8FAAE56-4623-4055-85DB-16CE600212AA}" + ProjectSection(ProjectDependencies) = postProject + {1BF7B71F-F511-46CA-B543-074644AFB4CF} = {1BF7B71F-F511-46CA-B543-074644AFB4CF} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Samples.Mvc4", "RouteJs.Samples.Mvc4\RouteJs.Samples.Mvc4.csproj", "{097BB265-A0B0-4D4C-A5ED-B00873F93951}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests", "RouteJs.Tests\RouteJs.Tests.csproj", "{A39C65D1-0720-438C-A2A9-59333FFA5CB3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc4", "RouteJs.Mvc4\RouteJs.Mvc4.csproj", "{071DC743-8F40-475F-BF54-253C61B2C683}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc3", "RouteJs.Mvc3\RouteJs.Mvc3.csproj", "{8C9563A9-03AD-4427-BEA0-D8513247BE99}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc4", "RouteJs.Tests.Mvc4\RouteJs.Tests.Mvc4.csproj", "{07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc3", "RouteJs.Tests.Mvc3\RouteJs.Tests.Mvc3.csproj", "{F2F43C34-4174-4945-90E5-31F4DFD4AE54}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc2", "RouteJs.Mvc2\RouteJs.Mvc2.csproj", "{9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc2", "RouteJs.Tests.Mvc2\RouteJs.Tests.Mvc2.csproj", "{98458A6B-0850-4DC5-ADCD-33F140449751}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Mvc5", "RouteJs.Mvc5\RouteJs.Mvc5.csproj", "{03021DFF-327A-4704-B61B-C4EFDAB093A0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteJs.Tests.Mvc5", "RouteJs.Tests.Mvc5\RouteJs.Tests.Mvc5.csproj", "{4ADD30D9-DB17-4610-B453-B853C7F00BC2}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RouteJs.Samples.Mvc6", "RouteJs.Samples.Mvc6\RouteJs.Samples.Mvc6.xproj", "{61D6393D-CFBC-47ED-BE3E-437D9AB44D99}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RouteJs.AspNet", "RouteJs.AspNet\RouteJs.AspNet.xproj", "{1BF7B71F-F511-46CA-B543-074644AFB4CF}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RouteJs.Tests.AspNet", "RouteJs.Tests.AspNet\RouteJs.Tests.AspNet.xproj", "{E7DEF2EB-671A-4DCE-838D-491D52192ADB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{B5177065-39AD-4563-9FD7-2F1FD9806CC7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{2E841511-4502-4C9A-8277-1FEDD2AF8314}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{68E3E691-8FC8-49CF-85C2-F0F00CB64674}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C8FAAE56-4623-4055-85DB-16CE600212AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8FAAE56-4623-4055-85DB-16CE600212AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8FAAE56-4623-4055-85DB-16CE600212AA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8FAAE56-4623-4055-85DB-16CE600212AA}.Release|Any CPU.Build.0 = Release|Any CPU + {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Debug|Any CPU.Build.0 = Debug|Any CPU + {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Release|Any CPU.ActiveCfg = Release|Any CPU + {097BB265-A0B0-4D4C-A5ED-B00873F93951}.Release|Any CPU.Build.0 = Release|Any CPU + {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A39C65D1-0720-438C-A2A9-59333FFA5CB3}.Release|Any CPU.Build.0 = Release|Any CPU + {071DC743-8F40-475F-BF54-253C61B2C683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {071DC743-8F40-475F-BF54-253C61B2C683}.Debug|Any CPU.Build.0 = Debug|Any CPU + {071DC743-8F40-475F-BF54-253C61B2C683}.Release|Any CPU.ActiveCfg = Release|Any CPU + {071DC743-8F40-475F-BF54-253C61B2C683}.Release|Any CPU.Build.0 = Release|Any CPU + {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8C9563A9-03AD-4427-BEA0-D8513247BE99}.Release|Any CPU.Build.0 = Release|Any CPU + {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A}.Release|Any CPU.Build.0 = Release|Any CPU + {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2F43C34-4174-4945-90E5-31F4DFD4AE54}.Release|Any CPU.Build.0 = Release|Any CPU + {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF}.Release|Any CPU.Build.0 = Release|Any CPU + {98458A6B-0850-4DC5-ADCD-33F140449751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98458A6B-0850-4DC5-ADCD-33F140449751}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98458A6B-0850-4DC5-ADCD-33F140449751}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98458A6B-0850-4DC5-ADCD-33F140449751}.Release|Any CPU.Build.0 = Release|Any CPU + {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03021DFF-327A-4704-B61B-C4EFDAB093A0}.Release|Any CPU.Build.0 = Release|Any CPU + {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4ADD30D9-DB17-4610-B453-B853C7F00BC2}.Release|Any CPU.Build.0 = Release|Any CPU + {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61D6393D-CFBC-47ED-BE3E-437D9AB44D99}.Release|Any CPU.Build.0 = Release|Any CPU + {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1BF7B71F-F511-46CA-B543-074644AFB4CF}.Release|Any CPU.Build.0 = Release|Any CPU + {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E7DEF2EB-671A-4DCE-838D-491D52192ADB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C8FAAE56-4623-4055-85DB-16CE600212AA} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} + {097BB265-A0B0-4D4C-A5ED-B00873F93951} = {2E841511-4502-4C9A-8277-1FEDD2AF8314} + {A39C65D1-0720-438C-A2A9-59333FFA5CB3} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} + {071DC743-8F40-475F-BF54-253C61B2C683} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} + {8C9563A9-03AD-4427-BEA0-D8513247BE99} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} + {07F49344-DA3B-4D91-ADCE-5E0E0B6B370A} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} + {F2F43C34-4174-4945-90E5-31F4DFD4AE54} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} + {9170F76B-D09E-4B38-A7C9-A22C5D79F6AF} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} + {98458A6B-0850-4DC5-ADCD-33F140449751} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} + {03021DFF-327A-4704-B61B-C4EFDAB093A0} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} + {4ADD30D9-DB17-4610-B453-B853C7F00BC2} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} + {61D6393D-CFBC-47ED-BE3E-437D9AB44D99} = {2E841511-4502-4C9A-8277-1FEDD2AF8314} + {1BF7B71F-F511-46CA-B543-074644AFB4CF} = {B5177065-39AD-4563-9FD7-2F1FD9806CC7} + {E7DEF2EB-671A-4DCE-838D-491D52192ADB} = {68E3E691-8FC8-49CF-85C2-F0F00CB64674} + EndGlobalSection +EndGlobal diff --git a/src/global.json b/src/global.json index 18f51d6..3f65545 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "1.0.0-preview1-002702" + "version": "1.0.0-preview2-1-003177" } }