Rename MVC -> MVC.Core, MVC.Startup -> MVC

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}

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;
 

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": { },

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

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": {

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" : { }
+  }
+}

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" : "",

src/Microsoft.AspNet.Mvc.Startup/project.json

@@ -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" : { }
-  }
-}

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
     {

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": { },