diff --git a/WebFx.sln b/WebFx.sln index a7e3dab06e..86812a1ff8 100644 --- a/WebFx.sln +++ b/WebFx.sln @@ -7,10 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32285FA4-6B46-4D6B-A840-2B13E4C8B58E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.net45", "src\Microsoft.AspNet.Mvc\Microsoft.AspNet.Mvc.net45.csproj", "{64BD92BA-F313-496C-ACE6-B9C4C10C420E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.k10", "src\Microsoft.AspNet.Mvc\Microsoft.AspNet.Mvc.k10.csproj", "{BA88E212-5889-48DC-823F-A3A67DDEF123}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor.net45", "src\Microsoft.AspNet.Mvc.Razor\Microsoft.AspNet.Mvc.Razor.net45.csproj", "{365CA5C6-037D-4E6E-AF05-F5FA42E024EB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor.k10", "src\Microsoft.AspNet.Mvc.Razor\Microsoft.AspNet.Mvc.Razor.k10.csproj", "{0D2C8C3D-AFC3-4E1F-A6D8-9F690EE5E063}" @@ -43,28 +39,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-2 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.ModelBinding.Test.net45", "test\Microsoft.AspNet.Mvc.ModelBinding.Test\Microsoft.AspNet.Mvc.ModelBinding.Test.net45.csproj", "{42195A56-42C0-4CFF-A982-B6E24EFC6356}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Startup.net45", "src\Microsoft.AspNet.Mvc.Startup\Microsoft.AspNet.Mvc.Startup.net45.csproj", "{8E6EAA52-7132-4707-936D-F15C8B28CFBA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Startup.k10", "src\Microsoft.AspNet.Mvc.Startup\Microsoft.AspNet.Mvc.Startup.k10.csproj", "{43ECCFDF-E646-4766-B339-F5CCD69DD6C3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor.Host.Test.net45", "test\Microsoft.AspNet.Mvc.Razor.Host.Test\Microsoft.AspNet.Mvc.Razor.Host.Test.net45.csproj", "{537CC0EE-4B62-4789-9AE9-94BE28E0D25A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcSample.Web.net45", "samples\MvcSample.Web\MvcSample.Web.net45.csproj", "{688ABC8B-BFA9-4CFF-9458-A466FEBB0448}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Core.k10", "src\Microsoft.AspNet.Mvc.Core\Microsoft.AspNet.Mvc.Core.k10.csproj", "{5E701B23-73E4-45D2-8521-1D7A94E152F1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Core.net45", "src\Microsoft.AspNet.Mvc.Core\Microsoft.AspNet.Mvc.Core.net45.csproj", "{792E181C-7645-4268-A04F-DB134411AD74}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.k10", "src\Microsoft.AspNet.Mvc\Microsoft.AspNet.Mvc.k10.csproj", "{BA88E212-5889-48DC-823F-A3A67DDEF123}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.net45", "src\Microsoft.AspNet.Mvc\Microsoft.AspNet.Mvc.net45.csproj", "{64BD92BA-F313-496C-ACE6-B9C4C10C420E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Release|Any CPU.Build.0 = Release|Any CPU - {BA88E212-5889-48DC-823F-A3A67DDEF123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA88E212-5889-48DC-823F-A3A67DDEF123}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA88E212-5889-48DC-823F-A3A67DDEF123}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA88E212-5889-48DC-823F-A3A67DDEF123}.Release|Any CPU.Build.0 = Release|Any CPU {365CA5C6-037D-4E6E-AF05-F5FA42E024EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {365CA5C6-037D-4E6E-AF05-F5FA42E024EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {365CA5C6-037D-4E6E-AF05-F5FA42E024EB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -109,14 +101,6 @@ Global {42195A56-42C0-4CFF-A982-B6E24EFC6356}.Debug|Any CPU.Build.0 = Debug|Any CPU {42195A56-42C0-4CFF-A982-B6E24EFC6356}.Release|Any CPU.ActiveCfg = Release|Any CPU {42195A56-42C0-4CFF-A982-B6E24EFC6356}.Release|Any CPU.Build.0 = Release|Any CPU - {8E6EAA52-7132-4707-936D-F15C8B28CFBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E6EAA52-7132-4707-936D-F15C8B28CFBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E6EAA52-7132-4707-936D-F15C8B28CFBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E6EAA52-7132-4707-936D-F15C8B28CFBA}.Release|Any CPU.Build.0 = Release|Any CPU - {43ECCFDF-E646-4766-B339-F5CCD69DD6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43ECCFDF-E646-4766-B339-F5CCD69DD6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43ECCFDF-E646-4766-B339-F5CCD69DD6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43ECCFDF-E646-4766-B339-F5CCD69DD6C3}.Release|Any CPU.Build.0 = Release|Any CPU {537CC0EE-4B62-4789-9AE9-94BE28E0D25A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {537CC0EE-4B62-4789-9AE9-94BE28E0D25A}.Debug|Any CPU.Build.0 = Debug|Any CPU {537CC0EE-4B62-4789-9AE9-94BE28E0D25A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -125,6 +109,22 @@ Global {688ABC8B-BFA9-4CFF-9458-A466FEBB0448}.Debug|Any CPU.Build.0 = Debug|Any CPU {688ABC8B-BFA9-4CFF-9458-A466FEBB0448}.Release|Any CPU.ActiveCfg = Release|Any CPU {688ABC8B-BFA9-4CFF-9458-A466FEBB0448}.Release|Any CPU.Build.0 = Release|Any CPU + {5E701B23-73E4-45D2-8521-1D7A94E152F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5E701B23-73E4-45D2-8521-1D7A94E152F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5E701B23-73E4-45D2-8521-1D7A94E152F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5E701B23-73E4-45D2-8521-1D7A94E152F1}.Release|Any CPU.Build.0 = Release|Any CPU + {792E181C-7645-4268-A04F-DB134411AD74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {792E181C-7645-4268-A04F-DB134411AD74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {792E181C-7645-4268-A04F-DB134411AD74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {792E181C-7645-4268-A04F-DB134411AD74}.Release|Any CPU.Build.0 = Release|Any CPU + {BA88E212-5889-48DC-823F-A3A67DDEF123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA88E212-5889-48DC-823F-A3A67DDEF123}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA88E212-5889-48DC-823F-A3A67DDEF123}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA88E212-5889-48DC-823F-A3A67DDEF123}.Release|Any CPU.Build.0 = Release|Any CPU + {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {64BD92BA-F313-496C-ACE6-B9C4C10C420E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -138,14 +138,14 @@ Global {A25566C9-97C7-4770-BBC1-9B815D3B1380} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} {28AA31B2-6504-432D-8599-1501FE0B100A} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} {236CDB04-8FDA-4152-9A5B-7F98C19C663A} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} + {792E181C-7645-4268-A04F-DB134411AD74} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} {64BD92BA-F313-496C-ACE6-B9C4C10C420E} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} - {8E6EAA52-7132-4707-936D-F15C8B28CFBA} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} {0D2C8C3D-AFC3-4E1F-A6D8-9F690EE5E063} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} {613579ED-7B96-4F5C-8DBF-D2C580257BE2} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} {24947215-86AB-4DD0-B94E-88B1EC4DC877} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} {DA65D56F-1C40-4D38-B1E0-BF9641A98C52} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} + {5E701B23-73E4-45D2-8521-1D7A94E152F1} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} {BA88E212-5889-48DC-823F-A3A67DDEF123} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} - {43ECCFDF-E646-4766-B339-F5CCD69DD6C3} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} {501817DD-8143-4A50-888D-99896A82CD12} = {222CA408-93EE-473A-9325-D04989EC9FEF} {688ABC8B-BFA9-4CFF-9458-A466FEBB0448} = {222CA408-93EE-473A-9325-D04989EC9FEF} {A7D7CD66-A407-4144-8AB7-07F895F87137} = {CE037E26-9EB5-48E2-B73B-06C6FF6CC9F5} diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs index d6ab3c79ff..fd9f25fc29 100644 --- a/samples/MvcSample.Web/Startup.cs +++ b/samples/MvcSample.Web/Startup.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Reflection; using Microsoft.AspNet.Abstractions; using Microsoft.AspNet.DependencyInjection; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Routing; -using Microsoft.AspNet.Mvc.Startup; using Microsoft.AspNet.Routing.Owin; using Microsoft.AspNet.Routing.Template; diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json index 868153aa41..0df5e2cb91 100644 --- a/samples/MvcSample.Web/project.json +++ b/samples/MvcSample.Web/project.json @@ -5,8 +5,8 @@ "Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.Routing" : "0.1-alpha-*", - "Microsoft.AspNet.Mvc" : "", - "Microsoft.AspNet.Mvc.Startup" : "" + "Microsoft.AspNet.Mvc.Core" : "", + "Microsoft.AspNet.Mvc" : "" }, "configurations": { "net45": { }, diff --git a/samples/MvcSample/Startup.cs b/samples/MvcSample/Startup.cs index 5e3c5d1fda..d3f5adbe64 100644 --- a/samples/MvcSample/Startup.cs +++ b/samples/MvcSample/Startup.cs @@ -9,7 +9,6 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing.Owin; using Microsoft.AspNet.Routing.Template; -using Microsoft.AspNet.Mvc.Startup; using Owin; namespace MvcSample diff --git a/samples/MvcSample/project.json b/samples/MvcSample/project.json index 330a4ac1a8..87bdf0b5f1 100644 --- a/samples/MvcSample/project.json +++ b/samples/MvcSample/project.json @@ -4,8 +4,8 @@ "Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.Routing" : "0.1-alpha-*", - "Microsoft.AspNet.Mvc" : "", - "Microsoft.AspNet.Mvc.Startup" : "" + "Microsoft.AspNet.Mvc.Core" : "", + "Microsoft.AspNet.Mvc" : "" }, "configurations": { "net45": { diff --git a/src/Microsoft.AspNet.Mvc/ActionContext.cs b/src/Microsoft.AspNet.Mvc.Core/ActionContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionContext.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionContext.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionConvention.cs b/src/Microsoft.AspNet.Mvc.Core/ActionConvention.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionConvention.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionConvention.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/ActionDescriptor.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionDescriptor.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionDescriptorProviderContext.cs b/src/Microsoft.AspNet.Mvc.Core/ActionDescriptorProviderContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionDescriptorProviderContext.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionDescriptorProviderContext.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/ActionInvokerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionInvokerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionInvokerFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionInvokerProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionInvokerProvider.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionInvokerProviderContext.cs b/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProviderContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionInvokerProviderContext.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionInvokerProviderContext.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResultFactory.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResultFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResultFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResultFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResultHelper.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResultHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResultHelper.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResultHelper.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResults/ContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResults/ContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResults/EmptyResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResults/EmptyResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResults/HttpStatusCodeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResults/HttpStatusCodeResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResults/IJsonResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/IJsonResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResults/IJsonResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/IJsonResult.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResults/JsonResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/JsonResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResults/JsonResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/JsonResult.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResults/NoContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResults/NoContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs diff --git a/src/Microsoft.AspNet.Mvc/ActionResults/ViewResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ViewResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ActionResults/ViewResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionResults/ViewResult.cs diff --git a/src/Microsoft.AspNet.Mvc/AppDomainControllerAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/AppDomainControllerAssemblyProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/AppDomainControllerAssemblyProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/AppDomainControllerAssemblyProvider.cs diff --git a/src/Microsoft.AspNet.Mvc/Controller.cs b/src/Microsoft.AspNet.Mvc.Core/Controller.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/Controller.cs rename to src/Microsoft.AspNet.Mvc.Core/Controller.cs diff --git a/src/Microsoft.AspNet.Mvc/ControllerDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/ControllerDescriptor.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ControllerDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/ControllerDescriptor.cs diff --git a/src/Microsoft.AspNet.Mvc/DefaultActionDiscoveryConventions.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultActionDiscoveryConventions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/DefaultActionDiscoveryConventions.cs rename to src/Microsoft.AspNet.Mvc.Core/DefaultActionDiscoveryConventions.cs diff --git a/src/Microsoft.AspNet.Mvc/DefaultActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/DefaultActionSelector.cs rename to src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs diff --git a/src/Microsoft.AspNet.Mvc/DefaultControllerDescriptorFactory.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerDescriptorFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/DefaultControllerDescriptorFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/DefaultControllerDescriptorFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/DefaultParameterDescriptorFactory.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultParameterDescriptorFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/DefaultParameterDescriptorFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/DefaultParameterDescriptorFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/Extensions/IEnumerableExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Extensions/IEnumerableExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/Extensions/IEnumerableExtensions.cs rename to src/Microsoft.AspNet.Mvc.Core/Extensions/IEnumerableExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc/Extensions/TypeExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Extensions/TypeExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/Extensions/TypeExtensions.cs rename to src/Microsoft.AspNet.Mvc.Core/Extensions/TypeExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc/HttpMethodConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/HttpMethodConstraint.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/HttpMethodConstraint.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpMethodConstraint.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/IActionConstraint.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionConstraint.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionConstraint.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/IActionDescriptorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionDescriptorProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionDescriptorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionDiscoveryConventions.cs b/src/Microsoft.AspNet.Mvc.Core/IActionDiscoveryConventions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionDiscoveryConventions.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionDiscoveryConventions.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/IActionInvoker.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionInvoker.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionInvoker.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/IActionInvokerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionInvokerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionInvokerFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/IActionInvokerProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionInvokerProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionInvokerProvider.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/IActionResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionResult.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionResult.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionResultFactory.cs b/src/Microsoft.AspNet.Mvc.Core/IActionResultFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionResultFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionResultFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionResultHelper.cs b/src/Microsoft.AspNet.Mvc.Core/IActionResultHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionResultHelper.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionResultHelper.cs diff --git a/src/Microsoft.AspNet.Mvc/IActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/IActionSelector.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IActionSelector.cs rename to src/Microsoft.AspNet.Mvc.Core/IActionSelector.cs diff --git a/src/Microsoft.AspNet.Mvc/IControllerAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/IControllerAssemblyProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IControllerAssemblyProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/IControllerAssemblyProvider.cs diff --git a/src/Microsoft.AspNet.Mvc/IControllerDescriptorFactory.cs b/src/Microsoft.AspNet.Mvc.Core/IControllerDescriptorFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IControllerDescriptorFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/IControllerDescriptorFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/IControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IControllerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/IParameterDescriptorFactory.cs b/src/Microsoft.AspNet.Mvc.Core/IParameterDescriptorFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/IParameterDescriptorFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/IParameterDescriptorFactory.cs diff --git a/src/Microsoft.AspNet.Mvc/ParameterBindingInfo.cs b/src/Microsoft.AspNet.Mvc.Core/ParameterBindingInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ParameterBindingInfo.cs rename to src/Microsoft.AspNet.Mvc.Core/ParameterBindingInfo.cs diff --git a/src/Microsoft.AspNet.Mvc/ParameterDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/ParameterDescriptor.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/ParameterDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/ParameterDescriptor.cs diff --git a/src/Microsoft.AspNet.Mvc/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Core/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNet.Mvc.Core/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Mvc/RouteDataActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/RouteDataActionConstraint.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/RouteDataActionConstraint.cs rename to src/Microsoft.AspNet.Mvc.Core/RouteDataActionConstraint.cs diff --git a/src/Microsoft.AspNet.Mvc/RouteKeyHandling.cs b/src/Microsoft.AspNet.Mvc.Core/RouteKeyHandling.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/RouteKeyHandling.cs rename to src/Microsoft.AspNet.Mvc.Core/RouteKeyHandling.cs diff --git a/src/Microsoft.AspNet.Mvc/Routing/RouteEndpoint.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/RouteEndpoint.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/Routing/RouteEndpoint.cs rename to src/Microsoft.AspNet.Mvc.Core/Routing/RouteEndpoint.cs diff --git a/src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptor.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptor.cs diff --git a/src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptorProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc/TypeMethodBasedActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionInvoker.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc/TypeMethodBasedActionInvoker.cs rename to src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionInvoker.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json new file mode 100644 index 0000000000..7d8514cbc1 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.Core/project.json @@ -0,0 +1,15 @@ +{ + "version" : "0.1-alpha-*", + "dependencies": { + "Newtonsoft.Json": "5.0.8", + "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", + "Microsoft.AspNet.Abstractions": "0.1-alpha-*", + "Microsoft.AspNet.Routing": "0.1-alpha-*", + "Microsoft.AspNet.Mvc.ModelBinding": "", + "Microsoft.AspNet.Mvc.Rendering": "" + }, + "configurations": { + "net45": { }, + "k10" : { } + } +} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index 9e0332e2ba..4946557e7d 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", "Microsoft.AspNet.Razor": "0.1-alpha-*", - "Microsoft.AspNet.Mvc" : "", + "Microsoft.AspNet.Mvc.Core" : "", "Microsoft.AspNet.Mvc.ModelBinding" : "", "Microsoft.AspNet.Mvc.Rendering" : "", "Microsoft.AspNet.Mvc.Razor.Host" : "", diff --git a/src/Microsoft.AspNet.Mvc.Startup/project.json b/src/Microsoft.AspNet.Mvc.Startup/project.json deleted file mode 100644 index 216ef68e3c..0000000000 --- a/src/Microsoft.AspNet.Mvc.Startup/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version" : "0.1-alpha-*", - "dependencies": { - "Microsoft.AspNet.Abstractions" : "0.1-alpha-*", - "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", - "Microsoft.AspNet.FileSystems" : "0.1-alpha-*", - "Microsoft.AspNet.Razor" : "0.1-alpha-*", - "Microsoft.AspNet.Routing" : "0.1-alpha-*", - "Microsoft.AspNet.Mvc": "", - "Microsoft.AspNet.Mvc.Razor": "", - "Microsoft.AspNet.Mvc.ModelBinding" : "", - "Microsoft.AspNet.Mvc.Rendering" : "", - "Microsoft.AspNet.Mvc.Razor.Host": "" - }, - "configurations": { - "net45": { }, - "k10" : { } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Startup/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Startup/MvcServices.cs rename to src/Microsoft.AspNet.Mvc/MvcServices.cs index e8c1e28d95..5701273bac 100644 --- a/src/Microsoft.AspNet.Mvc.Startup/MvcServices.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Razor; using Microsoft.AspNet.Mvc.Razor.Compilation; -namespace Microsoft.AspNet.Mvc.Startup +namespace Microsoft.AspNet.Mvc { public class MvcServices { diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json index 7d8514cbc1..9cbc3947d7 100644 --- a/src/Microsoft.AspNet.Mvc/project.json +++ b/src/Microsoft.AspNet.Mvc/project.json @@ -1,12 +1,16 @@ { "version" : "0.1-alpha-*", "dependencies": { - "Newtonsoft.Json": "5.0.8", + "Microsoft.AspNet.Abstractions" : "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", - "Microsoft.AspNet.Abstractions": "0.1-alpha-*", - "Microsoft.AspNet.Routing": "0.1-alpha-*", - "Microsoft.AspNet.Mvc.ModelBinding": "", - "Microsoft.AspNet.Mvc.Rendering": "" + "Microsoft.AspNet.FileSystems" : "0.1-alpha-*", + "Microsoft.AspNet.Razor" : "0.1-alpha-*", + "Microsoft.AspNet.Routing" : "0.1-alpha-*", + "Microsoft.AspNet.Mvc.Core": "", + "Microsoft.AspNet.Mvc.Razor": "", + "Microsoft.AspNet.Mvc.ModelBinding" : "", + "Microsoft.AspNet.Mvc.Rendering" : "", + "Microsoft.AspNet.Mvc.Razor.Host": "" }, "configurations": { "net45": { },