Added an error log if timed out

Changed the saving logic in ContentTypeControlNew to use the page's async execution and changed the page to support async.
Changed the page's async timeout to be 5 minutes.

.hgignore

@@ -1,10 +1,7 @@
-syntax: regexp
-^src/packages/(?!repositories.config$)
-web.Template.[a-zA-Z0-9]*.Debug.config
-
+# use glob syntax
 syntax: glob
+
 *.obj
-*.exe
 *.pdb
 *.user
 *.aps
@@ -15,10 +12,6 @@ syntax: glob
 obj/
 [Rr]elease*/
 _ReSharper*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
 [Tt]est[Rr]esult*
 [Bb]uild[Ll]og.*
 *.[Pp]ublish.xml
@@ -34,24 +27,25 @@ umbraco\presentation\scripts\*
 umbraco\presentation\fonts\*
 umbraco\presentation\css\*
 
-src\Umbraco.Web.UI\[Cc]ss\*
+src\Umbraco.Web.UI\css\*
 src\Umbraco.Web.UI\App_Code\*
 src\Umbraco.Web.UI\App_Data\*
 src\Umbraco.Tests\App_Data\*
-src\Umbraco.Web.UI\[Mm]edia\*
-src\Umbraco.Web.UI\[Mm]aster[Pp]ages\*
-src\Umbraco.Web.UI\[Mm]acro[Ss]cripts\*
-src\Umbraco.Web.UI\[Xx]slt\*
-src\Umbraco.Web.UI\[Ii]mages\*
-src\Umbraco.Web.UI\[Ss]cripts\*
+src\Umbraco.Web.UI\media\*
+src\Umbraco.Web.UI\masterpages\*
+src\Umbraco.Web.UI\macroScripts\*
+src\Umbraco.Web.UI\xslt\*
+src\Umbraco.Web.UI\images\*
+src\Umbraco.Web.UI\scripts\*
+src\Umbraco.Web.UI\Web.*.config.transformed
 
 umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx
 umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx
 _BuildOutput/*
 *.ncrunchsolution
-build/UmbracoCms.AllBinaries*zip
-build/UmbracoCms.WebPI*zip
-build/UmbracoCms*zip
+build/UmbracoCms.AllBinaries.zip
+build/UmbracoCms.WebPI.zip
+build/UmbracoCms.zip
 build/*.nupkg
 src/Umbraco.Tests/config/applications.config
 src/Umbraco.Tests/config/trees.config
@@ -64,5 +58,6 @@ src/Umbraco.Tests/config/umbracoSettings.config
 src/Umbraco.Web.UI/App_Plugins/*
 src/Umbraco.Web.UI/Views/*
 
-src\Umbraco.Web.UI\[Ww]eb.config
-*.transformed
+src\Umbraco.Web.UI\[W]eb.config
+src/packages/
+build/*.zip

.hgtags

@@ -20,3 +20,11 @@ f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
 73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
 0000000000000000000000000000000000000000 4.11.2
 73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2
+77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1
+54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2
+baa44b79cf90a60631e38e11f771c200b08a4583 Release-4.11.3
+e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1
+e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1
+0000000000000000000000000000000000000000 Release-4.11.3.1
+e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4
+14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6

build/Build.NuGet.bat

@@ -1,23 +0,0 @@
-@ECHO OFF
-
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt
-
-set version=6.0.0-beta
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
-
-if ERRORLEVEL 1 goto :showerror
-
-goto :EOF
-
-:showerror
-pause

build/Build.Plus.NuGet.bat

@@ -1,25 +0,0 @@
-@ECHO OFF
-set version=6.0.0-beta
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_NUMBER=%version%
-
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt
-
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
-
-
-if ERRORLEVEL 1 goto :showerror
-
-goto :EOF
-
-:showerror
-pause

build/Build.bat

@@ -1,5 +1,21 @@
 @ECHO OFF
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj"
+set version=4.11.7
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%version%
+
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt
+
+NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
+NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
+
 
 if ERRORLEVEL 1 goto :showerror
 

build/Build.proj

@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project InitialTargets="Build" DefaultTargets="AfterBuild" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
  <!-- 
  ****************************************************
@@ -24,6 +24,9 @@
  <PropertyGroup Condition="'$(BUILD_NUMBER)'!=''">
    <DECIMAL_BUILD_NUMBER>.$(BUILD_NUMBER)</DECIMAL_BUILD_NUMBER>
  </PropertyGroup>
+ <PropertyGroup Condition="'$(BUILD_RELEASE)'!=''">
+   <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)</DECIMAL_BUILD_NUMBER>
+ </PropertyGroup>
  
  <PropertyGroup>
    <BuildConfiguration>Release</BuildConfiguration>
@@ -46,8 +49,8 @@
  </PropertyGroup>
 
  <ItemGroup>
-   <SystemFolders Include="$(WebAppFolder)App_Plugins" />
-   <SystemFolders Include="$(WebAppFolder)App_Code" />
+	 <SystemFolders Include="$(WebAppFolder)App_Plugins" />
+	 <SystemFolders Include="$(WebAppFolder)App_Code" />
    <SystemFolders Include="$(WebAppFolder)App_Data" />
    <SystemFolders Include="$(WebAppFolder)media" />
    <SystemFolders Include="$(WebAppFolder)masterpages" />
@@ -56,7 +59,6 @@
    <SystemFolders Include="$(WebAppFolder)macroScripts" />
    <SystemFolders Include="$(WebAppFolder)xslt" />
    <SystemFolders Include="$(WebAppFolder)usercontrols" />
-   <SystemFolders Include="$(WebAppFolder)Views" />
  </ItemGroup>
 
  <!-- 
@@ -76,6 +78,7 @@
  </Target>
 
  <Target Name="ZipWebPiApp" DependsOnTargets="ZipWebApp" >
+
    <!-- Clean folders -->
    <RemoveDir Directories="$(WebPiFolder)" />
    <MakeDir Directories="$(WebPiFolder)" />
@@ -84,6 +87,13 @@
    <!-- Copy fresh built umbraco files -->
    <Exec Command="xcopy %22$(WebAppFolderAbsolutePath)*%22 %22$(WebPiFolderAbsolutePath)umbraco%22 /S /E /Y /I" />
    
+   <!--<ItemGroup>
+     <WebAppFiles Include="$(WebAppFolder)\**\*.*" />
+   </ItemGroup>
+
+   <Copy SourceFiles="@(WebAppFiles)"
+       DestinationFiles="@(WebAppFiles->'$(WebPiFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />-->
+
    <!-- Copy Web Pi template files -->
    <ItemGroup>
      <WebPiFiles Include="..\src\WebPi\**\*.*" />
@@ -94,9 +104,11 @@
 
    <!-- Zip the files -->
    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
+
  </Target>
  
  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
+   
    <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
 
    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
@@ -108,30 +120,41 @@
  <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
    <MakeDir Directories="@(SystemFolders)" />
  </Target>
- 
+
  <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
+
    <!-- Copy SQL CE -->
    <ItemGroup>
-     <SQLCE4Files 
-		Include="..\src\packages\SqlServerCE.4.0.0.0\**\*.*" 
-		Exclude="..\src\packages\SqlServerCE.4.0.0.0\lib\**\*;..\src\packages\SqlServerCE.4.0.0.0\**\*.nu*"
-		/>
+     <SQLCE4Files Include="..\lib\SQLCE4\**\*.*" />
    </ItemGroup>
 
    <Copy SourceFiles="@(SQLCE4Files)"
        DestinationFiles="@(SQLCE4Files->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
        OverwriteReadOnlyFiles="true"
        SkipUnchangedFiles="false" />
-
    <Copy SourceFiles="@(SQLCE4Files)"
        DestinationFiles="@(SQLCE4Files->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
        OverwriteReadOnlyFiles="true"
        SkipUnchangedFiles="false" />
- 
+
+   <!-- Copy WebPages -->
+   <ItemGroup>
+     <WebPageFiles Include="..\lib\WebPages\*.dll" />
+   </ItemGroup>
+
+   <Copy SourceFiles="@(WebPageFiles)"
+       DestinationFiles="@(WebPageFiles->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+   <Copy SourceFiles="@(WebPageFiles)"
+       DestinationFiles="@(WebPageFiles->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+   
  </Target>
 
  <!-- Offset the modified timestamps on all umbraco dlls, as WebResources break if date is in the future, which, due to timezone offsets can happen. -->
- <Target Name="OffsetTimestamps" DependsOnTargets="CopyTransformedWebConfig">
+ <Target Name="OffsetTimestamps" DependsOnTargets="CompileProjects">
    <CreateItem Include="$(BuildFolder)**\umbraco.*.dll">
      <Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
    </CreateItem>
@@ -140,26 +163,87 @@
    <Message Text="Finished offsetting timestamps" Importance="high" />
  </Target>
  
- <!-- Copy the transformed web.config file to the root -->
- <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CompileProjects">
-   <ItemGroup>
-     <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
-   </ItemGroup>
-   
-   <Copy SourceFiles="@(WebConfigFile)"
-       DestinationFiles="$(WebAppFolder)Web.config"
-       OverwriteReadOnlyFiles="true"
-       SkipUnchangedFiles="false" />
- </Target>
- 
- <Target Name="CompileProjects">
+ <Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
+
    <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
    <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
    <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
    </MSBuild>
 
+   <!--     
+   Now, because of all the circular dependencies we need to build those projects and have them dump their DLLs/assets out to the same folder. Really wish this wasn't the case! 
+   These are:    umbraco.editorControls    umbraco.webservices    umbraco.MacroEngines
+   
+   Each of these projects has a post build to put their stuff in the correct location based on the solution and unfortunately for us each 
+   of these projects references the web application! So if we specify an OutDir parameter it will also trigger a web deploy and chuck another
+   website output in bin/_PublishedWebSites folder. we cannot disable this: http://social.msdn.microsoft.com/forums/en-US/tfsbuild/thread/3ec642ad-2e6d-424c-891a-62f6409da62a/
+   so we need to just build the project 'in-place' then copy its output to the SolutionBinFolder    
+   -->
+
+   <!-- MACRO ENGINES -->
+   <Message Text="Compiling MacroEngines project" Importance="high" />
+   <MSBuild Projects="..\src\umbraco.MacroEngines\umbraco.MacroEngines.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <MacroEngineDll Include="..\src\umbraco.MacroEngines\bin\$(BuildConfiguration)\umbraco.MacroEngines.dll"/>
+   </ItemGroup>
+   <Copy SourceFiles="@(MacroEngineDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(MacroEngineDll)"
+           DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
+
+   <!-- EDITOR CONTROLS -->
+   <Message Text="Compiling editorControls project" Importance="high" />
+   <MSBuild Projects="..\src\umbraco.editorControls\umbraco.editorControls.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <EditorControlsDll Include="..\src\umbraco.editorControls\bin\$(BuildConfiguration)\umbraco.editorControls.dll"/>
+   </ItemGroup>
+   <Copy SourceFiles="@(EditorControlsDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(EditorControlsDll)"
+           DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
+
+   <!-- WEBSERVICES -->
+   <Message Text="Compiling webservices project" Importance="high" />
+   <MSBuild Projects="..\src\umbraco.webservices\umbraco.webservices.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <WebServicesDll Include="..\src\umbraco.webservices\bin\$(BuildConfiguration)\umbraco.webservices.dll"/>
+     <WebServicesASMX Include="..\src\umbraco.webservices\*.asmx"/>
+   </ItemGroup>
+   <Copy SourceFiles="@(WebServicesDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(WebServicesDll)"
+         DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(WebServicesASMX)"
+           DestinationFolder="$(WebAppFolder)\umbraco\webservices\api" OverwriteReadOnlyFiles="True"/>
+
+   <!-- SQLCE4UMBRACO -->
+   <!--<Message Text="Compiling SQLCE4Umbraco project" Importance="high" />
+   <MSBuild Projects="..\src\SQLCE4Umbraco\SQLCE4Umbraco.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+   </MSBuild>
+   <ItemGroup>
+     <SQLCE4UmbracoDll Include="..\src\SQLCE4Umbraco\bin\$(BuildConfiguration)\SQLCE4Umbraco.dll" />
+   </ItemGroup>
+   <Copy SourceFiles="@(SQLCE4UmbracoDll)"
+         DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
+   <Copy SourceFiles="@(SQLCE4UmbracoDll)"
+         DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>-->
+
    <!-- DONE -->
    <Message Text="Finished compiling projects" Importance="high" />
  </Target>
  
+ <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
+    <!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
+    <FileUpdate Files="..\src\Umbraco.Core\Configuration\GlobalSettings.cs"
+      Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?(-([a-zA-Z]+))?"
+      ReplacementText="$(BUILD_RELEASE)"/>
+ </Target>
+ 
+ <Target Name="AfterBuild">
+   <Message Text="Hi" />
+ </Target>
+ 
 </Project>

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms.Core</id>
-        <version>6.0.0-alpha</version>
+        <version>$version$</version>
         <title>Umbraco Cms Core Binaries</title>
         <authors>Morten Christensen</authors>
         <owners>Umbraco HQ</owners>
@@ -14,16 +14,10 @@
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
-		<dependencies>
-            <dependency id="Microsoft.AspNet.Mvc" version="[4.0.20710.0]" />
-			<dependency id="ServiceStack.Text" version="3.9.21" />
-			<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
-        </dependencies>
     </metadata>
 	<files>
 		<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
@@ -31,10 +25,11 @@
 		<file src="..\_BuildOutput\WebApp\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
@@ -42,6 +37,11 @@
 		<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\System.Web.Helpers.dll" target="lib\System.Web.Helpers.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\System.Web.Razor.dll" target="lib\System.Web.Razor.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\System.Web.WebPages.Deployment.dll" target="lib\System.Web.WebPages.Deployment.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\System.Web.WebPages.dll" target="lib\System.Web.WebPages.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\System.Web.WebPages.Razor.dll" target="lib\System.Web.WebPages.Razor.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />

build/NuSpecs/UmbracoCms.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms</id>
-        <version>6.0.0-alpha</version>
+        <version>$version$</version>
         <title>Umbraco Cms</title>
         <authors>Morten Christensen</authors>
         <owners>Umbraco HQ</owners>
@@ -15,7 +15,7 @@
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-            <dependency id="UmbracoCms.Core" version="$version$" />
+            <dependency id="UmbracoCms.Core" version="[$version$]" />
         </dependencies>
     </metadata>
   <files>
@@ -26,8 +26,8 @@
 	<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
 	<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
 	<file src="..\_BuildOutput\WebApp\usercontrols\**" target="Content\usercontrols" />
-	<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" />
 	<file src="..\_BuildOutput\WebApp\xslt\**" target="Content\xslt" />
+	<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" />
 	<file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
 	<file src="..\_BuildOutput\WebApp\Web.config" target="Content\Web.config" />
 	<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
@@ -38,8 +38,8 @@
 	<file src="..\_BuildOutput\WebApp\install\**" target="UmbracoFiles\install" />
 	<file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
 	<file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
-	<file src="..\_BuildOutput\WebApp\Global.asax" target="UmbracoFiles\Global.asax" />
 	<file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
+	<file src="..\_BuildOutput\WebApp\Global.asax" target="UmbracoFiles\Global.asax" />
     <file src="tools\install.ps1" target="tools\install.ps1" />
     <file src="tools\Readme.txt" target="tools\Readme.txt" />
   </files>

build/RevertToCleanInstall.bat

@@ -21,29 +21,44 @@ echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\U
 echo Removing plugin cache files
 del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
 
+echo Removing cache files and examine index
+del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
+
 echo Removing log files
 del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
 
+echo Removing packages
+del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
+
+echo Removing previews
+del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
+
+echo Removing app code files (typically added by starterkits)
+del ..\src\Umbraco.Web.UI\App_Code\*.*
+
 echo Removing xslt files
-del ..\src\Umbraco.Web.UI\Xslt\*.*
+del ..\src\Umbraco.Web.UI\xslt\*.*
 
 echo Removing user control files
 del ..\src\Umbraco.Web.UI\UserControls\*.*
 
+echo Removing masterpage files
+del ..\src\Umbraco.Web.UI\masterpages\*.*
+
 echo Removing view files
 del ..\src\Umbraco.Web.UI\Views\*.*
 
 echo Removing razor files
-del ..\src\Umbraco.Web.UI\MacroScripts\*.*
+del ..\src\Umbraco.Web.UI\macroScripts\*.*
 
 echo Removing media files
-del ..\src\Umbraco.Web.UI\Media\*.*
+del ..\src\Umbraco.Web.UI\media\*.*
 
 echo Removing script files
-del ..\src\Umbraco.Web.UI\Scripts\*.*
+del ..\src\Umbraco.Web.UI\scripts\*.*
 
 echo Removing css files
-del ..\src\Umbraco.Web.UI\Css\*.*
+del ..\src\Umbraco.Web.UI\css\*.*
 
 echo "Umbraco install reverted to clean install"
 pause 
@@ -64,29 +79,44 @@ echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\U
 echo Removing plugin cache files
 FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
 
+echo Removing cache files and examine index
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
+
 echo Removing log files
 FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
 
+echo Removing packages
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
+
+echo Removing previews
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
+
+echo Removing app code files (typically added by starterkits)
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
+
 echo Removing xslt files
-FOR %%A IN (..\src\Umbraco.Web.UI\Xslt\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
+
+echo Removing masterpage files
+FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
 
 echo Removing user control files
-FOR %%A IN (..\src\Umbraco.Web.UI\UserControls\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
 
 echo Removing view files
 FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
 
 echo Removing razor files
-FOR %%A IN (..\src\Umbraco.Web.UI\MacroScripts\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
 
 echo Removing media files
-FOR %%A IN (..\src\Umbraco.Web.UI\Media\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
 
 echo Removing script files
-FOR %%A IN (..\src\Umbraco.Web.UI\Scripts\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
 
 echo Removing css files
-FOR %%A IN (..\src\Umbraco.Web.UI\Css\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
 
 echo "Umbraco install reverted to clean install"
 pause 

docs/GettingStarted.txt

@@ -1,24 +0,0 @@
-Hi! Thanks for grabbing the Umbraco sourcecode.
-
-===========================================
-NOTE - DEFAULT BRANCH EMPTY - December 2010
-===========================================
-
-
-- With the help of CodePlex we have migrated much of our previous changesets (as of Dec 13th 2010) from TFS to Mercurial.
-
-- However, not everything could be migrated to our new branching workflow. So for each nominal group of 4.x changes, we've created named branches. For upcoming 5.x changesets, we'll adhere to our new workflow which we'll describe on the Wiki for contributors.
-
-- FOR THE MOMENT, the 'default' branch is empty - pending the addition of the 5.0 changesets
-
-- To switch to the codebase on which you want to work, 'hg update' to the named branch (e.g. "4.6.0") or tag (e.g. "Release-4.5.2") and browse or work from that point.
-
-
-Thanks to Matt Hawley at CodePlex for his help in our migration!
-
-Cheers,
-The Umbraco Team
-
-http://umbraco.org
-http://our.umbraco.org
-http://umbraco.codeplex.com

docs/IronPython License.Rtf

@@ -1,82 +0,0 @@
-{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f36\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
-{\f39\froman\fcharset238\fprq2 Times New Roman CE;}{\f40\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f42\froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\froman\fcharset162\fprq2 Times New Roman Tur;}
-{\f44\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f45\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f46\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\f399\fswiss\fcharset238\fprq2 Tahoma CE;}{\f400\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f402\fswiss\fcharset161\fprq2 Tahoma Greek;}{\f403\fswiss\fcharset162\fprq2 Tahoma Tur;}{\f404\fswiss\fcharset177\fprq2 Tahoma (Hebrew);}
-{\f405\fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f406\fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f407\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f408\fswiss\fcharset222\fprq2 Tahoma (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;
-\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;
-\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive 
-\ssemihidden Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
-\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
-\f36\fs16\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 \ssemihidden \styrsid668380 Balloon Text;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\listtable{\list\listtemplateid130696116{\listlevel\levelnfc0\levelnfcn0\leveljc0
-\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\fi-360\li2160
-\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
-\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\'02\'05.;}{\levelnumbers\'01;}\fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\fi-360\li5040
-\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
-\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid723138990}}{\*\listoverridetable{\listoverride\listid723138990\listoverridecount0\ls1}}
-{\*\pgptbl {\pgp\ipgp2\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp4\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid288726\rsid668380\rsid1077358\rsid1250157\rsid1778664
-\rsid2232581\rsid3018318\rsid3766585\rsid4417501\rsid4531485\rsid4807452\rsid5341002\rsid7018004\rsid7880391\rsid10749719\rsid12150908\rsid12939982\rsid13596669\rsid15149892\rsid15551579\rsid16128754\rsid16674677}{\*\generator Microsoft Word 11.0.6359;}
-{\info{\title Shared Source License for Software included in Workspaces}{\author suev}{\operator Martin Maly}{\creatim\yr2005\mo3\dy22\hr10\min45}{\revtim\yr2005\mo3\dy22\hr15\min54}{\printim\yr2002\mo9\dy20\hr15\min39}{\version3}{\edmins1}{\nofpages1}
-{\nofwords672}{\nofchars3837}{\*\company Microsoft}{\nofcharsws4501}{\vern24703}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984
-\dghshow1\dgvshow1\jexpand\viewkind5\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
-\asianbrkrule\nojkernpunct\rsidroot15149892 \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
-\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
-{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain 
-\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\fs28\insrsid1250157\charrsid1250157 Shared Source License for }{\b\fs28\insrsid16674677 IronPython}{
-\b\fs28\insrsid1250157 
-\par }{\b\fs28\insrsid5341002 
-\par }{\b\insrsid5341002\charrsid5341002 This license governs use of the accompanying software}{\b\insrsid5341002  (\'93Software\'94)}{\b\insrsid5341002\charrsid5341002 , and your use of the }{\b\insrsid5341002 S}{\b\insrsid5341002\charrsid5341002 
-oftware constitutes acceptance of this license.
-\par }{\insrsid1250157\charrsid5341002 
-\par }{\b\insrsid1250157\charrsid1250157 You }{\b\insrsid5341002 may}{\b\insrsid1250157\charrsid1250157  use }{\b\insrsid5341002 the}{\b\insrsid1250157\charrsid1250157  Software for any }{\b\insrsid1250157 commercial or }{\b\insrsid1250157\charrsid1250157 
-noncommercial purpose, including distributing derivative}{\b\insrsid4417501  work}{\b\insrsid1250157\charrsid1250157 s}{\b\insrsid1250157 .
-\par }{\insrsid1250157 
-\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1250157 {\insrsid1250157\charrsid1250157 In return, we simply require that you agree:
-\par {\listtext\pard\plain\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 1.\tab}}\pard \ql \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid1250157 {\insrsid1250157\charrsid1250157 
-Not to remove any copyright}{\insrsid5341002  or other}{\insrsid1250157\charrsid1250157  notices from the Software. 
-\par {\listtext\pard\plain\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 2.\tab}That if you distribute the Software in source code form you do so only under this }{\insrsid5341002 l}{\insrsid1250157\charrsid1250157 
-icense (i.e. you must include a complete copy of this }{\insrsid5341002 l}{\insrsid1250157\charrsid1250157 icense with your distribution), and if you distribute the Software solely in object form you only do so under a license that complies with this }{
-\insrsid5341002 l}{\insrsid1250157\charrsid1250157 icense. 
-\par {\listtext\pard\plain\b\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 3.\tab}}{\b\insrsid1250157\charrsid1250157 
-That the Software comes "as is", with no warranties. None whatsoever. This means no express, implied or statutory warranty, including without limitation, warranties of merchantability or fitness for a particular purpose or any warranty of }{
-\b\insrsid5341002 title or }{\b\insrsid1250157\charrsid1250157 non}{\b\insrsid5341002 -}{\b\insrsid1250157\charrsid1250157 infringement. Also, you must pass this disclaimer on whenever you distribute the Software}{\b\insrsid5341002  or derivative works}{
-\b\insrsid1250157\charrsid1250157 .}{\insrsid1250157\charrsid1250157  
-\par {\listtext\pard\plain\b\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 4.\tab}}{\b\insrsid1250157\charrsid1250157 That neither Microsoft nor }{\b\insrsid1250157 any contributor to the Software}{\b\insrsid1250157\charrsid1250157 
- will be liable for any of those types of damages known as}{\b\insrsid5341002  }{\b\insrsid1250157\charrsid1250157 indirect, special, consequential, or incidental related to the Software or this }{\b\insrsid5341002 l}{\b\insrsid1250157\charrsid1250157 
-icense, to the maximum extent the law permits, no matter what legal theory it\rquote s based on. Also, you must pass this limitation of liability on whenever you distribute the Software}{\b\insrsid5341002  or derivative works}{
-\b\insrsid1250157\charrsid1250157 .}{\insrsid1250157\charrsid1250157  
-\par {\listtext\pard\plain\insrsid1250157\charrsid1250157 \hich\af0\dbch\af0\loch\f0 5.\tab}That if you sue anyone over patents that you think may apply to the Software for a person's use of the Software, your license to the Software ends automatically. 
-
-\par {\listtext\pard\plain\insrsid1250157 \hich\af0\dbch\af0\loch\f0 6.\tab}}{\insrsid1250157 That the patent rights, if any, }{\insrsid288726 granted in this license}{\insrsid1250157\charrsid1250157  only apply to the Software, not to any derivative}{
-\insrsid4417501  work}{\insrsid1250157\charrsid1250157 s you make.}{\insrsid3018318 
-\par {\listtext\pard\plain\insrsid3018318\charrsid3018318 \hich\af0\dbch\af0\loch\f0 7.\tab}}{\insrsid3018318\charrsid3018318 That if you are an agency of the U.S. Government, (i) Software provided pursuant to a solicitation issued on or after Dece
-mber 1, 1995, is provided with the commercial license rights set forth in this license, and (ii) Software provided pursuant to a solicitation issued prior to December 1, 1995, is provided with \'93Restricted Rights\'94
- as set forth in FAR, 48 C.F.R. 52.227-14 (June 1987) or DFAR, 48 C.F.R. 252.227-7013 (Oct 1988), as applicable.}{\insrsid1250157 
-\par {\listtext\pard\plain\insrsid1250157 \hich\af0\dbch\af0\loch\f0 8.\tab}That your rights under this License end automatically if you breach it in any way.
-\par {\listtext\pard\plain\insrsid5341002 \hich\af0\dbch\af0\loch\f0 9.\tab}}{\insrsid5341002 That all rights not expressly granted to you in this license are reserved.
-\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1778664 {\insrsid1778664 
-\par }{\insrsid12150908 Read below}{\insrsid1778664  for answers to frequently asked questions about this license.
-\par }{\insrsid12150908 
-\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12150908 {\b\insrsid12150908\charrsid12150908 Q: Is this license OSI compliant?
-\par }{\insrsid12150908 
-A: This license has not been submitted to OSI, but it allows developers to take full advantage of a dynamic language on the CLR and to have the freedom to distribute their works for the benefit of the community at large. The license is half of a 
-page long and very straight forward. We believe it stands up to what developers demand of an "open" license.
-\par 
-\par }{\b\insrsid12150908\charrsid12150908 Q: What copyright rights does the license grant me?
-\par }{\insrsid12150908 A: The license grants you a copyright license to make unlimited copies of the Software in sour
-ce or object code form, as well as to create Derivative Works (as that term is defined under US copyright law). This means that in addition to making unlimited copies of the Software, you have a copyright license to modify the Software and to use all or p
-art of the Software to create a Derivative Work.
-\par 
-\par }{\b\insrsid12150908\charrsid12150908 Q: What patent rights does the license grant me?
-\par }{\insrsid12150908 A: This license grants you a patent license to use and distribute the Software under any Microsoft patent claims that read on the Software itself. In other wo
-rds, if you create a modified version of the Software, you still retain the patent license to use and distribute the original portions of the Software under the specific Microsoft patent claims that read on the Software, but you do not have a patent licen
-s
-e as to the new functionality you may have added by modifying the Software. This result is typical of many common open source licenses, including the Common Public License (CPL) and the Mozilla Public License (MPL). In addition, this license grants no rig
-h
-ts to any Microsoft patents that read on other components or files not included in the Software. This means that no patent license is granted to use or distribute any other software or technology that may be needed to use the Software or was created from 
-t
-he Software (for example, any compiled output of the Software, the combination of the Software with other hardware or other software, or any additional enabling technologies that may be necessary to make or use the Software or any final product that inclu
-des the Software).}{\insrsid12150908 
-\par }{\insrsid12150908\charrsid1250157 
-\par }}

docs/README.txt

@@ -1,9 +1,33 @@
-!! Umbraco - the simple, flexible and friendly ASP.NET CMS
+Umbraco - the simple, flexible and friendly ASP.NET CMS
+=======================================================
 For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 57.000 active websites including Heinz.com, Peugeot.com, NAIAS.com and Microsofts documentinteropinitiative.org website you can be sure that the technology is proven, stable and scales.
-[url:More info at http://umbraco.org|http://umbraco.org]
 
-!! Forums
-We have a forum running on [url:http://our.umbraco.org]. The discussions area on CodePlex will be for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [url:http://our.umbraco.org].
+More info at http://umbraco.com
 
-!! Submitting Issues
-Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [url:online guide|http://our.umbraco.org/wiki/how-tos/submitting-bug-reports].
+Exploring the repository
+========================
+Most contributors will work on their own fork and should pick the branch in which they need their fix. For more information see:
+http://our.umbraco.org/contribute/guidelines-for-core-contribution
+
+Exploring the source
+====================
+The Umbraco source code is never required for you to start building sites. If you are not using the source code for debugging purposes or to contribute to the source then please download the binaries listed at http://umbraco.codeplex.com
+
+With that said, the Umbraco solution can be opened in Visual Studio 2010 with SP1 installed or Visual Studio 2012.
+
+Contributing
+============
+Umbraco is Open Source which means you can contribute to make it great!
+Read all about it at http://our.umbraco.org/contribute
+
+Forums
+======
+We have a forum running on http://our.umbraco.org for friendly community support.
+
+Documentation
+=============
+Our documentation section provides help on installing and using Umbraco including API reference documentation: http://our.umbraco.org/documentation
+
+Submitting Issues
+=================
+Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our online guide at http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature

lib/SQLCE4/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable></noInheritable>
+    <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="amd64" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+    <file name="msvcr90.dll" hashalg="SHA1" hash="1b065fdf0cb8516b0553128eae4af39c5f8eeb46"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>Vy8CgQgbu3qH5JHTK0op4kR8114=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="45d3027d87eade77317e92994790598c755b3920"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>QTJu3Gttpt8hhCktGelNeXj4Yp8=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="e77fd69f7c88f34329d8a95c3179f67ead330217"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>1ruqF7/L+m1tqnJVscaOtNRNHIE=</dsig:DigestValue></asmv2:hash></file>
+</assembly>

lib/SQLCE4/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable></noInheritable>
+    <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+    <file name="msvcr90.dll" hashalg="SHA1" hash="98e8006e0a4542e69f1a3555b927758bd76ca07d"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>+CXED+6HzJlSphyMNOn27ujadC0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="3aec3be680024a46813dee891a753bd58b3f3b12"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>MyKED+9DyS+1XcMeaC0Zlw2vFZ0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="0195dd0896d74b62531e4f3c771904a3d996450e"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>EeyDE7og6WoPd2oBhYbMEnpFHhY=</dsig:DigestValue></asmv2:hash></file>
+</assembly>

lib/WebPages/System.Web.Helpers.xml

@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>System.Web.Helpers</name>
+  </assembly>
+  <members>
+    <member name="T:System.Web.Helpers.Chart">
+      <summary>Displays data as a chart image.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.#ctor(System.Int32,System.Int32,System.String,System.String)">
+      <summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.Chart" /> class.</summary>
+      <param name="width">The width, in pixels, of the complete chart image.</param>
+      <param name="height">The height, in pixels, of the complete chart image.</param>
+      <param name="theme">(Optional) The template (theme) to apply to the chart.</param>
+      <param name="themePath">(Optional) The template (theme) path and file name to apply to the chart.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.AddLegend(System.String,System.String)">
+      <summary>Adds a legend to the chart.</summary>
+      <returns>The chart.</returns>
+      <param name="title">The text of the legend title.</param>
+      <param name="name">The unique name of the legend.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.AddSeries(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Collections.IEnumerable,System.String,System.Collections.IEnumerable,System.String)">
+      <summary>Provides data points and series attributes for the chart.</summary>
+      <returns>The chart.</returns>
+      <param name="name">The unique name of the series.</param>
+      <param name="chartType">The chart type of a series.</param>
+      <param name="chartArea">The name of the chart area used to plot the data series.</param>
+      <param name="axisLabel">The axis label text for the series.</param>
+      <param name="legend">The name of the series associated with the legend.</param>
+      <param name="markerStep">A value that determines the granularity to display data point markers.</param>
+      <param name="xValue">The values to plot along the X-axis.</param>
+      <param name="xField">The name of the field for X-values.</param>
+      <param name="yValues">The values to plot along the Y-axis.</param>
+      <param name="yFields">A comma-separated list of name or names of the field or fields for Y-values.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.AddTitle(System.String,System.String)">
+      <summary>Adds a title to the chart.</summary>
+      <returns>The chart.</returns>
+      <param name="text">The title text.</param>
+      <param name="name">The unique name of the title.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.DataBindCrossTable(System.Collections.IEnumerable,System.String,System.String,System.String,System.String,System.String)">
+      <summary>Databinds a chart to a data table, with one series created per unique value in a column.</summary>
+      <returns>The chart.</returns>
+      <param name="dataSource">The chart data source.</param>
+      <param name="groupByField">The name of the column used to group data into the series.</param>
+      <param name="xField">The name of the column for X-values.</param>
+      <param name="yFields">A comma-separated list of names of the columns for Y-values.</param>
+      <param name="otherFields">Other data point properties that can be bound.</param>
+      <param name="pointSortOrder">The order in which the series will be sorted. The default is "Ascending".</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.DataBindTable(System.Collections.IEnumerable,System.String)">
+      <summary>Creates and binds series data to the specified data table, and optionally populates multiple Y-values.</summary>
+      <returns>The chart.</returns>
+      <param name="dataSource">The chart data source.</param>
+      <param name="xField">The name of the table column used for the series X-values.</param>
+    </member>
+    <member name="P:System.Web.Helpers.Chart.FileName">
+      <summary>Gets or sets the name of the file that contains the chart image.</summary>
+      <returns>The name of the file.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.GetBytes(System.String)">
+      <summary>Returns a chart image as a byte array.</summary>
+      <returns>The chart.</returns>
+      <param name="format">The image format. The default is "jpeg".</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.GetFromCache(System.String)">
+      <summary>Retrieves the specified chart from cache.</summary>
+      <returns>The chart.</returns>
+      <param name="key">The identifier of the cache item that contains the chart to retrieve. The key is set when you call the <see cref="M:System.Web.Helpers.Chart.SaveToCache(System.String,System.Int32,System.Boolean)" /> method.</param>
+    </member>
+    <member name="P:System.Web.Helpers.Chart.Height">
+      <summary>Gets or sets the height of the chart image.</summary>
+      <returns>The chart height.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.Save(System.String,System.String)">
+      <summary>Saves a chart image to the specified path and file name.</summary>
+      <returns>The chart.</returns>
+      <param name="path">The location and name of the image file.</param>
+      <param name="format">The image file format.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.SaveToCache(System.String,System.Int32,System.Boolean)">
+      <summary>Saves a chart in the system cache.</summary>
+      <returns>Returns <see cref="T:System.String" />.</returns>
+      <param name="key">The identifier for the chart in the cache.</param>
+      <param name="minutesToCache">The number of minutes to keep the chart image in the cache. The default is 20.</param>
+      <param name="slidingExpiration">true to indicate that the chart cache item's expiration is reset each time the item is accessed, or false to indicate that the expiration is based on an absolute interval since the time that the item was added to the cache. </param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.SaveXml(System.String)">
+      <summary>Saves a chart as an XML file.</summary>
+      <returns>The chart.</returns>
+      <param name="path">The path and filename to save the XML file to.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.SetXAxis(System.String,System.Double,System.Double)">
+      <summary>Sets values for the horizontal axis.</summary>
+      <returns>The chart.</returns>
+      <param name="title">The title of the horizontal axis.</param>
+      <param name="min">The minimum value for the horizontal axis.</param>
+      <param name="max">The maximum value for the horizontal axis.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.SetYAxis(System.String,System.Double,System.Double)">
+      <summary>Sets values for the vertical axis.</summary>
+      <returns>The chart.</returns>
+      <param name="title">The title of the vertical axis.</param>
+      <param name="min">The minimum value for the vertical axis.</param>
+      <param name="max">The maximum value for the vertical axis.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.ToWebImage(System.String)">
+      <summary>Creates a <see cref="T:System.Web.Helpers.WebImage" /> object based on the current <see cref="T:System.Web.Helpers.Chart" /> object.</summary>
+      <returns>The chart.</returns>
+      <param name="format">The format of the image to save the <see cref="T:System.Web.Helpers.WebImage" /> object as. The default is jpeg.</param>
+    </member>
+    <member name="P:System.Web.Helpers.Chart.Width">
+      <summary>Gets or set the width of the chart image.</summary>
+      <returns>The chart width.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.Write(System.String)">
+      <summary>Renders the output of the <see cref="T:System.Web.Helpers.Chart" /> object as an image.</summary>
+      <returns>The chart.</returns>
+      <param name="format">The format of the image. The default is "jpeg".</param>
+    </member>
+    <member name="M:System.Web.Helpers.Chart.WriteFromCache(System.String,System.String)">
+      <summary>Renders the output of a <see cref="T:System.Web.Helpers.Chart" /> object that has been cached as an image.</summary>
+      <returns>The chart.</returns>
+      <param name="key">The identifier for the chart in the cache.</param>
+      <param name="format">The format of the image. The default is "jpeg".</param>
+    </member>
+    <member name="T:System.Web.Helpers.ChartTheme"></member>
+    <member name="F:System.Web.Helpers.ChartTheme.Blue"></member>
+    <member name="F:System.Web.Helpers.ChartTheme.Green"></member>
+    <member name="F:System.Web.Helpers.ChartTheme.Vanilla"></member>
+    <member name="F:System.Web.Helpers.ChartTheme.Vanilla3D"></member>
+    <member name="F:System.Web.Helpers.ChartTheme.Yellow"></member>
+    <member name="T:System.Web.Helpers.Crypto">
+      <summary>Provides methods to encrypt passwords or other sensitive data.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.Crypto.GenerateSalt(System.Int32)"></member>
+    <member name="M:System.Web.Helpers.Crypto.Hash(System.Byte[],System.String)">
+      <summary>Returns a hash value for the specified byte array.</summary>
+      <returns>The hash value for <paramref name="input" />.</returns>
+      <param name="input">The data to provide a hash value for.</param>
+      <param name="algorithm">The algorithm used to generate the hash value. The default is "sha256".</param>
+    </member>
+    <member name="M:System.Web.Helpers.Crypto.Hash(System.String,System.String)">
+      <summary>Returns a hash value for the specified string.</summary>
+      <returns>The hash value for <paramref name="input" />.</returns>
+      <param name="input">The data to provide a hash value for.</param>
+      <param name="algorithm">The algorithm used to generate the hash value. The default is "sha256".</param>
+    </member>
+    <member name="M:System.Web.Helpers.Crypto.HashPassword(System.String)">
+      <summary>Returns a hash value for the specified password.</summary>
+      <returns>The hash value for <paramref name="password" />.</returns>
+      <param name="password">The password to generate a hash value for.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Crypto.SHA1(System.String)"></member>
+    <member name="M:System.Web.Helpers.Crypto.SHA256(System.String)"></member>
+    <member name="M:System.Web.Helpers.Crypto.VerifyHashedPassword(System.String,System.String)"></member>
+    <member name="T:System.Web.Helpers.DynamicJsonArray"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonArray.#ctor(System.Object[])"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonArray.GetEnumerator"></member>
+    <member name="P:System.Web.Helpers.DynamicJsonArray.Item(System.Int32)"></member>
+    <member name="P:System.Web.Helpers.DynamicJsonArray.Length"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonArray.op_Implicit(System.Web.Helpers.DynamicJsonArray)~System.Array"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonArray.op_Implicit(System.Web.Helpers.DynamicJsonArray)~System.Object[]"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonArray.System#Collections#Generic#IEnumerable{T}#GetEnumerator"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonArray.TryConvert(System.Dynamic.ConvertBinder,System.Object@)"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonArray.TryGetMember(System.Dynamic.GetMemberBinder,System.Object@)"></member>
+    <member name="T:System.Web.Helpers.DynamicJsonObject"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonObject.#ctor(System.Collections.Generic.IDictionary{System.String,System.Object})"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonObject.GetDynamicMemberNames"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonObject.TryConvert(System.Dynamic.ConvertBinder,System.Object@)"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonObject.TryGetIndex(System.Dynamic.GetIndexBinder,System.Object[],System.Object@)"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonObject.TryGetMember(System.Dynamic.GetMemberBinder,System.Object@)"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonObject.TrySetIndex(System.Dynamic.SetIndexBinder,System.Object[],System.Object)"></member>
+    <member name="M:System.Web.Helpers.DynamicJsonObject.TrySetMember(System.Dynamic.SetMemberBinder,System.Object)"></member>
+    <member name="T:System.Web.Helpers.Json">
+      <summary>Provides methods for working with data in JavaScript Object Notation (JSON) format.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.Json.Decode``1(System.String)">
+      <summary>Converts data in JavaScript Object Notation (JSON) format into the specified strongly typed data list.</summary>
+      <returns>The JSON-encoded data converted to a strongly typed list.</returns>
+      <param name="value">The JSON-encoded string to convert.</param>
+      <typeparam name="T">The type of the strongly typed list to convert JSON data into.</typeparam>
+    </member>
+    <member name="M:System.Web.Helpers.Json.Decode(System.String)">
+      <summary>Converts data in JavaScript Object Notation (JSON) format into a data object.</summary>
+      <returns>The JSON-encoded data converted to a data object.</returns>
+      <param name="value">The JSON-encoded string to convert.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Json.Decode(System.String,System.Type)">
+      <summary>Converts data in JavaScript Object Notation (JSON) format into a data object of a specified type.</summary>
+      <returns>The JSON-encoded data converted to the specified type.</returns>
+      <param name="value">The JSON-encoded string to convert.</param>
+      <param name="targetType">The type that the <paramref name="value" /> data should be converted to.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Json.Encode(System.Object)">
+      <summary>Converts a data object to a string that is in the JavaScript Object Notation (JSON) format.</summary>
+      <returns>Returns a string of data converted to the JSON format.</returns>
+      <param name="value">The data object to convert.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Json.Write(System.Object,System.IO.TextWriter)">
+      <summary>Converts a data object to a string in JavaScript Object Notation (JSON) format and adds the string to the specified <see cref="T:System.IO.TextWriter" /> object.</summary>
+      <param name="value">The data object to convert.</param>
+      <param name="writer">The object that contains the converted JSON data.</param>
+    </member>
+    <member name="T:System.Web.Helpers.ObjectInfo">
+      <summary>Renders the property names and values of the specified object and any subobjects that it references.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.ObjectInfo.Print(System.Object,System.Int32,System.Int32)">
+      <summary>Renders the property names and values of the specified object and any subobjects that it references.</summary>
+      <returns>For a simple variable, returns the type and the value. For an object that contains multiple items, returns the property name or key, and the value for each property.</returns>
+      <param name="value">The object to render information for.</param>
+      <param name="depth">Optional. Specifies the depth of nested subobjects to render information for. The default is 10.</param>
+      <param name="enumerationLength">Optional.  Specifies the maximum number of characters that the method displays for object values. The default is 1000.</param>
+      <exception cref="T:System.ArgumentOutOfRangeException">
+        <paramref name="depth" /> is less than zero.</exception>
+      <exception cref="T:System.ArgumentOutOfRangeException">
+        <paramref name="enumerationLength" /> is less than or equal to zero.</exception>
+    </member>
+    <member name="T:System.Web.Helpers.ServerInfo">
+      <summary>Displays information about the Web server environment that hosts the current Web page.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.ServerInfo.GetHtml">
+      <summary>Displays information about the Web server environment.</summary>
+      <returns>A string of name-value pairs that contains information about the Web server. </returns>
+    </member>
+    <member name="T:System.Web.Helpers.SortDirection">
+      <summary>Specifies the direction in which to sort a list of items.</summary>
+    </member>
+    <member name="F:System.Web.Helpers.SortDirection.Ascending">
+      <summary>Sort from smallest to largest. For example, from A to Z.</summary>
+    </member>
+    <member name="F:System.Web.Helpers.SortDirection.Descending">
+      <summary>Sort from largest to smallest. For example, from Z to A.</summary>
+    </member>
+    <member name="T:System.Web.Helpers.WebCache">
+      <summary>Provides a cache to store frequently accessed data.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.WebCache.Get(System.String)">
+      <summary>Retrieves the specified item from the <see cref="T:System.Web.Helpers.WebCache" /> object.</summary>
+      <returns>The item retrieved from the cache, or null if the item is not found.</returns>
+      <param name="key">The identifier for the cache item to retrieve.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebCache.Remove(System.String)">
+      <summary>Removes the specified item from the <see cref="T:System.Web.Helpers.WebCache" /> object.</summary>
+      <returns>The item removed from the <see cref="T:System.Web.Helpers.WebCache" /> object. If the item is not found, returns null.</returns>
+      <param name="key">The identifier for the cache item to remove.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebCache.Set(System.String,System.Object,System.Int32,System.Boolean)">
+      <summary>Inserts an item into the <see cref="T:System.Web.Helpers.WebCache" /> object.</summary>
+      <param name="key">The identifier for the cache item.</param>
+      <param name="value">The data to insert into the cache.</param>
+      <param name="minutesToCache">Optional. The number of minutes to keep an item in the cache. The default is 20.</param>
+      <param name="slidingExpiration">Optional. true to indicate that the cache item expiration is reset each time the item is accessed, or false to indicate that the expiration is based on an absolute interval since the time that the item was added to the cache. The default is true, which means that, if you also use the default value for the <paramref name="minutesToCache" /> parameter, a cached item expires 20 minutes after it was last accessed.</param>
+      <exception cref="T:System.ArgumentOutOfRangeException">The value of <paramref name="minutesToCache" /> is less than or equal to zero.</exception>
+      <exception cref="T:System.ArgumentOutOfRangeException">Sliding expiration is enabled and the value of <paramref name="minutesToCache" /> is greater than a year.</exception>
+    </member>
+    <member name="T:System.Web.Helpers.WebGrid">
+      <summary>Displays data using an HTML table.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.#ctor(System.Collections.Generic.IEnumerable{System.Object},System.Collections.Generic.IEnumerable{System.String},System.String,System.Int32,System.Boolean,System.Boolean,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+      <summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebGrid" /> class.</summary>
+      <param name="source">The data to display.</param>
+      <param name="columnNames">A collection of data source column names. By default, this value is auto-populated.</param>
+      <param name="defaultSort">The column name that is used to sort the table by default.</param>
+      <param name="rowsPerPage">The number of rows that are displayed when paging is displayed. The default is 10.</param>
+      <param name="canPage">true to specify that the <see cref="T:System.Web.Helpers.WebGrid" /> object can display paging; otherwise false. The default is true. </param>
+      <param name="canSort">true to specify that the <see cref="T:System.Web.Helpers.WebGrid" /> object can sort based on column; otherwise, false. The default is true.</param>
+      <param name="ajaxUpdateContainerId">The ID of the HTML element in the <see cref="T:System.Web.Helpers.WebGrid" /> instance that is used for Ajax support in order in order to make partial page updates.</param>
+      <param name="ajaxUpdateCallback">The JavaScript function to call after the HTML element specified by the <see cref="P:System.Web.Helpers.WebGrid.AjaxUpdateContainerId" /> property has been updated.</param>
+      <param name="fieldNamePrefix">The prefix for query-string fields. This value is used in order to support multiple T:System.Web.Helpers.WebGrid objects on the same page.</param>
+      <param name="pageFieldName">The query-string field name for the page number.</param>
+      <param name="selectionFieldName">The query-string field name for the selected row number.</param>
+      <param name="sortFieldName">The query-string field name for the sort column.</param>
+      <param name="sortDirectionFieldName">The query-string field name for the sort direction.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.AjaxUpdateCallback">
+      <summary>Gets the name of the JavaScript function to call after the HTML element specified by the <see cref="P:System.Web.Helpers.WebGrid.AjaxUpdateContainerId" /> property has been updated.</summary>
+      <returns>The element name.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.AjaxUpdateContainerId">
+      <summary>Gets the ID of the HTML element in the <see cref="T:System.Web.Helpers.WebGrid" /> object that is used for Ajax support in order to make partial-page updates.</summary>
+      <returns>The element ID.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.Bind(System.Collections.Generic.IEnumerable{System.Object},System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Int32)">
+      <summary>Binds the specified data to the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
+      <returns>The populated <see cref="T:System.Web.Helpers.WebGrid" /> object.</returns>
+      <param name="source">The data to display.</param>
+      <param name="columnNames">The names of the columns to bind.</param>
+      <param name="autoSortAndPage">true to enable sorting and paging; otherwise, false.</param>
+      <param name="rowCount">The number of rows to display for each page of data.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.Column(System.String,System.String,System.Func`2,System.Boolean,System.Object)">
+      <summary>Adds a column object to the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
+      <returns>A column object.</returns>
+      <param name="columnName">The name of the column.</param>
+      <param name="header">The header of the column.</param>
+      <param name="format">A string that specifies the formatting of the column.</param>
+      <param name="style">A string that specifies the style of the column.</param>
+      <param name="canSort">true if the column can be sorted; otherwise, false. The default is true.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.ColumnNames">
+      <summary>Gets a collection of column names from the data source.</summary>
+      <returns>The collection of column names.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.Columns(System.Web.Helpers.WebGridColumn[])">
+      <summary>Adds a collection of column objects to the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
+      <returns>A set of columns.</returns>
+      <param name="columnSet">The columns to add.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.FieldNamePrefix">
+      <summary>Gets the prefix for query-string fields of a page.</summary>
+      <returns>The prefix for query-string fields.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.GetContainerUpdateScript(System.String)">
+      <summary>Converts a URL into a jQuery Ajax call.</summary>
+      <returns>A script used as a jQuery Ajax call.</returns>
+      <param name="path">The URL to convert.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.GetHtml(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String,System.Collections.Generic.IEnumerable{System.Web.Helpers.WebGridColumn},System.Collections.Generic.IEnumerable{System.String},System.Web.Helpers.WebGridPagerModes,System.String,System.String,System.String,System.String,System.Int32,System.Object)">
+      <summary>Returns HTML that is used to render the <see cref="T:System.Web.Helpers.WebGrid" /> instance.</summary>
+      <returns>The HTML that represents the populated <see cref="T:System.Web.Helpers.WebGrid" /> object.</returns>
+      <param name="tableStyle">The CSS class to use to style the table.</param>
+      <param name="headerStyle">The CSS class to use to style the header row of the table.</param>
+      <param name="footerStyle">The CSS class to use to style the footer row of the table.</param>
+      <param name="rowStyle">The CSS class to use to style each row of the table.</param>
+      <param name="alternatingRowStyle">The CSS class to use to style the even rows of the table.</param>
+      <param name="selectedRowStyle">The CSS class to use to style the selected rows of the table.</param>
+      <param name="caption">The caption for the table.</param>
+      <param name="displayHeader">true to specify that the header of the table is displayed; otherwise, false. The default is true.</param>
+      <param name="fillEmptyRows">true to specify that the table can add empty rows to ensure the <see cref="P:System.Web.Helpers.WebGrid.RowsPerPage" /> row count is maintained; otherise, false. The default is false.</param>
+      <param name="emptyRowCellValue">The text that is used to populate empty rows. The <paramref name="fillEmptyRows" /> parameter must be set to true to display this value.</param>
+      <param name="columns">The column model for customizing column rendering.</param>
+      <param name="exclusions">The columns to exclude when auto-populating columns.</param>
+      <param name="mode">A <see cref="T:System.Web.Helpers.WebGridPagerModes" /> value specifying the mode for rendering paging support.</param>
+      <param name="firstText">The text for the link to the first page.</param>
+      <param name="previousText">The text for the link to the previous page.</param>
+      <param name="nextText">The text for the link to the next page.</param>
+      <param name="lastText">The text for the link to the last page.</param>
+      <param name="numericLinksCount">The number of numeric links to display.</param>
+      <param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.GetPageUrl(System.Int32)">
+      <summary>Returns the URL of the page that the <see cref="T:System.Web.Helpers.WebGrid" /> object will display based on the specified page index.</summary>
+      <returns>The URL of the page that the <see cref="T:System.Web.Helpers.WebGrid" /> object will display.</returns>
+      <param name="pageIndex">The index of the page to display.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.GetSortUrl(System.String)">
+      <summary>Returns a URL used to display the sorted data in the <see cref="T:System.Web.Helpers.WebGrid" /> object based on a column name.</summary>
+      <returns>The url used to display the sorted data.</returns>
+      <param name="column">The name of the column to sort the grid by.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.HasSelection">
+      <summary>Gets a value that determines whether any row in the <see cref="T:System.Web.Helpers.WebGrid" /> object has been selected.</summary>
+      <returns>true if a row has been selected; otherwise, false.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.PageCount">
+      <summary>Gets the number of pages that the <see cref="T:System.Web.Helpers.WebGrid" /> object has available to display.</summary>
+      <returns>The page count.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.PageFieldName">
+      <summary>Gets the query string field name for the page number of the WebGrid.</summary>
+      <returns>The column name.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.PageIndex">
+      <summary>Gets or sets the index of the current page to display.</summary>
+      <returns>The current page index.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.Pager(System.Web.Helpers.WebGridPagerModes,System.String,System.String,System.String,System.String,System.Int32)">
+      <summary>Returns the HTML that is required to provide paging support.</summary>
+      <param name="mode">A <see cref="T:System.Web.Helpers.WebGridPagerModes" /> value that specifies paging support.</param>
+      <param name="firstText">The text for the link to the first page.</param>
+      <param name="previousText">The text for the link to the previous page.</param>
+      <param name="nextText">The text for the link to the next page.</param>
+      <param name="lastText">The test for the link to the last page.</param>
+      <param name="numericLinksCount">The number of numeric links to display.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.Rows">
+      <summary>Gets a list of rows that are in the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
+      <returns>The collection of rows.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.RowsPerPage">
+      <summary>Gets the number of rows to display on each page.</summary>
+      <returns>The row count for a page.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.SelectedIndex">
+      <summary>Gets or sets the index of the selected row.</summary>
+      <returns>The row index.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.SelectedRow">
+      <summary>Gets the selected row of the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
+      <returns>The selected row.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.SelectionFieldName">
+      <summary>Gets the query string field name for the selected row number of the WebGrid.</summary>
+      <returns>The name of the selected column.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.SortColumn">
+      <summary>Gets or sets the name of the column that is used to sort the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
+      <returns>The name of the sort column.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.SortDirection">
+      <summary>Gets or sets the direction that the <see cref="T:System.Web.Helpers.WebGrid" /> object is sorted.</summary>
+      <returns>The sort direction.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.SortDirectionFieldName">
+      <summary>Gets the query string field name for the sort direction of the WebGrid. </summary>
+      <returns>The column prefix and name.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.SortFieldName">
+      <summary>Gets the query string field name for the sort column of the WebGrid. </summary>
+      <returns>The sort column name.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebGrid.Table(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String,System.Collections.Generic.IEnumerable{System.Web.Helpers.WebGridColumn},System.Collections.Generic.IEnumerable{System.String},System.Func`2,System.Boolean)">
+      <summary>Returns the HTML that is used to render the <see cref="T:System.Web.Helpers.WebGrid" /> instance that supports paging.</summary>
+      <returns>The HTML that represents the populated <see cref="T:System.Web.Helpers.WebGrid" /> object.</returns>
+      <param name="tableStyle">The CSS class to use to style the table.</param>
+      <param name="headerStyle">The CSS class to use to style the header row.</param>
+      <param name="footerStyle">The CSS class to use to style the footer row.</param>
+      <param name="rowStyle">The CSS class to use to style odd rows.</param>
+      <param name="alternatingRowStyle">The CSS class to use to style even rows.</param>
+      <param name="selectedRowStyle">The CSS class used to use to style the selected row.</param>
+      <param name="caption">The caption for the table.</param>
+      <param name="displayHeader">true to specify that the header of the table is displayed; otherwise, false. The default is true.</param>
+      <param name="fillEmptyRows">true to specify that the table can add empty rows to ensure the <see cref="P:System.Web.Helpers.WebGrid.RowsPerPage" /> row count is maintained; otherise, false. The default is false.</param>
+      <param name="emptyRowCellValue">The text that is used to populate empty rows. The <paramref name="fillEmptyRows" /> parameter must be set to true to display this value.</param>
+      <param name="columns">The column model that is used to customize column rendering.</param>
+      <param name="exclusions">The columns to exclude when auto-populating columns.</param>
+      <param name="footer">The table footer template.</param>
+      <param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebGrid.TotalRowCount">
+      <summary>Gets the total row count for the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
+      <returns>The row count.</returns>
+    </member>
+    <member name="T:System.Web.Helpers.WebGridColumn"></member>
+    <member name="M:System.Web.Helpers.WebGridColumn.#ctor"></member>
+    <member name="P:System.Web.Helpers.WebGridColumn.CanSort"></member>
+    <member name="P:System.Web.Helpers.WebGridColumn.ColumnName"></member>
+    <member name="P:System.Web.Helpers.WebGridColumn.Format"></member>
+    <member name="P:System.Web.Helpers.WebGridColumn.Header"></member>
+    <member name="P:System.Web.Helpers.WebGridColumn.Style"></member>
+    <member name="T:System.Web.Helpers.WebGridPagerModes"></member>
+    <member name="F:System.Web.Helpers.WebGridPagerModes.Numeric">
+      <summary />
+    </member>
+    <member name="F:System.Web.Helpers.WebGridPagerModes.NextPrevious">
+      <summary />
+    </member>
+    <member name="F:System.Web.Helpers.WebGridPagerModes.FirstLast">
+      <summary />
+    </member>
+    <member name="F:System.Web.Helpers.WebGridPagerModes.All">
+      <summary />
+    </member>
+    <member name="T:System.Web.Helpers.WebGridRow"></member>
+    <member name="M:System.Web.Helpers.WebGridRow.#ctor(System.Web.Helpers.WebGrid,System.Object,System.Int32)"></member>
+    <member name="M:System.Web.Helpers.WebGridRow.GetEnumerator"></member>
+    <member name="M:System.Web.Helpers.WebGridRow.GetSelectLink(System.String)"></member>
+    <member name="M:System.Web.Helpers.WebGridRow.GetSelectUrl"></member>
+    <member name="P:System.Web.Helpers.WebGridRow.Item(System.Int32)"></member>
+    <member name="P:System.Web.Helpers.WebGridRow.Item(System.String)"></member>
+    <member name="M:System.Web.Helpers.WebGridRow.System#Collections#IEnumerable#GetEnumerator"></member>
+    <member name="M:System.Web.Helpers.WebGridRow.ToString"></member>
+    <member name="M:System.Web.Helpers.WebGridRow.TryGetMember(System.Dynamic.GetMemberBinder,System.Object@)"></member>
+    <member name="P:System.Web.Helpers.WebGridRow.Value"></member>
+    <member name="P:System.Web.Helpers.WebGridRow.WebGrid"></member>
+    <member name="T:System.Web.Helpers.WebImage">
+      <summary>Represents an object that lets you display and manage images in in a Web page.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.#ctor(System.Byte[])">
+      <summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebImage" /> class using a byte array to represent the image.</summary>
+      <param name="content">The image.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.#ctor(System.IO.Stream)">
+      <summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebImage" /> class using a stream to represent the image.</summary>
+      <param name="imageStream">The image.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.#ctor(System.String)">
+      <summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebImage" /> class using a path to represent the image location.</summary>
+      <param name="filePath">The path of the file that contains the image.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.AddImageWatermark(System.String,System.Int32,System.Int32,System.String,System.String,System.Int32,System.Int32)">
+      <summary>Adds a watermark image to the image using the specified image file.</summary>
+      <returns>The image.</returns>
+      <param name="watermarkImageFilePath">The path of a file that contains the image.</param>
+      <param name="width">The width, in pixels, of the watermark image.</param>
+      <param name="height">The height, in pixels, of the watermark image.</param>
+      <param name="horizontalAlign">The horizontal alignment for watermark image. Values can be left, right, or center.</param>
+      <param name="verticalAlign">The vertical alignment for the watermark image. Values can be top, bottom, or middle.</param>
+      <param name="opacity">The opacity for the watermark image, specified as a value between 0 and 100.</param>
+      <param name="padding">The size, in pixels, of the padding around the watermark image.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.AddImageWatermark(System.Web.Helpers.WebImage,System.Int32,System.Int32,System.String,System.String,System.Int32,System.Int32)">
+      <summary>Adds a watermark image to the image using the specified <see cref="T:System.Web.Helpers.WebImage" /> object.</summary>
+      <returns>The image.</returns>
+      <param name="watermarkImage">A <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
+      <param name="width">The width, in pixels, of the watermark image.</param>
+      <param name="height">The height, in pixels, of the watermark image.</param>
+      <param name="horizontalAlign">The horizontal alignment for watermark image. Values can be left, right, or center.</param>
+      <param name="verticalAlign">The vertical alignment for the watermark image. Values can be top, bottom, or middle.</param>
+      <param name="opacity">The opacity for the watermark image specifies as a value between 0 and 100.</param>
+      <param name="padding">The size, in pixels, of the padding around the watermark image.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.AddTextWatermark(System.String,System.String,System.Int32,System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
+      <summary>Adds watermark text to the image.</summary>
+      <returns>The image.</returns>
+      <param name="text">The text to use as a watermark.</param>
+      <param name="fontColor">The color of the watermark text.</param>
+      <param name="fontSize">The font size of the watermark text.</param>
+      <param name="fontStyle">The font style of the watermark text.</param>
+      <param name="fontFamily">The font type of the watermark text.</param>
+      <param name="horizontalAlign">The horizontal alignment for watermark text. Values can be left, right, or center.</param>
+      <param name="verticalAlign">The vertical alignment for the watermark text. Values can be top, bottom, or middle.</param>
+      <param name="opacity">The text opacity for the watermark text specified as a value between 0 and 100.</param>
+      <param name="padding">The size, in pixels, of the padding around the watermark text.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.Clone">
+      <summary>Copies the <see cref="T:System.Web.Helpers.WebImage" /> object.</summary>
+      <returns>The image.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.Crop(System.Int32,System.Int32,System.Int32,System.Int32)">
+      <summary>Crops an image.</summary>
+      <returns>The cropped image.</returns>
+      <param name="top">The number of pixels to remove from the top.</param>
+      <param name="left">The number of pixels to remove from the left.</param>
+      <param name="bottom">The number of pixels to remove from the bottom.</param>
+      <param name="right">The number of pixels to remove from the right.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebImage.FileName">
+      <summary>Gets or sets the name of the file used by the <see cref="T:System.Web.Helpers.WebImage" /> object.</summary>
+      <returns>The file name</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.FlipHorizontal">
+      <summary>Flips an image horizontally.</summary>
+      <returns>The flipped image.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.FlipVertical">
+      <summary>Flips an image vertically.</summary>
+      <returns>The flipped image.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.GetBytes(System.String)">
+      <summary>Returns the image as a byte array.</summary>
+      <returns>The image.</returns>
+      <param name="requestedFormat">The <see cref="P:System.Web.Helpers.WebImage.ImageFormat" /> of the <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.GetImageFromRequest(System.String)">
+      <summary>Returns an image that has been uploaded using the browser.</summary>
+      <returns>The image.</returns>
+      <param name="postedFileName">(Optional) The name of the file that has been posted.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebImage.Height">
+      <summary>Gets the height, in pixels, of the image.</summary>
+      <returns>The height.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebImage.ImageFormat">
+      <summary>Gets the format of the image (for example, JPEG or PNG).</summary>
+      <returns>The format.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.Resize(System.Int32,System.Int32,System.Boolean,System.Boolean)">
+      <summary>Resizes an image.</summary>
+      <returns>The resized image.</returns>
+      <param name="width">The width, in pixels, of the <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
+      <param name="height">The height, in pixels, of the <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
+      <param name="preserveAspectRatio">true to preserve the aspect ratio of the image; otherwise, false.</param>
+      <param name="preventEnlarge">true to prevent the enlargement of the image; otherwise, false.</param>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.RotateLeft">
+      <summary>Rotates an image to the left.</summary>
+      <returns>The rotated image.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.RotateRight">
+      <summary>Rotates an image to the right.</summary>
+      <returns>The rotated image.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.Save(System.String,System.String,System.Boolean)">
+      <summary>Saves the image using the specified file name.</summary>
+      <returns>The image.</returns>
+      <param name="filePath">The path to save the image to.</param>
+      <param name="imageFormat">The format used when saving the image file.</param>
+      <param name="forceCorrectExtension">true to force that the correct file extension is used for the format specified in <paramref name="imageFormat" />; otherwise, false.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebImage.Width">
+      <summary>Gets the width, in pixels, of the image.</summary>
+      <returns>The width.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebImage.Write(System.String)">
+      <summary>Renders an image to the browser to be displayed.</summary>
+      <returns>The image.</returns>
+      <param name="requestedFormat">(Optional) The file format.</param>
+    </member>
+    <member name="T:System.Web.Helpers.WebMail">
+      <summary>Provides a way to construct and send an email message using Simple Mail Transfer Protocol (SMTP).</summary>
+    </member>
+    <member name="P:System.Web.Helpers.WebMail.EnableSsl">
+      <summary>Gets or sets whether Secure Sockets Layer (SSL) is used to encrypt the connection when sending email.</summary>
+      <returns>true if SSL is used to encrypt the connection; otherwise, false.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebMail.From">
+      <summary>Gets or sets the email address of the sender.</summary>
+      <returns>The email address of the sender.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebMail.Password">
+      <summary>Gets or sets the sender’s password based on the email account used.</summary>
+      <returns>The password of the sender.</returns>
+    </member>
+    <member name="M:System.Web.Helpers.WebMail.Send(System.String,System.String,System.String,System.String,System.String,System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Collections.Generic.IEnumerable{System.String})">
+      <summary>Sends the specified message to an SMTP server for delivery.</summary>
+      <param name="to">The recipients of this email message. Multiple recipients can be specified by separating them using a semicolon (;).</param>
+      <param name="subject">The subject line for the email message.</param>
+      <param name="body">The body of the email message. If <paramref name="isBodyHtml" /> is true, HTML in the body is interpreted as markup.</param>
+      <param name="from">The email address of the message sender.</param>
+      <param name="cc">The carbon copy (CC) recipients for the email message, if any.</param>
+      <param name="filesToAttach">A collection of file names that specifies the files to attach to the email message.</param>
+      <param name="isBodyHtml">true to specify that the  email message body is in HTML format; false to indicate that the body is in plain-text format.</param>
+      <param name="additionalHeaders">A collection of headers that are sent with this email message.</param>
+    </member>
+    <member name="P:System.Web.Helpers.WebMail.SmtpPort">
+      <summary>Gets or sets the port used for SMTP transactions.</summary>
+      <returns>The port used for SMTP transactions.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebMail.SmtpServer">
+      <summary>Gets or sets the SMTP server used to transmit the email message.</summary>
+      <returns>The SMTP server.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebMail.SmtpUseDefaultCredentials">
+      <summary>Gets or sets a value that indicates whether the default credentials are sent with the requests.</summary>
+      <returns>true if credentials are sent with the email message; otherwise, false.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.WebMail.UserName">
+      <summary>Gets or sets the name of email account name used to send email.</summary>
+      <returns>The name of the user.</returns>
+    </member>
+  </members>
+</doc>

lib/WebPages/System.Web.Razor.xml

@@ -0,0 +1,866 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>System.Web.Razor</name>
+  </assembly>
+  <members>
+    <member name="T:System.Web.Razor.CSharpRazorCodeLanguage"></member>
+    <member name="M:System.Web.Razor.CSharpRazorCodeLanguage.#ctor"></member>
+    <member name="P:System.Web.Razor.CSharpRazorCodeLanguage.CodeDomProviderType"></member>
+    <member name="M:System.Web.Razor.CSharpRazorCodeLanguage.CreateCodeGenerator(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
+    <member name="M:System.Web.Razor.CSharpRazorCodeLanguage.CreateCodeParser"></member>
+    <member name="P:System.Web.Razor.CSharpRazorCodeLanguage.LanguageName"></member>
+    <member name="T:System.Web.Razor.DocumentParseCompleteEventArgs"></member>
+    <member name="M:System.Web.Razor.DocumentParseCompleteEventArgs.#ctor"></member>
+    <member name="P:System.Web.Razor.DocumentParseCompleteEventArgs.GeneratorResults"></member>
+    <member name="P:System.Web.Razor.DocumentParseCompleteEventArgs.SourceChange"></member>
+    <member name="P:System.Web.Razor.DocumentParseCompleteEventArgs.TreeStructureChanged"></member>
+    <member name="T:System.Web.Razor.GeneratorResults"></member>
+    <member name="M:System.Web.Razor.GeneratorResults.#ctor(System.Boolean,System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError},System.CodeDom.CodeCompileUnit,System.Collections.Generic.IDictionary{System.Int32,System.Web.Razor.Generator.GeneratedCodeMapping})"></member>
+    <member name="M:System.Web.Razor.GeneratorResults.#ctor(System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError},System.CodeDom.CodeCompileUnit,System.Collections.Generic.IDictionary{System.Int32,System.Web.Razor.Generator.GeneratedCodeMapping})"></member>
+    <member name="M:System.Web.Razor.GeneratorResults.#ctor(System.Web.Razor.ParserResults,System.CodeDom.CodeCompileUnit,System.Collections.Generic.IDictionary{System.Int32,System.Web.Razor.Generator.GeneratedCodeMapping})"></member>
+    <member name="P:System.Web.Razor.GeneratorResults.DesignTimeLineMappings"></member>
+    <member name="P:System.Web.Razor.GeneratorResults.GeneratedCode"></member>
+    <member name="T:System.Web.Razor.ParserResults"></member>
+    <member name="M:System.Web.Razor.ParserResults.#ctor(System.Boolean,System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
+    <member name="M:System.Web.Razor.ParserResults.#ctor(System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
+    <member name="P:System.Web.Razor.ParserResults.Document"></member>
+    <member name="P:System.Web.Razor.ParserResults.ParserErrors"></member>
+    <member name="P:System.Web.Razor.ParserResults.Success"></member>
+    <member name="T:System.Web.Razor.PartialParseResult"></member>
+    <member name="F:System.Web.Razor.PartialParseResult.Rejected">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.PartialParseResult.Accepted">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.PartialParseResult.Provisional">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.PartialParseResult.SpanContextChanged">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.PartialParseResult.AutoCompleteBlock">
+      <summary />
+    </member>
+    <member name="T:System.Web.Razor.RazorCodeLanguage"></member>
+    <member name="M:System.Web.Razor.RazorCodeLanguage.#ctor"></member>
+    <member name="P:System.Web.Razor.RazorCodeLanguage.CodeDomProviderType"></member>
+    <member name="M:System.Web.Razor.RazorCodeLanguage.CreateCodeGenerator(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
+    <member name="M:System.Web.Razor.RazorCodeLanguage.CreateCodeParser"></member>
+    <member name="M:System.Web.Razor.RazorCodeLanguage.GetLanguageByExtension(System.String)"></member>
+    <member name="P:System.Web.Razor.RazorCodeLanguage.LanguageName"></member>
+    <member name="P:System.Web.Razor.RazorCodeLanguage.Languages"></member>
+    <member name="T:System.Web.Razor.RazorEditorParser"></member>
+    <member name="M:System.Web.Razor.RazorEditorParser.#ctor(System.Web.Razor.RazorEngineHost,System.String)"></member>
+    <member name="M:System.Web.Razor.RazorEditorParser.CheckForStructureChanges(System.Web.Razor.Text.TextChange)"></member>
+    <member name="P:System.Web.Razor.RazorEditorParser.CurrentParseTree"></member>
+    <member name="M:System.Web.Razor.RazorEditorParser.Dispose"></member>
+    <member name="M:System.Web.Razor.RazorEditorParser.Dispose(System.Boolean)"></member>
+    <member name="E:System.Web.Razor.RazorEditorParser.DocumentParseComplete"></member>
+    <member name="M:System.Web.Razor.RazorEditorParser.GetAutoCompleteString"></member>
+    <member name="M:System.Web.Razor.RazorEditorParser.ProcessChange(System.Threading.CancellationToken,System.Web.Razor.Text.TextChange,System.Web.Razor.Parser.SyntaxTree.Block)"></member>
+    <member name="M:System.Web.Razor.RazorEditorParser.QueueFullReparse(System.Web.Razor.Text.TextChange)"></member>
+    <member name="T:System.Web.Razor.RazorEngineHost"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.#ctor"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.#ctor(System.Web.Razor.RazorCodeLanguage)"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.#ctor(System.Web.Razor.RazorCodeLanguage,System.Func`1)"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.CodeLanguage"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.CreateMarkupParser"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.DecorateCodeGenerator(System.Web.Razor.Generator.RazorCodeGenerator)"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.DecorateCodeParser(System.Web.Razor.Parser.ParserBase)"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.DecorateMarkupParser(System.Web.Razor.Parser.MarkupParser)"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.DefaultBaseClass"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.DefaultClassName"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.DefaultNamespace"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.DesignTimeMode"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.GeneratedClassContext"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.NamespaceImports"></member>
+    <member name="M:System.Web.Razor.RazorEngineHost.PostProcessGeneratedCode(System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.CodeDom.CodeTypeDeclaration,System.CodeDom.CodeMemberMethod)"></member>
+    <member name="P:System.Web.Razor.RazorEngineHost.StaticHelpers"></member>
+    <member name="T:System.Web.Razor.RazorTemplateEngine"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.#ctor(System.Web.Razor.RazorEngineHost)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.CreateCodeGenerator(System.String,System.String,System.String)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.CreateParser"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader,System.String,System.String,System.String)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader,System.String,System.String,System.String,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer,System.String,System.String,System.String)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer,System.String,System.String,System.String,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCodeCore(System.Web.Razor.Text.LookaheadTextReader,System.String,System.String,System.String,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="P:System.Web.Razor.RazorTemplateEngine.Host"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.IO.TextReader)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.IO.TextReader,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.Web.Razor.Text.ITextBuffer)"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.Web.Razor.Text.ITextBuffer,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplateCore(System.Web.Razor.Text.LookaheadTextReader,System.Nullable{System.Threading.CancellationToken})"></member>
+    <member name="T:System.Web.Razor.VBRazorCodeLanguage"></member>
+    <member name="M:System.Web.Razor.VBRazorCodeLanguage.#ctor"></member>
+    <member name="P:System.Web.Razor.VBRazorCodeLanguage.CodeDomProviderType"></member>
+    <member name="M:System.Web.Razor.VBRazorCodeLanguage.CreateCodeGenerator(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
+    <member name="M:System.Web.Razor.VBRazorCodeLanguage.CreateCodeParser"></member>
+    <member name="P:System.Web.Razor.VBRazorCodeLanguage.LanguageName"></member>
+    <member name="T:System.Web.Razor.Generator.BaseCodeWriter"></member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.#ctor"></member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitEndConstructor"></member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitEndLambdaExpression"></member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitEndMethodInvoke"></member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitStartMethodInvoke(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.WriteCommaSeparatedList``1(``0[],System.Action{``0})">
+      <typeparam name="T"></typeparam>
+    </member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.WriteParameterSeparator"></member>
+    <member name="M:System.Web.Razor.Generator.BaseCodeWriter.WriteSnippet(System.String)"></member>
+    <member name="T:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs"></member>
+    <member name="M:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.#ctor(System.String,System.String,System.CodeDom.CodeCompileUnit)"></member>
+    <member name="P:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.GeneratedCode"></member>
+    <member name="P:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.PhysicalPath"></member>
+    <member name="P:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.VirtualPath"></member>
+    <member name="T:System.Web.Razor.Generator.CodeWriter"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.#ctor"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.Clear"></member>
+    <member name="P:System.Web.Razor.Generator.CodeWriter.Content"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.Dispose"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.Dispose(System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndConstructor"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndLambdaDelegate"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndLambdaExpression"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndMethodInvoke"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartConstructor(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartLambdaDelegate(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartLambdaExpression(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartMethodInvoke(System.String)"></member>
+    <member name="P:System.Web.Razor.Generator.CodeWriter.InnerWriter"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.ToStatement"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.ToTypeMember"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndConstructor"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndLambdaDelegate"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndLambdaExpression"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndMethodInvoke"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndStatement"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteHelperHeaderPrefix(System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteHelperHeaderSuffix(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteHelperTrailer"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteHiddenLinePragma"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteIdentifier(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteLinePragma(System.Nullable{System.Int32},System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteParameterSeparator"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteReturn"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteSnippet(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartAssignment(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartConstructor(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartLambdaDelegate(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartLambdaExpression(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartMethodInvoke(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CodeWriter.WriteStringLiteral(System.String)"></member>
+    <member name="T:System.Web.Razor.Generator.CSharpCodeWriter"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.#ctor"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitEndLambdaDelegate"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitStartConstructor(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitStartLambdaDelegate(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitStartLambdaExpression(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteEndStatement"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteHelperHeaderPrefix(System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteHiddenLinePragma"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteIdentifier(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteLinePragma(System.Nullable{System.Int32},System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteReturn"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteStringLiteral(System.String)"></member>
+    <member name="T:System.Web.Razor.Generator.CSharpRazorCodeGenerator"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpRazorCodeGenerator.#ctor(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpRazorCodeGenerator.CreateCodeWriter"></member>
+    <member name="M:System.Web.Razor.Generator.CSharpRazorCodeGenerator.WriteHelperVariable(System.String,System.String)"></member>
+    <member name="T:System.Web.Razor.Generator.GeneratedClassContext"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedClassContext.#ctor(System.String,System.String,System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedClassContext.#ctor(System.String,System.String,System.String,System.String,System.String,System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedClassContext.#ctor(System.String,System.String,System.String,System.String,System.String,System.String,System.String)"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.AllowSections"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.AllowTemplates"></member>
+    <member name="F:System.Web.Razor.Generator.GeneratedClassContext.Default"></member>
+    <member name="F:System.Web.Razor.Generator.GeneratedClassContext.DefaultExecuteMethodName"></member>
+    <member name="F:System.Web.Razor.Generator.GeneratedClassContext.DefaultWriteLiteralMethodName"></member>
+    <member name="F:System.Web.Razor.Generator.GeneratedClassContext.DefaultWriteMethodName"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.DefineSectionMethodName"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedClassContext.Equals(System.Object)"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.ExecuteMethodName"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedClassContext.GetHashCode"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedClassContext.op_Equality(System.Web.Razor.Generator.GeneratedClassContext,System.Web.Razor.Generator.GeneratedClassContext)"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedClassContext.op_Inequality(System.Web.Razor.Generator.GeneratedClassContext,System.Web.Razor.Generator.GeneratedClassContext)"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.TemplateTypeName"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteLiteralMethodName"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteLiteralToMethodName"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteMethodName"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteToMethodName"></member>
+    <member name="T:System.Web.Razor.Generator.GeneratedCodeMapping"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.#ctor(System.Int32,System.Int32,System.Int32,System.Int32)"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.CodeLength"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.GetHashCode"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.op_Equality(System.Web.Razor.Generator.GeneratedCodeMapping,System.Web.Razor.Generator.GeneratedCodeMapping)"></member>
+    <member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.op_Inequality(System.Web.Razor.Generator.GeneratedCodeMapping,System.Web.Razor.Generator.GeneratedCodeMapping)"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.StartColumn"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.StartGeneratedColumn"></member>
+    <member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.StartLine"></member>
+    <member name="T:System.Web.Razor.Generator.RazorCodeGenerator"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.#ctor(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.ClassName"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CodeMappings"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateCodeWriter"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateLinePragma(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateLinePragma(System.Web.Razor.Text.SourceLocation,System.Int32,System.Int32)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateStatement(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentBlock"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentWriteLiteralMethod"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentWriteMethod"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentWriterName"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.DesignTimeMode"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.EndBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.EnsureExpressionHelperVariable"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedClass"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedCode"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedExecuteMethod"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedNamespace"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GenerateLinePragmas"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperVariablesMethod"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.Host"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InHelper"></member>
+    <member name="F:System.Web.Razor.Generator.RazorCodeGenerator.InheritsHelperName"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InNestedWriterBlock"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InSection"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InTemplate"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.OnComplete"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.ResumeBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext,System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.RootNamespaceName"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.SourceFileName"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.StartBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.SuspendBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext,System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.TryVisit``1(System.Web.Razor.Parser.SyntaxTree.Span,System.Action{``0})">
+      <typeparam name="T"></typeparam>
+    </member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.TryVisitSpecialSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.InheritsSpan)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.WriteHelperTrailer(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.WriteHelperTrailer(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext,System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan)"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.WriteHelperVariable(System.String,System.String)"></member>
+    <member name="T:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.#ctor(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Web.Razor.Generator.CodeWriter)"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.BlockType"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.GeneratedCodeLength"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.GeneratedCodeStart"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.GeneratedColumnOffset"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.HasContent"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.MarkEndGeneratedCode"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.MarkStartGeneratedCode"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.ResetBuffer"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.SourceCodeStart"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.VisitedSpans"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.WriteLinePragma"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.Writer"></member>
+    <member name="T:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext"></member>
+    <member name="M:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.#ctor"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.Content"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.TrailerWritten"></member>
+    <member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.WroteHelperPrefix"></member>
+    <member name="T:System.Web.Razor.Generator.VBCodeWriter"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.#ctor"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitEndLambdaDelegate"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitStartConstructor(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitStartLambdaDelegate(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitStartLambdaExpression(System.String[])"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteEndStatement"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteHelperHeaderPrefix(System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteHelperHeaderSuffix(System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteHelperTrailer"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteLinePragma(System.Nullable{System.Int32},System.String)"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteReturn"></member>
+    <member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteStringLiteral(System.String)"></member>
+    <member name="T:System.Web.Razor.Generator.VBRazorCodeGenerator"></member>
+    <member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.#ctor(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
+    <member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.CreateCodeWriter"></member>
+    <member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.VBOptionSpan)"></member>
+    <member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.WriteHelperVariable(System.String,System.String)"></member>
+    <member name="T:System.Web.Razor.Parser.CallbackVisitor"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span})"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType})"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType},System.Action)"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.OnComplete"></member>
+    <member name="P:System.Web.Razor.Parser.CallbackVisitor.SynchronizationContext"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="T:System.Web.Razor.Parser.CodeBlockInfo"></member>
+    <member name="M:System.Web.Razor.Parser.CodeBlockInfo.#ctor(System.String,System.Web.Razor.Text.SourceLocation,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeBlockInfo.#ctor(System.String,System.Web.Razor.Text.SourceLocation,System.Boolean,System.Web.Razor.Parser.SyntaxTree.Span,System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="P:System.Web.Razor.Parser.CodeBlockInfo.BlockType"></member>
+    <member name="P:System.Web.Razor.Parser.CodeBlockInfo.InitialSpan"></member>
+    <member name="P:System.Web.Razor.Parser.CodeBlockInfo.IsTopLevel"></member>
+    <member name="P:System.Web.Razor.Parser.CodeBlockInfo.Name"></member>
+    <member name="M:System.Web.Razor.Parser.CodeBlockInfo.ResumeSpans(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="P:System.Web.Razor.Parser.CodeBlockInfo.Start"></member>
+    <member name="P:System.Web.Razor.Parser.CodeBlockInfo.TransitionSpan"></member>
+    <member name="T:System.Web.Razor.Parser.CodeParser"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.AcceptDottedExpression(System.Boolean,System.Boolean,System.Char[])"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.AcceptGenericArgument"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.AcceptTypeName"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.AcceptTypeName(System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.AcceptUntilUnquoted(System.Predicate{System.Char})"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.AcceptWhiteSpaceByLines"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean,System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean,System.Nullable{System.Char},System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.CreateImplicitExpressionSpan(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.HandleTransition(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="P:System.Web.Razor.Parser.CodeParser.OtherParser"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.ParseBlockStart(System.Boolean,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.RequireSingleWhiteSpace"></member>
+    <member name="P:System.Web.Razor.Parser.CodeParser.TopLevelKeywords"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.TryAcceptStringOrComment"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.TryRecover(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.TryRecover(System.Web.Razor.Parser.RecoveryModes)"></member>
+    <member name="M:System.Web.Razor.Parser.CodeParser.TryRecover(System.Web.Razor.Parser.RecoveryModes,System.Predicate{System.Char},System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="T:System.Web.Razor.Parser.CodeParser.BlockParser"></member>
+    <member name="T:System.Web.Razor.Parser.CSharpCodeParser"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.AcceptGenericArgument"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.AcceptWhiteSpaceAndComments"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.HandleReservedWord(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.HandleTransition(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.IsAtExplicitTransition"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.IsAtImplicitTransition"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseBlock"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseCaseBlock(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseConditionalBlockStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseControlFlowBody(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseDoStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseIfStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseImplicitExpression(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseImplicitExpression(System.Web.Razor.Parser.CodeBlockInfo,System.Boolean,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseInheritsStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseInvalidMarkupSwitch"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseTryStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="P:System.Web.Razor.Parser.CSharpCodeParser.RazorKeywords"></member>
+    <member name="P:System.Web.Razor.Parser.CSharpCodeParser.TopLevelKeywords"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.TryAcceptStringOrComment"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.TryRecover(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="M:System.Web.Razor.Parser.CSharpCodeParser.WrapSimpleBlockParser(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Web.Razor.Parser.CodeParser.BlockParser)"></member>
+    <member name="T:System.Web.Razor.Parser.HtmlMarkupParser"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsAtExplicitTransition"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsAtImplicitTransition"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsEndTag"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsStartTag"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.ParseBlock"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.ParseDocument"></member>
+    <member name="M:System.Web.Razor.Parser.HtmlMarkupParser.ParseSection(System.Tuple`2,System.Boolean)"></member>
+    <member name="T:System.Web.Razor.Parser.MarkupParser"></member>
+    <member name="M:System.Web.Razor.Parser.MarkupParser.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.MarkupParser.IsEndTag"></member>
+    <member name="M:System.Web.Razor.Parser.MarkupParser.IsStartTag"></member>
+    <member name="P:System.Web.Razor.Parser.MarkupParser.OtherParser"></member>
+    <member name="M:System.Web.Razor.Parser.MarkupParser.ParseDocument"></member>
+    <member name="M:System.Web.Razor.Parser.MarkupParser.ParseSection(System.Tuple`2,System.Boolean)"></member>
+    <member name="T:System.Web.Razor.Parser.ParserBase"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.AcceptLineWithBlockComments(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.Context"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.CurrentCharacter"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.CurrentLocation"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.DesignTimeMode"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.End(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.End(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.EndBlock"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.EndOfFile"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.HaveContent"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.InTemporaryBuffer"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.IsAtExplicitTransition"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.IsAtImplicitTransition"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.IsAtTransition"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.NextIsTransition(System.Boolean,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.OnError(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.OnError(System.Web.Razor.Text.SourceLocation,System.String,System.Object[])"></member>
+    <member name="P:System.Web.Razor.Parser.ParserBase.OtherParser"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.Output(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.ParseBlock"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.ParseBlockWithOtherParser(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.ParseBlockWithOtherParser(System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.ParseComment"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.StartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.StartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserBase.TryParseComment(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="T:System.Web.Razor.Parser.ParserContext"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.#ctor(System.Web.Razor.Text.LookaheadTextReader,System.Web.Razor.Parser.ParserBase,System.Web.Razor.Parser.MarkupParser,System.Web.Razor.Parser.ParserBase,System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.AcceptCurrent"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.AcceptTemporaryBuffer"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.AcceptTemporaryBufferInDesignTimeMode"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.ActiveParser"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.Append(System.String)"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.CodeParser"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.ContentBuffer"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.CurrentCharacter"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.CurrentLocation"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.CurrentSpanStart"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.DesignTimeMode"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.EndBlock"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.EndOfFile"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.FlushNextOutputSpan"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.HaveContent"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.InTemporaryBuffer"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.IsEmailPrefixOrSuffixCharacter(System.Char)"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.MarkupParser"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.OnComplete"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.OnError(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.OnError(System.Web.Razor.Text.SourceLocation,System.String,System.Object[])"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.OutputSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.PopVisitor"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.PreviousSpan"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.PreviousSpanCanGrow"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.PushVisitor(System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.RejectTemporaryBuffer"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.Replay(System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode},System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.ResetBuffers"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.ResumeSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.SeenValidEmailPrefix"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.SkipCurrent"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.Source"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.StartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.StartTemporaryBuffer"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.SwitchActiveParser"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContext.UpdateSeenValidEmailPrefix"></member>
+    <member name="P:System.Web.Razor.Parser.ParserContext.WhiteSpaceIsImportantToAncestorBlock"></member>
+    <member name="T:System.Web.Razor.Parser.ParserContextExtensions"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Accept(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Accept(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation}@,System.Nullable{System.Char}@)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptCharacters(System.Web.Razor.Parser.ParserContext,System.Int32)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptIdentifier(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptLine(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptNewLine(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntil(System.Web.Razor.Parser.ParserContext,System.Char[])"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntil(System.Web.Razor.Parser.ParserContext,System.Predicate{System.Char})"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntil(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntilInclusive(System.Web.Razor.Parser.ParserContext,System.Char[])"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptWhile(System.Web.Razor.Parser.ParserContext,System.Predicate{System.Char})"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptWhiteSpace(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation})"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation})"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.ExpectIdentifier(System.Web.Razor.Parser.ParserContext,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.ExpectIdentifier(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.ExpectIdentifier(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation})"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.Peek(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.PeekAny(System.Web.Razor.Parser.ParserContext,System.Boolean,System.String[])"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.PeekAny(System.Web.Razor.Parser.ParserContext,System.String[])"></member>
+    <member name="M:System.Web.Razor.Parser.ParserContextExtensions.ReadWhiteSpace(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="T:System.Web.Razor.Parser.ParserHelpers"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsCombining(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsConnecting(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsDecimalDigit(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsFormatting(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsHexDigit(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifier(System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifier(System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifierPart(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifierStart(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsLetter(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsNewLine(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsNewLine(System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsTerminatingCharToken(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.IsTerminatingQuotedStringToken(System.Char)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserHelpers.SanitizeClassName(System.String)"></member>
+    <member name="T:System.Web.Razor.Parser.ParserVisitor"></member>
+    <member name="M:System.Web.Razor.Parser.ParserVisitor.#ctor"></member>
+    <member name="P:System.Web.Razor.Parser.ParserVisitor.CancelToken"></member>
+    <member name="M:System.Web.Razor.Parser.ParserVisitor.OnComplete"></member>
+    <member name="M:System.Web.Razor.Parser.ParserVisitor.ThrowIfCanceled"></member>
+    <member name="M:System.Web.Razor.Parser.ParserVisitor.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserVisitor.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserVisitor.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Parser.ParserVisitor.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="T:System.Web.Razor.Parser.RazorParser"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.#ctor(System.Web.Razor.Parser.ParserBase,System.Web.Razor.Parser.MarkupParser)"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Threading.CancellationToken)"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Threading.SynchronizationContext)"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Threading.SynchronizationContext,System.Threading.CancellationToken)"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="P:System.Web.Razor.Parser.RazorParser.DesignTimeMode"></member>
+    <member name="F:System.Web.Razor.Parser.RazorParser.EndCommentSequence"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.IO.TextReader)"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.IO.TextReader,System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.Web.Razor.Text.LookaheadTextReader)"></member>
+    <member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.Web.Razor.Text.LookaheadTextReader,System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="F:System.Web.Razor.Parser.RazorParser.StartCommentSequence"></member>
+    <member name="F:System.Web.Razor.Parser.RazorParser.TransitionCharacter"></member>
+    <member name="F:System.Web.Razor.Parser.RazorParser.TransitionString"></member>
+    <member name="T:System.Web.Razor.Parser.RecoveryModes"></member>
+    <member name="F:System.Web.Razor.Parser.RecoveryModes.Markup">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.RecoveryModes.Code">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.RecoveryModes.Transition">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.RecoveryModes.Any">
+      <summary />
+    </member>
+    <member name="T:System.Web.Razor.Parser.VBCodeParser"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.AcceptGenericArgument"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.HandleReservedWord(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.HandleTransition(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.IsAtExplicitTransition"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.IsAtImplicitTransition"></member>
+    <member name="P:System.Web.Razor.Parser.VBCodeParser.KeywordHandlers"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.ParseBlock"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.ParseInheritsStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
+    <member name="P:System.Web.Razor.Parser.VBCodeParser.TopLevelKeywords"></member>
+    <member name="M:System.Web.Razor.Parser.VBCodeParser.TryAcceptStringOrComment"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters"></member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.None">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.NewLine">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.WhiteSpace">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.NonWhiteSpace">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.AllWhiteSpace">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.Any">
+      <summary />
+    </member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.Block"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.#ctor(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode})"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.#ctor(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode},System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.Accept(System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Children"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.FindFirstDescendentSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.FindLastDescendentSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.Flatten"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.GetHashCode"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Block.IsBlock"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Length"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.LocateOwner(System.Web.Razor.Text.TextChange)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Name"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Start"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Block.ToString"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Type"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.BlockType"></member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Statement">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Directive">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Functions">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Expression">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Helper">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Markup">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Section">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Template">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Comment">
+      <summary />
+    </member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.CodeSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.CommentSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.Create(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.GetHashCode"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Complete"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.GetHashCode"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Collections.Generic.ISet{System.String},System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Collections.Generic.ISet{System.String},System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.Create(System.Web.Razor.Parser.ParserContext,System.Collections.Generic.ISet{System.String},System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.GetHashCode"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.InheritsSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.String)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.BaseClass"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.Create(System.Web.Razor.Parser.ParserContext,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.GetHashCode"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.MarkupSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.DocumentLevel"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters,System.String,System.Int32)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.Create(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters,System.Web.Razor.Parser.SyntaxTree.SpanKind,System.String,System.Int32)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.GetHashCode"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.Namespace"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.NamespaceKeywordLength"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.RazorError"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.#ctor(System.String,System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.#ctor(System.String,System.Web.Razor.Text.SourceLocation,System.Int32)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.Equals(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.GetHashCode"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.RazorError.Length"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.RazorError.Location"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.RazorError.Message"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.String,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.Create(System.Web.Razor.Parser.ParserContext,System.String,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.GetHashCode"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.SectionName"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.ToString"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.GetHashCode"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.Span"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanKind)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.Accept(System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.AcceptedCharacters"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.ApplyChange(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.ApplyChange(System.Web.Razor.Text.TextChange,System.Boolean)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.AutoCompleteString"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Content"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.GetHashCode"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.GetOldText(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.GetSpanTypeName"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Hidden"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsAtEndOfFirstLine(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsAtEndOfSpan(System.Web.Razor.Text.TextChange)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.IsBlock"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsEndDeletion(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsEndInsertion(System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsEndReplace(System.Web.Razor.Text.TextChange)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Kind"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Length"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Next"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Offset"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.OwnsChange(System.Web.Razor.Text.TextChange)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Previous"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Start"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.ToString"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.Span.TryMergeWith(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.SpanFactory"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.SpanKind"></member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Transition">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.MetaCode">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Comment">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Code">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Markup">
+      <summary />
+    </member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.OnComplete"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.Results"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.#ctor"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Accept(System.Web.Razor.Parser.ParserVisitor)"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.IsBlock"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Length"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Parent"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Start"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.TransitionSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
+    <member name="T:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.Create(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.GetHashCode"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.OptionName"></member>
+    <member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.ToString"></member>
+    <member name="P:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.Value"></member>
+    <member name="T:System.Web.Razor.Text.BufferingTextReader"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.#ctor(System.IO.TextReader)"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.BeginLookahead"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.CancelBacktrack"></member>
+    <member name="P:System.Web.Razor.Text.BufferingTextReader.CurrentCharacter"></member>
+    <member name="P:System.Web.Razor.Text.BufferingTextReader.CurrentLocation"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.Dispose(System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.ExpandBuffer"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.NextCharacter"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.Peek"></member>
+    <member name="M:System.Web.Razor.Text.BufferingTextReader.Read"></member>
+    <member name="T:System.Web.Razor.Text.ITextBuffer"></member>
+    <member name="P:System.Web.Razor.Text.ITextBuffer.Length"></member>
+    <member name="M:System.Web.Razor.Text.ITextBuffer.Peek"></member>
+    <member name="P:System.Web.Razor.Text.ITextBuffer.Position"></member>
+    <member name="M:System.Web.Razor.Text.ITextBuffer.Read"></member>
+    <member name="T:System.Web.Razor.Text.LookaheadTextReader"></member>
+    <member name="M:System.Web.Razor.Text.LookaheadTextReader.#ctor"></member>
+    <member name="M:System.Web.Razor.Text.LookaheadTextReader.BeginLookahead"></member>
+    <member name="M:System.Web.Razor.Text.LookaheadTextReader.CancelBacktrack"></member>
+    <member name="P:System.Web.Razor.Text.LookaheadTextReader.CurrentLocation"></member>
+    <member name="T:System.Web.Razor.Text.SourceLocation"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.#ctor(System.Int32,System.Int32,System.Int32)"></member>
+    <member name="P:System.Web.Razor.Text.SourceLocation.AbsoluteIndex"></member>
+    <member name="P:System.Web.Razor.Text.SourceLocation.CharacterIndex"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.CompareTo(System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.Equals(System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.GetHashCode"></member>
+    <member name="P:System.Web.Razor.Text.SourceLocation.LineIndex"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.op_Equality(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.op_GreaterThan(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.op_Inequality(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.op_LessThan(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocation.ToString"></member>
+    <member name="F:System.Web.Razor.Text.SourceLocation.Zero"></member>
+    <member name="T:System.Web.Razor.Text.SourceLocationTracker"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocationTracker.#ctor"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocationTracker.#ctor(System.Web.Razor.Text.SourceLocation)"></member>
+    <member name="P:System.Web.Razor.Text.SourceLocationTracker.CurrentLocation"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocationTracker.UpdateLocation(System.Char,System.Func`1)"></member>
+    <member name="M:System.Web.Razor.Text.SourceLocationTracker.UpdateLocation(System.String)"></member>
+    <member name="T:System.Web.Razor.Text.TextBufferReader"></member>
+    <member name="M:System.Web.Razor.Text.TextBufferReader.#ctor(System.Web.Razor.Text.ITextBuffer)"></member>
+    <member name="M:System.Web.Razor.Text.TextBufferReader.BeginLookahead"></member>
+    <member name="M:System.Web.Razor.Text.TextBufferReader.CancelBacktrack"></member>
+    <member name="P:System.Web.Razor.Text.TextBufferReader.CurrentLocation"></member>
+    <member name="M:System.Web.Razor.Text.TextBufferReader.Dispose(System.Boolean)"></member>
+    <member name="M:System.Web.Razor.Text.TextBufferReader.Peek"></member>
+    <member name="M:System.Web.Razor.Text.TextBufferReader.Read"></member>
+    <member name="T:System.Web.Razor.Text.TextChange"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.#ctor(System.Int32,System.Int32,System.Web.Razor.Text.ITextBuffer,System.Int32,System.Int32,System.Web.Razor.Text.ITextBuffer)"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.ApplyChange(System.String,System.Int32)"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.ApplyChange(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.Equals(System.Object)"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.GetHashCode"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.IsDelete"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.IsInsert"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.IsReplace"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.NewBuffer"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.NewLength"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.NewPosition"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.NewText"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.Normalize"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.OldBuffer"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.OldLength"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.OldPosition"></member>
+    <member name="P:System.Web.Razor.Text.TextChange.OldText"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.op_Equality(System.Web.Razor.Text.TextChange,System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.op_Inequality(System.Web.Razor.Text.TextChange,System.Web.Razor.Text.TextChange)"></member>
+    <member name="M:System.Web.Razor.Text.TextChange.ToString"></member>
+    <member name="T:System.Web.Razor.Text.TextChangeType"></member>
+    <member name="F:System.Web.Razor.Text.TextChangeType.Insert">
+      <summary />
+    </member>
+    <member name="F:System.Web.Razor.Text.TextChangeType.Remove">
+      <summary />
+    </member>
+  </members>
+</doc>

lib/WebPages/System.Web.WebPages.Deployment.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>System.Web.WebPages.Deployment</name>
+  </assembly>
+  <members>
+    <member name="T:System.Web.WebPages.Deployment.PreApplicationStartCode"></member>
+    <member name="M:System.Web.WebPages.Deployment.PreApplicationStartCode.Start"></member>
+    <member name="T:System.Web.WebPages.Deployment.WebPagesDeployment"></member>
+    <member name="F:System.Web.WebPages.Deployment.WebPagesDeployment.CacheKeyPrefix"></member>
+    <member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.GetAssemblyPath(System.Version)"></member>
+    <member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.GetVersion(System.String)"></member>
+    <member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.IsEnabled(System.String)"></member>
+    <member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.IsExplicitlyDisabled(System.String)"></member>
+  </members>
+</doc>

lib/WebPages/System.Web.WebPages.Razor.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>System.Web.WebPages.Razor</name>
+  </assembly>
+  <members>
+    <member name="T:System.Web.WebPages.Razor.PreApplicationStartCode"></member>
+    <member name="M:System.Web.WebPages.Razor.PreApplicationStartCode.Start"></member>
+    <member name="T:System.Web.WebPages.Razor.RazorBuildProvider"></member>
+    <member name="M:System.Web.WebPages.Razor.RazorBuildProvider.#ctor"></member>
+    <member name="M:System.Web.WebPages.Razor.RazorBuildProvider.AddVirtualPathDependency(System.String)"></member>
+    <member name="P:System.Web.WebPages.Razor.RazorBuildProvider.AssemblyBuilder"></member>
+    <member name="P:System.Web.WebPages.Razor.RazorBuildProvider.CodeCompilerType"></member>
+    <member name="E:System.Web.WebPages.Razor.RazorBuildProvider.CodeGenerationCompleted"></member>
+    <member name="E:System.Web.WebPages.Razor.RazorBuildProvider.CodeGenerationStarted"></member>
+    <member name="M:System.Web.WebPages.Razor.RazorBuildProvider.CreateHost"></member>
+    <member name="M:System.Web.WebPages.Razor.RazorBuildProvider.GenerateCode(System.Web.Compilation.AssemblyBuilder)"></member>
+    <member name="M:System.Web.WebPages.Razor.RazorBuildProvider.GetGeneratedType(System.CodeDom.Compiler.CompilerResults)"></member>
+    <member name="M:System.Web.WebPages.Razor.RazorBuildProvider.InternalOpenReader"></member>
+    <member name="P:System.Web.WebPages.Razor.RazorBuildProvider.VirtualPath"></member>
+    <member name="P:System.Web.WebPages.Razor.RazorBuildProvider.VirtualPathDependencies"></member>
+    <member name="T:System.Web.WebPages.Razor.WebCodeRazorHost"></member>
+    <member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.#ctor(System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.#ctor(System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.GetClassName(System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.PostProcessGeneratedCode(System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.CodeDom.CodeTypeDeclaration,System.CodeDom.CodeMemberMethod)"></member>
+    <member name="T:System.Web.WebPages.Razor.WebPageRazorHost"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.#ctor(System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.#ctor(System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.AddGlobalImport(System.String)"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.CodeLanguage"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.CreateMarkupParser"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultBaseClass"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultClassName"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultDebugCompilation"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultPageBaseClass"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.GetClassName(System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.GetCodeLanguage"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.GetGlobalImports"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.IsSpecialPage"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.PhysicalPath"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.PostProcessGeneratedCode(System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.CodeDom.CodeTypeDeclaration,System.CodeDom.CodeMemberMethod)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.RegisterSpecialFile(System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebPageRazorHost.RegisterSpecialFile(System.String,System.Type)"></member>
+    <member name="P:System.Web.WebPages.Razor.WebPageRazorHost.VirtualPath"></member>
+    <member name="T:System.Web.WebPages.Razor.WebRazorHostFactory"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.#ctor"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.ApplyConfigurationToHost(System.Web.WebPages.Razor.Configuration.RazorPagesSection,System.Web.WebPages.Razor.WebPageRazorHost)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateDefaultHost(System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateDefaultHost(System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHost(System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup,System.String)"></member>
+    <member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup,System.String,System.String)"></member>
+    <member name="T:System.Web.WebPages.Razor.Configuration.HostSection"></member>
+    <member name="M:System.Web.WebPages.Razor.Configuration.HostSection.#ctor"></member>
+    <member name="P:System.Web.WebPages.Razor.Configuration.HostSection.FactoryType"></member>
+    <member name="F:System.Web.WebPages.Razor.Configuration.HostSection.SectionName"></member>
+    <member name="T:System.Web.WebPages.Razor.Configuration.RazorPagesSection"></member>
+    <member name="M:System.Web.WebPages.Razor.Configuration.RazorPagesSection.#ctor"></member>
+    <member name="P:System.Web.WebPages.Razor.Configuration.RazorPagesSection.Namespaces"></member>
+    <member name="P:System.Web.WebPages.Razor.Configuration.RazorPagesSection.PageBaseType"></member>
+    <member name="F:System.Web.WebPages.Razor.Configuration.RazorPagesSection.SectionName"></member>
+    <member name="T:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup"></member>
+    <member name="M:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.#ctor"></member>
+    <member name="F:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.GroupName"></member>
+    <member name="P:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.Host"></member>
+    <member name="P:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.Pages"></member>
+  </members>
+</doc>

lib/WebPages/System.Web.WebPages.xml

@@ -0,0 +1,884 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>System.Web.WebPages</name>
+  </assembly>
+  <members>
+    <member name="T:System.Web.Helpers.AntiForgery">
+      <summary>Helps prevent malicious scripts from submitting forged page requests.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.AntiForgery.GetHtml">
+      <summary>Adds an authenticating token to a form to help protect against request forgery.</summary>
+      <returns>Returns a string that contains the encrypted token value in a hidden HTML field.</returns>
+      <exception cref="T:System.ArgumentException">The current <see cref="T:System.Web.HttpContext" /> object is null.</exception>
+    </member>
+    <member name="M:System.Web.Helpers.AntiForgery.GetHtml(System.Web.HttpContextBase,System.String,System.String,System.String)">
+      <summary>Adds an authenticating token to a form to help protect against request forgery, allowing callers to specify added authentication details.</summary>
+      <returns>Returns the encrypted token value in a hidden HTML field.</returns>
+      <param name="httpContext">The HTTP context data for a request.</param>
+      <param name="salt">An optional random string of characters (such as Z*7g1&amp;p4) that is used to add complexity to the encryption for extra safety. The default is a null string.</param>
+      <param name="domain">The domain of a Web application that a request is submitted from.</param>
+      <param name="path">The virtual root path of a Web application that a request is submitted from.</param>
+      <exception cref="T:System.ArgumentNullException">The supplied <see cref="T:System.Web.HttpContextBase" /> object is null.</exception>
+    </member>
+    <member name="M:System.Web.Helpers.AntiForgery.Validate">
+      <summary>Validates that input data from an HTML form field comes from the user who submitted the data.</summary>
+      <exception cref="T:System.ArgumentException">The current <see cref="T:System.Web.HttpContext" /> value is null.</exception>
+      <exception cref="T:System.Web.Helpers.HttpAntiForgeryException">The HTTP cookie token that accompanies a valid request is missing-or-The form token is missing.-or-The form token value does not match the cookie token value.-or-The form token value does not match the cookie token value.</exception>
+    </member>
+    <member name="M:System.Web.Helpers.AntiForgery.Validate(System.Web.HttpContextBase,System.String)">
+      <summary>Validates that input data from an HTML form field comes from the user who submitted the data, allowing callers to specify additional custom details for the validation.</summary>
+      <param name="salt">An optional random string of characters (such as Z*7g1&amp;p4) used to decrypt an authentication token created by the <see cref="T:System.Web.Helpers.AntiForgery" /> class. The default is a null string.</param>
+      <exception cref="T:System.ArgumentException">The current <see cref="T:System.Web.HttpContext" /> value is null.</exception>
+      <exception cref="T:System.Web.Helpers.HttpAntiForgeryException">The HTTP cookie token that accompanies a valid request is missing-or-The form token is missing.-or-The form token value does not match the cookie token value.-or-The form token value does not match the cookie token value.-or-The <paramref name="salt" /> value supplied does not match the <paramref name="salt" /> value used to create the form token.</exception>
+    </member>
+    <member name="T:System.Web.Helpers.UnvalidatedRequestValues">
+      <summary>Provides access to unvalidated values in the <see cref="T:System.Web.HttpRequest" /> object.</summary>
+    </member>
+    <member name="P:System.Web.Helpers.UnvalidatedRequestValues.Form">
+      <summary>Gets a collection of unvalidated Web form values.</summary>
+      <returns>An unvalidated collection of Web form values.</returns>
+    </member>
+    <member name="P:System.Web.Helpers.UnvalidatedRequestValues.Item(System.String)">
+      <summary>Gets an unvalidated object from a collection in the <see cref="T:System.Web.HttpRequest" /> object.</summary>
+      <returns>A member of a collection contained in the <see cref="T:System.Web.HttpRequest" /> object.</returns>
+      <param name="key">The name of the collection member to get.</param>
+    </member>
+    <member name="P:System.Web.Helpers.UnvalidatedRequestValues.QueryString">
+      <summary>Gets a collection of unvalidated query-string values.</summary>
+      <returns>A collection of unvalidated query-string values.</returns>
+    </member>
+    <member name="T:System.Web.Helpers.Validation">
+      <summary>Excludes fields of the Request object from being checked for potentially unsafe HTML markup.</summary>
+    </member>
+    <member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequest)">
+      <summary>Returns an unvalidated version of form values or query-string values.</summary>
+      <returns>An <see cref="System.Web.Helpers.UnvalidatedRequestValues" /> object that contains unvalidated versions of the form and query string values.</returns>
+      <param name="request">The <see cref="T:System.Web.HttpRequest" /> object that contains values to exclude.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequest,System.String)">
+      <summary>Returns an unvalidated value from the form or query string based on the field that has been requested.</summary>
+      <returns>A string that contains unvalidated text from the specified field  or query-string value.</returns>
+      <param name="request">The <see cref="T:System.Web.HttpRequest" /> object that contains values to exclude from validation s</param>
+      <param name="key">The name of the field to exclude from validation.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequestBase)">
+      <summary>Returns an unvalidated version of form values or query-string values.</summary>
+      <returns>An <see cref="System.Web.Helpers.UnvalidatedRequestValues" /> object that contains unvalidated versions of the form and query-string values.</returns>
+      <param name="request">The <see cref="T:System.Web.HttpRequest" /> object that contains values to exclude from validation.</param>
+    </member>
+    <member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequestBase,System.String)">
+      <summary>Returns an unvalidated value from the form or query string based on the field that has been requested.</summary>
+      <returns>A string that contains unvalidated text from the specified field or query-string value.</returns>
+      <param name="request">The <see cref="T:System.Web.HttpRequestBase" /> object that contains values to exclude from validation.</param>
+      <param name="key">The name of the field to exclude from validation.</param>
+    </member>
+    <member name="T:System.Web.Mvc.HttpAntiForgeryException">
+      <summary>This class and its members support the .NET Framework infrastructure and are not intended to be used directly from your code.</summary>
+    </member>
+    <member name="M:System.Web.Mvc.HttpAntiForgeryException.#ctor">
+      <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+    </member>
+    <member name="M:System.Web.Mvc.HttpAntiForgeryException.#ctor(System.String)">
+      <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+      <param name="message">Details about the exception.</param>
+    </member>
+    <member name="M:System.Web.Mvc.HttpAntiForgeryException.#ctor(System.String,System.Exception)">
+      <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+      <param name="message">Details about the exception.</param>
+      <param name="innerException">An exception that occurred before the current exception.</param>
+    </member>
+    <member name="T:System.Web.Mvc.TagBuilder"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.#ctor(System.String)"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.AddCssClass(System.String)"></member>
+    <member name="P:System.Web.Mvc.TagBuilder.Attributes"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.CreateSanitizedId(System.String)"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.CreateSanitizedId(System.String,System.String)"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.GenerateId(System.String)"></member>
+    <member name="P:System.Web.Mvc.TagBuilder.IdAttributeDotReplacement"></member>
+    <member name="P:System.Web.Mvc.TagBuilder.InnerHtml"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.MergeAttribute(System.String,System.String)"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.MergeAttribute(System.String,System.String,System.Boolean)"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.MergeAttributes``2(System.Collections.Generic.IDictionary{``0,``1})">
+      <typeparam name="TKey"></typeparam>
+      <typeparam name="TValue"></typeparam>
+    </member>
+    <member name="M:System.Web.Mvc.TagBuilder.MergeAttributes``2(System.Collections.Generic.IDictionary{``0,``1},System.Boolean)">
+      <typeparam name="TKey"></typeparam>
+      <typeparam name="TValue"></typeparam>
+    </member>
+    <member name="M:System.Web.Mvc.TagBuilder.SetInnerText(System.String)"></member>
+    <member name="P:System.Web.Mvc.TagBuilder.TagName"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.ToString"></member>
+    <member name="M:System.Web.Mvc.TagBuilder.ToString(System.Web.Mvc.TagRenderMode)"></member>
+    <member name="T:System.Web.Mvc.TagRenderMode">
+      <summary>Enumerates the modes that are available for rendering HTML tags.</summary>
+    </member>
+    <member name="F:System.Web.Mvc.TagRenderMode.Normal">
+      <summary>Represents normal mode.</summary>
+    </member>
+    <member name="F:System.Web.Mvc.TagRenderMode.StartTag">
+      <summary>Represents the start-tag mode.</summary>
+    </member>
+    <member name="F:System.Web.Mvc.TagRenderMode.EndTag">
+      <summary>Represents end-tag mode.</summary>
+    </member>
+    <member name="F:System.Web.Mvc.TagRenderMode.SelfClosing">
+      <summary>Represents self-closing-tag mode.</summary>
+    </member>
+    <member name="T:System.Web.WebPages.ApplicationPart"></member>
+    <member name="M:System.Web.WebPages.ApplicationPart.#ctor(System.Reflection.Assembly,System.String)"></member>
+    <member name="M:System.Web.WebPages.ApplicationPart.ProcessVirtualPath(System.Reflection.Assembly,System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.ApplicationPart.Register(System.Web.WebPages.ApplicationPart)"></member>
+    <member name="T:System.Web.WebPages.ApplicationStartPage"></member>
+    <member name="M:System.Web.WebPages.ApplicationStartPage.#ctor"></member>
+    <member name="P:System.Web.WebPages.ApplicationStartPage.Application"></member>
+    <member name="F:System.Web.WebPages.ApplicationStartPage.CacheKeyPrefix"></member>
+    <member name="P:System.Web.WebPages.ApplicationStartPage.Context"></member>
+    <member name="P:System.Web.WebPages.ApplicationStartPage.Markup"></member>
+    <member name="P:System.Web.WebPages.ApplicationStartPage.Output"></member>
+    <member name="F:System.Web.WebPages.ApplicationStartPage.StartPageVirtualPath"></member>
+    <member name="P:System.Web.WebPages.ApplicationStartPage.VirtualPath"></member>
+    <member name="M:System.Web.WebPages.ApplicationStartPage.Write(System.Object)"></member>
+    <member name="M:System.Web.WebPages.ApplicationStartPage.Write(System.Web.WebPages.HelperResult)"></member>
+    <member name="M:System.Web.WebPages.ApplicationStartPage.WriteLiteral(System.Object)"></member>
+    <member name="T:System.Web.WebPages.HelperPage"></member>
+    <member name="M:System.Web.WebPages.HelperPage.#ctor"></member>
+    <member name="P:System.Web.WebPages.HelperPage.App"></member>
+    <member name="P:System.Web.WebPages.HelperPage.AppState"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Cache"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Context"></member>
+    <member name="P:System.Web.WebPages.HelperPage.CurrentPage"></member>
+    <member name="M:System.Web.WebPages.HelperPage.Href(System.String,System.Object[])"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Html"></member>
+    <member name="P:System.Web.WebPages.HelperPage.IsAjax"></member>
+    <member name="P:System.Web.WebPages.HelperPage.IsPost"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Model"></member>
+    <member name="P:System.Web.WebPages.HelperPage.ModelState"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Page"></member>
+    <member name="P:System.Web.WebPages.HelperPage.PageContext"></member>
+    <member name="P:System.Web.WebPages.HelperPage.PageData"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Request"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Response"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Server"></member>
+    <member name="P:System.Web.WebPages.HelperPage.Session"></member>
+    <member name="P:System.Web.WebPages.HelperPage.UrlData"></member>
+    <member name="P:System.Web.WebPages.HelperPage.User"></member>
+    <member name="P:System.Web.WebPages.HelperPage.VirtualPath"></member>
+    <member name="M:System.Web.WebPages.HelperPage.WriteLiteralTo(System.IO.TextWriter,System.Object)"></member>
+    <member name="M:System.Web.WebPages.HelperPage.WriteLiteralTo(System.IO.TextWriter,System.Web.WebPages.HelperResult)"></member>
+    <member name="M:System.Web.WebPages.HelperPage.WriteTo(System.IO.TextWriter,System.Object)"></member>
+    <member name="M:System.Web.WebPages.HelperPage.WriteTo(System.IO.TextWriter,System.Web.WebPages.HelperResult)"></member>
+    <member name="T:System.Web.WebPages.HelperResult"></member>
+    <member name="M:System.Web.WebPages.HelperResult.#ctor(System.Action{System.IO.TextWriter})"></member>
+    <member name="M:System.Web.WebPages.HelperResult.ToHtmlString"></member>
+    <member name="M:System.Web.WebPages.HelperResult.ToString"></member>
+    <member name="M:System.Web.WebPages.HelperResult.WriteTo(System.IO.TextWriter)"></member>
+    <member name="T:System.Web.WebPages.HttpContextExtensions"></member>
+    <member name="M:System.Web.WebPages.HttpContextExtensions.RedirectLocal(System.Web.HttpContextBase,System.String)">
+      <summary>Redirects to the root of the Web site if the host is not local.</summary>
+      <param name="context">The HTTP context of the HTTP request.</param>
+      <param name="url">A locally hosted URL.</param>
+    </member>
+    <member name="M:System.Web.WebPages.HttpContextExtensions.RegisterForDispose(System.Web.HttpContextBase,System.IDisposable)"></member>
+    <member name="T:System.Web.WebPages.ITemplateFile"></member>
+    <member name="P:System.Web.WebPages.ITemplateFile.TemplateInfo"></member>
+    <member name="T:System.Web.WebPages.IVirtualPathFactory"></member>
+    <member name="M:System.Web.WebPages.IVirtualPathFactory.CreateInstance(System.String)"></member>
+    <member name="M:System.Web.WebPages.IVirtualPathFactory.Exists(System.String)"></member>
+    <member name="T:System.Web.WebPages.IWebPageRequestExecutor"></member>
+    <member name="M:System.Web.WebPages.IWebPageRequestExecutor.Execute(System.Web.WebPages.WebPage)"></member>
+    <member name="T:System.Web.WebPages.PageVirtualPathAttribute"></member>
+    <member name="M:System.Web.WebPages.PageVirtualPathAttribute.#ctor(System.String)"></member>
+    <member name="P:System.Web.WebPages.PageVirtualPathAttribute.VirtualPath"></member>
+    <member name="T:System.Web.WebPages.PreApplicationStartCode"></member>
+    <member name="M:System.Web.WebPages.PreApplicationStartCode.Start"></member>
+    <member name="T:System.Web.WebPages.RequestExtensions"></member>
+    <member name="M:System.Web.WebPages.RequestExtensions.IsUrlLocalToHost(System.Web.HttpRequestBase,System.String)"></member>
+    <member name="T:System.Web.WebPages.ResponseExtensions"></member>
+    <member name="M:System.Web.WebPages.ResponseExtensions.OutputCache(System.Web.HttpResponseBase,System.Int32,System.Boolean,System.Collections.Generic.IEnumerable{System.String},System.Collections.Generic.IEnumerable{System.String},System.Collections.Generic.IEnumerable{System.String},System.Web.HttpCacheability)"></member>
+    <member name="M:System.Web.WebPages.ResponseExtensions.SetStatus(System.Web.HttpResponseBase,System.Int32)"></member>
+    <member name="M:System.Web.WebPages.ResponseExtensions.SetStatus(System.Web.HttpResponseBase,System.Net.HttpStatusCode)"></member>
+    <member name="M:System.Web.WebPages.ResponseExtensions.WriteBinary(System.Web.HttpResponseBase,System.Byte[])"></member>
+    <member name="M:System.Web.WebPages.ResponseExtensions.WriteBinary(System.Web.HttpResponseBase,System.Byte[],System.String)"></member>
+    <member name="T:System.Web.WebPages.SectionWriter"></member>
+    <member name="T:System.Web.WebPages.StartPage"></member>
+    <member name="M:System.Web.WebPages.StartPage.#ctor"></member>
+    <member name="P:System.Web.WebPages.StartPage.ChildPage"></member>
+    <member name="P:System.Web.WebPages.StartPage.Context"></member>
+    <member name="M:System.Web.WebPages.StartPage.ExecutePageHierarchy"></member>
+    <member name="M:System.Web.WebPages.StartPage.GetStartPage(System.Web.WebPages.WebPageRenderingBase,System.String,System.Collections.Generic.IEnumerable{System.String})"></member>
+    <member name="P:System.Web.WebPages.StartPage.Layout"></member>
+    <member name="P:System.Web.WebPages.StartPage.Page"></member>
+    <member name="P:System.Web.WebPages.StartPage.PageData"></member>
+    <member name="M:System.Web.WebPages.StartPage.RenderPage(System.String,System.Object[])"></member>
+    <member name="M:System.Web.WebPages.StartPage.RunPage"></member>
+    <member name="M:System.Web.WebPages.StartPage.Write(System.Object)"></member>
+    <member name="M:System.Web.WebPages.StartPage.Write(System.Web.WebPages.HelperResult)"></member>
+    <member name="M:System.Web.WebPages.StartPage.WriteLiteral(System.Object)"></member>
+    <member name="T:System.Web.WebPages.StringExtensions">
+      <summary>Provides utility methods for converting string values to other data types.</summary>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.As``1(System.String)">
+      <summary>Converts a string to a strongly typed value of the specified data type.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+      <typeparam name="TValue">The data type to convert to.</typeparam>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.As``1(System.String,``0)">
+      <summary>Converts a string to the specified data type and specifies a default value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+      <param name="defaultValue">The value to return if <paramref name="value" /> is null.</param>
+      <typeparam name="TValue">The data type to convert to.</typeparam>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsBool(System.String)">
+      <summary>Converts a string to a Boolean (true/false) value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsBool(System.String,System.Boolean)">
+      <summary>Converts a string to a Boolean (true/false) value and specifies a default value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+      <param name="defaultValue">The value to return if <paramref name="value" /> is null or an invalid value. The default is false.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsDateTime(System.String)">
+      <summary>Converts a string to a <see cref="T:System.DateTime" /> value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsDateTime(System.String,System.DateTime)">
+      <summary>Converts a string to a <see cref="T:System.DateTime" /> value and specifies a default value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+      <param name="defaultValue">The value to return if <paramref name="value" /> is null or an invalid value. The default is the minimum time value on the system.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsDecimal(System.String)">
+      <summary>Converts a string to a <see cref="T:System.Decimal" /> number.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsDecimal(System.String,System.Decimal)">
+      <summary>Converts a string to a <see cref="T:System.Decimal" /> number and specifies a default value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+      <param name="defaultValue">The value to return if <paramref name="value" /> is null or invalid.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsFloat(System.String)">
+      <summary>Converts a string to a <see cref="T:System.Single" /> number.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsFloat(System.String,System.Single)">
+      <summary>Converts a string to a <see cref="T:System.Single" /> number and specifies a default value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+      <param name="defaultValue">The value to return if <paramref name="value" /> is null.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsInt(System.String)">
+      <summary>Converts a string to an integer.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.AsInt(System.String,System.Int32)">
+      <summary>Converts a string to an integer and specifies a default value.</summary>
+      <returns>The converted value.</returns>
+      <param name="value">The value to convert.</param>
+      <param name="defaultValue">The value to return if <paramref name="value" /> is null or is an invalid value.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.Is``1(System.String)">
+      <summary>Checks whether a string can be converted to the specified data type.</summary>
+      <returns>
+        <paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
+      <param name="value">The value to test.</param>
+      <typeparam name="TValue">The data type to convert to.</typeparam>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.IsBool(System.String)">
+      <summary>Checks whether a string can be converted to the Boolean (true/false) type.</summary>
+      <returns>
+        <paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
+      <param name="value">The string value to test.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.IsDateTime(System.String)">
+      <summary>Checks whether a string can be converted to the <see cref="T:System.DateTime" /> type.</summary>
+      <returns>
+        <paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
+      <param name="value">The string value to test.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.IsDecimal(System.String)">
+      <summary>Checks whether a string can be converted to the <see cref="T:System.Decimal" /> type.</summary>
+      <returns>
+        <paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
+      <param name="value">The string value to test.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.IsEmpty(System.String)">
+      <summary>Checks whether a string value is null or empty.</summary>
+      <returns>true if <paramref name="value" /> is null or is a zero-length string (""); otherwise, false.</returns>
+      <param name="value">The string value to test.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.IsFloat(System.String)">
+      <summary>Checks whether a string can be converted to the <see cref="T:System.Single" /> type.</summary>
+      <returns>true if <paramref name="value" /> can be converted to the specified type; otherwise,  false.</returns>
+      <param name="value">The string value to test.</param>
+    </member>
+    <member name="M:System.Web.WebPages.StringExtensions.IsInt(System.String)">
+      <summary>Checks whether a string can be converted to an integer.</summary>
+      <returns>
+        <paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
+      <param name="value">The string value to test.</param>
+    </member>
+    <member name="T:System.Web.WebPages.TemplateFileInfo"></member>
+    <member name="M:System.Web.WebPages.TemplateFileInfo.#ctor(System.String)"></member>
+    <member name="P:System.Web.WebPages.TemplateFileInfo.VirtualPath"></member>
+    <member name="T:System.Web.WebPages.TemplateStack"></member>
+    <member name="M:System.Web.WebPages.TemplateStack.GetCurrentTemplate(System.Web.HttpContextBase)"></member>
+    <member name="M:System.Web.WebPages.TemplateStack.Pop(System.Web.HttpContextBase)"></member>
+    <member name="M:System.Web.WebPages.TemplateStack.Push(System.Web.HttpContextBase,System.Web.WebPages.ITemplateFile)"></member>
+    <member name="T:System.Web.WebPages.VirtualPathFactoryManager"></member>
+    <member name="M:System.Web.WebPages.VirtualPathFactoryManager.RegisterVirtualPathFactory(System.Web.WebPages.IVirtualPathFactory)"></member>
+    <member name="T:System.Web.WebPages.WebPage">
+      <summary>Represents an ASP.NET Razor page.</summary>
+    </member>
+    <member name="M:System.Web.WebPages.WebPage.#ctor">
+      <summary>Called from a derived class to create a new instance that is based on the <see cref="T:System.Web.WebPages.WebPage" /> class.</summary>
+    </member>
+    <member name="P:System.Web.WebPages.WebPage.Context">
+      <summary>Gets or sets the <see cref="T:System.Web.HttpContextBase" /> object that is associated with a page.</summary>
+      <returns>An object that references HTTP data about the current context of a page.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPage.ExecutePageHierarchy">
+      <summary>Executes the code in a set of dependent Web pages.</summary>
+    </member>
+    <member name="P:System.Web.WebPages.WebPage.Html">
+      <summary>Gets the <see cref="T:System.Web.WebPages.Html.HtmlHelper" /> object that is associated with a page.</summary>
+      <returns>An object that supports rendering HTML form controls in a page.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPage.InitializePage">
+      <summary>Initializes an object that inherits from the <see cref="T:System.Web.WebPages.WebPage" /> class.</summary>
+    </member>
+    <member name="P:System.Web.WebPages.WebPage.Model">
+      <summary>Gets the model that is associated with a page.</summary>
+      <returns>An object that represents a model that is associated with the view data for a page.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPage.ModelState">
+      <summary>Gets the state data for the model that is associated with a page.</summary>
+      <returns>The state of the model.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPage.RegisterPageExecutor(System.Web.WebPages.IWebPageRequestExecutor)">
+      <summary>Adds a class to a list of classes that handle page execution and that implement custom features for pages.</summary>
+      <param name="executor">The class to add.</param>
+    </member>
+    <member name="T:System.Web.WebPages.WebPageBase"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.#ctor"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.ConfigurePage(System.Web.WebPages.WebPageBase)"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.CreateInstanceFromVirtualPath(System.String)"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.DefineSection(System.String,System.Web.WebPages.SectionWriter)">
+      <summary>Called by content pages to create named content sections.</summary>
+      <param name="name">The name of the section to create.</param>
+      <param name="action">The type of action to take with the new section.</param>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageBase.ExecutePageHierarchy"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.ExecutePageHierarchy(System.Web.WebPages.WebPageContext,System.IO.TextWriter)"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.ExecutePageHierarchy(System.Web.WebPages.WebPageContext,System.IO.TextWriter,System.Web.WebPages.WebPageRenderingBase)"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.InitializePage"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.IsSectionDefined(System.String)"></member>
+    <member name="P:System.Web.WebPages.WebPageBase.Layout">
+      <summary>Gets or sets the path of a layout page.</summary>
+      <returns>The path of the layout page.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageBase.Output"></member>
+    <member name="P:System.Web.WebPages.WebPageBase.OutputStack"></member>
+    <member name="P:System.Web.WebPages.WebPageBase.Page">
+      <summary>Provides property-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
+      <returns>An object that contains page data.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageBase.PageData">
+      <summary>Provides array-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
+      <returns>A dictionary that contains page data.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageBase.PopContext"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.PushContext(System.Web.WebPages.WebPageContext,System.IO.TextWriter)"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.RenderBody">
+      <summary>In layout pages, renders the portion of a content page that is not within a named section.</summary>
+      <returns>The HTML content to render.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageBase.RenderPage(System.String,System.Object[])">
+      <summary>Renders the content of one page within another page.</summary>
+      <returns>The HTML content to render.</returns>
+      <param name="path">The path of the page to render.</param>
+      <param name="data">(Optional) An array of data to pass to the page being rendered. In the rendered page, these parameters can be accessed by using the <see cref="P:System.Web.WebPages.WebPageBase.PageData" /> property.</param>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageBase.RenderSection(System.String)">
+      <summary>In layout pages, renders the content of a named section.</summary>
+      <returns>The HTML content to render.</returns>
+      <param name="name">The section to render.</param>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageBase.RenderSection(System.String,System.Boolean)">
+      <summary>In layout pages, renders the content of a named section and specifies whether the section is required.</summary>
+      <returns>The HTML content to render.</returns>
+      <param name="name">The section to render.</param>
+      <param name="required">true to specify that the section is required; otherwise, false. The default is false.</param>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageBase.Write(System.Object)"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.Write(System.Web.WebPages.HelperResult)"></member>
+    <member name="M:System.Web.WebPages.WebPageBase.WriteLiteral(System.Object)"></member>
+    <member name="T:System.Web.WebPages.WebPageContext">
+      <summary>Contains data that is used by a <see cref="T:System.Web.WebPages.WebPage" /> object to reference details about the Web application, the current HTTP request context, the current execution context, and page data.</summary>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageContext.#ctor"></member>
+    <member name="M:System.Web.WebPages.WebPageContext.#ctor(System.Web.HttpContextBase,System.Web.WebPages.WebPageRenderingBase,System.Object)"></member>
+    <member name="P:System.Web.WebPages.WebPageContext.Current">
+      <summary>Gets a reference to the current <see cref="T:System.Web.WebPages.WebPageContext" /> object that is associated with a page.</summary>
+      <returns>The current page context object.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageContext.Model"></member>
+    <member name="P:System.Web.WebPages.WebPageContext.Page">
+      <summary>Gets the <see cref="T:System.Web.WebPages.WebPageRenderingBase" /> object that is associated with a page.</summary>
+      <returns>The page rendering object.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageContext.PageData">
+      <summary>Gets the page data that is shared between pages, layout pages, and partial pages.</summary>
+      <returns>A dictionary that contains page data.</returns>
+    </member>
+    <member name="T:System.Web.WebPages.WebPageExecutingBase">
+      <summary>Provides objects and methods that are used to execute and render all ASP.NET Razor pages.</summary>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.#ctor"></member>
+    <member name="P:System.Web.WebPages.WebPageExecutingBase.App">
+      <summary>Gets the application state data cast as a <see cref="T:System.Dynamic.DynamicObject" /> object that callers can use to create and access custom application-scoped properties.</summary>
+      <returns>An object that references the application state data.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageExecutingBase.AppState">
+      <summary>Gets a reference to global application state data that can be shared across sessions and requests in an ASP.NET application.</summary>
+      <returns>The application state data.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageExecutingBase.Context">
+      <summary>When overridden in a derived class, gets or sets the <see cref="T:System.Web.HttpContextBase" /> object that is associated with a page.</summary>
+      <returns>The current context data.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.Execute"></member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.NormalizePath(System.String)"></member>
+    <member name="P:System.Web.WebPages.WebPageExecutingBase.VirtualPath"></member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.Write(System.Object)"></member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.Write(System.Web.WebPages.HelperResult)"></member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.WriteLiteral(System.Object)"></member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.WriteLiteralTo(System.IO.TextWriter,System.Object)"></member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.WriteTo(System.IO.TextWriter,System.Object)"></member>
+    <member name="M:System.Web.WebPages.WebPageExecutingBase.WriteTo(System.IO.TextWriter,System.Web.WebPages.HelperResult)"></member>
+    <member name="T:System.Web.WebPages.WebPageHttpHandler"></member>
+    <member name="M:System.Web.WebPages.WebPageHttpHandler.#ctor(System.Web.WebPages.WebPage)"></member>
+    <member name="M:System.Web.WebPages.WebPageHttpHandler.CreateFromVirtualPath(System.String)"></member>
+    <member name="P:System.Web.WebPages.WebPageHttpHandler.DisableWebPagesResponseHeader"></member>
+    <member name="M:System.Web.WebPages.WebPageHttpHandler.GetRegisteredExtensions"></member>
+    <member name="P:System.Web.WebPages.WebPageHttpHandler.IsReusable"></member>
+    <member name="M:System.Web.WebPages.WebPageHttpHandler.ProcessRequest(System.Web.HttpContext)"></member>
+    <member name="M:System.Web.WebPages.WebPageHttpHandler.RegisterExtension(System.String)"></member>
+    <member name="F:System.Web.WebPages.WebPageHttpHandler.WebPagesVersionHeaderName"></member>
+    <member name="T:System.Web.WebPages.WebPageRenderingBase">
+      <summary>Provides methods and properties that are used to render pages that use the Razor view engine.</summary>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageRenderingBase.#ctor">
+      <summary>Initializes a new instance of the <see cref="T:System.WebPages.WebPageRenderingBase" /> class.</summary>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Cache">
+      <summary>When overridden in a derived class, gets the cache object for the current application domain.</summary>
+      <returns>The cache object.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Culture">
+      <summary>Gets or sets the culture for the current thread.</summary>
+      <returns>The culture for the current thread.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageRenderingBase.ExecutePageHierarchy">
+      <summary>When overridden in a derived class, calls the methods that are used to initialize the page.</summary>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageRenderingBase.Href(System.String,System.Object[])">
+      <summary>When overridden in a derived class, builds a URL using the specified parameters.</summary>
+      <returns>A URL.</returns>
+      <param name="path">The path to include in the URL.</param>
+      <param name="pathParts">Additional path information.</param>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.IsAjax">
+      <summary>When overridden in a derived class, get a value that indicates whether Ajax is being used during the request of the Web page.</summary>
+      <returns>true if Ajax is being used during the request; otherwise, false.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.IsPost">
+      <summary>When overridden in a derived class, returns a value that indicates whether the HTTP data transfer method used by the client to request the Web page is POST.</summary>
+      <returns>true if the HTTP verb is "POST"; otherwise, false.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Layout">
+      <summary>When overridden in a derived class, gets or sets the path of a layout page.</summary>
+      <returns>The path of a layout page.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Page">
+      <summary>When overridden in a derived class, provides property-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
+      <returns>An object that contains page data.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.PageContext">
+      <summary>Gets the HTTP context for the Web page.</summary>
+      <returns>The HTTP context for the Web page.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.PageData">
+      <summary>When overridden in a derived class, provides array-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
+      <returns>An object that provides array-like access to page data.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.WebPageRenderingBase.RenderPage(System.String,System.Object[])">
+      <summary>When overridden in a derived class, renders a Web page.</summary>
+      <returns>The markup that represents the Web page.</returns>
+      <param name="path">The path of the page to render.</param>
+      <param name="data">Additional data that is used to render the page.</param>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Request">
+      <summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpRequest" /> object for the current HTTP request.</summary>
+      <returns>A <see cref="T:System.Web.HttpRequest" /> object that contains the HTTP values sent by a client during a Web request.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Response">
+      <summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpResponse" /> object for the current HTTP response.</summary>
+      <returns>A <see cref="T:System.Web.HttpResponse" /> object that contains the HTTP-response information from an ASP.NET operation.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Server">
+      <summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpServerUtility" /> object that provides methods that can be used as part of Web-page processing.</summary>
+      <returns>The <see cref="T:System.Web.HttpServerUtility" /> object.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.Session">
+      <summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpSessionState" /> object for the current HTTP request.</summary>
+      <returns>Session data for the current request.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.TemplateInfo">
+      <summary>When overridden in a derived class, gets information about the currently executing file.</summary>
+      <returns>Information about the currently executing file.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.UICulture">
+      <summary>Gets or sets the current culture used by the ResourceManager to look up culture-specific resources at run time.</summary>
+      <returns>The current culture used by the Resource Manager.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.UrlData">
+      <summary>When overridden in a derived class, gets data related to the URL path.</summary>
+      <returns>Data related to the URL path.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.WebPageRenderingBase.User">
+      <summary>When overridden in a derived class, gets a user value based on the HTTP context.</summary>
+      <returns>A user value based on the HTTP context.</returns>
+    </member>
+    <member name="T:System.Web.WebPages.Html.HtmlHelper">
+      <summary>Represents support for rendering HTML controls in a Web page.</summary>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.AttributeEncode(System.Object)">
+      <returns>Returns <see cref="T:System.String" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.AttributeEncode(System.String)">
+      <returns>Returns <see cref="T:System.String" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Boolean)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Boolean,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Encode(System.Object)">
+      <returns>Returns <see cref="T:System.String" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Encode(System.String)">
+      <returns>Returns <see cref="T:System.String" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String,System.Object,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.Html.HtmlHelper.IdAttributeDotReplacement">
+      <returns>Returns <see cref="T:System.String" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String,System.Object,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Boolean)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Boolean,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.Raw(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Int32,System.Int32,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Int32,System.Int32,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String,System.Object,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.Html.HtmlHelper.ValidationInputCssClassName">
+      <returns>Returns <see cref="T:System.String" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.Boolean)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Boolean,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Object)">
+      <returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
+    </member>
+    <member name="P:System.Web.WebPages.Html.HtmlHelper.ValidationSummaryClass">
+      <returns>Returns <see cref="T:System.String" />.</returns>
+    </member>
+    <member name="T:System.Web.WebPages.Html.ModelState"></member>
+    <member name="M:System.Web.WebPages.Html.ModelState.#ctor"></member>
+    <member name="P:System.Web.WebPages.Html.ModelState.Errors"></member>
+    <member name="P:System.Web.WebPages.Html.ModelState.Value"></member>
+    <member name="T:System.Web.WebPages.Html.ModelStateDictionary"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.#ctor"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.#ctor(System.Web.WebPages.Html.ModelStateDictionary)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.Add(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState})"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.Add(System.String,System.Web.WebPages.Html.ModelState)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.AddError(System.String,System.String)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.AddFormError(System.String)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.Clear"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.Contains(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState})"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.ContainsKey(System.String)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.CopyTo(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState}[],System.Int32)"></member>
+    <member name="P:System.Web.WebPages.Html.ModelStateDictionary.Count"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.GetEnumerator"></member>
+    <member name="P:System.Web.WebPages.Html.ModelStateDictionary.IsReadOnly"></member>
+    <member name="P:System.Web.WebPages.Html.ModelStateDictionary.IsValid"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.IsValidField(System.String)"></member>
+    <member name="P:System.Web.WebPages.Html.ModelStateDictionary.Item(System.String)"></member>
+    <member name="P:System.Web.WebPages.Html.ModelStateDictionary.Keys"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.Merge(System.Web.WebPages.Html.ModelStateDictionary)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.Remove(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState})"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.Remove(System.String)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.SetModelValue(System.String,System.Object)"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.System#Collections#IEnumerable#GetEnumerator"></member>
+    <member name="M:System.Web.WebPages.Html.ModelStateDictionary.TryGetValue(System.String,System.Web.WebPages.Html.ModelState@)"></member>
+    <member name="P:System.Web.WebPages.Html.ModelStateDictionary.Values"></member>
+    <member name="T:System.Web.WebPages.Html.SelectListItem"></member>
+    <member name="M:System.Web.WebPages.Html.SelectListItem.#ctor"></member>
+    <member name="M:System.Web.WebPages.Html.SelectListItem.#ctor(System.Web.WebPages.Html.SelectListItem)"></member>
+    <member name="P:System.Web.WebPages.Html.SelectListItem.Selected"></member>
+    <member name="P:System.Web.WebPages.Html.SelectListItem.Text"></member>
+    <member name="P:System.Web.WebPages.Html.SelectListItem.Value"></member>
+    <member name="T:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider"></member>
+    <member name="M:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.#ctor"></member>
+    <member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.ApplicationScope"></member>
+    <member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.CurrentScope"></member>
+    <member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.GlobalScope"></member>
+    <member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.RequestScope"></member>
+    <member name="T:System.Web.WebPages.Scope.IScopeStorageProvider"></member>
+    <member name="P:System.Web.WebPages.Scope.IScopeStorageProvider.CurrentScope"></member>
+    <member name="P:System.Web.WebPages.Scope.IScopeStorageProvider.GlobalScope"></member>
+    <member name="T:System.Web.WebPages.Scope.ScopeStorage"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorage.CreateTransientScope"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorage.CreateTransientScope(System.Collections.Generic.IDictionary{System.Object,System.Object})"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorage.CurrentProvider"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorage.CurrentScope"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorage.GlobalScope"></member>
+    <member name="T:System.Web.WebPages.Scope.ScopeStorageDictionary"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.#ctor"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.#ctor(System.Collections.Generic.IDictionary{System.Object,System.Object})"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Add(System.Collections.Generic.KeyValuePair{System.Object,System.Object})"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Add(System.Object,System.Object)"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.BackingStore"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.BaseScope"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Clear"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Contains(System.Collections.Generic.KeyValuePair{System.Object,System.Object})"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.ContainsKey(System.Object)"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.CopyTo(System.Collections.Generic.KeyValuePair{System.Object,System.Object}[],System.Int32)"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Count"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.GetEnumerator"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.GetItems"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.IsReadOnly"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Item(System.Object)"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Keys"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Remove(System.Collections.Generic.KeyValuePair{System.Object,System.Object})"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Remove(System.Object)"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.SetValue(System.Object,System.Object)"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.System#Collections#IEnumerable#GetEnumerator"></member>
+    <member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.TryGetValue(System.Object,System.Object@)"></member>
+    <member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Values"></member>
+    <member name="T:System.Web.WebPages.Scope.StaticScopeStorageProvider"></member>
+    <member name="M:System.Web.WebPages.Scope.StaticScopeStorageProvider.#ctor"></member>
+    <member name="P:System.Web.WebPages.Scope.StaticScopeStorageProvider.CurrentScope"></member>
+    <member name="P:System.Web.WebPages.Scope.StaticScopeStorageProvider.GlobalScope"></member>
+  </members>
+</doc>

src/.nuget/NuGet.targets

@@ -1,152 +1,152 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-        
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+  <PropertyGroup>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
 
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+    <!-- Enable the restore command to run before builds -->
+    <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
 
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-        
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-    
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
-        <!--
-            <PackageSource Include="https://nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-      <PackageSource Include="https://nuget.org/api/v2/" />
-      <PackageSource Include="http://www.myget.org/F/umbracocore/" />
-    </ItemGroup>
+    <!-- Property that enables building a package from a project -->
+    <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
 
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-        <PackagesConfig>packages.config</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-        
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+    <!-- Determines if package restore consent is required to restore packages -->
+    <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
 
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-        
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
+    <!-- Download NuGet.exe if it does not already exist -->
+    <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+  </PropertyGroup>
 
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(ResolveReferencesDependsOn);
-        </ResolveReferencesDependsOn>
+  <ItemGroup Condition=" '$(PackageSources)' == '' ">
+    <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
+    <!--
+           <PackageSource Include="https://nuget.org/api/v2/" />
+           <PackageSource Include="https://my-nuget-source/nuget/" />
+       -->
+    <PackageSource Include="https://nuget.org/api/v2/" />
+    <PackageSource Include="http://www.myget.org/F/umbracocore/" />
+  </ItemGroup>
 
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+    <!-- Windows specific commands -->
+    <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+    <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+  </PropertyGroup>
 
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
-    </Target>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+    <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+    <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+    <PackagesConfig>packages.config</PackagesConfig>
+  </PropertyGroup>
 
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
+  <PropertyGroup>
+    <!-- NuGet command -->
+    <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+    <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
 
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-              
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
+    <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+    <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
 
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)" 
-              Condition=" '$(OS)' != 'Windows_NT' " />
-              
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-    
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
+    <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
 
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+    <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+    <!-- Commands -->
+    <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
+    <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
 
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-    
-     <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <EnvKey ParameterType="System.String" Required="true" />
-            <EnvValue ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Using Namespace="System" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
-                }
-                catch  {
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>
+    <!-- We need to ensure packages are restored prior to assembly resolve -->
+    <ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
+      RestorePackages;
+      $(ResolveReferencesDependsOn);
+    </ResolveReferencesDependsOn>
+
+    <!-- Make the build depend on restore packages -->
+    <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+      $(BuildDependsOn);
+      BuildPackage;
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="CheckPrerequisites">
+    <!-- Raise an error if we're unable to locate nuget.exe  -->
+    <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+    <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
+    <!--
+       Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+       This effectively acts as a lock that makes sure that the download operation will only happen once and all
+       parallel builds will have to wait for it to complete.
+       -->
+    <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
+  </Target>
+
+  <Target Name="_DownloadNuGet">
+    <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+  </Target>
+
+  <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+    <Exec Command="$(RestoreCommand)"
+          Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+    <Exec Command="$(RestoreCommand)"
+          LogStandardErrorAsError="true"
+          Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+  </Target>
+
+  <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+    <Exec Command="$(BuildCommand)"
+          Condition=" '$(OS)' != 'Windows_NT' " />
+
+    <Exec Command="$(BuildCommand)"
+          LogStandardErrorAsError="true"
+          Condition=" '$(OS)' == 'Windows_NT' " />
+  </Target>
+
+  <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <OutputFilename ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="System.Core" />
+      <Using Namespace="System" />
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Net" />
+      <Using Namespace="Microsoft.Build.Framework" />
+      <Using Namespace="Microsoft.Build.Utilities" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+               try {
+                   OutputFilename = Path.GetFullPath(OutputFilename);
+
+                   Log.LogMessage("Downloading latest version of NuGet.exe...");
+                   WebClient webClient = new WebClient();
+                   webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+
+                   return true;
+               }
+               catch (Exception ex) {
+                   Log.LogErrorFromException(ex);
+                   return false;
+               }
+           ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
+  <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <EnvKey ParameterType="System.String" Required="true" />
+      <EnvValue ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+               try {
+                   Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
+               }
+               catch  {
+               }
+           ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+</Project>

src/SQLCE4Umbraco/Properties/AssemblyInfo.cs

@@ -6,9 +6,10 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SqlCE4Umbraco")]
-[assembly: AssemblyDescription("Umbraco specific Sql Ce Provider")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Umbraco CMS")]
+[assembly: AssemblyProduct("SqlCE4Umbraco")]
+
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 

src/SQLCE4Umbraco/Sql/Total.sql

@@ -10,7 +10,7 @@
  
 IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
  
-    Database version: 6.0.0.0
+    Database version: 4.8.0.2
     
     Please increment this version number if ANY change is made to this script,
     so compatibility with scripts for other database systems can be verified easily.
@@ -147,18 +147,12 @@ CREATE TABLE [cmsContentType]
 [nodeId] [int] NOT NULL, 
 [alias] [nvarchar] (255) NULL, 
 [icon] [nvarchar] (255) NULL,
-[thumbnail] nvarchar(255) NOT NULL CONSTRAINT [DF_cmsContentType_thumbnail] DEFAULT ('folder.png'),
-[isContainer] bit NOT NULL CONSTRAINT [DF_cmsContentType_isContainer] DEFAULT (0),
-[allowAtRoot] bit NOT NULL  CONSTRAINT [DF_cmsContentType_allowAtRoot] DEFAULT (0)
+[thumbnail] nvarchar(255) NOT NULL CONSTRAINT [DF_cmsContentType_thumbnail] DEFAULT ('folder.png')
 ) 
  
 ; 
 ALTER TABLE [cmsContentType] ADD CONSTRAINT [PK_cmsContentType] PRIMARY KEY  ([pk]) 
 ; 
-CREATE TABLE [cmsContentType2ContentType] ([parentContentTypeId] int NOT NULL,[childContentTypeId] int NOT NULL)
-;
-ALTER TABLE [cmsContentType2ContentType] ADD CONSTRAINT  [cmsContentType2ContentType_PK] PRIMARY KEY ([parentContentTypeId],[childContentTypeId])
-;
 CREATE TABLE [cmsMacroPropertyType] 
 ( 
 [id] [int] NOT NULL IDENTITY(1, 1), 
@@ -190,19 +184,16 @@ ALTER TABLE [umbracoStylesheetProperty] ADD CONSTRAINT [PK_stylesheetProperty] P
 
 */
  
