From adb35031ed4602141b765639a58efb856a82fc43 Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Sat, 4 Jun 2011 17:34:53 +0100
Subject: [PATCH] Add ASP.NET MVC project templates for VB and C#.

---
 .../project/CSharp/MvcWebProject.xpt          | 326 ++++++++++++++++++
 data/templates/project/VB/MvcWebProject.xpt   | 318 +++++++++++++++++
 src/Setup/Files.wxs                           |   6 +
 src/Setup/Setup.wxs                           |  14 +-
 4 files changed, 658 insertions(+), 6 deletions(-)
 create mode 100644 data/templates/project/CSharp/MvcWebProject.xpt
 create mode 100644 data/templates/project/VB/MvcWebProject.xpt

diff --git a/data/templates/project/CSharp/MvcWebProject.xpt b/data/templates/project/CSharp/MvcWebProject.xpt
new file mode 100644
index 0000000000..3e235cc3fd
--- /dev/null
+++ b/data/templates/project/CSharp/MvcWebProject.xpt
@@ -0,0 +1,326 @@
+<Template
+	originator="Matt Ward"
+	created="04/06/2011"
+	lastModified="04/06/2011">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<Name>ASP.NET MVC Application</Name>
+		<Category>C#</Category>
+		<Subcategory>ASP.NET</Subcategory>
+		<Icon>C#.Project.Form</Icon>
+		<Description>ASP.NET MVC Application</Description>
+		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
+	</TemplateConfiguration>
+
+	<!-- Actions -->
+	<Actions>
+		<Open filename="Views\Home\Index.aspx"/>
+		<Open filename="Controllers\HomeController.cs"/>
+	</Actions>
+
+	<Project language="C#">
+		<ProjectItems>
+			<Reference Include="System" />
+			<Reference Include="System.Web" />
+			<Reference Include="System.Web.Mvc" />
+			<Reference Include="System.Xml" />
+		</ProjectItems>
+		
+		<PropertyGroup escapeValue="False">
+			<OutputType>Library</OutputType>
+			<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+			<AppDesignerFolder>Properties</AppDesignerFolder>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Debug">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Release">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<Imports clear="False">
+				<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+		</Imports>
+
+		<Files>
+			<File name="Content\Site.css">
+<![CDATA[
+body
+{
+	font-family: Verdana, sans-serif;
+	margin: 0;
+	padding: 0;
+	text-align: center;
+	background-color: #709ad1;
+}
+
+h1 
+{
+	font-size: 12pt;
+	font-weight: bold;
+	padding: 0;
+	margin-left: 20px;
+	margin-top: 5px;
+	margin-right: 20px;
+}
+
+h2
+{
+	font-size: 11pt;
+	font-weight: bold;
+	margin-top: 10px;
+}
+
+p
+{
+	margin-left: 20px;
+	font-size: 10pt;
+	margin-right: 20px;
+}
+
+a
+{
+	color: #666666;
+}
+
+a:hover
+{
+	color: #111;
+}
+
+#body li
+{
+	font-size: 10pt;
+}
+
+li
+{
+	font-size: 10pt;
+}
+
+#body li li
+{
+	font-size: 10pt;
+}
+
+#links
+{
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+#title
+{
+	margin-top: 5px;
+	margin-bottom: 5px;
+	padding: 20px;
+}
+
+#title h1
+{
+  font-size: 20pt;
+  color: #fff;
+}
+
+#page
+{
+	margin: auto;
+	text-align: left;
+	width: 90%;
+}
+
+#main
+{
+  clear: both;
+	padding: 10px 20px;
+	background-color: #fff
+}
+
+#menu 
+{
+	float: left;
+	margin: 0;
+	padding: 0;
+	list-style: none;
+ 	position: relative;
+}
+
+#menu li 
+{
+	float: left;
+	font-size: 8pt;
+	font-weight: bold;
+	margin: 5px;
+	padding: 0;
+	list-style: none;
+}
+
+#menu a 
+{
+	float: left;
+	padding: 5px 20px 5px 20px;
+	text-decoration: none;
+	color: #111;
+	background-color: #fff;
+}
+
+#menu a:hover
+{
+	color: #fff;
+	background-color: #111;
+}
+]]>
+			</File>
+			<File name="Controllers\HomeController.cs">
+<![CDATA[${StandardHeader.C#}
+using System;
+using System.Web.Mvc;
+
+namespace ${StandardNamespace}.Controllers
+{
+	public class HomeController : Controller
+	{
+		public ActionResult Index()
+		{
+			return View();
+		}
+		
+		public ActionResult Contact()
+		{
+			return View();
+		}
+	}
+}
+]]>
+			</File>
+			<File name="Global.asax">
+<![CDATA[<%@ Application Codebehind="Global.asax.cs" Inherits="${StandardNamespace}.MvcApplication" Language="C#" %>
+]]>
+			</File>
+			<File name="Global.asax.cs" DependentUpon="Global.asax">
+<![CDATA[${StandardHeader.C#}
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace ${StandardNamespace}
+{
+	public class MvcApplication : HttpApplication
+	{
+		public static void RegisterRoutes(RouteCollection routes)
+		{
+			routes.Ignore("{resource}.axd/{*pathInfo}");
+			
+			routes.MapRoute(
+				"Default",
+				"{controller}/{action}/{id}",
+				new {
+					controller = "Home",
+					action = "Index",
+					id = UrlParameter.Optional
+				});
+		}
+		
+		protected void Application_Start()
+		{
+			RegisterRoutes(RouteTable.Routes);
+		}
+	}
+}
+]]>
+			</File>
+			<File name="Properties\AssemblyInfo.cs" src="DefaultAssemblyInfo.cs" />
+			<File name="Views\Home\Contact.aspx">
+<![CDATA[<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
+
+<asp:Content id="ContactTitle" ContentPlaceHolderId="Title" runat="server">
+	ASP.NET MVC Application
+</asp:Content>
+
+<asp:Content id="ContactMain" ContentPlaceHolderId="Main" runat="server">
+	<h2>Contact Us</h2>
+	<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut massa lectus, ac sodales justo. 
+	In hac habitasse platea dictumst. Vestibulum eget purus justo. Aliquam ultrices, ante faucibus imperdiet 
+	imperdiet, tellus magna porta elit, eget commodo augue elit vitae risus. Curabitur rutrum, nibh at tincidunt 
+	aliquet, lectus dolor fringilla ante, id consequat est ipsum in leo. Duis a convallis magna. Vivamus eget 
+	felis elit, ac scelerisque odio. Morbi ante mauris, sollicitudin eu posuere quis, imperdiet sed ligula. 
+	Aliquam suscipit tellus vel nunc elementum fringilla.</p>
+</asp:Content>
+]]>
+			</File>
+			<File name="Views\Home\Index.aspx">
+<![CDATA[<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
+
+<asp:Content id="HomeTitle" ContentPlaceHolderId="Title" runat="server">
+	ASP.NET MVC Application
+</asp:Content>
+
+<asp:Content id="HomeMain" ContentPlaceHolderId="Main" runat="server">
+	<h2>Home</h2>
+	<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut massa lectus, ac sodales justo. 
+	In hac habitasse platea dictumst. Vestibulum eget purus justo. Aliquam ultrices, ante faucibus imperdiet 
+	imperdiet, tellus magna porta elit, eget commodo augue elit vitae risus. Curabitur rutrum, nibh at tincidunt 
+	aliquet, lectus dolor fringilla ante, id consequat est ipsum in leo. Duis a convallis magna. Vivamus eget 
+	felis elit, ac scelerisque odio. Morbi ante mauris, sollicitudin eu posuere quis, imperdiet sed ligula. 
+	Aliquam suscipit tellus vel nunc elementum fringilla.</p>
+</asp:Content>
+]]>
+			</File>
+			<File name="Views\Shared\Site.Master">
+<![CDATA[<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %>
+
+<!DOCTYPE html>
+<html>
+	<head runat="server">
+		<title><asp:ContentPlaceHolder id="Title" runat="server"/></title>
+		<link href="<%: Url.Content("~/Content/Site.css") %>" rel="stylesheet" type="text/css">
+		<script src="<%: Url.Content("~/Scripts/modernizer-1.7.min.js") %>" type="text/javascript"></script>
+		<script src="<%: Url.Content("~/Scripts/jquery-1.6.1.min.js") %>" type="text/javascript"></script>
+	</head>
+	<body>
+		<div id="page">
+			<header>
+				<div id="title">
+					<h1>ASP.NET MVC Application</h1>
+				</div>
+			</header>
+			<nav>
+				<ul id="menu">
+					<li><%: Html.ActionLink("Home", "Index", "Home")%></li>
+					<li><%: Html.ActionLink("Contact", "Contact", "Home")%></li>
+				</ul>
+			</nav>
+			<section id="main">
+				<asp:ContentPlaceHolder id="Main" runat="server"/>
+			</section>
+		</div>
+	</body>
+</html>
+]]>
+			</File>
+			<File name="web.config">
+<![CDATA[<configuration>
+	<system.web>
+		<compilation debug="true" targetFramework="4.0">
+			<assemblies>
+				<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			</assemblies>
+		</compilation>
+	
+		<pages>
+			<namespaces>
+				<add namespace="System.Web.Mvc"/>
+				<add namespace="System.Web.Mvc.Html"/>
+			</namespaces>
+		</pages>
+	</system.web>
+</configuration>
+]]>
+			</File>
+		</Files>
+	</Project>
+</Template>
diff --git a/data/templates/project/VB/MvcWebProject.xpt b/data/templates/project/VB/MvcWebProject.xpt
new file mode 100644
index 0000000000..694e30bdd3
--- /dev/null
+++ b/data/templates/project/VB/MvcWebProject.xpt
@@ -0,0 +1,318 @@
+<Template
+	originator="Matt Ward"
+	created="04/06/2011"
+	lastModified="04/06/2011">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<Name>ASP.NET MVC Application</Name>
+		<Category>VB</Category>
+		<Subcategory>ASP.NET</Subcategory>
+		<Icon>VBNet.Project.Form</Icon>
+		<Description>ASP.NET MVC Application</Description>
+		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
+	</TemplateConfiguration>
+
+	<!-- Actions -->
+	<Actions>
+		<Open filename="Views\Home\Index.aspx"/>
+		<Open filename="Controllers\HomeController.vb"/>
+	</Actions>
+
+	<Project language="VBNet">
+		<ProjectItems>
+			<Reference Include="System" />
+			<Reference Include="System.Web" />
+			<Reference Include="System.Web.Mvc" />
+			<Reference Include="System.Xml" />
+		</ProjectItems>
+		
+		<PropertyGroup escapeValue="False">
+			<OutputType>Library</OutputType>
+			<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+			<AppDesignerFolder>Properties</AppDesignerFolder>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Debug">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<PropertyGroup configuration="Release">
+			<OutputPath>bin\</OutputPath>
+		</PropertyGroup>
+		
+		<Imports clear="False">
+				<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+		</Imports>
+
+		<Files>
+			<File name="Content\Site.css">
+<![CDATA[
+body
+{
+	font-family: Verdana, sans-serif;
+	margin: 0;
+	padding: 0;
+	text-align: center;
+	background-color: #709ad1;
+}
+
+h1 
+{
+	font-size: 12pt;
+	font-weight: bold;
+	padding: 0;
+	margin-left: 20px;
+	margin-top: 5px;
+	margin-right: 20px;
+}
+
+h2
+{
+	font-size: 11pt;
+	font-weight: bold;
+	margin-top: 10px;
+}
+
+p
+{
+	margin-left: 20px;
+	font-size: 10pt;
+	margin-right: 20px;
+}
+
+a
+{
+	color: #666666;
+}
+
+a:hover
+{
+	color: #111;
+}
+
+#body li
+{
+	font-size: 10pt;
+}
+
+li
+{
+	font-size: 10pt;
+}
+
+#body li li
+{
+	font-size: 10pt;
+}
+
+#links
+{
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+#title
+{
+	margin-top: 5px;
+	margin-bottom: 5px;
+	padding: 20px;
+}
+
+#title h1
+{
+  font-size: 20pt;
+  color: #fff;
+}
+
+#page
+{
+	margin: auto;
+	text-align: left;
+	width: 90%;
+}
+
+#main
+{
+  clear: both;
+	padding: 10px 20px;
+	background-color: #fff
+}
+
+#menu 
+{
+	float: left;
+	margin: 0;
+	padding: 0;
+	list-style: none;
+ 	position: relative;
+}
+
+#menu li 
+{
+	float: left;
+	font-size: 8pt;
+	font-weight: bold;
+	margin: 5px;
+	padding: 0;
+	list-style: none;
+}
+
+#menu a 
+{
+	float: left;
+	padding: 5px 20px 5px 20px;
+	text-decoration: none;
+	color: #111;
+	background-color: #fff;
+}
+
+#menu a:hover
+{
+	color: #fff;
+	background-color: #111;
+}
+]]>
+			</File>
+			<File name="Controllers\HomeController.vb">
+<![CDATA[${StandardHeader.VBNET}
+Imports System
+Imports System.Web.Mvc
+
+Public Class HomeController
+	Inherits Controller
+	
+	Function Index() As ActionResult
+		Return View()
+	End Function
+		
+	Function Contact() As ActionResult
+		Return View()
+	End Function
+End Class
+]]>
+			</File>
+			<File name="Global.asax">
+<![CDATA[<%@ Application Codebehind="Global.asax.vb" Inherits="${StandardNamespace}.MvcApplication" Language="VB" %>
+]]>
+			</File>
+			<File name="Global.asax.vb" DependentUpon="Global.asax">
+<![CDATA[${StandardHeader.VBNET}
+Imports System.Web
+Imports System.Web.Mvc
+Imports System.Web.Routing
+
+Public Class MvcApplication 
+	Inherits HttpApplication
+
+		Shared Sub RegisterRoutes(ByVal routes as RouteCollection)
+			routes.Ignore("{resource}.axd/{*pathInfo}")
+			
+			routes.MapRoute( _
+				"Default", _
+				"{controller}/{action}/{id}", _
+				New With { _
+					.controller = "Home", _
+					.action = "Index", _
+					.id = UrlParameter.Optional _
+				})
+		End Sub
+		
+		Sub Application_Start()
+			RegisterRoutes(RouteTable.Routes)
+		End Sub
+End Class
+]]>
+			</File>
+			<File name="Properties\AssemblyInfo.vb" src="DefaultAssemblyInfo.vb" />
+			<File name="Views\Home\Contact.aspx">
+<![CDATA[<%@ Page Language="VB" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
+
+<asp:Content id="ContactTitle" ContentPlaceHolderId="Title" runat="server">
+	ASP.NET MVC Application
+</asp:Content>
+
+<asp:Content id="ContactMain" ContentPlaceHolderId="Main" runat="server">
+	<h2>Contact Us</h2>
+	<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut massa lectus, ac sodales justo. 
+	In hac habitasse platea dictumst. Vestibulum eget purus justo. Aliquam ultrices, ante faucibus imperdiet 
+	imperdiet, tellus magna porta elit, eget commodo augue elit vitae risus. Curabitur rutrum, nibh at tincidunt 
+	aliquet, lectus dolor fringilla ante, id consequat est ipsum in leo. Duis a convallis magna. Vivamus eget 
+	felis elit, ac scelerisque odio. Morbi ante mauris, sollicitudin eu posuere quis, imperdiet sed ligula. 
+	Aliquam suscipit tellus vel nunc elementum fringilla.</p>
+</asp:Content>
+]]>
+			</File>
+			<File name="Views\Home\Index.aspx">
+<![CDATA[<%@ Page Language="VB" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
+
+<asp:Content id="HomeTitle" ContentPlaceHolderId="Title" runat="server">
+	ASP.NET MVC Application
+</asp:Content>
+
+<asp:Content id="HomeMain" ContentPlaceHolderId="Main" runat="server">
+	<h2>Home</h2>
+	<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut massa lectus, ac sodales justo. 
+	In hac habitasse platea dictumst. Vestibulum eget purus justo. Aliquam ultrices, ante faucibus imperdiet 
+	imperdiet, tellus magna porta elit, eget commodo augue elit vitae risus. Curabitur rutrum, nibh at tincidunt 
+	aliquet, lectus dolor fringilla ante, id consequat est ipsum in leo. Duis a convallis magna. Vivamus eget 
+	felis elit, ac scelerisque odio. Morbi ante mauris, sollicitudin eu posuere quis, imperdiet sed ligula. 
+	Aliquam suscipit tellus vel nunc elementum fringilla.</p>
+</asp:Content>
+]]>
+			</File>
+			<File name="Views\Shared\Site.Master">
+<![CDATA[<%@ Master Language="VB" Inherits="System.Web.Mvc.ViewMasterPage" %>
+
+<!DOCTYPE html>
+<html>
+	<head runat="server">
+		<title><asp:ContentPlaceHolder id="Title" runat="server"/></title>
+		<link href="<%: Url.Content("~/Content/Site.css") %>" rel="stylesheet" type="text/css">
+		<script src="<%: Url.Content("~/Scripts/modernizer-1.7.min.js") %>" type="text/javascript"></script>
+		<script src="<%: Url.Content("~/Scripts/jquery-1.6.1.min.js") %>" type="text/javascript"></script>
+	</head>
+	<body>
+		<div id="page">
+			<header>
+				<div id="title">
+					<h1>ASP.NET MVC Application</h1>
+				</div>
+			</header>
+			<nav>
+				<ul id="menu">
+					<li><%: Html.ActionLink("Home", "Index", "Home")%></li>
+					<li><%: Html.ActionLink("Contact", "Contact", "Home")%></li>
+				</ul>
+			</nav>
+			<section id="main">
+				<asp:ContentPlaceHolder id="Main" runat="server"/>
+			</section>
+		</div>
+	</body>
+</html>
+]]>
+			</File>
+			<File name="web.config">
+<![CDATA[<configuration>
+	<system.web>
+		<compilation debug="true" targetFramework="4.0">
+			<assemblies>
+				<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			</assemblies>
+		</compilation>
+	
+		<pages>
+			<namespaces>
+				<add namespace="System.Web.Mvc"/>
+				<add namespace="System.Web.Mvc.Html"/>
+			</namespaces>
+		</pages>
+	</system.web>
+</configuration>
+]]>
+			</File>
+		</Files>
+	</Project>
+</Template>
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 71600f3fc6..55ad2c3052 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -806,6 +806,9 @@
 										<Component Guid="084FDE9A-C356-4D88-8718-00D53478225A" Id="WPFAssemblyInfoTemplate" DiskId="1">
 											<File Source="..\..\data\templates\project\CSharp\WPFAssemblyInfo.cs" Id="WPFAssemblyInfoTemplate" Name="WPFAssemblyInfo.cs" />
 										</Component>
+										<Component Id="CSharpMvcWebProjectTemplate" Guid="82060284-5670-4B2F-8AB0-BE075D09D4BE" DiskId="1">
+											<File Id="CSharp.MvcWebProject.xpt" Name="MvcWebProject.xpt" Source="..\..\data\templates\project\CSharp\MvcWebProject.xpt" KeyPath="yes" />
+										</Component>
 									</Directory>
 									<Directory Id="MiscProjectTemplatesFolder" Name="Misc">
 										<Component Guid="F9A7F832-6EC8-4B15-A037-146BD028C9D5" Id="MiscProjectTemplates" DiskId="1">
@@ -838,6 +841,9 @@
 											<File Id="WPFAssemblyInfo.vb" Name="WPFAssemblyInfo.vb" Source="..\..\data\templates\project\VB\WPFAssemblyInfo.vb" />
 											<File Id="WPFNavigationApplication.xpt" Name="WPFNavigationApplication.xpt" Source="..\..\data\templates\project\VB\WPFNavigationApplication.xpt" />
 										</Component>
+										<Component Id="VBMvcWebProjectTemplate" Guid="FBDC313E-FC77-4500-84EC-35F0E19925C1" DiskId="1">
+											<File Id="VB.MvcWebProject.xpt" Name="MvcWebProject.xpt" Source="..\..\data\templates\project\VB\MvcWebProject.xpt" KeyPath="yes" />
+										</Component>
 									</Directory>
 									<Component Guid="73EAC135-57B6-46C0-9F24-70A347B9AAC8" Id="ExampleProjectTemplate" DiskId="1">
 										<File Source="..\..\data\templates\project\ComplexExample.xpt.test" Id="ComplexExample.xpt.test" Name="ComplexExample.xpt.test" />
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 5f337f9a4e..559b74d520 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -256,11 +256,11 @@
 				<ComponentRef Id="Difxapp_ia64Wixlib"/>
 				<ComponentRef Id="Difxapp_x64Wixlib"/>
 				<ComponentRef Id="Difxapp_x86Wixlib"/>
-				<ComponentRef Id="EmptyWixFileTemplate"/>				
-				<ComponentRef Id="WixDefaultLicenseRtf"/>				
-				<ComponentRef Id="EmptyWixProjectTemplate"/>				
-				<ComponentRef Id="EmptyWixDialogTemplate"/>				
-				<ComponentRef Id="WixDialogTemplate"/>				
+				<ComponentRef Id="EmptyWixFileTemplate"/>
+				<ComponentRef Id="WixDefaultLicenseRtf"/>
+				<ComponentRef Id="EmptyWixProjectTemplate"/>
+				<ComponentRef Id="EmptyWixDialogTemplate"/>
+				<ComponentRef Id="WixDialogTemplate"/>
 
 				<ComponentRef Id="CandleExe"/>
 				<ComponentRef Id="DarkExe"/>
@@ -297,8 +297,10 @@
 				<ComponentRef Id="CSharpFileTemplates"/>
 				<ComponentRef Id="CSharpRecentFilesCollectionTemplate"/>				
 				<ComponentRef Id="CSharpRecentFilesCollectionTemplateRecentFileElementClass"/>				
-				<ComponentRef Id="CSharpRecentFilesCollectionTemplateRecentFilesCollectionClass"/>				
+				<ComponentRef Id="CSharpRecentFilesCollectionTemplateRecentFilesCollectionClass"/>
+				<ComponentRef Id="CSharpMvcWebProjectTemplate"/>
 				<ComponentRef Id="VBFileTemplates"/>
+				<ComponentRef Id="VBMvcWebProjectTemplate"/>
 				<ComponentRef Id="EmptyHTMLFileTemplate"/>
 				<ComponentRef Id="EmptyMsBuildFileTemplate"/>
 				<ComponentRef Id="EmptyResourceFileTemplate"/>