-CREATE TABLE [cmsPropertyTypeGroup] 
+CREATE TABLE [cmsTab] 
 ( 
 [id] [int] NOT NULL IDENTITY(1, 1), 
 [contenttypeNodeId] [int] NOT NULL, 
 [text] [nvarchar] (255) NOT NULL, 
-[sortorder] [int] NOT NULL,
-[parentGroupId] int NULL CONSTRAINT [DF_cmsPropertyTypeGroup_parentGroupId] DEFAULT NULL
+[sortorder] [int] NOT NULL 
 ) 
  
 ; 
-ALTER TABLE [cmsPropertyTypeGroup] ADD CONSTRAINT [PK_cmsPropertyTypeGroup] PRIMARY KEY  ([id]) 
-; 
-ALTER TABLE [cmsPropertyTypeGroup] ADD CONSTRAINT [FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup] FOREIGN KEY([parentGroupId]) REFERENCES [cmsPropertyTypeGroup] ([id])
+ALTER TABLE [cmsTab] ADD CONSTRAINT [PK_cmsTab] PRIMARY KEY  ([id]) 
 ; 
 CREATE TABLE [cmsTemplate] 
 ( 
@@ -310,7 +301,7 @@ CREATE TABLE [cmsPropertyType]
 [id] [int] NOT NULL IDENTITY(1, 1), 
 [dataTypeId] [int] NOT NULL, 
 [contentTypeId] [int] NOT NULL, 
-[propertyTypeGroupId] int,
+[tabId] [int] NULL, 
 [Alias] [nvarchar] (255) NOT NULL, 
 [Name] [nvarchar] (255) NULL, 
 [helpText] [nvarchar] (1000) NULL, 
@@ -387,8 +378,7 @@ ALTER TABLE [umbracoAppTree] ADD CONSTRAINT [PK_umbracoAppTree] PRIMARY KEY  ([a
 CREATE TABLE [cmsContentTypeAllowedContentType] 
 ( 
 [Id] [int] NOT NULL, 
-[AllowedId] [int] NOT NULL,
-[sortOrder] int NOT NULL CONSTRAINT [DF_cmsContentTypeAllowedContentType_sortOrder] DEFAULT (1)
+[AllowedId] [int] NOT NULL 
 ) 
  
 ; 
@@ -588,6 +578,9 @@ CONSTRAINT [FK_cmsTemplate_umbracoNode] FOREIGN KEY ([nodeId]) REFERENCES [umbra
 ALTER TABLE [cmsContentType] ADD 
 CONSTRAINT [FK_cmsContentType_umbracoNode] FOREIGN KEY ([nodeId]) REFERENCES [umbracoNode] ([id]) 
 ; 
+ALTER TABLE [cmsPropertyType] ADD 
+CONSTRAINT [FK_cmsPropertyType_cmsTab] FOREIGN KEY ([tabId]) REFERENCES [cmsTab] ([id]) 
+; 
 ALTER TABLE [cmsContent] ADD 
 CONSTRAINT [FK_cmsContent_umbracoNode] FOREIGN KEY ([nodeId]) REFERENCES [umbracoNode] ([id]) 
 ; 
@@ -601,6 +594,8 @@ CONSTRAINT [FK_umbracoUser2app_umbracoApp] FOREIGN KEY ([app]) REFERENCES [umbra
  
 ALTER TABLE [cmsTemplate] DROP CONSTRAINT [FK_cmsTemplate_umbracoNode] 
 ; 
+ALTER TABLE [cmsPropertyType] DROP CONSTRAINT [FK_cmsPropertyType_cmsTab] 
+; 
 ALTER TABLE [cmsContent] DROP CONSTRAINT [FK_cmsContent_umbracoNode] 
 ; 
 ALTER TABLE [cmsMacroProperty] DROP CONSTRAINT [FK_umbracoMacroProperty_umbracoMacroPropertyType] 
@@ -663,7 +658,7 @@ ALTER TABLE [umbracoNode] DROP CONSTRAINT [FK_umbracoNode_umbracoNode]
 |SET IDENTITY_INSERT [umbracoNode] OFF 
 ;
 !!!SET IDENTITY_INSERT [cmsContentType] ON 
-|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon], [thumbnail], [isContainer], [allowAtRoot]) VALUES (532, 1031, N'Folder', N'folder.gif', N'folder.png', 1, 1) 
+|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon], [thumbnail]) VALUES (532, 1031, N'Folder', N'folder.gif', N'folder.png') 
 |INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon], [thumbnail]) VALUES (533, 1032, N'Image', N'mediaPhoto.gif', N'mediaPhoto.png') 
 |INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon], [thumbnail]) VALUES (534, 1033, N'File', N'mediaFile.gif', N'mediaFile.png') 
 |SET IDENTITY_INSERT [cmsContentType] OFF 
@@ -732,22 +727,22 @@ ALTER TABLE [umbracoNode] DROP CONSTRAINT [FK_umbracoNode_umbracoNode]
 |INSERT INTO [cmsMacroPropertyType] ([id], [macroPropertyTypeAlias], [macroPropertyTypeRenderAssembly], [macroPropertyTypeRenderType], [macroPropertyTypeBaseType]) VALUES (25, N'textMultiLine', N'umbraco.macroRenderings', N'textMultiple', N'String') 
 |SET IDENTITY_INSERT [cmsMacroPropertyType] OFF 
 ;
-!!!SET IDENTITY_INSERT [cmsPropertyTypeGroup] ON 
-|INSERT INTO [cmsPropertyTypeGroup] ([id], [contenttypeNodeId], [text], [sortorder]) VALUES (3, 1032, N'Image', 1) 
-|INSERT INTO [cmsPropertyTypeGroup] ([id], [contenttypeNodeId], [text], [sortorder]) VALUES (4, 1033, N'File', 1) 
-|INSERT INTO [cmsPropertyTypeGroup] ([id], [contenttypeNodeId], [text], [sortorder]) VALUES (5, 1031, N'Contents', 1) 
-|SET IDENTITY_INSERT [cmsPropertyTypeGroup] OFF 
+!!!SET IDENTITY_INSERT [cmsTab] ON 
+|INSERT INTO [cmsTab] ([id], [contenttypeNodeId], [text], [sortorder]) VALUES (3, 1032, N'Image', 1) 
+|INSERT INTO [cmsTab] ([id], [contenttypeNodeId], [text], [sortorder]) VALUES (4, 1033, N'File', 1) 
+|INSERT INTO [cmsTab] ([id], [contenttypeNodeId], [text], [sortorder]) VALUES (5, 1031, N'Contents', 1) 
+|SET IDENTITY_INSERT [cmsTab] OFF 
 ;
 !!!SET IDENTITY_INSERT [cmsPropertyType] ON 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (6, -90, 1032, 3, N'umbracoFile', N'Upload image', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (7, -92, 1032, 3, N'umbracoWidth', N'Width', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (8, -92, 1032, 3, N'umbracoHeight', N'Height', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (9, -92, 1032, 3, N'umbracoBytes', N'Size', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (10, -92, 1032, 3, N'umbracoExtension', N'Type', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (24, -90, 1033, 4, N'umbracoFile', N'Upload file', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (25, -92, 1033, 4, N'umbracoExtension', N'Type', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (26, -92, 1033, 4, N'umbracoBytes', N'Size', NULL, 0, 0, NULL, NULL) 
-|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [propertyTypeGroupId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (27, -38, 1031, 5, N'contents', N'Contents:', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (6, -90, 1032, 3, N'umbracoFile', N'Upload image', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (7, -92, 1032, 3, N'umbracoWidth', N'Width', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (8, -92, 1032, 3, N'umbracoHeight', N'Height', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (9, -92, 1032, 3, N'umbracoBytes', N'Size', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (10, -92, 1032, 3, N'umbracoExtension', N'Type', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (24, -90, 1033, 4, N'umbracoFile', N'Upload file', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (25, -92, 1033, 4, N'umbracoExtension', N'Type', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (26, -92, 1033, 4, N'umbracoBytes', N'Size', NULL, 0, 0, NULL, NULL) 
+|INSERT INTO [cmsPropertyType] ([id], [dataTypeId], [contentTypeId], [tabId], [Alias], [Name], [helpText], [sortOrder], [mandatory], [validationRegExp], [Description]) VALUES (27, -38, 1031, 5, N'contents', N'Contents:', NULL, 0, 0, NULL, NULL) 
 |SET IDENTITY_INSERT [cmsPropertyType] OFF 
 ;
 !!!SET IDENTITY_INSERT [umbracoLanguage] ON 
@@ -797,6 +792,8 @@ INSERT INTO [cmsContentTypeAllowedContentType] ([Id], [AllowedId]) VALUES (1031,
 ;
 ALTER TABLE [cmsTemplate] ADD CONSTRAINT [FK_cmsTemplate_umbracoNode] FOREIGN KEY ([nodeId]) REFERENCES [umbracoNode] ([id]) 
 ;
+ALTER TABLE [cmsPropertyType] ADD CONSTRAINT [FK_cmsPropertyType_cmsTab] FOREIGN KEY ([tabId]) REFERENCES [cmsTab] ([id]) 
+;
 ALTER TABLE [cmsContent] ADD CONSTRAINT [FK_cmsContent_umbracoNode] FOREIGN KEY ([nodeId]) REFERENCES [umbracoNode] ([id]) 
 ;
 ALTER TABLE [cmsMacroProperty] ADD CONSTRAINT [FK_umbracoMacroProperty_umbracoMacroPropertyType] FOREIGN KEY ([macroPropertyType]) REFERENCES [cmsMacroPropertyType] ([id]) 
@@ -866,11 +863,11 @@ INSERT INTO [umbracoAppTree]([treeSilent], [treeInitialize], [treeSortOrder], [a
 ;
 INSERT INTO [umbracoAppTree]([treeSilent], [treeInitialize], [treeSortOrder], [appAlias], [treeAlias], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES(0, 1, 2, 'settings', 'scripts', 'Scripts', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadScripts') 
 ;
-alter TABLE [cmsContentType]
+*/
+/*alter TABLE [cmsContentType]
 add [thumbnail] nvarchar(255) NOT NULL CONSTRAINT
 [DF_cmsContentType_thumbnail] DEFAULT ('folder.png')
-;
-*/
+;*/
 alter TABLE [cmsContentType]
 add [description] nvarchar(1500) NULL
 ;
@@ -929,6 +926,10 @@ INSERT INTO umbracoAppTree (treeSilent, treeInitialize, treeSortOrder, appAlias,
 VALUES (0, 1, 2, 'translation','yourTasks', 'Tasks created by you', '.sprTreeFolder', '.sprTreeFolder_o', 'umbraco', 'loadYourTasks');
 ; 
 */
+alter TABLE [cmsContentType]
+add [masterContentType] int NULL CONSTRAINT
+[DF_cmsContentType_masterContentType] DEFAULT (0)
+;
 CREATE TABLE [cmsTagRelationship](
 	[nodeId] [int] NOT NULL,
 	[tagId] [int] NOT NULL)
@@ -962,10 +963,11 @@ CREATE TABLE [cmsPreviewXml](
 	[versionId] [uniqueidentifier] NOT NULL,
 	[timestamp] [datetime] NOT NULL,
 	[xml] [ntext] NOT NULL)
-
 ;
 
 
+
+
 /***********************************************************************************************************************
 
 ADD NEW PRIMARY KEYS, FOREIGN KEYS AND INDEXES FOR VERSION 4.1
@@ -990,7 +992,7 @@ ALTER TABLE [umbracoUserType] ALTER COLUMN id IDENTITY(5,1)
 ;
 ALTER TABLE [cmsMacroPropertyType] ALTER COLUMN id IDENTITY(26,1)
 ;
-ALTER TABLE [cmsPropertyTypeGroup] ALTER COLUMN id IDENTITY(6,1)
+ALTER TABLE [cmsTab] ALTER COLUMN id IDENTITY(6,1)
 ;
 ALTER TABLE [cmsPropertyType] ALTER COLUMN id IDENTITY(28,1)
 ;

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -20,8 +20,6 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,13 +41,9 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\SQLCE4\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -79,7 +73,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Sql\Total.sql" />
-    <None Include="packages.config" />
     <None Include="Sql\Version4_1_Upgrade.sql" />
   </ItemGroup>
   <ItemGroup>
@@ -100,7 +93,6 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/SQLCE4Umbraco/SqlCEHelper.cs

@@ -94,7 +94,7 @@ namespace SqlCE4Umbraco
                 var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory") as string;
                 if (!string.IsNullOrEmpty(dataDirectory))
                 {
-                    path = path.Replace("|DataDirectory|", dataDirectory + System.IO.Path.DirectorySeparatorChar);
+                    path = path.Replace("|DataDirectory|", dataDirectory);
                 }
             }
 

src/SQLCE4Umbraco/SqlCeContextGuardian.cs

@@ -11,7 +11,7 @@ namespace SQLCE4Umbraco
     public static class SqlCeContextGuardian
     {
         private static SqlCeConnection _constantOpenConnection;
-        private static readonly object Lock = new object();
+        private static object objLock = new object();
 
         // Awesome SQL CE 4 speed improvement by Erik Ejskov Jensen - SQL CE 4 MVP
         // It's not an issue with SQL CE 4 that we never close the connection
@@ -29,7 +29,7 @@ namespace SQLCE4Umbraco
             connectionStringBuilder.Remove("datalayer");
 
             // SQL CE 4 performs better when there's always a connection open in the background
-            EnsureOpenBackgroundConnection(connectionStringBuilder.ConnectionString);
+            ensureOpenBackgroundConnection(connectionStringBuilder.ConnectionString);
 
             SqlCeConnection conn = new SqlCeConnection(connectionStringBuilder.ConnectionString);
             conn.Open();
@@ -38,18 +38,9 @@ namespace SQLCE4Umbraco
 
         }
 
-		/// <summary>
-		/// Sometimes we need to ensure this is closed especially in unit tests
-		/// </summary>
-		internal static void CloseBackgroundConnection()
-		{
-			if (_constantOpenConnection != null)
-				_constantOpenConnection.Close();
-		}
-
-        private static void EnsureOpenBackgroundConnection(string connectionString)
+        private static void ensureOpenBackgroundConnection(string connectionString)
         {
-            lock (Lock)
+            lock (objLock)
             {
                 if (_constantOpenConnection == null)
                 {

src/SQLCE4Umbraco/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
-</packages>

src/Umbraco.Core/ActionsResolver.cs

@@ -9,14 +9,14 @@ namespace Umbraco.Core
 	/// <summary>
 	/// A resolver to return all IAction objects
 	/// </summary>
-	internal sealed class ActionsResolver : ManyObjectsResolverBase<ActionsResolver, IAction>
+	internal sealed class ActionsResolver : LazyManyObjectsResolverBase<ActionsResolver, IAction>
 	{
 
 		/// <summary>
 		/// Constructor
 		/// </summary>
 		/// <param name="packageActions"></param>		
-		internal ActionsResolver(IEnumerable<Type> packageActions)
+		internal ActionsResolver(Func<IEnumerable<Type>> packageActions)
 			: base(packageActions)
 		{
 
@@ -34,9 +34,9 @@ namespace Umbraco.Core
 		}
 
 		protected override IEnumerable<IAction> CreateInstances()
-		{
+		{					
 			var actions = new List<IAction>();
-			var foundIActions = PluginManager.Current.ResolveActions();
+			var foundIActions = InstanceTypes;
 			foreach (var type in foundIActions)
 			{
 				IAction typeInstance;

src/Umbraco.Core/ApplicationContext.cs

@@ -1,10 +1,14 @@
 using System;
+using System.Collections;
 using System.Configuration;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
 using System.Web;
 using System.Web.Caching;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Services;
+using Umbraco.Core.Models;
 
 
 namespace Umbraco.Core
@@ -19,28 +23,14 @@ namespace Umbraco.Core
     {
     	/// <summary>
         /// Constructor
-        /// </summary>        
-        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
-			:this()
+        /// </summary>
+        internal ApplicationContext()
     	{
-    		if (dbContext == null) throw new ArgumentNullException("dbContext");
-    		if (serviceContext == null) throw new ArgumentNullException("serviceContext");
-
-			_databaseContext = dbContext;
-			_services = serviceContext;			
-    	}
-
-		/// <summary>
-		/// Empty constructor normally reserved for unit tests when a DatabaseContext or a ServiceContext is not
-		/// necessarily required or needs to be set after construction.
-		/// </summary>
-		internal ApplicationContext()
-		{
 			//create a new application cache from the HttpRuntime.Cache
-			ApplicationCache = HttpRuntime.Cache == null
-				? new CacheHelper(new Cache())
+    		ApplicationCache = HttpRuntime.Cache == null 
+				? new CacheHelper(new Cache()) 
 				: new CacheHelper(HttpRuntime.Cache);
-		}
+    	}
 
 		/// <summary>
     	/// Singleton accessor
@@ -60,10 +50,7 @@ namespace Umbraco.Core
         //   now, the boot task that setup the content store ensures that it is ready
         bool _isReady = false;
 		readonly System.Threading.ManualResetEventSlim _isReadyEvent = new System.Threading.ManualResetEventSlim(false);
-		private DatabaseContext _databaseContext;
-		private ServiceContext _services;
-
-		public bool IsReady
+        public bool IsReady
         {
             get
             {
@@ -100,6 +87,18 @@ namespace Umbraco.Core
             }
         }
 
+        /// <summary>
+        /// The original/first url that the web application executes
+        /// </summary>
+        /// <remarks>
+        /// we need to set the initial url in our ApplicationContext, this is so our keep alive service works and this must
+        /// exist on a global context because the keep alive service doesn't run in a web context.
+        /// we are NOT going to put a lock on this because locking will slow down the application and we don't really care
+        /// if two threads write to this at the exact same time during first page hit.
+        /// see: http://issues.umbraco.org/issue/U4-2059
+        /// </remarks>
+        internal string OriginalRequestUrl { get; set; }
+
 		private bool Configured
 		{
 			get
@@ -107,7 +106,7 @@ namespace Umbraco.Core
 				try
 				{
 					string configStatus = ConfigurationStatus;
-					string currentVersion = UmbracoVersion.Current.ToString(3);
+					string currentVersion = GlobalSettings.CurrentVersion;
 
 
 					if (currentVersion != configStatus)
@@ -140,7 +139,6 @@ namespace Umbraco.Core
 			}			
 		}
 
-
         private void AssertIsReady()
         {
             if (!this.IsReady)
@@ -152,39 +150,5 @@ namespace Umbraco.Core
             if (this.IsReady)
                 throw new Exception("ApplicationContext has already been initialized.");
         }
-
-		/// <summary>
-		/// Gets the current DatabaseContext
-		/// </summary>
-		/// <remarks>
-		/// Internal set is generally only used for unit tests
-		/// </remarks>
-		public DatabaseContext DatabaseContext
-		{
-			get
-			{
-				if (_databaseContext == null)
-					throw new InvalidOperationException("The DatabaseContext has not been set on the ApplicationContext");
-				return _databaseContext;
-			}
-			internal set { _databaseContext = value; }
-		}
-		
-		/// <summary>
-		/// Gets the current ServiceContext
-		/// </summary>
-		/// <remarks>
-		/// Internal set is generally only used for unit tests
-		/// </remarks>
-		public ServiceContext Services
-		{
-			get
-			{
-				if (_services == null)
-					throw new InvalidOperationException("The ServiceContext has not been set on the ApplicationContext");
-				return _services;
-			}
-			internal set { _services = value; }
-		}
     }
 }

src/Umbraco.Core/Auditing/Audit.cs

@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Auditing
-{
-	/// <summary>
-	/// Public method to create new audit trail
-	/// </summary>
-    public static class Audit
-    {
-         public static void Add(AuditTypes type, string comment, int userId, int objectId)
-         {
-             AuditTrail.Current.AddEntry(type, comment, userId, objectId);
-         }
-    }
-}

src/Umbraco.Core/Auditing/AuditTrail.cs

@@ -1,30 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Auditing
-{
-    /// <summary>
-    /// Represents the Audit implementation
-    /// </summary>
-    internal class AuditTrail
-    {
-        #region Singleton
-
-        private static readonly Lazy<AuditTrail> lazy = new Lazy<AuditTrail>(() => new AuditTrail());
-
-        public static AuditTrail Current { get { return lazy.Value; } }
-
-        private AuditTrail()
-        {
-            WriteProvider = new DataAuditWriteProvider();
-        }
-
-        #endregion
-
-        private IAuditWriteProvider WriteProvider { get; set; }
-
-        public void AddEntry(AuditTypes type, string comment, int userId, int objectId)
-        {
-            WriteProvider.WriteEntry(objectId, userId, DateTime.Now, type.ToString(), comment);
-        }
-    }
-}

src/Umbraco.Core/Auditing/AuditTypes.cs

@@ -1,85 +0,0 @@
-namespace Umbraco.Core.Auditing
-{
-    /// <summary>
-    /// Enums for vailable types of auditing
-    /// </summary>
-    public enum AuditTypes
-    {
-        /// <summary>
-        /// Used when new nodes are added
-        /// </summary>
-        New,
-        /// <summary>
-        /// Used when nodes are saved
-        /// </summary>
-        Save,
-        /// <summary>
-        /// Used when nodes are opened
-        /// </summary>
-        Open,
-        /// <summary>
-        /// Used when nodes are deleted
-        /// </summary>
-        Delete,
-        /// <summary>
-        /// Used when nodes are published
-        /// </summary>
-        Publish,
-        /// <summary>
-        /// Used when nodes are send to publishing
-        /// </summary>
-        SendToPublish,
-        /// <summary>
-        /// Used when nodes are unpublished
-        /// </summary>
-        UnPublish,
-        /// <summary>
-        /// Used when nodes are moved
-        /// </summary>
-        Move,
-        /// <summary>
-        /// Used when nodes are copied
-        /// </summary>
-        Copy,
-        /// <summary>
-        /// Used when nodes are assígned a domain
-        /// </summary>
-        AssignDomain,
-        /// <summary>
-        /// Used when public access are changed for a node
-        /// </summary>
-        PublicAccess,
-        /// <summary>
-        /// Used when nodes are sorted
-        /// </summary>
-        Sort,
-        /// <summary>
-        /// Used when a notification are send to a user
-        /// </summary>
-        Notify,
-        /// <summary>
-        /// General system notification
-        /// </summary>
-        System,
-        /// <summary>
-        /// Used when a node's content is rolled back to a previous version
-        /// </summary>
-        RollBack,
-        /// <summary>
-        /// Used when a package is installed
-        /// </summary>
-        PackagerInstall,
-        /// <summary>
-        /// Used when a package is uninstalled
-        /// </summary>
-        PackagerUninstall,
-        /// <summary>
-        /// Used when a node is send to translation
-        /// </summary>
-        SendToTranslate,
-        /// <summary>
-        /// Use this log action for custom log messages that should be shown in the audit trail
-        /// </summary>
-        Custom
-    }
-}

src/Umbraco.Core/Auditing/DataAuditWriteProvider.cs

@@ -1,29 +0,0 @@
-using System;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-
-namespace Umbraco.Core.Auditing
-{
-    internal class DataAuditWriteProvider : IAuditWriteProvider
-    {
-        /// <summary>
-        /// Writes an audit entry to the underlaying datastore.
-        /// </summary>
-        /// <param name="objectId">Id of the object (Content, ContentType, Media, etc.)</param>
-        /// <param name="userId">Id of the user</param>
-        /// <param name="date">Datestamp</param>
-        /// <param name="header">Audit header</param>
-        /// <param name="comment">Audit comment</param>
-        public void WriteEntry(int objectId, int userId, DateTime date, string header, string comment)
-        {
-            ApplicationContext.Current.DatabaseContext.Database.Insert(new LogDto
-                                                        {
-                                                            Comment = comment,
-                                                            Datestamp = date,
-                                                            Header = header,
-                                                            NodeId = objectId,
-                                                            UserId = userId
-                                                        });
-        }
-    }
-}

src/Umbraco.Core/Auditing/IAuditWriteProvider.cs

@@ -1,17 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Auditing
-{
-    internal interface IAuditWriteProvider
-    {
-        /// <summary>
-        /// Writes an audit entry to the underlaying datastore.
-        /// </summary>
-        /// <param name="objectId">Id of the object (Content, ContentType, Media, etc.)</param>
-        /// <param name="userId">Id of the user</param>
-        /// <param name="date">Datestamp</param>
-        /// <param name="header">Audit header</param>
-        /// <param name="comment">Audit comment</param>
-        void WriteEntry(int objectId, int userId, DateTime date, string header, string comment);
-    }
-}

src/Umbraco.Core/CacheRefreshersResolver.cs

@@ -17,7 +17,7 @@ namespace Umbraco.Core
 		/// Constructor
 		/// </summary>
 		/// <param name="refreshers"></param>		
-		internal CacheRefreshersResolver(IEnumerable<Type> refreshers)
+		internal CacheRefreshersResolver(Func<IEnumerable<Type>> refreshers)
 			: base(refreshers)
 		{
 			

src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Linq;
-using System.Xml.Linq;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.Configuration
-{
-    internal class ClientDependencyConfiguration
-    {
-        private readonly string _fileName;
-
-        public ClientDependencyConfiguration()
-        {
-            _fileName = IOHelper.MapPath(string.Format("{0}/ClientDependency.config", SystemDirectories.Config));
-        }
-
-        /// <summary>
-        /// Increases the version number in ClientDependency.config by 1
-        /// </summary>
-        internal bool IncreaseVersionNumber()
-        {
-            try
-            {
-                var clientDependencyConfigXml = XDocument.Load(_fileName, LoadOptions.PreserveWhitespace);
-                if (clientDependencyConfigXml.Root != null)
-                {
-
-                    var versionAttribute = clientDependencyConfigXml.Root.Attribute("version");
-
-                    int oldVersion;
-                    int.TryParse(versionAttribute.Value, out oldVersion);
-                    var newVersion = oldVersion + 1;
-
-                    versionAttribute.SetValue(newVersion);
-                    clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);
-
-                    LogHelper.Info<ClientDependencyConfiguration>(string.Format("Updated version number from {0} to {1}", oldVersion, newVersion));
-                    return true;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<ClientDependencyConfiguration>("Couldn't update ClientDependency version number", ex);
-            }
-
-            return false;
-        }
-    }
-}

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
@@ -12,12 +12,12 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
-    //NOTE: Do not expose this class ever until we cleanup all configuration including removal of static classes, etc...
-    // we have this two tasks logged:
-    // http://issues.umbraco.org/issue/U4-58
-    // http://issues.umbraco.org/issue/U4-115	
-
-    //TODO:  Replace checking for if the app settings exist and returning an empty string, instead return the defaults!
+	//NOTE: Do not expose this class ever until we cleanup all configuration including removal of static classes, etc...
+	// we have this two tasks logged:
+	// http://issues.umbraco.org/issue/U4-58
+	// http://issues.umbraco.org/issue/U4-115	
+	
+	//TODO:  Replace checking for if the app settings exist and returning an empty string, instead return the defaults!
 
     /// <summary>
     /// The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information from  web.config appsettings 
@@ -26,26 +26,53 @@ namespace Umbraco.Core.Configuration
     {
 
         #region Private static fields
+        
+		// CURRENT UMBRACO VERSION ID
+    	private const string CurrentUmbracoVersion = "4.11.7";
 
-        private static Version _version;
-        private static string _reservedUrlsCache;
+        private static readonly object Locker = new object();
+        //make this volatile so that we can ensure thread safety with a double check lock
+    	private static volatile string _reservedUrlsCache;
         private static string _reservedPathsCache;
         private static StartsWithContainer _reservedList = new StartsWithContainer();
+        private static string _reservedPaths;
+        private static string _reservedUrls;
+        //ensure the built on (non-changeable) reserved paths are there at all times
+        private const string StaticReservedPaths = "~/app_plugins/,~/install/,";
+        private const string StaticReservedUrls = "~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,";
 
         #endregion
 
         /// <summary>
+        /// used for unit tests
+        /// </summary>
+        internal static void ResetCache()
+        {
+            _reservedUrlsCache = null;
+            _reservedPaths = null;
+            _reservedUrls = null;
+        }
+
+    	/// <summary>
         /// Gets the reserved urls from web.config.
         /// </summary>
         /// <value>The reserved urls.</value>
         public static string ReservedUrls
         {
             get
-            {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoReservedUrls")
-                    ? ConfigurationManager.AppSettings["umbracoReservedUrls"]
-                    : string.Empty;
+            {                
+                if (_reservedUrls == null)
+                {
+                    var urls = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedUrls")
+                                   ? ConfigurationManager.AppSettings["umbracoReservedUrls"]
+                                   : string.Empty;
+
+                    //ensure the built on (non-changeable) reserved paths are there at all times
+                    _reservedUrls = StaticReservedUrls + urls;    
+                }
+                return _reservedUrls;
             }
+            internal set { _reservedUrls = value; }
         }
 
         /// <summary>
@@ -56,10 +83,25 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoReservedPaths")
-                           ? ConfigurationManager.AppSettings["umbracoReservedPaths"]
-                           : string.Empty;
+                if (_reservedPaths == null)
+                {
+                    var reservedPaths = StaticReservedPaths;
+                    //always add the umbraco path to the list
+                    if (ConfigurationManager.AppSettings.ContainsKey("umbracoPath")
+                        && !ConfigurationManager.AppSettings["umbracoPath"].IsNullOrWhiteSpace())
+                    {
+                        reservedPaths += ConfigurationManager.AppSettings["umbracoPath"].EnsureEndsWith(',');
+                    }
+
+                    var allPaths = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedPaths")
+                                    ? ConfigurationManager.AppSettings["umbracoReservedPaths"]
+                                    : string.Empty;
+
+                    _reservedPaths = reservedPaths + allPaths;
+                }
+                return _reservedPaths;
             }
+            internal set { _reservedPaths = value; }
         }
 
         /// <summary>
@@ -69,10 +111,10 @@ namespace Umbraco.Core.Configuration
         public static string ContentXmlFile
         {
             get
-            {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXML")
-                    ? ConfigurationManager.AppSettings["umbracoContentXML"]
-                    : string.Empty;
+            {                
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXML")
+					? ConfigurationManager.AppSettings["umbracoContentXML"]
+					: string.Empty;	                    
             }
         }
 
@@ -84,9 +126,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoStorageDirectory")
-                    ? ConfigurationManager.AppSettings["umbracoStorageDirectory"]
-                    : string.Empty;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoStorageDirectory")
+					? ConfigurationManager.AppSettings["umbracoStorageDirectory"]
+					: string.Empty;	                    
             }
         }
 
@@ -98,34 +140,37 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoPath")
-                    ? IOHelper.ResolveUrl(ConfigurationManager.AppSettings["umbracoPath"])
-                    : string.Empty;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoPath")
+					? IOHelper.ResolveUrl(ConfigurationManager.AppSettings["umbracoPath"])
+					: string.Empty;	                
             }
         }
 
-        /// <summary>
-        /// This returns the string of the MVC Area route.
-        /// </summary>
-        /// <remarks>
-        /// THIS IS TEMPORARY AND SHOULD BE REMOVED WHEN WE MIGRATE/UPDATE THE CONFIG SETTINGS TO BE A REAL CONFIG SECTION
-        /// AND SHOULD PROBABLY BE HANDLED IN A MORE ROBUST WAY.
-        /// 
-        /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
-        /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
-        /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
-        /// </remarks>
-        internal static string UmbracoMvcArea
-        {
-            get
-            {
-                if (Path.IsNullOrWhiteSpace())
-                {
-                    throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
-                }
-                return Path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim();
-            }
-        }
+		/// <summary>
+		/// This returns the string of the MVC Area route.
+		/// </summary>
+		/// <remarks>
+		/// THIS IS TEMPORARY AND SHOULD BE REMOVED WHEN WE MIGRATE/UPDATE THE CONFIG SETTINGS TO BE A REAL CONFIG SECTION
+		/// AND SHOULD PROBABLY BE HANDLED IN A MORE ROBUST WAY.
+		/// 
+		/// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
+		/// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
+		/// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
+		/// 
+        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
+        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
+		/// </remarks>
+    	internal static string UmbracoMvcArea
+    	{
+    		get 
+			{ 
+				if (Path.IsNullOrWhiteSpace())
+				{
+					throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
+				}
+			    return Path.TrimStart(SystemDirectories.Root).TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+			}
+    	}
 
         /// <summary>
         /// Gets the path to umbraco's client directory (/umbraco_client by default).
@@ -145,44 +190,23 @@ namespace Umbraco.Core.Configuration
         /// Gets the database connection string
         /// </summary>
         /// <value>The database connection string.</value>
-        [Obsolete("Use System.ConfigurationManager.ConnectionStrings to get the connection with the key Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName instead")]
         public static string DbDsn
         {
             get
             {
-                var settings = ConfigurationManager.ConnectionStrings[UmbracoConnectionName];
-                var connectionString = string.Empty;
-
-                if (settings != null)
-                {
-                    connectionString = settings.ConnectionString;
-
-                    // The SqlCe connectionString is formatted slightly differently, so we need to updat it
-                    if (settings.ProviderName.Contains("SqlServerCe"))
-                        connectionString = string.Format("datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;{0}", connectionString);
-                }
-
-                return connectionString;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoDbDSN")
+					? ConfigurationManager.AppSettings["umbracoDbDSN"]
+					: string.Empty;	          				
             }
             set
             {
                 if (DbDsn != value)
                 {
-                    if (value.ToLower().Contains("SQLCE4Umbraco.SqlCEHelper".ToLower()))
-                    {
-                        ApplicationContext.Current.DatabaseContext.ConfigureDatabaseConnection();
-                    }
-                    else
-                    {
-                        ApplicationContext.Current.DatabaseContext.ConfigureDatabaseConnection(value);
-                    } 
+                    SaveSetting("umbracoDbDSN", value);
                 }
             }
         }
 
-        public const string UmbracoConnectionName = "umbracoDbDSN";
-        public const string UmbracoMigrationName = "Umbraco";
-
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
         /// </summary>
@@ -191,16 +215,16 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoConfigurationStatus")
-                    ? ConfigurationManager.AppSettings["umbracoConfigurationStatus"]
-                    : string.Empty;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoConfigurationStatus")
+					? ConfigurationManager.AppSettings["umbracoConfigurationStatus"]
+					: string.Empty;	        
             }
             set
             {
                 SaveSetting("umbracoConfigurationStatus", value);
             }
         }
-
+        
         /// <summary>
         /// Saves a setting into the configuration file.
         /// </summary>
@@ -208,57 +232,32 @@ namespace Umbraco.Core.Configuration
         /// <param name="value">Value of the setting to be saved.</param>
         internal static void SaveSetting(string key, string value)
         {
-            var fileName = GetFullWebConfigFileName();
-            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
+            var webConfig = new WebConfigurationFileMap();
+            var vDirs = webConfig.VirtualDirectories;
+            var physicalPathToRoot = FullpathToRoot;
+            foreach (VirtualDirectoryMapping v in webConfig.VirtualDirectories)
+            {
+                if (v.IsAppRoot)
+                {
+                    physicalPathToRoot = v.PhysicalDirectory;
+                }
+            }
 
+            string fileName = System.IO.Path.Combine(physicalPathToRoot, "web.config");
+            var xml = XDocument.Load(fileName);
             var appSettings = xml.Root.Descendants("appSettings").Single();
 
             // Update appSetting if it exists, or else create a new appSetting for the given key and value
-            var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
+            var setting = appSettings.Descendants("add").Where(s => s.Attribute("key").Value == key).FirstOrDefault();
             if (setting == null)
                 appSettings.Add(new XElement("add", new XAttribute("key", key), new XAttribute("value", value)));
             else
                 setting.Attribute("value").Value = value;
 
-            xml.Save(fileName, SaveOptions.DisableFormatting);
+            xml.Save(fileName);
             ConfigurationManager.RefreshSection("appSettings");
         }
 
-        /// <summary>
-        /// Removes a setting from the configuration file.
-        /// </summary>
-        /// <param name="key">Key of the setting to be removed.</param>
-        internal static void RemoveSetting(string key)
-        {
-            var fileName = GetFullWebConfigFileName();
-            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-
-            var appSettings = xml.Root.Descendants("appSettings").Single();
-            var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
-
-            if (setting != null)
-            {
-                setting.Remove();
-                xml.Save(fileName, SaveOptions.DisableFormatting);
-                ConfigurationManager.RefreshSection("appSettings");
-            }
-        }
-
-        private static string GetFullWebConfigFileName()
-        {
-            var webConfig = new WebConfigurationFileMap();
-            var vDir = FullpathToRoot;
-
-            foreach (VirtualDirectoryMapping v in webConfig.VirtualDirectories)
-            {
-                if (v.IsAppRoot)
-                    vDir = v.PhysicalDirectory;
-            }
-
-            var fileName = System.IO.Path.Combine(vDir, "web.config");
-            return fileName;
-        }
-
         /// <summary>
         /// Gets the full path to root.
         /// </summary>
@@ -298,14 +297,14 @@ namespace Umbraco.Core.Configuration
                 try
                 {
                     string configStatus = ConfigurationStatus;
-                    string currentVersion = UmbracoVersion.Current.ToString(3);
+                    string currentVersion = CurrentVersion;
 
 
                     if (currentVersion != configStatus)
                     {
-                        LogHelper.Debug<GlobalSettings>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
+                    	LogHelper.Debug<GlobalSettings>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");                    	
                     }
-
+                        
 
                     return (configStatus == currentVersion);
                 }
@@ -362,17 +361,17 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                try
-                {
-                    return int.Parse(ConfigurationManager.AppSettings["umbracoVersionCheckPeriod"]);
-                }
-                catch
-                {
-                    return 7;
-                }
+				try
+				{
+					return int.Parse(ConfigurationManager.AppSettings["umbracoVersionCheckPeriod"]);
+				}
+				catch
+				{
+					return 7;
+				}
             }
         }
-
+        
         /// <summary>
         /// Returns a string value to determine if umbraco should disbable xslt extensions
         /// </summary>
@@ -381,9 +380,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoDisableXsltExtensions")
-                    ? ConfigurationManager.AppSettings["umbracoDisableXsltExtensions"]
-                    : string.Empty;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoDisableXsltExtensions")
+					? ConfigurationManager.AppSettings["umbracoDisableXsltExtensions"]
+					: string.Empty;	   
             }
         }
 
@@ -395,9 +394,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoEditXhtmlMode")
-                    ? ConfigurationManager.AppSettings["umbracoEditXhtmlMode"]
-                    : string.Empty;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoEditXhtmlMode")
+					? ConfigurationManager.AppSettings["umbracoEditXhtmlMode"]
+					: string.Empty;	   
             }
         }
 
@@ -409,9 +408,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoDefaultUILanguage")
-                    ? ConfigurationManager.AppSettings["umbracoDefaultUILanguage"]
-                    : string.Empty;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoDefaultUILanguage")
+					? ConfigurationManager.AppSettings["umbracoDefaultUILanguage"]
+					: string.Empty;	   
             }
         }
 
@@ -423,9 +422,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoProfileUrl")
-                    ? ConfigurationManager.AppSettings["umbracoProfileUrl"]
-                    : string.Empty;
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoProfileUrl")
+					? ConfigurationManager.AppSettings["umbracoProfileUrl"]
+					: string.Empty;	   
             }
         }
 
@@ -439,14 +438,14 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                try
-                {
-                    return bool.Parse(ConfigurationManager.AppSettings["umbracoHideTopLevelNodeFromPath"]);
-                }
-                catch
-                {
-                    return false;
-                }
+				try
+				{
+					return bool.Parse(ConfigurationManager.AppSettings["umbracoHideTopLevelNodeFromPath"]);
+				}
+				catch
+				{
+					return false;
+				}
             }
         }
 
@@ -454,12 +453,12 @@ namespace Umbraco.Core.Configuration
         /// Gets the current version.
         /// </summary>
         /// <value>The current version.</value>
-        [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
         public static string CurrentVersion
         {
             get
             {
-                return UmbracoVersion.Current.ToString(3);
+                // change this to be hardcoded in the binary
+                return CurrentUmbracoVersion;
             }
         }
 
@@ -467,12 +466,12 @@ namespace Umbraco.Core.Configuration
         /// Gets the major version number.
         /// </summary>
         /// <value>The major version number.</value>
-        [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
         public static int VersionMajor
         {
             get
             {
-                return UmbracoVersion.Current.Major;
+                string[] version = CurrentVersion.Split(".".ToCharArray());
+                return int.Parse(version[0]);
             }
         }
 
@@ -480,12 +479,12 @@ namespace Umbraco.Core.Configuration
         /// Gets the minor version number.
         /// </summary>
         /// <value>The minor version number.</value>
-        [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
         public static int VersionMinor
         {
             get
             {
-                return UmbracoVersion.Current.Minor;
+                string[] version = CurrentVersion.Split(".".ToCharArray());
+                return int.Parse(version[1]);
             }
         }
 
@@ -493,12 +492,12 @@ namespace Umbraco.Core.Configuration
         /// Gets the patch version number.
         /// </summary>
         /// <value>The patch version number.</value>
-        [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
         public static int VersionPatch
         {
             get
             {
-                return UmbracoVersion.Current.Build;
+                string[] version = CurrentVersion.Split(".".ToCharArray());
+                return int.Parse(version[2]);
             }
         }
 
@@ -506,12 +505,15 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
         public static string VersionComment
         {
             get
             {
-                return Umbraco.Core.Configuration.UmbracoVersion.CurrentComment;
+                string[] version = CurrentVersion.Split(".".ToCharArray());
+                if (version.Length > 3)
+                    return version[3];
+                else
+                    return "";
             }
         }
 
@@ -561,59 +563,59 @@ namespace Umbraco.Core.Configuration
                 string license =
                     "<A href=\"http://umbraco.org/redir/license\" target=\"_blank\">the open source license MIT</A>. The umbraco UI is freeware licensed under the umbraco license.";
 
-                var versionDoc = new XmlDocument();
-                var versionReader = new XmlTextReader(IOHelper.MapPath(SystemDirectories.Umbraco + "/version.xml"));
-                versionDoc.Load(versionReader);
-                versionReader.Close();
+				var versionDoc = new XmlDocument();
+				var versionReader = new XmlTextReader(IOHelper.MapPath(SystemDirectories.Umbraco + "/version.xml"));
+				versionDoc.Load(versionReader);
+				versionReader.Close();
 
-                // check for license
-                try
-                {
-                    string licenseUrl =
-                        versionDoc.SelectSingleNode("/version/licensing/licenseUrl").FirstChild.Value;
-                    string licenseValidation =
-                        versionDoc.SelectSingleNode("/version/licensing/licenseValidation").FirstChild.Value;
-                    string licensedTo =
-                        versionDoc.SelectSingleNode("/version/licensing/licensedTo").FirstChild.Value;
+				// check for license
+				try
+				{
+					string licenseUrl =
+						versionDoc.SelectSingleNode("/version/licensing/licenseUrl").FirstChild.Value;
+					string licenseValidation =
+						versionDoc.SelectSingleNode("/version/licensing/licenseValidation").FirstChild.Value;
+					string licensedTo =
+						versionDoc.SelectSingleNode("/version/licensing/licensedTo").FirstChild.Value;
 
-                    if (licensedTo != "" && licenseUrl != "")
-                    {
-                        license = "umbraco Commercial License<br/><b>Registered to:</b><br/>" +
-                                  licensedTo.Replace("\n", "<br/>") + "<br/><b>For use with domain:</b><br/>" +
-                                  licenseUrl;
-                    }
-                }
-                catch
-                {
-                }
+					if (licensedTo != "" && licenseUrl != "")
+					{
+						license = "umbraco Commercial License<br/><b>Registered to:</b><br/>" +
+								  licensedTo.Replace("\n", "<br/>") + "<br/><b>For use with domain:</b><br/>" +
+								  licenseUrl;
+					}
+				}
+				catch
+				{
+				}
 
                 return license;
             }
         }
 
-        /// <summary>
-        /// Determines whether the current request is reserved based on the route table and 
-        /// whether the specified URL is reserved or is inside a reserved path.
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="httpContext"></param>
-        /// <param name="routes">The route collection to lookup the request in</param>
-        /// <returns></returns>
-        public static bool IsReservedPathOrUrl(string url, HttpContextBase httpContext, RouteCollection routes)
-        {
-            if (httpContext == null) throw new ArgumentNullException("httpContext");
-            if (routes == null) throw new ArgumentNullException("routes");
+	    /// <summary>
+	    /// Determines whether the current request is reserved based on the route table and 
+	    /// whether the specified URL is reserved or is inside a reserved path.
+	    /// </summary>
+	    /// <param name="url"></param>
+	    /// <param name="httpContext"></param>
+	    /// <param name="routes">The route collection to lookup the request in</param>
+	    /// <returns></returns>
+	    public static bool IsReservedPathOrUrl(string url, HttpContextBase httpContext, RouteCollection routes)
+		{
+			if (httpContext == null) throw new ArgumentNullException("httpContext");
+		    if (routes == null) throw new ArgumentNullException("routes");
 
-            //check if the current request matches a route, if so then it is reserved.
-            var route = routes.GetRouteData(httpContext);
-            if (route != null)
-                return true;
+		    //check if the current request matches a route, if so then it is reserved.
+			var route = routes.GetRouteData(httpContext);
+			if (route != null)
+				return true;
 
-            //continue with the standard ignore routine
-            return IsReservedPathOrUrl(url);
-        }
+			//continue with the standard ignore routine
+		    return IsReservedPathOrUrl(url);
+		}
 
-        /// <summary>
+	    /// <summary>
         /// Determines whether the specified URL is reserved or is inside a reserved path.
         /// </summary>
         /// <param name="url">The URL to check.</param>
@@ -621,149 +623,153 @@ namespace Umbraco.Core.Configuration
         /// 	<c>true</c> if the specified URL is reserved; otherwise, <c>false</c>.
         /// </returns>
         public static bool IsReservedPathOrUrl(string url)
-        {
-            // check if GlobalSettings.ReservedPaths and GlobalSettings.ReservedUrls are unchanged
-            if (!object.ReferenceEquals(_reservedPathsCache, GlobalSettings.ReservedPaths)
-                || !object.ReferenceEquals(_reservedUrlsCache, GlobalSettings.ReservedUrls))
+        {			
+            if (_reservedUrlsCache == null)
             {
-                // store references to strings to determine changes
-                _reservedPathsCache = GlobalSettings.ReservedPaths;
-                _reservedUrlsCache = GlobalSettings.ReservedUrls;
-
-                string _root = SystemDirectories.Root.Trim().ToLower();
-
-                // add URLs and paths to a new list
-                StartsWithContainer _newReservedList = new StartsWithContainer();
-                foreach (string reservedUrl in _reservedUrlsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+                lock (Locker)
                 {
-                    //resolves the url to support tilde chars
-                    string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl).Trim().ToLower();
-                    if (reservedUrlTrimmed.Length > 0)
-                        _newReservedList.Add(reservedUrlTrimmed);
+                    if (_reservedUrlsCache == null)
+                    {
+                        // store references to strings to determine changes
+                        _reservedPathsCache = GlobalSettings.ReservedPaths;
+                        _reservedUrlsCache = GlobalSettings.ReservedUrls;
+
+                        string _root = SystemDirectories.Root.Trim().ToLower();
+
+                        // add URLs and paths to a new list
+                        StartsWithContainer _newReservedList = new StartsWithContainer();
+                        foreach (string reservedUrl in _reservedUrlsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+                        {
+                            //resolves the url to support tilde chars
+                            string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl).Trim().ToLower();
+                            if (reservedUrlTrimmed.Length > 0)
+                                _newReservedList.Add(reservedUrlTrimmed);
+                        }
+
+                        foreach (string reservedPath in _reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+                        {
+                            bool trimEnd = !reservedPath.EndsWith("/");
+                            //resolves the url to support tilde chars
+                            string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath).Trim().ToLower();
+
+                            if (reservedPathTrimmed.Length > 0)
+                                _newReservedList.Add(reservedPathTrimmed + (reservedPathTrimmed.EndsWith("/") ? "" : "/"));
+                        }
+
+                        // use the new list from now on
+                        _reservedList = _newReservedList;
+                    }
                 }
-
-                foreach (string reservedPath in _reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
-                {
-                    bool trimEnd = !reservedPath.EndsWith("/");
-                    //resolves the url to support tilde chars
-                    string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath).Trim().ToLower();
-
-                    if (reservedPathTrimmed.Length > 0)
-                        _newReservedList.Add(reservedPathTrimmed + (reservedPathTrimmed.EndsWith("/") ? "" : "/"));
-                }
-
-                // use the new list from now on
-                _reservedList = _newReservedList;
             }
 
-            //The url should be cleaned up before checking:
-            // * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
-            // * We shouldn't be comparing the query at all
-            var pathPart = url.Split('?')[0];
-            if (!pathPart.Contains(".") && !pathPart.EndsWith("/"))
-            {
-                pathPart += "/";
-            }
+			//The url should be cleaned up before checking:
+			// * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
+			// * We shouldn't be comparing the query at all
+			var pathPart = url.Split('?')[0];
+			if (!pathPart.Contains(".") && !pathPart.EndsWith("/"))
+			{
+				pathPart += "/";
+			}
 
             // return true if url starts with an element of the reserved list
-            return _reservedList.StartsWith(pathPart.ToLowerInvariant());
+			return _reservedList.StartsWith(pathPart.ToLowerInvariant());
         }
 
-        /// <summary>
-        /// Structure that checks in logarithmic time
-        /// if a given string starts with one of the added keys.
-        /// </summary>
-        private class StartsWithContainer
-        {
-            /// <summary>Internal sorted list of keys.</summary>
-            public SortedList<string, string> _list
-                = new SortedList<string, string>(StartsWithComparator.Instance);
+		/// <summary>
+		/// Structure that checks in logarithmic time
+		/// if a given string starts with one of the added keys.
+		/// </summary>
+		private class StartsWithContainer
+		{
+			/// <summary>Internal sorted list of keys.</summary>
+			public SortedList<string, string> _list
+				= new SortedList<string, string>(StartsWithComparator.Instance);
 
-            /// <summary>
-            /// Adds the specified new key.
-            /// </summary>
-            /// <param name="newKey">The new key.</param>
-            public void Add(string newKey)
-            {
-                // if the list already contains an element that begins with newKey, return
-                if (String.IsNullOrEmpty(newKey) || StartsWith(newKey))
-                    return;
+			/// <summary>
+			/// Adds the specified new key.
+			/// </summary>
+			/// <param name="newKey">The new key.</param>
+			public void Add(string newKey)
+			{
+				// if the list already contains an element that begins with newKey, return
+				if (String.IsNullOrEmpty(newKey) || StartsWith(newKey))
+					return;
 
-                // create a new collection, so the old one can still be accessed
-                SortedList<string, string> newList
-                    = new SortedList<string, string>(_list.Count + 1, StartsWithComparator.Instance);
+				// create a new collection, so the old one can still be accessed
+				SortedList<string, string> newList
+					= new SortedList<string, string>(_list.Count + 1, StartsWithComparator.Instance);
 
-                // add only keys that don't already start with newKey, others are unnecessary
-                foreach (string key in _list.Keys)
-                    if (!key.StartsWith(newKey))
-                        newList.Add(key, null);
-                // add the new key
-                newList.Add(newKey, null);
+				// add only keys that don't already start with newKey, others are unnecessary
+				foreach (string key in _list.Keys)
+					if (!key.StartsWith(newKey))
+						newList.Add(key, null);
+				// add the new key
+				newList.Add(newKey, null);
 
-                // update the list (thread safe, _list was never in incomplete state)
-                _list = newList;
-            }
+				// update the list (thread safe, _list was never in incomplete state)
+				_list = newList;
+			}
 
-            /// <summary>
-            /// Checks if the given string starts with any of the added keys.
-            /// </summary>
-            /// <param name="target">The target.</param>
-            /// <returns>true if a key is found that matches the start of target</returns>
-            /// <remarks>
-            /// Runs in O(s*log(n)), with n the number of keys and s the length of target.
-            /// </remarks>
-            public bool StartsWith(string target)
-            {
-                return _list.ContainsKey(target);
-            }
+			/// <summary>
+			/// Checks if the given string starts with any of the added keys.
+			/// </summary>
+			/// <param name="target">The target.</param>
+			/// <returns>true if a key is found that matches the start of target</returns>
+			/// <remarks>
+			/// Runs in O(s*log(n)), with n the number of keys and s the length of target.
+			/// </remarks>
+			public bool StartsWith(string target)
+			{
+				return _list.ContainsKey(target);
+			}
 
-            /// <summary>Comparator that tests if a string starts with another.</summary>
-            /// <remarks>Not a real comparator, since it is not reflexive. (x==y does not imply y==x)</remarks>
-            private sealed class StartsWithComparator : IComparer<string>
-            {
-                /// <summary>Default string comparer.</summary>
-                private readonly static Comparer<string> _stringComparer = Comparer<string>.Default;
+			/// <summary>Comparator that tests if a string starts with another.</summary>
+			/// <remarks>Not a real comparator, since it is not reflexive. (x==y does not imply y==x)</remarks>
+			private sealed class StartsWithComparator : IComparer<string>
+			{
+				/// <summary>Default string comparer.</summary>
+				private readonly static Comparer<string> _stringComparer = Comparer<string>.Default;
 
-                /// <summary>Gets an instance of the StartsWithComparator.</summary>
-                public static readonly StartsWithComparator Instance = new StartsWithComparator();
+				/// <summary>Gets an instance of the StartsWithComparator.</summary>
+				public static readonly StartsWithComparator Instance = new StartsWithComparator();
 
-                /// <summary>
-                /// Tests if whole begins with all characters of part.
-                /// </summary>
-                /// <param name="part">The part.</param>
-                /// <param name="whole">The whole.</param>
-                /// <returns>
-                /// Returns 0 if whole starts with part, otherwise performs standard string comparison.
-                /// </returns>
-                public int Compare(string part, string whole)
-                {
-                    // let the default string comparer deal with null or when part is not smaller then whole
-                    if (part == null || whole == null || part.Length >= whole.Length)
-                        return _stringComparer.Compare(part, whole);
+				/// <summary>
+				/// Tests if whole begins with all characters of part.
+				/// </summary>
+				/// <param name="part">The part.</param>
+				/// <param name="whole">The whole.</param>
+				/// <returns>
+				/// Returns 0 if whole starts with part, otherwise performs standard string comparison.
+				/// </returns>
+				public int Compare(string part, string whole)
+				{
+					// let the default string comparer deal with null or when part is not smaller then whole
+					if (part == null || whole == null || part.Length >= whole.Length)
+						return _stringComparer.Compare(part, whole);
 
-                    ////ensure both have a / on the end
-                    //part = part.EndsWith("/") ? part : part + "/"; 
-                    //whole = whole.EndsWith("/") ? whole : whole + "/";
-                    //if (part.Length >= whole.Length)
-                    //    return _stringComparer.Compare(part, whole);
+					////ensure both have a / on the end
+					//part = part.EndsWith("/") ? part : part + "/"; 
+					//whole = whole.EndsWith("/") ? whole : whole + "/";
+					//if (part.Length >= whole.Length)
+					//    return _stringComparer.Compare(part, whole);
 
-                    // loop through all characters that part and whole have in common
-                    int pos = 0;
-                    bool match;
-                    do
-                    {
-                        match = (part[pos] == whole[pos]);
-                    } while (match && ++pos < part.Length);
+					// loop through all characters that part and whole have in common
+					int pos = 0;
+					bool match;
+					do
+					{
+						match = (part[pos] == whole[pos]);
+					} while (match && ++pos < part.Length);
 
-                    // return result of last comparison
-                    return match ? 0 : (part[pos] < whole[pos] ? -1 : 1);
-                }
-            }
-        }
+					// return result of last comparison
+					return match ? 0 : (part[pos] < whole[pos] ? -1 : 1);
+				}
+			}
+		}
 
     }
 
 
 
-
+    
 }

src/Umbraco.Core/Configuration/UmbracoSettings.cs

@@ -25,7 +25,31 @@ namespace Umbraco.Core.Configuration
 	/// </summary>
 	internal class UmbracoSettings
 	{
-		/// <summary>
+        private static bool GetKeyValue(string key, bool defaultValue)
+        {
+            bool value;
+            string stringValue = GetKey(key);
+
+            if (string.IsNullOrWhiteSpace(stringValue))
+                return defaultValue;
+            if (bool.TryParse(stringValue, out value))
+                return value;
+            return defaultValue;
+        }
+
+        private static int GetKeyValue(string key, int defaultValue)
+        {
+            int value;
+            string stringValue = GetKey(key);
+
+            if (string.IsNullOrWhiteSpace(stringValue))
+                return defaultValue;
+            if (int.TryParse(stringValue, out value))
+                return value;
+            return defaultValue;
+        }
+
+        /// <summary>
 		/// Used in unit testing to reset all config items that were set with property setters (i.e. did not come from config)
 		/// </summary>
 		internal static void ResetSetters()
@@ -35,7 +59,7 @@ namespace Umbraco.Core.Configuration
 			_useLegacySchema = null;
 			_useDomainPrefixes = null;
 			_umbracoLibraryCacheDuration = null;
-		    SettingsFilePath = null;
+			_trySkipIisCustomErrors = null;
 		}
 
 		internal const string TempFriendlyXmlChildContainerNodename = ""; // "children";
@@ -126,11 +150,32 @@ namespace Umbraco.Core.Configuration
 		{
 			EnsureSettingsDocument();
 
+            string attrName = null;
+            var pos = key.IndexOf('@');
+            if (pos > 0)
+            {
+                attrName = key.Substring(pos + 1);
+                key = key.Substring(0, pos - 1);
+            }
+
 			var node = UmbracoSettingsXmlDoc.DocumentElement.SelectSingleNode(key);
-			if (node == null || node.FirstChild == null || node.FirstChild.Value == null)
-				return string.Empty;
-			return node.FirstChild.Value;
-		}
+            if (node == null)
+                return string.Empty;
+
+            if (pos < 0)
+            {
+                if (node.FirstChild == null || node.FirstChild.Value == null)
+                    return string.Empty;
+                return node.FirstChild.Value;
+            }
+            else
+            {
+                var attr = node.Attributes[attrName];
+                if (attr == null)
+                    return string.Empty;
+                return attr.Value;
+            }
+        }
 
 		/// <summary>
 		/// Gets a value indicating whether the media library will create new directories in the /media directory.
@@ -203,6 +248,7 @@ namespace Umbraco.Core.Configuration
 				return value != null ? value.Attributes["assembly"].Value : "";
 			}
 		}
+
 		/// <summary>
 		/// Gets the type of an external logger that can be used to store log items in 3rd party systems
 		/// </summary>
@@ -351,24 +397,13 @@ namespace Umbraco.Core.Configuration
 		{
 			get
 			{
-				try
-				{
-					if (_useDomainPrefixes.HasValue)
-						return _useDomainPrefixes.Value;
-					bool result;
-					if (bool.TryParse(GetKey("/settings/requestHandler/useDomainPrefixes"), out result))
-						return result;
-					return false;
-				}
-				catch
-				{
-					return false;
-				}
+                // default: false
+                return _useDomainPrefixes ?? GetKeyValue("/settings/requestHandler/useDomainPrefixes", false);
 			}
-			// for unit tests only
 			internal set
 			{
-				_useDomainPrefixes = value;
+                // for unit tests only
+                _useDomainPrefixes = value;
 			}
 		}
 
@@ -382,31 +417,14 @@ namespace Umbraco.Core.Configuration
 		{
 			get
 			{
-				try
-				{
-					if (GlobalSettings.UseDirectoryUrls)
-					{
-						if (_addTrailingSlash.HasValue)
-							return _addTrailingSlash.Value;
-						bool result;
-						if (bool.TryParse(GetKey("/settings/requestHandler/addTrailingSlash"), out result))
-							return result;
-						return false;
-					}
-					else
-					{
-						return false;
-					}
-				}
-				catch
-				{
-					return false;
-				}
+                // default: false
+                return GlobalSettings.UseDirectoryUrls
+                    && (_addTrailingSlash ?? GetKeyValue("/settings/requestHandler/addTrailingSlash", false));
 			}
-			// for unit tests only
 			internal set
 			{
-				_addTrailingSlash = value;
+                // for unit tests only
+                _addTrailingSlash = value;
 			}
 		}
 
@@ -623,31 +641,46 @@ namespace Umbraco.Core.Configuration
 		{
 			get
 			{
-				if (_forceSafeAliases.HasValue)
-					return _forceSafeAliases.Value;
-
-				string forceSafeAlias = GetKey("/settings/content/ForceSafeAliases");
-				if (String.IsNullOrEmpty(forceSafeAlias))
-					return true;
-				else
-				{
-					try
-					{
-						return bool.Parse(forceSafeAlias);
-					}
-					catch
-					{
-						return true;
-					}
-				}
+                // default: true
+                return _forceSafeAliases ?? GetKeyValue("/settings/content/ForceSafeAliases", true);
 			}
 			internal set
 			{
-				//used for unit  testing
+				// used for unit  testing
 				_forceSafeAliases = value;
 			}
 		}
 
+        private static bool? _trySkipIisCustomErrors;
+
+        /// <summary>
+        /// Gets or sets a value indicating where to try to skip IIS custom errors.
+        /// </summary>
+        public static bool TrySkipIisCustomErrors
+        {
+            get
+            {
+                // default: false
+                return _trySkipIisCustomErrors ?? GetKeyValue("/settings/web.routing/@trySkipIisCustomErrors", false);
+            }
+            internal set
+            {
+                // used for unit  testing
+                _trySkipIisCustomErrors = value;
+            }
+        }
+
+        /// <summary>
+        /// File types that will not be allowed to be uploaded via the content/media upload control
+        /// </summary>
+	    public static IEnumerable<string> DisallowedUploadFiles
+	    {
+	        get
+	        {
+                var val = GetKey("/settings/content/disallowedUploadFiles");
+	            return val.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
+	        }
+	    }
 
 		/// <summary>
 		/// Gets the allowed image file types.
@@ -677,26 +710,14 @@ namespace Umbraco.Core.Configuration
 		{
 			get
 			{
-				if (_umbracoLibraryCacheDuration.HasValue)
-					return _umbracoLibraryCacheDuration.Value;
-				
-				string libraryCacheDuration = GetKey("/settings/content/UmbracoLibraryCacheDuration");
-				if (String.IsNullOrEmpty(libraryCacheDuration))
-					return 1800;
-				else
-				{
-					try
-					{
-						return int.Parse(libraryCacheDuration);
-					}
-					catch
-					{
-						return 1800;
-					}
-				}
-
+                // default: 1800
+                return _umbracoLibraryCacheDuration ?? GetKeyValue("/settings/content/UmbracoLibraryCacheDuration", 1800);
 			}
-			internal set { _umbracoLibraryCacheDuration = value; }
+			internal set
+            {
+                // for unit tests only
+                _umbracoLibraryCacheDuration = value;
+            }
 		}
 
 		/// <summary>
@@ -1052,27 +1073,12 @@ namespace Umbraco.Core.Configuration
 		{
 			get
 			{
-				try
-				{
-					if (_useLegacySchema.HasValue)
-						return _useLegacySchema.Value;
-
-					string value = GetKey("/settings/content/UseLegacyXmlSchema");
-					bool result;
-					if (!string.IsNullOrEmpty(value) && bool.TryParse(value, out result))
-						return result;
-					return true;
-				}
-				catch (Exception)
-				{
-					//default. TODO: When we change this to a real config section we won't have to worry about parse errors
-					// and should handle defaults with unit tests properly.
-					return false;
-				}
+                // default: true
+                return _useLegacySchema ?? GetKeyValue("/settings/content/UseLegacyXmlSchema", false);
 			}
 			internal set
 			{
-				//used for unit  testing
+				// used for unit testing
 				_useLegacySchema = value;
 			}
 		}
@@ -1221,6 +1227,75 @@ namespace Umbraco.Core.Configuration
 			}
 		}
 
+		private static MacroErrorBehaviour? _macroErrorBehaviour;
+
+		/// <summary>
+		/// This configuration setting defines how to handle macro errors:
+		/// - Inline - Show error within macro as text (default and current Umbraco 'normal' behavior)
+		/// - Silent - Suppress error and hide macro
+		/// - Throw  - Throw an exception and invoke the global error handler (if one is defined, if not you'll get a YSOD)
+		/// </summary>
+		/// <value>MacroErrorBehaviour enum defining how to handle macro errors.</value>
+		public static MacroErrorBehaviour MacroErrorBehaviour
+		{
+			get
+			{
+				if (_macroErrorBehaviour == null)
+				{
+					try
+					{
+						var behaviour = MacroErrorBehaviour.Inline;
+						var value = GetKey("/settings/content/MacroErrors");
+						if (value != null)
+						{
+							Enum<MacroErrorBehaviour>.TryParse(value, true, out behaviour);
+						}
+						_macroErrorBehaviour = behaviour;
+					}
+					catch (Exception ex)
+					{
+						LogHelper.Error<UmbracoSettings>("Could not load /settings/content/MacroErrors from umbracosettings.config", ex);
+						_macroErrorBehaviour = MacroErrorBehaviour.Inline;
+					}
+				}
+				return _macroErrorBehaviour.Value;
+			}
+		}
+
+		private static IconPickerBehaviour? _iconPickerBehaviour;
+
+        /// <summary>
+        /// This configuration setting defines how to show icons in the document type editor. 
+        /// - ShowDuplicates       - Show duplicates in files and sprites. (default and current Umbraco 'normal' behaviour)
+        /// - HideSpriteDuplicates - Show files on disk and hide duplicates from the sprite
+        /// - HideFileDuplicates   - Show files in the sprite and hide duplicates on disk
+        /// </summary>
+        /// <value>MacroErrorBehaviour enum defining how to show icons in the document type editor.</value>
+        public static IconPickerBehaviour IconPickerBehaviour
+		{
+			get
+			{
+				if (_iconPickerBehaviour == null)
+				{
+					try
+					{
+						var behaviour = IconPickerBehaviour.ShowDuplicates;
+                        var value = GetKey("/settings/content/DocumentTypeIconList");
+						if (value != null)
+						{
+                            Enum<IconPickerBehaviour>.TryParse(value, true, out behaviour);
+						}
+                        _iconPickerBehaviour = behaviour;
+					}
+					catch (Exception ex)
+					{
+                        LogHelper.Error<UmbracoSettings>("Could not load /settings/content/DocumentTypeIconList from umbracosettings.config", ex);
+                        _iconPickerBehaviour = IconPickerBehaviour.ShowDuplicates;
+					}
+				}
+                return _iconPickerBehaviour.Value;
+			}
+		}
 
 		/// <summary>
 		/// Configuration regarding webservices

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Reflection;
-
-namespace Umbraco.Core.Configuration
-{
-    public class UmbracoVersion
-    {
-        private static readonly Version Version = new Version(6, 0, 0);
-
-        /// <summary>
-        /// Gets the current version of Umbraco.
-        /// Version class with the specified major, minor, build (Patch), and revision numbers.
-        /// </summary>
-        /// <remarks>
-        /// CURRENT UMBRACO VERSION ID.
-        /// </remarks>
-        public static Version Current
-        {
-            get { return Version; }
-        }
-
-        /// <summary>
-        /// Gets the version comment (like beta or RC).
-        /// </summary>
-        /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "Beta"; } }
-
-        // Get the version of the umbraco.dll by looking at a class in that dll
-        // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
-        public static string AssemblyVersion { get { return new AssemblyName(typeof(ActionsResolver).Assembly.FullName).Version.ToString(); } }
-    }
-}

src/Umbraco.Core/CoreBootManager.cs

@@ -2,18 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Migrations;
-using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Publishing;
-using Umbraco.Core.Services;
-using MigrationsVersionSixth = Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixth;
-using MigrationsVersionFourNineZero = Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionFourNineZero;
 
 namespace Umbraco.Core
 {
@@ -23,7 +14,7 @@ namespace Umbraco.Core
 	/// <remarks>
 	/// This does not provide any startup functionality relating to web objects
 	/// </remarks>
-	public class CoreBootManager : IBootManager
+	internal class CoreBootManager : IBootManager
 	{
 
 		private DisposableTimer _timer;
@@ -41,20 +32,7 @@ namespace Umbraco.Core
 			LogHelper.Info<CoreBootManager>("Umbraco application starting");
 			_timer = DisposableTimer.Start(x => LogHelper.Info<CoreBootManager>("Umbraco application startup complete" + " (took " + x + "ms)"));
 
-			//create database and service contexts for the app context
-			var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName);
-		    Database.Mapper = new PetaPocoMapper();
-			var dbContext = new DatabaseContext(dbFactory);
-			var serviceContext = new ServiceContext(
-				new PetaPocoUnitOfWorkProvider(dbFactory), 
-				new FileUnitOfWorkProvider(), 
-				new PublishingStrategy());
-			
-			//create the ApplicationContext
-			ApplicationContext = ApplicationContext.Current = new ApplicationContext(dbContext, serviceContext);
-
-            //initialize the DatabaseContext
-			dbContext.Initialize();
+            CreateApplicationContext();
 
 			InitializeResolvers();
 
@@ -63,6 +41,15 @@ namespace Umbraco.Core
 			return this;
 		}
 
+        /// <summary>
+        /// Creates and assigns the application context singleton
+        /// </summary>
+        protected virtual void CreateApplicationContext()
+        {
+            //create the ApplicationContext
+            ApplicationContext = ApplicationContext.Current = new ApplicationContext();
+        }
+
 		/// <summary>
 		/// Fires after initialization and calls the callback to allow for customizations to occur
 		/// </summary>
@@ -93,8 +80,7 @@ namespace Umbraco.Core
 			if (_isComplete)
 				throw new InvalidOperationException("The boot manager has already been completed");
 
-			//freeze resolution to not allow Resolvers to be modified
-			Resolution.Freeze();
+		    FreezeResolution();
 
 			//stop the timer and log the output
 			_timer.Dispose();
@@ -109,31 +95,33 @@ namespace Umbraco.Core
 			return this;
 		}
 
+        /// <summary>
+        /// Freeze resolution to not allow Resolvers to be modified
+        /// </summary>
+        protected virtual void FreezeResolution()
+        {
+            Resolution.Freeze();
+        }
+
 		/// <summary>
 		/// Create the resolvers
 		/// </summary>
 		protected virtual void InitializeResolvers()
 		{
-			RepositoryResolver.Current = new RepositoryResolver(
-				new RepositoryFactory());
-
 			CacheRefreshersResolver.Current = new CacheRefreshersResolver(
-				PluginManager.Current.ResolveCacheRefreshers());
+				() => PluginManager.Current.ResolveCacheRefreshers());
 
 			DataTypesResolver.Current = new DataTypesResolver(
-				PluginManager.Current.ResolveDataTypes());
+				() => PluginManager.Current.ResolveDataTypes());
 
 			MacroFieldEditorsResolver.Current = new MacroFieldEditorsResolver(
-				PluginManager.Current.ResolveMacroRenderings());
+				() => PluginManager.Current.ResolveMacroRenderings());
 
 			PackageActionsResolver.Current = new PackageActionsResolver(
-				PluginManager.Current.ResolvePackageActions());
+				() => PluginManager.Current.ResolvePackageActions());
 
 			ActionsResolver.Current = new ActionsResolver(
-				PluginManager.Current.ResolveActions());
-
-            MacroPropertyTypeResolver.Current = new MacroPropertyTypeResolver(
-                PluginManager.Current.ResolveMacroPropertyTypes());
+				() => PluginManager.Current.ResolveActions());
 
 			PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
 				PluginManager.Current.ResolvePropertyEditorValueConverters());
@@ -141,23 +129,6 @@ namespace Umbraco.Core
 			PropertyEditorValueConvertersResolver.Current.AddType<DatePickerPropertyEditorValueConverter>();
 			PropertyEditorValueConvertersResolver.Current.AddType<TinyMcePropertyEditorValueConverter>();
 			PropertyEditorValueConvertersResolver.Current.AddType<YesNoPropertyEditorValueConverter>();
-
-			//the database migration objects
-			MigrationResolver.Current = new MigrationResolver(new List<Type>
-				{
-					typeof (MigrationsVersionFourNineZero.RemoveUmbracoAppConstraints),
-					typeof (MigrationsVersionSixth.DeleteAppTables),
-					typeof (MigrationsVersionSixth.EnsureAppsTreesUpdated),
-					typeof (MigrationsVersionSixth.MoveMasterContentTypeData),
-					typeof (MigrationsVersionSixth.NewCmsContentType2ContentTypeTable),
-					typeof (MigrationsVersionSixth.RemoveMasterContentTypeColumn),
-					typeof (MigrationsVersionSixth.RenameCmsTabTable),
-					typeof (MigrationsVersionSixth.RenameTabIdColumn),
-					typeof (MigrationsVersionSixth.UpdateCmsContentTypeAllowedContentTypeTable),
-					typeof (MigrationsVersionSixth.UpdateCmsContentTypeTable),
-					typeof (MigrationsVersionSixth.UpdateCmsContentVersionTable),
-					typeof (MigrationsVersionSixth.UpdateCmsPropertyTypeGroupTable)
-				});
 		}
 	}
 }

src/Umbraco.Core/DataTypesResolver.cs

@@ -10,11 +10,13 @@ namespace Umbraco.Core
 	/// </summary>
 	internal sealed class DataTypesResolver : LegacyTransientObjectsResolver<DataTypesResolver, IDataType>
 	{
+
+	
 		/// <summary>
 		/// Constructor
 		/// </summary>
 		/// <param name="dataTypes"></param>		
-		internal DataTypesResolver(IEnumerable<Type> dataTypes)
+		internal DataTypesResolver(Func<IEnumerable<Type>> dataTypes)
 			: base(dataTypes)
 		{
 

src/Umbraco.Core/DatabaseContext.cs

@@ -1,322 +0,0 @@
-using System;
-using System.Configuration;
-using System.Data.SqlServerCe;
-using System.IO;
-using System.Linq;
-using System.Web.Configuration;
-using System.Xml.Linq;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Migrations;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// The Umbraco Database context
-    /// </summary>
-    /// <remarks>
-    /// One per AppDomain, represents the Umbraco database
-    /// </remarks>
-    public class DatabaseContext
-    {
-	    private readonly IDatabaseFactory _factory;
-	    private bool _configured;
-        private string _connectionString;
-        private string _providerName;
-
-		internal DatabaseContext(IDatabaseFactory factory)
-        {
-	        _factory = factory;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Database"/> object for doing CRUD operations
-        /// against custom tables that resides in the Umbraco database.
-        /// </summary>
-        /// <remarks>
-        /// This should not be used for CRUD operations or queries against the
-        /// standard Umbraco tables! Use the Public services for that.
-        /// </remarks>
-        public UmbracoDatabase Database
-        {
-            get { return _factory.CreateDatabase(); }
-        }
-
-        /// <summary>
-        /// Boolean indicating whether the database has been configured
-        /// </summary>
-        public bool IsDatabaseConfigured
-        {
-            get { return _configured; }
-        }
-
-        /// <summary>
-        /// Gets the configured umbraco db connection string.
-        /// </summary>
-        public string ConnectionString
-        {
-            get { return _connectionString; }
-        }
-
-        /// <summary>
-        /// Returns the name of the dataprovider from the connectionstring setting in config
-        /// </summary>
-        internal string ProviderName
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(_providerName) == false)
-                    return _providerName;
-
-                _providerName = "System.Data.SqlClient";
-                if (ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName] != null)
-                {
-                    if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
-                        _providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
-                }
-                else
-                {
-                    throw new InvalidOperationException("Can't find a connection string with the name '" + GlobalSettings.UmbracoConnectionName + "'");
-                }
-                return _providerName;
-            }
-        }
-
-        /// <summary>
-        /// Returns the Type of DatabaseProvider used
-        /// </summary>
-        public DatabaseProviders DatabaseProvider
-        {
-            get
-            {
-                string dbtype = Database.Connection == null ? ProviderName : Database.Connection.GetType().Name;
-
-                if (dbtype.StartsWith("MySql")) return DatabaseProviders.MySql;
-                if (dbtype.StartsWith("SqlCe") || dbtype.Contains("SqlServerCe")) return DatabaseProviders.SqlServerCE;
-                if (dbtype.StartsWith("Npgsql")) return DatabaseProviders.PostgreSQL;
-                if (dbtype.StartsWith("Oracle") || dbtype.Contains("OracleClient")) return DatabaseProviders.Oracle;
-                if (dbtype.StartsWith("SQLite")) return DatabaseProviders.SQLite;
-                if (dbtype.Contains("Azure")) return DatabaseProviders.SqlAzure;
-
-                return DatabaseProviders.SqlServer;
-            }
-        }
-
-        /// <summary>
-        /// Configure a ConnectionString for the embedded database.
-        /// </summary>
-        public void ConfigureDatabaseConnection()
-        {
-            const string providerName = "System.Data.SqlServerCe.4.0";
-            const string connectionString = "Datasource=|DataDirectory|Umbraco.sdf";
-
-            SaveConnectionString(connectionString, providerName);
-
-            var path = Path.Combine(GlobalSettings.FullpathToRoot, "App_Data", "Umbraco.sdf");
-            if (File.Exists(path) == false)
-            {
-                var engine = new SqlCeEngine(connectionString);
-                engine.CreateDatabase();
-            }
-
-            Initialize(providerName);
-        }
-
-        /// <summary>
-        /// Configure a ConnectionString that has been entered manually.
-        /// </summary>
-        /// <remarks>
-        /// Please note that we currently assume that the 'System.Data.SqlClient' provider can be used.
-        /// </remarks>
-        /// <param name="connectionString"></param>
-        public void ConfigureDatabaseConnection(string connectionString)
-        {
-            SaveConnectionString(connectionString, string.Empty);
-            Initialize(string.Empty);
-        }
-
-        /// <summary>
-        /// Configures a ConnectionString for the Umbraco database based on the passed in properties from the installer.
-        /// </summary>
-        /// <param name="server">Name or address of the database server</param>
-        /// <param name="databaseName">Name of the database</param>
-        /// <param name="user">Database Username</param>
-        /// <param name="password">Database Password</param>
-        /// <param name="databaseProvider">Type of the provider to be used (Sql, Sql Azure, Sql Ce, MySql)</param>
-        public void ConfigureDatabaseConnection(string server, string databaseName, string user, string password, string databaseProvider)
-        {
-            string connectionString;
-            string providerName = "System.Data.SqlClient";
-            if(databaseProvider.ToLower().Contains("mysql"))
-            {
-                providerName = "MySql.Data.MySqlClient";
-                connectionString = string.Format("Server={0}; Database={1};Uid={2};Pwd={3}", server, databaseName, user, password);
-            }
-            else if(databaseProvider.ToLower().Contains("azure"))
-            {
-                connectionString = string.Format("Server=tcp:{0}.database.windows.net;Database={1};User ID={2}@{0};Password={3}", server, databaseName, user, password);
-            }
-            else
-            {
-                connectionString = string.Format("server={0};database={1};user id={2};password={3}", server, databaseName, user, password);
-            }
-
-            SaveConnectionString(connectionString, providerName);
-            Initialize(providerName);
-        }
-
-        /// <summary>
-        /// Saves the connection string as a proper .net ConnectionString and the legacy AppSettings key/value.
-        /// </summary>
-        /// <remarks>
-        /// Saves the ConnectionString in the very nasty 'medium trust'-supportive way.
-        /// </remarks>
-        /// <param name="connectionString"></param>
-        /// <param name="providerName"></param>
-        private void SaveConnectionString(string connectionString, string providerName)
-        {
-            //Set the connection string for the new datalayer
-            var connectionStringSettings = string.IsNullOrEmpty(providerName)
-                                      ? new ConnectionStringSettings(GlobalSettings.UmbracoConnectionName,
-                                                                     connectionString)
-                                      : new ConnectionStringSettings(GlobalSettings.UmbracoConnectionName,
-                                                                     connectionString, providerName);
-
-            _connectionString = connectionString;
-            _providerName = providerName;
-
-            var webConfig = new WebConfigurationFileMap();
-            var vDir = GlobalSettings.FullpathToRoot;
-            foreach (VirtualDirectoryMapping v in webConfig.VirtualDirectories)
-            {
-                if (v.IsAppRoot)
-                {
-                    vDir = v.PhysicalDirectory;
-                }
-            }
-
-            var fileName = Path.Combine(vDir, "web.config");
-            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-            var connectionstrings = xml.Root.Descendants("connectionStrings").Single();
-
-            // Update connectionString if it exists, or else create a new appSetting for the given key and value
-            var setting = connectionstrings.Descendants("add").FirstOrDefault(s => s.Attribute("name").Value == GlobalSettings.UmbracoConnectionName);
-            if (setting == null)
-                connectionstrings.Add(new XElement("add", 
-                    new XAttribute("name", GlobalSettings.UmbracoConnectionName),
-                    new XAttribute("connectionString", connectionStringSettings),
-                    new XAttribute("providerName", providerName)));
-            else
-            {
-                setting.Attribute("connectionString").Value = connectionString;
-                setting.Attribute("providerName").Value = providerName;
-            }
-
-            xml.Save(fileName, SaveOptions.DisableFormatting);
-
-            LogHelper.Info<DatabaseContext>("Configured new ConnectionString: " + connectionString);
-        }
-
-        /// <summary>
-        /// Internal method to initialize the database configuration.
-        /// </summary>
-        /// <remarks>
-        /// If an Umbraco connectionstring exists the database can be configured on app startup,
-        /// but if its a new install the entry doesn't exist and the db cannot be configured.
-        /// So for new installs the Initialize() method should be called after the connectionstring
-        /// has been added to the web.config.
-        /// </remarks>
-        internal void Initialize()
-        {
-            if (ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName] != null)
-            {
-                var providerName = "System.Data.SqlClient";
-                if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
-                {
-                    providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
-
-                    _connectionString =
-                        ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
-                    
-                }
-
-                if (providerName.StartsWith("MySql"))
-                {
-                    SyntaxConfig.SqlSyntaxProvider = MySqlSyntax.Provider;
-                }
-                else if (providerName.Contains("SqlServerCe"))
-                {
-                    SyntaxConfig.SqlSyntaxProvider = SqlCeSyntax.Provider;
-                }
-                else
-                {
-                    SyntaxConfig.SqlSyntaxProvider = SqlServerSyntax.Provider;
-                }
-
-                _configured = true;
-            }
-            else
-            {
-                _configured = false;
-            }
-        }
-
-        internal void Initialize(string providerName)
-        {
-            if (providerName.StartsWith("MySql"))
-            {
-                SyntaxConfig.SqlSyntaxProvider = MySqlSyntax.Provider;
-            }
-            else if (providerName.Contains("SqlServerCe"))
-            {
-                SyntaxConfig.SqlSyntaxProvider = SqlCeSyntax.Provider;
-            }
-            else
-            {
-                SyntaxConfig.SqlSyntaxProvider = SqlServerSyntax.Provider;
-            }
-
-            _configured = true;
-        }
-
-        internal Result CreateDatabaseSchemaAndDataOrUpgrade()
-        {
-            if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
-            {
-                return new Result{Message = "Database configuration is invalid", Success = false, Percentage = "10"};
-            }
-
-            try
-            {
-                var database = new UmbracoDatabase(_connectionString, ProviderName);
-                //If Configuration Status is empty its a new install - otherwise upgrade the existing
-                if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus))
-                {
-                    database.CreateDatabaseSchema();
-                }
-                else
-                {
-                    var configuredVersion = new Version(GlobalSettings.ConfigurationStatus);
-                    var targetVersion = UmbracoVersion.Current;
-                    var runner = new MigrationRunner(configuredVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
-                    var upgraded = runner.Execute(database, true);
-                }
-                
-                return new Result { Message = "Installation completed!", Success = true, Percentage = "100" };
-            }
-            catch (Exception ex)
-            {
-                return new Result { Message = ex.Message, Success = false, Percentage = "90" };
-            }
-        }
-
-        internal class Result
-        {
-            public string Message { get; set; }
-            public bool Success { get; set; }
-            public string Percentage { get; set; }
-        }
-    }
-}

src/Umbraco.Core/Dictionary/CultureDictionaryFactoryResolver.cs

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Dictionary
 	/// <summary>
 	/// Resolves the current CultureDictionaryFactory
 	/// </summary>
-	internal class CultureDictionaryFactoryResolver : SingleObjectResolverBase<CultureDictionaryFactoryResolver, ICultureDictionaryFactory>
+	internal sealed class CultureDictionaryFactoryResolver : SingleObjectResolverBase<CultureDictionaryFactoryResolver, ICultureDictionaryFactory>
 	{
 		internal CultureDictionaryFactoryResolver(ICultureDictionaryFactory factory)
 			: base(factory)

src/Umbraco.Core/DictionaryExtensions.cs

@@ -5,6 +5,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Text;
 using System.Web.Mvc;
+using System.Web;
 
 namespace Umbraco.Core
 {
@@ -158,7 +159,7 @@ namespace Umbraco.Core
 			var builder = new StringBuilder();
 			foreach (var i in d)
 			{
-				builder.Append(String.Format("{0}={1}&", i.Key, i.Value));
+				builder.Append(String.Format("{0}={1}&", HttpUtility.UrlEncode(i.Key), i.Value == null ? string.Empty : HttpUtility.UrlEncode(i.Value.ToString())));
 			}
 			return builder.ToString().TrimEnd('&');
 		}

src/Umbraco.Core/DisposableTimer.cs

@@ -4,135 +4,135 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core
 {
-	/// <summary>
-	/// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
-	/// </summary>
-	/// <example>
-	/// <code>
-	/// Console.WriteLine("Testing Stopwatchdisposable, should be 567:");
-	//  using (var timer = new DisposableTimer(result => Console.WriteLine("Took {0}ms", result)))
-	//  {
-	//      Thread.Sleep(567);
-	//  }
-	/// </code>
-	/// </example>
-	public class DisposableTimer : DisposableObject
-	{
-		private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
-		private readonly Action<long> _callback;
+    /// <summary>
+    /// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// Console.WriteLine("Testing Stopwatchdisposable, should be 567:");
+    //  using (var timer = new DisposableTimer(result => Console.WriteLine("Took {0}ms", result)))
+    //  {
+    //      Thread.Sleep(567);
+    //  }
+    /// </code>
+    /// </example>
+    public class DisposableTimer : DisposableObject
+    {
+        private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+        private readonly Action<long> _callback;
 
-		protected DisposableTimer(Action<long> callback)
-		{
-			_callback = callback;
-		}
+        protected DisposableTimer(Action<long> callback)
+        {
+            _callback = callback;
+        }
 
-		public Stopwatch Stopwatch
-		{
-			get { return _stopwatch; }
-		}
+        public Stopwatch Stopwatch
+        {
+            get { return _stopwatch; }
+        }
 
-		/// <summary>
-		/// Starts the timer and invokes the specified callback upon disposal.
-		/// </summary>
-		/// <param name="callback">The callback.</param>
-		/// <returns></returns>
-		public static DisposableTimer Start(Action<long> callback)
-		{
-			return new DisposableTimer(callback);
-		}
+        /// <summary>
+        /// Starts the timer and invokes the specified callback upon disposal.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        /// <returns></returns>
+        public static DisposableTimer Start(Action<long> callback)
+        {
+            return new DisposableTimer(callback);
+        }
 
-		public static DisposableTimer TraceDuration<T>(Func<string> startMessage, Func<string> completeMessage)
-		{
-			return TraceDuration(typeof(T), startMessage, completeMessage);
-		}
+        public static DisposableTimer TraceDuration<T>(Func<string> startMessage, Func<string> completeMessage)
+        {
+            return TraceDuration(typeof(T), startMessage, completeMessage);
+        }
 
-		public static DisposableTimer TraceDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
-		{
-			LogHelper.Debug(loggerType, startMessage);
-			return new DisposableTimer(x => LogHelper.Info(loggerType, () => completeMessage() + " (took " + x + "ms)"));
-		}
+        public static DisposableTimer TraceDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
+        {
+            LogHelper.Debug(loggerType, startMessage);
+            return new DisposableTimer(x => LogHelper.Info(loggerType, () => completeMessage() + " (took " + x + "ms)"));
+        }
 
-		/// <summary>
-		/// Adds a start and end log entry as Info and tracks how long it takes until disposed.
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="startMessage"></param>
-		/// <param name="completeMessage"></param>
-		/// <returns></returns>
-		public static DisposableTimer TraceDuration<T>(string startMessage, string completeMessage)
-		{
-			return TraceDuration(typeof(T), startMessage, completeMessage);
-		}
+        /// <summary>
+        /// Adds a start and end log entry as Info and tracks how long it takes until disposed.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer TraceDuration<T>(string startMessage, string completeMessage)
+        {
+            return TraceDuration(typeof(T), startMessage, completeMessage);
+        }
 
-		/// <summary>
-		/// Adds a start and end log entry as Info and tracks how long it takes until disposed.
-		/// </summary>
-		/// <param name="loggerType"></param>
-		/// <param name="startMessage"></param>
-		/// <param name="completeMessage"></param>
-		/// <returns></returns>
-		public static DisposableTimer TraceDuration(Type loggerType, string startMessage, string completeMessage)
-		{
-			LogHelper.Info(loggerType, () => startMessage);
-			return new DisposableTimer(x => LogHelper.Info(loggerType, () => completeMessage + " (took " + x + "ms)"));
-		}
+        /// <summary>
+        /// Adds a start and end log entry as Info and tracks how long it takes until disposed.
+        /// </summary>
+        /// <param name="loggerType"></param>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer TraceDuration(Type loggerType, string startMessage, string completeMessage)
+        {
+            LogHelper.Info(loggerType, () => startMessage);
+            return new DisposableTimer(x => LogHelper.Info(loggerType, () => completeMessage + " (took " + x + "ms)"));
+        }
 
-		/// <summary>
-		/// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="startMessage"></param>
-		/// <param name="completeMessage"></param>
-		/// <returns></returns>
-		public static DisposableTimer DebugDuration<T>(string startMessage, string completeMessage)
-		{
-			return DebugDuration(typeof(T), startMessage, completeMessage);
-		}
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration<T>(string startMessage, string completeMessage)
+        {
+            return DebugDuration(typeof(T), startMessage, completeMessage);
+        }
 
-		/// <summary>
-		/// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="startMessage"></param>
-		/// <param name="completeMessage"></param>
-		/// <returns></returns>
-		public static DisposableTimer DebugDuration<T>(Func<string> startMessage, Func<string> completeMessage)
-		{
-			return DebugDuration(typeof(T), startMessage, completeMessage);
-		}
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration<T>(Func<string> startMessage, Func<string> completeMessage)
+        {
+            return DebugDuration(typeof(T), startMessage, completeMessage);
+        }
 
-		/// <summary>
-		/// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
-		/// </summary>
-		/// <param name="loggerType"></param>
-		/// <param name="startMessage"></param>
-		/// <param name="completeMessage"></param>
-		/// <returns></returns>
-		public static DisposableTimer DebugDuration(Type loggerType, string startMessage, string completeMessage)
-		{
-			LogHelper.Debug(loggerType, () => startMessage);
-			return new DisposableTimer(x => LogHelper.Debug(loggerType, () => completeMessage + " (took " + x + "ms)"));
-		}
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <param name="loggerType"></param>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration(Type loggerType, string startMessage, string completeMessage)
+        {
+            LogHelper.Debug(loggerType, () => startMessage);
+            return new DisposableTimer(x => LogHelper.Debug(loggerType, () => completeMessage + " (took " + x + "ms)"));
+        }
 
-		/// <summary>
-		/// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
-		/// </summary>
-		/// <param name="loggerType"></param>
-		/// <param name="startMessage"></param>
-		/// <param name="completeMessage"></param>
-		/// <returns></returns>
-		public static DisposableTimer DebugDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
-		{
-			LogHelper.Debug(loggerType, startMessage);
-			return new DisposableTimer(x => LogHelper.Debug(loggerType, () => completeMessage() + " (took " + x + "ms)"));
-		}
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <param name="loggerType"></param>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
+        {
+            LogHelper.Debug(loggerType, startMessage);
+            return new DisposableTimer(x => LogHelper.Debug(loggerType, () => completeMessage() + " (took " + x + "ms)"));
+        }
 
-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
-		protected override void DisposeResources()
-		{
-			_callback.Invoke(Stopwatch.ElapsedMilliseconds);
-		}
-	}
+        /// <summary>
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+        /// </summary>
+        protected override void DisposeResources()
+        {
+            _callback.Invoke(Stopwatch.ElapsedMilliseconds);
+        }
+    }
 }

src/Umbraco.Core/Dynamics/DynamicXml.cs

@@ -72,51 +72,51 @@ namespace Umbraco.Core.Dynamics
                 return true; //anyway
             }
 
-			//ok, now lets try to match by member, property, extensino method
-			var attempt = DynamicInstanceHelper.TryInvokeMember(this, binder, args, new[]
+            //ok, now lets try to match by member, property, extensino method
+            var attempt = DynamicInstanceHelper.TryInvokeMember(this, binder, args, new[]
 				{
 					typeof (IEnumerable<DynamicXml>),
 					typeof (IEnumerable<XElement>),
 					typeof (DynamicXml)
 				});
 
-			if (attempt.Success)
-			{
-				result = attempt.Result.ObjectResult;
+            if (attempt.Success)
+            {
+                result = attempt.Result.ObjectResult;
 
-				//need to check the return type and possibly cast if result is from an extension method found
-				if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod)
-				{
-					//if the result is already a DynamicXml instance, then we do not need to cast
-					if (attempt.Result.ObjectResult != null && !(attempt.Result.ObjectResult is DynamicXml))
-					{
-						if (attempt.Result.ObjectResult is XElement)
-						{
-							result = new DynamicXml((XElement)attempt.Result.ObjectResult);
-						}
-						else if (attempt.Result.ObjectResult is IEnumerable<XElement>)
-						{
-							result = ((IEnumerable<XElement>)attempt.Result.ObjectResult).Select(x => new DynamicXml(x));
-						}
-						else if (attempt.Result.ObjectResult is IEnumerable<DynamicXml>)
-						{
-							result = ((IEnumerable<DynamicXml>)attempt.Result.ObjectResult).Select(x => new DynamicXml(x.BaseElement));
-						}
-					}
-				}
-				return true;
-			}
+                //need to check the return type and possibly cast if result is from an extension method found
+                if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod)
+                {
+                    //if the result is already a DynamicXml instance, then we do not need to cast
+                    if (attempt.Result.ObjectResult != null && !(attempt.Result.ObjectResult is DynamicXml))
+                    {
+                        if (attempt.Result.ObjectResult is XElement)
+                        {
+                            result = new DynamicXml((XElement)attempt.Result.ObjectResult);
+                        }
+                        else if (attempt.Result.ObjectResult is IEnumerable<XElement>)
+                        {
+                            result = ((IEnumerable<XElement>)attempt.Result.ObjectResult).Select(x => new DynamicXml(x));
+                        }
+                        else if (attempt.Result.ObjectResult is IEnumerable<DynamicXml>)
+                        {
+                            result = ((IEnumerable<DynamicXml>)attempt.Result.ObjectResult).Select(x => new DynamicXml(x.BaseElement));
+                        }
+                    }
+                }
+                return true;
+            }
 
-			//this is the result of an extension method execution gone wrong so we return dynamic null
-			if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod
-				&& attempt.Error != null && attempt.Error is TargetInvocationException)
-			{
-				result = new DynamicNull();
-				return true;
-			}
+            //this is the result of an extension method execution gone wrong so we return dynamic null
+            if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod
+                && attempt.Error != null && attempt.Error is TargetInvocationException)
+            {
+                result = new DynamicNull();
+                return true;
+            }
 
-			result = null;
-			return false;
+            result = null;
+            return false;
 
         }
         public override bool TryGetMember(GetMemberBinder binder, out object result)
@@ -228,40 +228,40 @@ namespace Umbraco.Core.Dynamics
             return new DynamicXml(this.BaseElement.XPathSelectElements(expression).FirstOrDefault());
         }
 
-	    IEnumerator<XElement> IEnumerable<XElement>.GetEnumerator()
-	    {
-			return this.BaseElement.Elements().GetEnumerator();
-	    }
+        IEnumerator<XElement> IEnumerable<XElement>.GetEnumerator()
+        {
+            return this.BaseElement.Elements().GetEnumerator();
+        }
 
-	    public IEnumerator<DynamicXml> GetEnumerator()
-	    {
-			return this.BaseElement.Elements().Select(e => new DynamicXml(e)).GetEnumerator();
-	    }
+        public IEnumerator<DynamicXml> GetEnumerator()
+        {
+            return this.BaseElement.Elements().Select(e => new DynamicXml(e)).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
 
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-	    
         public int Count()
         {
-			return ((IEnumerable<XElement>)this).Count();
+            return ((IEnumerable<XElement>)this).Count();
         }
 
         public bool Any()
         {
-			return ((IEnumerable<XElement>)this).Any();
+            return ((IEnumerable<XElement>)this).Any();
         }
 
-		public IEnumerable<DynamicXml> Take(int count)
-		{
-			return ((IEnumerable<DynamicXml>)this).Take(count);
-		}
+        public IEnumerable<DynamicXml> Take(int count)
+        {
+            return ((IEnumerable<DynamicXml>)this).Take(count);
+        }
 
-		public IEnumerable<DynamicXml> Skip(int count)
-		{
-			return ((IEnumerable<DynamicXml>)this).Skip(count);
-		} 
+        public IEnumerable<DynamicXml> Skip(int count)
+        {
+            return ((IEnumerable<DynamicXml>)this).Skip(count);
+        }
 
         public bool IsNull()
         {
@@ -503,84 +503,86 @@ namespace Umbraco.Core.Dynamics
         public HtmlString IsDescendant(DynamicXml other, string valueIfTrue)
         {
             var ancestors = this.Ancestors();
-			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue);
+            return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue);
         }
         public HtmlString IsDescendant(DynamicXml other, string valueIfTrue, string valueIfFalse)
         {
             var ancestors = this.Ancestors();
-			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+            return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
         }
         public bool IsDescendantOrSelf(DynamicXml other)
         {
             var ancestors = this.AncestorsOrSelf();
-			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null);
+            return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null);
         }
         public HtmlString IsDescendantOrSelf(DynamicXml other, string valueIfTrue)
         {
             var ancestors = this.AncestorsOrSelf();
-			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue);
+            return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue);
         }
         public HtmlString IsDescendantOrSelf(DynamicXml other, string valueIfTrue, string valueIfFalse)
         {
             var ancestors = this.AncestorsOrSelf();
-			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+            return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
         }
         public bool IsAncestor(DynamicXml other)
         {
             var descendants = this.Descendants();
-			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null);
+            return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null);
         }
         public HtmlString IsAncestor(DynamicXml other, string valueIfTrue)
         {
             var descendants = this.Descendants();
-			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue);
+            return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue);
         }
         public HtmlString IsAncestor(DynamicXml other, string valueIfTrue, string valueIfFalse)
         {
             var descendants = this.Descendants();
-			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+            return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
         }
         public bool IsAncestorOrSelf(DynamicXml other)
         {
             var descendants = this.DescendantsOrSelf();
-			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null);
+            return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null);
         }
         public HtmlString IsAncestorOrSelf(DynamicXml other, string valueIfTrue)
         {
             var descendants = this.DescendantsOrSelf();
-			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue);
+            return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue);
         }
         public HtmlString IsAncestorOrSelf(DynamicXml other, string valueIfTrue, string valueIfFalse)
         {
             var descendants = this.DescendantsOrSelf();
-			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+            return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
         }
         public IEnumerable<DynamicXml> Descendants()
         {
             return Descendants(n => true);
         }
-		public IEnumerable<DynamicXml> Descendants(Func<XElement, bool> func)
+        public IEnumerable<DynamicXml> Descendants(Func<XElement, bool> func)
         {
-            var flattenedNodes = this.BaseElement.Elements().Map(func, (XElement n) => { return n.Elements(); });
+            //var flattenedNodes = this.BaseElement.Elements().Map(func, n => n.Elements());
+            var flattenedNodes = this.BaseElement.Elements().SelectMany(n => n.Elements()).Where(func);
             return flattenedNodes.ToList().ConvertAll(n => new DynamicXml(n));
         }
-		public IEnumerable<DynamicXml> DescendantsOrSelf()
+        public IEnumerable<DynamicXml> DescendantsOrSelf()
         {
             return DescendantsOrSelf(n => true);
         }
-		public IEnumerable<DynamicXml> DescendantsOrSelf(Func<XElement, bool> func)
+        public IEnumerable<DynamicXml> DescendantsOrSelf(Func<XElement, bool> func)
         {
-            var flattenedNodes = this.BaseElement.Elements().Map(func, (XElement n) => { return n.Elements(); });
+            //var flattenedNodes = this.BaseElement.Elements().Map(func, n => n.Elements());
+            var flattenedNodes = this.BaseElement.Elements().SelectMany(n => n.Elements()).Where(func);
             var list = new List<DynamicXml>();
             list.Add(this);
             list.AddRange(flattenedNodes.ToList().ConvertAll(n => new DynamicXml(n)));
             return list;
         }
-		public IEnumerable<DynamicXml> Ancestors()
+        public IEnumerable<DynamicXml> Ancestors()
         {
             return Ancestors(item => true);
         }
-		public IEnumerable<DynamicXml> Ancestors(Func<XElement, bool> func)
+        public IEnumerable<DynamicXml> Ancestors(Func<XElement, bool> func)
         {
             var ancestorList = new List<XElement>();
             var node = this.BaseElement;
@@ -611,11 +613,11 @@ namespace Umbraco.Core.Dynamics
             ancestorList.Reverse();
             return ancestorList.ConvertAll(item => new DynamicXml(item));
         }
-		public IEnumerable<DynamicXml> AncestorsOrSelf()
+        public IEnumerable<DynamicXml> AncestorsOrSelf()
         {
             return AncestorsOrSelf(item => true);
         }
-		public IEnumerable<DynamicXml> AncestorsOrSelf(Func<XElement, bool> func)
+        public IEnumerable<DynamicXml> AncestorsOrSelf(Func<XElement, bool> func)
         {
             List<XElement> ancestorList = new List<XElement>();
             var node = this.BaseElement;
@@ -730,6 +732,6 @@ namespace Umbraco.Core.Dynamics
             }
         }
 
-	    
+
     }
 }

src/Umbraco.Core/Dynamics/ExtensionMethods.cs

@@ -5,36 +5,35 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Dynamics
 {
+    [Obsolete("This class should not be used, it is just referenced by already obsoleted code and will be removed in the future")]
     internal static class ExtensionMethods
     {
-        public static IEnumerable<TSource> Map<TSource>(
-            this IEnumerable<TSource> source,
-            Func<TSource, bool> selectorFunction,
-            Func<TSource, IEnumerable<TSource>> getChildrenFunction)
-        {
-            if (!source.Any())
-            {
-                return source;
-            }
-            // Add what we have to the stack   
-            var flattenedList = source.Where(selectorFunction);
-            // Go through the input enumerable looking for children,   
-            // and add those if we have them   
-            foreach (TSource element in source)
-            {
-                var secondInner = getChildrenFunction(element);
-                if (secondInner.Any())
-                {
-                    secondInner = secondInner.Map(selectorFunction, getChildrenFunction);
-                }
-                flattenedList = flattenedList.Concat(secondInner);
-            }
-            return flattenedList;
-        }
-
-
-        
+        //public static IEnumerable<TSource> Map<TSource>(
+        //    this IEnumerable<TSource> source,
+        //    Func<TSource, bool> selectorFunction,
+        //    Func<TSource, IEnumerable<TSource>> getChildrenFunction)
+        //{
+        //    if (!source.Any())
+        //    {
+        //        return source;
+        //    }
+        //    // Add what we have to the stack   
+        //    var flattenedList = source.Where(selectorFunction);
+        //    // Go through the input enumerable looking for children,   
+        //    // and add those if we have them   
+        //    foreach (TSource element in source)
+        //    {
+        //        var secondInner = getChildrenFunction(element);
+        //        if (secondInner.Any())
+        //        {
+        //            secondInner = secondInner.Map(selectorFunction, getChildrenFunction);
+        //        }
+        //        flattenedList = flattenedList.Concat(secondInner);
+        //    }
+        //    return flattenedList;
+        //}
 
+        [Obsolete("This method should not be used and will be removed in the future")]
         public static bool ContainsAny(this string haystack, IEnumerable<string> needles)
         {
         	if (haystack == null) throw new ArgumentNullException("haystack");
@@ -44,6 +43,7 @@ namespace Umbraco.Core.Dynamics
             }
             return false;
         }
+        [Obsolete("This method should not be used and will be removed in the future")]
         public static bool ContainsAny(this string haystack, params string[] needles)
         {
         	if (haystack == null) throw new ArgumentNullException("haystack");
@@ -53,6 +53,7 @@ namespace Umbraco.Core.Dynamics
             }
             return false;
         }
+        [Obsolete("This method should not be used and will be removed in the future")]
 		public static bool ContainsAny(this string haystack, StringComparison comparison, IEnumerable<string> needles)
         {
         	if (haystack == null) throw new ArgumentNullException("haystack");
@@ -62,6 +63,7 @@ namespace Umbraco.Core.Dynamics
             }
             return false;
         }
+        [Obsolete("This method should not be used and will be removed in the future")]
         public static bool ContainsAny(this string haystack, StringComparison comparison, params string[] needles)
         {
         	if (haystack == null) throw new ArgumentNullException("haystack");
@@ -71,12 +73,13 @@ namespace Umbraco.Core.Dynamics
             }
             return false;
         }
+        [Obsolete("This method should not be used and will be removed in the future")]
         public static bool ContainsInsensitive(this string haystack, string needle)
         {
         	if (haystack == null) throw new ArgumentNullException("haystack");
         	return haystack.IndexOf(needle, StringComparison.CurrentCultureIgnoreCase) >= 0;
         }
-
+        [Obsolete("This method should not be used and will be removed in the future")]
     	public static bool HasValue(this string s)
         {
             return !string.IsNullOrWhiteSpace(s);

src/Umbraco.Core/Events/CancellableEventArgs.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Security.Permissions;
-
-namespace Umbraco.Core.Events
-{
-	/// <summary>
-	/// Event args for that can support cancellation
-	/// </summary>
-	[HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-	public class CancellableEventArgs : EventArgs
-	{
-		private bool _cancel;
-
-		public CancellableEventArgs(bool canCancel)
-		{
-			CanCancel = canCancel;
-		}
-
-		public CancellableEventArgs()
-			: this(true)
-		{
-		}
-		/// <summary>
-		/// Flag to determine if this instance will support being cancellable
-		/// </summary>
-		public bool CanCancel { get; set; }
-
-		/// <summary>
-		/// If this instance supports cancellation, this gets/sets the cancel value
-		/// </summary>
-		public bool Cancel
-		{
-			get
-			{
-				if (!CanCancel)
-				{
-					throw new InvalidOperationException("This event argument class does not support cancelling.");
-				}
-				return _cancel;
-			}
-			set
-			{
-				if (!CanCancel)
-				{
-					throw new InvalidOperationException("This event argument class does not support cancelling.");
-				}
-				_cancel = value;
-			}
-		}
-	}
-}

src/Umbraco.Core/Events/CancellableObjectEventArgs.cs

@@ -1,35 +0,0 @@
-using System.Security.Permissions;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Events
-{
-	/// <summary>
-	/// Event args for a strongly typed object that can support cancellation
-	/// </summary>
-	/// <typeparam name="T"></typeparam>
-	[HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-	public class CancellableObjectEventArgs<T> : CancellableEventArgs
-	{
-
-		public CancellableObjectEventArgs(T eventObject, bool canCancel)
-			: base(canCancel)
-		{
-			EventObject = eventObject;
-		}
-
-		public CancellableObjectEventArgs(T eventObject)
-			: this(eventObject, true)
-		{
-		}
-
-		/// <summary>
-		/// Returns the object relating to the event
-		/// </summary>
-		/// <remarks>
-		/// This is protected so that inheritors can expose it with their own name
-		/// </remarks>
-		protected T EventObject { get; private set; }
-
-	}
-}

src/Umbraco.Core/Events/ContentCacheEventArgs.cs

@@ -1,4 +0,0 @@
-namespace Umbraco.Core.Events
-{
-	public class ContentCacheEventArgs : System.ComponentModel.CancelEventArgs { }
-}

src/Umbraco.Core/Events/CopyEventArgs.cs

@@ -1,35 +0,0 @@
-namespace Umbraco.Core.Events
-{
-	public class CopyEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
-	{
-		public CopyEventArgs(TEntity original, TEntity copy, bool canCancel, int parentId) : base(original, canCancel)
-		{
-			Copy = copy;
-			ParentId = parentId;
-		}
-
-		public CopyEventArgs(TEntity eventObject, TEntity copy, int parentId) : base(eventObject)
-		{
-			Copy = copy;
-			ParentId = parentId;
-		}
-
-		/// <summary>
-		/// The copied entity
-		/// </summary>
-		public TEntity Copy { get; set; }
-
-		/// <summary>
-		/// The original entity
-		/// </summary>
-		public TEntity Original
-		{
-			get { return EventObject; }
-		}
-
-		/// <summary>
-		/// Gets or Sets the Id of the objects new parent.
-		/// </summary>
-		public int ParentId { get; private set; }
-	}
-}

src/Umbraco.Core/Events/DeleteEventArgs.cs

@@ -1,70 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Events
-{
-	public class DeleteEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
-	{
-		/// <summary>
-		/// Constructor accepting multiple entities that are used in the delete operation
-		/// </summary>
-		/// <param name="eventObject"></param>
-		/// <param name="canCancel"></param>
-		public DeleteEventArgs(IEnumerable<TEntity> eventObject, bool canCancel) : base(eventObject, canCancel)
-		{
-		}
-
-		/// <summary>
-		/// Constructor accepting multiple entities that are used in the delete operation
-		/// </summary>
-		/// <param name="eventObject"></param>
-		public DeleteEventArgs(IEnumerable<TEntity> eventObject) : base(eventObject)
-		{
-		}
-
-		/// <summary>
-		/// Constructor accepting a single entity instance
-		/// </summary>
-		/// <param name="eventObject"></param>
-		public DeleteEventArgs(TEntity eventObject)
-			: base(new List<TEntity> { eventObject })
-		{
-		}
-
-		/// <summary>
-		/// Constructor accepting a single entity instance
-		/// </summary>
-		/// <param name="eventObject"></param>
-		/// <param name="canCancel"></param>
-		public DeleteEventArgs(TEntity eventObject, bool canCancel)
-			: base(new List<TEntity> { eventObject }, canCancel)
-		{
-		}
-
-		/// <summary>
-		/// Returns all entities that were deleted during the operation
-		/// </summary>
-		public IEnumerable<TEntity> DeletedEntities
-		{
-			get { return EventObject; }
-		} 
-	}
-
-	public class DeleteEventArgs : CancellableEventArgs
-	{
-		public DeleteEventArgs(int id, bool canCancel)
-			: base(canCancel)
-		{
-			Id = id;
-		}
-
-		public DeleteEventArgs(int id)
-		{
-			Id = id;
-		}
-
-		/// <summary>
-		/// Gets the Id of the object being deleted.
-		/// </summary>
-		public int Id { get; private set; }
-	}
-}

src/Umbraco.Core/Events/DeleteRevisionsEventArgs.cs

@@ -1,35 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Events
-{
-	public class DeleteRevisionsEventArgs : DeleteEventArgs
-	{
-		public DeleteRevisionsEventArgs(int id, bool canCancel, Guid specificVersion = default(Guid), bool deletePriorVersions = false, DateTime dateToRetain = default(DateTime))
-			: base(id, canCancel)
-		{
-			DeletePriorVersions = deletePriorVersions;
-			SpecificVersion = specificVersion;
-			DateToRetain = dateToRetain;
-		}
-
-		public DeleteRevisionsEventArgs(int id, Guid specificVersion = default(Guid), bool deletePriorVersions = false, DateTime dateToRetain = default(DateTime))
-			: base(id)
-		{
-			DeletePriorVersions = deletePriorVersions;
-			SpecificVersion = specificVersion;
-			DateToRetain = dateToRetain;			
-		}
-
-		public bool DeletePriorVersions { get; private set; }
-		public Guid SpecificVersion { get; private set; }
-		public DateTime DateToRetain { get; private set; }
-		
-		/// <summary>
-		/// Returns true if we are deleting a specific revision
-		/// </summary>
-		public bool IsDeletingSpecificRevision
-		{
-			get { return SpecificVersion != default(Guid); }
-		}
-	}
-}

src/Umbraco.Core/Events/EventExtensions.cs

@@ -1,49 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Events
-{
-	/// <summary>
-	/// Extension methods for cancellable event operations
-	/// </summary>
-	public static class EventExtensions
-	{
-		/// <summary>
-		/// Raises the event and returns a boolean value indicating if the event was cancelled
-		/// </summary>
-		/// <typeparam name="TSender"></typeparam>
-		/// <typeparam name="TArgs"></typeparam>
-		/// <param name="eventHandler"></param>
-		/// <param name="args"></param>
-		/// <param name="sender"></param>
-		/// <returns></returns>
-		public static bool IsRaisedEventCancelled<TSender, TArgs>(
-			this TypedEventHandler<TSender, TArgs> eventHandler,
-			TArgs args,
-			TSender sender)
-			where TArgs : CancellableEventArgs
-		{
-			if (eventHandler != null)
-				eventHandler(sender, args);
-
-			return args.Cancel;
-		}
-
-		/// <summary>
-		/// Raises the event
-		/// </summary>
-		/// <typeparam name="TSender"></typeparam>
-		/// <typeparam name="TArgs"></typeparam>
-		/// <param name="eventHandler"></param>
-		/// <param name="args"></param>
-		/// <param name="sender"></param>
-		public static void RaiseEvent<TSender, TArgs>(
-			this TypedEventHandler<TSender, TArgs> eventHandler,
-			TArgs args,
-			TSender sender)
-			where TArgs : EventArgs
-		{
-			if (eventHandler != null)
-				eventHandler(sender, args);
-		}
-	}
-}

src/Umbraco.Core/Events/MacroErrorEventArgs.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core.Events
+{
+    // Provides information on the macro that caused an error
+    public class MacroErrorEventArgs : System.EventArgs
+    {
+        /// <summary>
+        /// Name of the faulting macro. 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Alias of the faulting macro. 
+        /// </summary>
+        public string Alias { get; set; }
+
+        /// <summary>
+        /// Filename, file path, fully qualified class name, or other key used by the macro engine to do it's processing of the faulting macro.
+        /// </summary>
+        public string ItemKey { get; set; }
+
+        /// <summary>
+        /// Exception raised.
+        /// </summary>
+        public Exception Exception { get; set; }
+
+        /// <summary>
+        /// Gets or sets the desired behaviour when a matching macro causes an error. See
+        /// <see cref="MacroErrorBehaviour"/> for definitions. By setting this in your event
+        /// you can override the default behaviour defined in UmbracoSettings.config.
+        /// </summary>
+        /// <value>Macro error behaviour enum.</value>
+        public MacroErrorBehaviour Behaviour { get; set; }
+    }
+}

src/Umbraco.Core/Events/MigrationEventArgs.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Persistence.Migrations;
-
-namespace Umbraco.Core.Events
-{
-    public class MigrationEventArgs : CancellableObjectEventArgs<IEnumerable<IMigration>>
-    {
-        /// <summary>
-        /// Constructor accepting multiple migrations that are used in the migration runner
-        /// </summary>
-        /// <param name="eventObject"></param>
-        /// <param name="targetVersion"></param>
-        /// <param name="canCancel"></param>
-        /// <param name="configuredVersion"></param>
-        public MigrationEventArgs(IEnumerable<IMigration> eventObject, Version configuredVersion, Version targetVersion, bool canCancel)
-			: base(eventObject, canCancel)
-         {
-             ConfiguredVersion = configuredVersion;
-             TargetVersion = targetVersion;
-         }
-
-        /// <summary>
-        /// Constructor accepting multiple migrations that are used in the migration runner
-        /// </summary>
-        /// <param name="eventObject"></param>
-        /// <param name="migrationContext"></param>
-        /// <param name="targetVersion"></param>
-        /// <param name="canCancel"></param>
-        /// <param name="configuredVersion"></param>
-        internal MigrationEventArgs(IEnumerable<IMigration> eventObject, MigrationContext migrationContext, Version configuredVersion, Version targetVersion, bool canCancel)
-            : base(eventObject, canCancel)
-        {
-            MigrationContext = migrationContext;
-            ConfiguredVersion = configuredVersion;
-            TargetVersion = targetVersion;
-        }
-
-        /// <summary>
-        /// Constructor accepting multiple migrations that are used in the migration runner
-        /// </summary>
-        /// <param name="eventObject"></param>
-        /// <param name="configuredVersion"></param>
-        /// <param name="targetVersion"></param>
-        public MigrationEventArgs(IEnumerable<IMigration> eventObject, Version configuredVersion, Version targetVersion)
-			: base(eventObject)
-		{
-            ConfiguredVersion = configuredVersion;
-            TargetVersion = targetVersion;
-		}
-
-		/// <summary>
-		/// Returns all migrations that were used in the migration runner
-		/// </summary>
-        public IEnumerable<IMigration> Migrations
-		{
-			get { return EventObject; }
-		}
-
-        public Version ConfiguredVersion { get; private set; }
-
-        public Version TargetVersion { get; private set; }
-
-        internal MigrationContext MigrationContext { get; private set; }
-    }
-}