Fxies U4-2257

Show containers in folderbrowser again
Fixes the EntityRepository for Content and Media, so trees load correctly.
2013-06-02 11:30:27 -02:00 · 2013-06-02 05:03:51 -02:00 · 2013-06-01 20:40:51 -02:00 · 2013-05-31 14:01:21 -02:00 · 2013-05-31 13:59:35 -02:00 · 2013-05-31 12:16:09 -02:00
1887 changed files with 136208 additions and 108659 deletions
@@ -1,6 +1,8 @@
-# use glob syntax
-syntax: glob
+syntax: regexp
+^src/packages/(?!repositories.config$)
+web.Template.[a-zA-Z0-9]*.Debug.config

+syntax: glob
 *.obj
 *.pdb
 *.user
@@ -12,6 +14,11 @@ syntax: glob
 obj/
 [Rr]elease*/
 _ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
 [Tt]est[Rr]esult*
 [Bb]uild[Ll]og.*
 *.[Pp]ublish.xml
@@ -27,25 +34,25 @@ umbraco\presentation\scripts\*
 umbraco\presentation\fonts\*
 umbraco\presentation\css\*

-src\Umbraco.Web.UI\css\*
+src\Umbraco.Web.UI\[Cc]ss\*
 src\Umbraco.Web.UI\App_Code\*
 src\Umbraco.Web.UI\App_Data\*
 src\Umbraco.Tests\App_Data\*
-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\[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\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
@@ -57,7 +64,7 @@ src/Umbraco.Web.UI/Views/*.vbhtml
 src/Umbraco.Tests/config/umbracoSettings.config
 src/Umbraco.Web.UI/App_Plugins/*
 src/Umbraco.Web.UI/Views/*
+src/packages/

 src\Umbraco.Web.UI\[W]eb.config
-src/packages/
-build/*.zip
+*.transformed
@@ -22,10 +22,16 @@ f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
 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
+ff3bb24ea0c915878396a6ae27f1ff164e8ac150 Release-6.0.0-beta
+56015ac26f5ab60e3c61b1d09075297b660afa07 Release-6.0.0-RC
+1719fbd857f28b376639ac2aa0abada0ef2e7560 Release-6.0.0
 e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4
 14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6
 ce47176bc6b9298741783e20f1fe2672c811f744 release-4.11.7
+b247b35d821144849f551e02da8ba719f91d5fb0 Release-6.0.2
+aed55cba29009ad3db48880a7cfb66407ce9805f release-6.0.3
+87cf618a39e38ec58df916d10e6a924de62ae37d release-6.1.0-beta
+0dee9964687ea51ea797984cf7cce3655d6a6558 release-6.0.4
+7670bb47a671a9ecc15118589d8048907ea76241 release-6.1.0-beta2
+953c466faf8fcfd6e85e06ccd04c2346bbdb88a8 release-6.0.6
+8309c3bd6db5885c9ef37e71db0672b8947fcb59 release-6.1.0
@@ -1,6 +1,11 @@
@ECHO OFF
-set version=4.11.9
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%version%
+SET release=6.1.1
+SET comment=
+SET version=%release%
+
+IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
+
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%

 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
@@ -11,15 +16,16 @@ echo This file is only here so that the containing folder will be included in th
 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\Views\Partials\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\Views\MacroPartials\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%
+..\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

-if ERRORLEVEL 1 goto :showerror
-
-goto :EOF
+GOTO :EOF

 :showerror
-pause
+PAUSE
@@ -1,222 +1,282 @@
-<Project InitialTargets="Build" DefaultTargets="AfterBuild" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

- <!-- 
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- 
 ****************************************************
 INCLUDES 
 *****************************************************
 -->

- <PropertyGroup>
-   <MSBuildCommunityTasksPath>..\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
-   <UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
- </PropertyGroup>
- 
- <Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
- <Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+  <PropertyGroup>
+    <MSBuildCommunityTasksPath>..\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
+    <UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
+  </PropertyGroup>

- <!-- 
+  <Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
+  <Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+ 
+ <UsingTask TaskName="GenerateHash" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+        <InputFiles ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+        <OutputFile ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+        <Using Namespace="System.IO" />
+        <Using Namespace="System.Linq" />
+        <Using Namespace="System.Security.Cryptography" />
+        <Code Type="Fragment" Language="cs">
+            <![CDATA[
+                using (var ms = new MemoryStream())
+                {
+                    foreach (var item in InputFiles)
+                    {
+                        string path = item.ItemSpec;
+
+                        using (FileStream stream = new FileStream(path, FileMode.Open))
+                        {
+                            using (var cryptoProvider = new SHA1CryptoServiceProvider())
+                            {
+                                
+                                var fileHash = cryptoProvider.ComputeHash(stream);
+                                
+                                using (TextWriter w = new StreamWriter(OutputFile, false))
+                                {
+                                    w.WriteLine(string.Join("", fileHash.Select(b => b.ToString("x2"))));
+                                }
+                            }
+                        }
+                    }
+                }
+            ]]>
+        </Code>
+    </Task>
+ </UsingTask>
+
+ 
+  <!-- 
 ****************************************************
 VARIABLES 
 *****************************************************
 -->

- <!-- NB: BUILD_NUMBER is passed in by the build server -->
- <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>
-   <BuildFolder>_BuildOutput\</BuildFolder>
-   <BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
-   <BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
-   <BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
-   <IncludeSymbols>False</IncludeSymbols>
-   <BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
-   <BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
-   <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
-   <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
-   <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
-   <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
-   <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
-   <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
-   <WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
-   <WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
-   <WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
- </PropertyGroup>
+  <!-- NB: BUILD_NUMBER is passed in by the build server -->
+  <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 Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>

- <ItemGroup>
-	 <SystemFolders Include="$(WebAppFolder)App_Plugins" />
-	 <SystemFolders Include="$(WebAppFolder)App_Code" />
-   <SystemFolders Include="$(WebAppFolder)App_Data" />
-   <SystemFolders Include="$(WebAppFolder)media" />
-   <SystemFolders Include="$(WebAppFolder)masterpages" />
-   <SystemFolders Include="$(WebAppFolder)scripts" />
-   <SystemFolders Include="$(WebAppFolder)css" />
-   <SystemFolders Include="$(WebAppFolder)macroScripts" />
-   <SystemFolders Include="$(WebAppFolder)xslt" />
-   <SystemFolders Include="$(WebAppFolder)usercontrols" />
- </ItemGroup>
+  <PropertyGroup>
+    <BuildConfiguration>Release</BuildConfiguration>
+    <BuildFolder>_BuildOutput\</BuildFolder>
+    <BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
+    <BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
+    <BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
+    <IncludeSymbols>False</IncludeSymbols>
+    <BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
+    <BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
+    <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
+    <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
+    <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
+    <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
+    <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
+    <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
+    <WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
+    <WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
+    <WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
+    <ExaminePDFPath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF\</ExaminePDFPath>
+    <ExamineAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.Azure\</ExamineAzurePath>
+    <ExaminePDFAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF.Azure\</ExaminePDFAzurePath>
+  </PropertyGroup>

- <!-- 
+  <ItemGroup>
+    <SystemFolders Include="$(WebAppFolder)App_Plugins" />
+    <SystemFolders Include="$(WebAppFolder)App_Code" />
+    <SystemFolders Include="$(WebAppFolder)App_Data" />
+    <SystemFolders Include="$(WebAppFolder)Media" />
+    <SystemFolders Include="$(WebAppFolder)Masterpages" />
+    <SystemFolders Include="$(WebAppFolder)Scripts" />
+    <SystemFolders Include="$(WebAppFolder)Css" />
+    <SystemFolders Include="$(WebAppFolder)MacroScripts" />
+    <SystemFolders Include="$(WebAppFolder)Xslt" />
+    <SystemFolders Include="$(WebAppFolder)UserControls" />
+    <SystemFolders Include="$(WebAppFolder)Views" />
+  </ItemGroup>
+
+  <!-- 
 ****************************************************
 TARGETS 
 *****************************************************
 -->

- <Target Name="Build" DependsOnTargets="ZipWebPiApp">
-   <Message Text="Build finished" />
+ <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
+    <Message Text="Build finished" />
 </Target>
 
- <Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
-   <Message Text="Deleting $(BuildFolder)" Importance="high" />
-   <RemoveDir Directories="$(BuildFolder)" />
-   <Message Text="Finished deleting $(BuildFolder)" Importance="high" />
- </Target>
-
- <Target Name="ZipWebPiApp" DependsOnTargets="ZipWebApp" >
-
-   <!-- Clean folders -->
-   <RemoveDir Directories="$(WebPiFolder)" />
-   <MakeDir Directories="$(WebPiFolder)" />
-   <MakeDir Directories="$(WebPiFolder)umbraco" />
-
-   <!-- 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 -->
+ <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
   <ItemGroup>
-     <WebPiFiles Include="..\src\WebPi\**\*.*" />
+      <WebPiFile Include="$(BuildZipFileNameWebPi)" />
   </ItemGroup>
+   <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
+   <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
+  </Target>

-   <Copy SourceFiles="@(WebPiFiles)"
-       DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
+  <Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
+    <Message Text="Deleting $(BuildFolder)" Importance="high" />
+    <RemoveDir Directories="$(BuildFolder)" />
+    <Message Text="Finished deleting $(BuildFolder)" Importance="high" />
+  </Target>

-   <!-- Zip the files -->
-   <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
+  <Target Name="ZipWebPiApp" DependsOnTargets="ZipWebApp" >
+    <!-- Clean folders -->
+    <RemoveDir Directories="$(WebPiFolder)" />
+    <MakeDir Directories="$(WebPiFolder)" />
+    <MakeDir Directories="$(WebPiFolder)umbraco" />

- </Target>
- 
- <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
-   
-   <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
+    <!-- Copy fresh built umbraco files -->
+    <Exec Command="xcopy %22$(WebAppFolderAbsolutePath)*%22 %22$(WebPiFolderAbsolutePath)umbraco%22 /S /E /Y /I" />

-   <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
-   <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22" />
-   
-   <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
- </Target>
+    <!-- Copy Web Pi template files -->
+    <ItemGroup>
+      <WebPiFiles Include="..\src\WebPi\**\*.*" />
+    </ItemGroup>

- <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
-   <MakeDir Directories="@(SystemFolders)" />
- </Target>
+    <Copy SourceFiles="@(WebPiFiles)"
+        DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />

- <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
+    <!-- Zip the files -->
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
+  </Target>

-   <!-- Copy SQL CE -->
-   <ItemGroup>
-     <SQLCE4Files Include="..\lib\SQLCE4\**\*.*" />
-   </ItemGroup>
+  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
+    <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />

-   <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" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22" />

-   <!-- Copy WebPages -->
-   <ItemGroup>
-     <WebPageFiles Include="..\lib\WebPages\*.dll" />
-   </ItemGroup>
+    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
+  </Target>

-   <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>
+  <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
+    <MakeDir Directories="@(SystemFolders)" />
+  </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="CompileProjects">
-   <CreateItem Include="$(BuildFolder)**\umbraco.*.dll">
-     <Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
-   </CreateItem>
-   <Message Text="Starting to offset timestamps" Importance="high" />
-   <Umbraco.MSBuild.Tasks.TimestampOffset Files="@(FilesToOffsetTimestamp)" Offset="-11" />
-   <Message Text="Finished offsetting timestamps" Importance="high" />
- </Target>
- 
- <Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
+  <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*"
+		/>
+    </ItemGroup>

-   <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>
+    <Copy SourceFiles="@(SQLCE4Files)"
+        DestinationFiles="@(SQLCE4Files->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />

-   <!--     
-   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.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    
-   -->
+    <Copy SourceFiles="@(SQLCE4Files)"
+        DestinationFiles="@(SQLCE4Files->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />

-   <!-- 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"/>
+  </Target>

-   <!-- 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"/>
+  <!-- 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">
+    <CreateItem Include="$(BuildFolder)**\umbraco.*.dll">
+      <Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
+    </CreateItem>
+    <Message Text="Starting to offset timestamps" Importance="high" />
+    <Umbraco.MSBuild.Tasks.TimestampOffset Files="@(FilesToOffsetTimestamp)" Offset="-11" />
+    <Message Text="Finished offsetting timestamps" Importance="high" />
+  </Target>

-   <!-- DONE -->
-   <Message Text="Finished compiling projects" Importance="high" />
- </Target>
- 
- <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
+  <!-- Copy the transformed web.config file to the root -->
+  <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyXmlDocumentation">
+    <ItemGroup>
+      <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(WebConfigFile)"
+        DestinationFiles="$(WebAppFolder)Web.config"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+  </Target>
+
+  <!-- Copy the xml documentation to the bin folder -->
+  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CompileProjects">
+    <ItemGroup>
+      <XmlDocumentationFiles Include="$(SolutionBinFolder)*.xml" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(XmlDocumentationFiles)"
+        DestinationFiles="@(XmlDocumentationFiles->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+    <Message Text="CopyXmlDocumentation" />
+  </Target>
+
+  <Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">
+    
+    <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 -->
+    <!-- Build the Umbraco.Web.UI project -->
+    <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>
+    
+    <!-- DONE -->
+    <Message Text="Finished compiling projects" Importance="high" />
+  </Target>
+
+  <Target Name="CompileExternalExamineProjects" DependsOnTargets="SetVersionNumber">
+    <Message Text="Building externally shipped examine projects" Importance="high" />
+
+    <!-- First remove old files from the examine builds -->
+    <ItemGroup>
+      <FilesToDeleteBeforeBuild Include="$(ExaminePDFPath)*;$(ExamineAzurePath)*"/>
+    </ItemGroup>
+    <Delete Files="@(FilesToDeleteBeforeBuild)" />
+    <!-- 
+      Build the UmbracoExamine.PDF.Azure library ... this builds the 3 projects that we want to bundle separately so no need to build each one separately .
+      We'll just build this one and then manually copy the DLLs to where we want them.
+    -->
+    <MSBuild Projects="..\src\UmbracoExamine.PDF.Azure\UmbracoExamine.PDF.Azure.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);PipelineDependsOnBuild=False;OutDir=$(ExaminePDFAzurePath);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+    </MSBuild>
+    <ItemGroup>
+      <ExaminePDFFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.pdf;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.xml;$(ExaminePDFAzurePath)**\itextsharp.dll" />
+      <ExamineAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.xml" />
+      <ExaminePDFAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.xml" />
+    </ItemGroup>
+    <!-- Now copy the built files to their correct deployment folders-->
+    <Copy SourceFiles="@(ExaminePDFFiles)"
+        DestinationFolder="$(ExaminePDFPath)"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(ExamineAzureFiles)"
+        DestinationFolder="$(ExamineAzurePath)"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+    <!-- Then just delete the files we don't want to ship in the UmbracoExamine.Azure.PDF folder -->
+    <ItemGroup>
+      <FilesToDeleteAfterBuild Include="$(ExaminePDFAzurePath)*" Exclude="$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.dll;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.pdb;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.xml"/>
+    </ItemGroup>
+    <Delete Files="@(FilesToDeleteAfterBuild)" />
+  </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]+))?"
+    <FileUpdate
+      Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+      Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
      ReplacementText="$(BUILD_RELEASE)"/>
- </Target>
- 
- <Target Name="AfterBuild">
-   <Message Text="Hi" />
- </Target>
- 
+
+    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+      Regex="CurrentComment { get { return &quot;([a-zA-Z]+)?&quot;"
+      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>
+  </Target>
 </Project>
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms.Core</id>
-        <version>$version$</version>
+        <version>6.0.0-alpha</version>
        <title>Umbraco Cms Core Binaries</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -14,22 +14,33 @@
        <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="Microsoft.AspNet.WebApi" version="4.0.20710.0" />
+			<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
+			<dependency id="MiniProfiler" version="2.1.0" />
+        </dependencies>
    </metadata>
 	<files>
 		<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
 		<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\cms.xml" target="lib\cms.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\Examine.dll" target="lib\Examine.dll" />
 		<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\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
 		<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\Lucene.Net.xml" target="lib\Lucene.Net.xml" />
 		<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" />
@@ -37,24 +48,24 @@
 		<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.Core.xml" target="lib\Umbraco.Core.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
+		<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
 		<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\umbraco.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
 		<file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
-		<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
 	</files>
 </package>
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>UmbracoCms</id>
-        <version>$version$</version>
+        <version>6.0.0-alpha</version>
        <title>Umbraco Cms</title>
        <authors>Morten Christensen</authors>
        <owners>Umbraco HQ</owners>
@@ -19,15 +19,17 @@
        </dependencies>
    </metadata>
  <files>
-    <file src="..\_BuildOutput\WebApp\config\*.config" target="Content\config" />
+	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
+	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
+	<file src="..\_BuildOutput\WebApp\config\*.config" target="Content\config" />
 	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
 	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" />
 	<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
 	<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\xslt\**" target="Content\xslt" />
 	<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" />
+	<file src="..\_BuildOutput\WebApp\xslt\**" target="Content\xslt" />
 	<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 +40,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\Web.config" target="UmbracoFiles\Web.config" />
 	<file src="..\_BuildOutput\WebApp\Global.asax" target="UmbracoFiles\Global.asax" />
+	<file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
    <file src="tools\install.ps1" target="tools\install.ps1" />
    <file src="tools\Readme.txt" target="tools\Readme.txt" />
  </files>
@@ -21,4 +21,7 @@ if ($project) {
 	$projectDestinationPath = Split-Path $project.FullName -Parent
 	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
 	Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
+	
+	# Open readme.txt file
+	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
 }
@@ -0,0 +1,161 @@
+@ECHO OFF
+
+:choice
+set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal?
+if /I "%c%" EQU "C" goto :prompt
+if /I "%c%" EQU "Y" goto :auto
+if /I "%c%" EQU "N" goto :exit
+goto :choice
+
+
+:prompt
+
+echo Current folder: %CD%
+
+echo Regenerating SQL CE database
+SET buildfolder=%CD%
+CD ..\tools\RegenerateUmbracoSQLCEDatabase\
+RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
+CD %buildfolder%
+
+echo Removing bin files
+del ..\src\Umbraco.Web.UI\bin\*.*
+
+echo Building solution
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
+
+echo Resetting installedPackages.config
+echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
+
+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\*.*
+
+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\*.*
+
+echo Removing media files
+del ..\src\Umbraco.Web.UI\media\*.*
+
+echo Removing script files
+del ..\src\Umbraco.Web.UI\scripts\*.*
+
+echo Removing css files
+del ..\src\Umbraco.Web.UI\css\*.*
+
+echo "Umbraco install reverted to clean install"
+pause 
+exit
+
+
+
+:auto
+
+echo Current folder: %CD%
+
+echo Regenerating SQL CE database
+SET buildfolder=%CD%
+CD ..\tools\RegenerateUmbracoSQLCEDatabase\
+RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
+CD %buildfolder%
+
+echo Removing bin files
+ FOR %%A IN (..\src\Umbraco.Web.UI\bin\*.*) DO DEL %%A
+
+echo Building solution
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
+
+echo Resetting installedPackages.config
+echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
+
+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
+
+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
+
+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
+
+echo Removing media files
+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
+
+echo Removing css files
+FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
+
+echo Removing Courier files
+del ..\src\Umbraco.Web.UI\config\courier.config
+del ..\src\Umbraco.Web.UI\umbraco\images\tray\courier.jpg
+rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\courier\" /S /Q
+
+echo Removing Contour files
+del ..\src\Umbraco.Web.UI\umbraco\images\tray\contour.png
+FOR %%A IN (..\src\Umbraco.Web.UI\umbraco\images\umbraco\icon_*.*) DO DEL %%A
+rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\umbracoContour\" /S /Q
+del ..\src\Umbraco.Web.UI\umbraco\xslt\templates\UmbracoContour*.* /S /Q
+rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
+
+echo Start with a clean web.config
+copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
+
+echo "Umbraco install reverted to clean install"
+pause 
+exit
+
+
+
+:exit
+exit
@@ -1,6 +0,0 @@
-<?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>
@@ -1,6 +0,0 @@
-<?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>
@@ -1,636 +0,0 @@
-<?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>
@@ -1,866 +0,0 @@
-<?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>
@@ -1,16 +0,0 @@
-<?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>
@@ -1,71 +0,0 @@
-<?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>
@@ -1,884 +0,0 @@
-<?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>
@@ -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>
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+        
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>

-    <!-- Enable the restore command to run before builds -->
-    <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>

-    <!-- Property that enables building a package from a project -->
-    <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+        <!-- 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>

-    <!-- Determines if package restore consent is required to restore packages -->
-    <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+    <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>

-    <!-- Download NuGet.exe if it does not already exist -->
-    <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-  </PropertyGroup>
+        <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>

-  <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>
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(ResolveReferencesDependsOn);
+        </ResolveReferencesDependsOn>

-  <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>
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </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>
+    <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>
-    <!-- NuGet command -->
-    <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
-    <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>

-    <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-    <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+    <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>

-    <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+    <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);

-    <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>
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);

-    <!-- 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>
+                    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>
@@ -6,10 +6,9 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SqlCE4Umbraco")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Umbraco specific Sql Ce Provider")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("SqlCE4Umbraco")]
-
+[assembly: AssemblyProduct("Umbraco CMS")]

 // 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 
@@ -10,7 +10,7 @@
 
 IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
 
-    Database version: 4.8.0.2
+    Database version: 6.0.0.0
    
    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,12 +147,18 @@ 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')
+[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)
 ) 
 
 ; 
 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), 
@@ -184,16 +190,19 @@ ALTER TABLE [umbracoStylesheetProperty] ADD CONSTRAINT [PK_stylesheetProperty] P

 */
 
-CREATE TABLE [cmsTab] 
+CREATE TABLE [cmsPropertyTypeGroup] 
 ( 
 [id] [int] NOT NULL IDENTITY(1, 1), 
 [contenttypeNodeId] [int] NOT NULL, 
 [text] [nvarchar] (255) NOT NULL, 
-[sortorder] [int] NOT NULL 
+[sortorder] [int] NOT NULL,
+[parentGroupId] int NULL CONSTRAINT [DF_cmsPropertyTypeGroup_parentGroupId] DEFAULT NULL
 ) 
 
 ; 
-ALTER TABLE [cmsTab] ADD CONSTRAINT [PK_cmsTab] PRIMARY KEY  ([id]) 
+ALTER TABLE [cmsPropertyTypeGroup] ADD CONSTRAINT [PK_cmsPropertyTypeGroup] PRIMARY KEY  ([id]) 
+; 
+ALTER TABLE [cmsPropertyTypeGroup] ADD CONSTRAINT [FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup] FOREIGN KEY([parentGroupId]) REFERENCES [cmsPropertyTypeGroup] ([id])
 ; 
 CREATE TABLE [cmsTemplate] 
 ( 
@@ -301,7 +310,7 @@ CREATE TABLE [cmsPropertyType]
 [id] [int] NOT NULL IDENTITY(1, 1), 
 [dataTypeId] [int] NOT NULL, 
 [contentTypeId] [int] NOT NULL, 
-[tabId] [int] NULL, 
+[propertyTypeGroupId] int,
 [Alias] [nvarchar] (255) NOT NULL, 
 [Name] [nvarchar] (255) NULL, 
 [helpText] [nvarchar] (1000) NULL, 
@@ -378,7 +387,8 @@ ALTER TABLE [umbracoAppTree] ADD CONSTRAINT [PK_umbracoAppTree] PRIMARY KEY  ([a
 CREATE TABLE [cmsContentTypeAllowedContentType] 
 ( 
 [Id] [int] NOT NULL, 
-[AllowedId] [int] NOT NULL 
+[AllowedId] [int] NOT NULL,
+[sortOrder] int NOT NULL CONSTRAINT [DF_cmsContentTypeAllowedContentType_sortOrder] DEFAULT (1)
 ) 
 
 ; 
@@ -578,9 +588,6 @@ 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]) 
 ; 
@@ -594,8 +601,6 @@ 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] 
@@ -658,7 +663,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]) VALUES (532, 1031, N'Folder', N'folder.gif', N'folder.png') 
+|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 (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 
@@ -727,22 +732,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 [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 [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 [cmsPropertyType] ON 
-|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) 
+|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) 
 |SET IDENTITY_INSERT [cmsPropertyType] OFF 
 ;
 !!!SET IDENTITY_INSERT [umbracoLanguage] ON 
@@ -792,8 +797,6 @@ 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]) 
@@ -863,11 +866,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
 ;
@@ -926,10 +929,6 @@ 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)
@@ -963,11 +962,10 @@ 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
@@ -992,7 +990,7 @@ ALTER TABLE [umbracoUserType] ALTER COLUMN id IDENTITY(5,1)
 ;
 ALTER TABLE [cmsMacroPropertyType] ALTER COLUMN id IDENTITY(26,1)
 ;
-ALTER TABLE [cmsTab] ALTER COLUMN id IDENTITY(6,1)
+ALTER TABLE [cmsPropertyTypeGroup] ALTER COLUMN id IDENTITY(6,1)
 ;
 ALTER TABLE [cmsPropertyType] ALTER COLUMN id IDENTITY(28,1)
 ;
@@ -20,6 +20,8 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -37,13 +39,18 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\SQLCE4Umbraco.XML</DocumentationFile>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Core" />
-    <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 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>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -73,6 +80,7 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="Sql\Total.sql" />
+    <None Include="packages.config" />
    <None Include="Sql\Version4_1_Upgrade.sql" />
  </ItemGroup>
  <ItemGroup>
@@ -93,6 +101,7 @@
    <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">
@@ -50,35 +50,90 @@ namespace SqlCE4Umbraco
        /// </summary>
        internal void ClearDatabase()
        {
+            // drop constraints before tables to avoid exceptions
+            // looping on try/catching exceptions was not really nice
+
+            // http://stackoverflow.com/questions/536350/drop-all-the-tables-stored-procedures-triggers-constriants-and-all-the-depend
+
            var localConnection = new SqlCeConnection(ConnectionString);
            if (System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
            {
-                var tables = new List<string>();
-                using (var reader = ExecuteReader("select table_name from information_schema.tables where TABLE_TYPE <> 'VIEW'"))
+                List<string> tables;
+
+                // drop foreign keys
+                // SQL may need "where constraint_catalog=DB_NAME() and ..."
+                tables = new List<string>();
+                using (var reader = ExecuteReader("select table_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' order by table_name"))
                {
-                    while (reader.Read())
+                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
+                }
+
+                foreach (var table in tables)
+                {
+                    var constraints = new List<string>();
+                    using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' and table_name = '" + table + "' order by constraint_name"))
                    {
-                        tables.Add(reader.GetString("TABLE_NAME"));
+                        while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
+                    }
+                    foreach (var constraint in constraints)
+                    {
+                        // SQL may need "[dbo].[table]"
+                        ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
                    }
                }

-                while(tables.Any())
+                // drop primary keys
+                // SQL may need "where constraint_catalog=DB_NAME() and ..."
+                tables = new List<string>();
+                using (var reader = ExecuteReader("select table_name from information_schema.table_constraints where constraint_type = 'PRIMARY KEY' order by table_name"))
                {
-                    for (var i = 0; i < tables.Count; i++)
-                    {
-                        var dropTable = "DROP TABLE " + tables[i];
+                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
+                }

-                        try
-                        {
-                            ExecuteNonQuery(dropTable);
-                            tables.Remove(tables[i]);
-                        }
-                        catch (SqlHelperException ex)
-                        {
-                            //this will occur because there is no cascade option, so we just wanna try the next one       
-                        }
+                foreach (var table in tables)
+                {
+                    var constraints = new List<string>();
+                    using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'PRIMARY KEY' and table_name = '" + table + "' order by constraint_name"))
+                    {
+                        while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
+                    }
+                    foreach (var constraint in constraints)
+                    {
+                        // SQL may need "[dbo].[table]"
+                        ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
                    }
                }
+
+                // drop tables
+                tables = new List<string>();
+                using (var reader = ExecuteReader("select table_name from information_schema.tables where table_type <> 'VIEW' order by table_name"))
+                {
+                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
+                }
+
+                foreach (var table in tables)
+                {
+                    ExecuteNonQuery("drop table [" + table + "]");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Drops all foreign keys on a table.
+        /// </summary>
+        /// <param name="table">The name of the table.</param>
+        /// <remarks>To be used in unit tests.</remarks>
+        internal void DropForeignKeys(string table)
+        {
+            var constraints = new List<string>();
+            using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' and table_name = '" + table + "' order by constraint_name"))
+            {
+                while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
+            }
+            foreach (var constraint in constraints)
+            {
+                // SQL may need "[dbo].[table]"
+                ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
            }
        }

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

@@ -11,7 +11,7 @@ namespace SQLCE4Umbraco
    public static class SqlCeContextGuardian
    {
        private static SqlCeConnection _constantOpenConnection;
-        private static object objLock = new object();
+        private static readonly object Lock = 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,9 +38,18 @@ namespace SQLCE4Umbraco

        }

-        private static void ensureOpenBackgroundConnection(string connectionString)
+		/// <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)
        {
-            lock (objLock)
+            lock (Lock)
            {
                if (_constantOpenConnection == null)
                {
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
+</packages>
@@ -1,14 +1,13 @@
 using System;
-using System.Collections;
 using System.Configuration;
-using System.Data;
-using System.Diagnostics;
-using System.Linq;
+using System.Threading;
 using System.Web;
 using System.Web.Caching;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
+using Umbraco.Core.ObjectResolution;
+using Umbraco.Core.Services;


 namespace Umbraco.Core
@@ -19,19 +18,53 @@ namespace Umbraco.Core
    /// <remarks>
    /// one per AppDomain, represents the global Umbraco application
    /// </remarks>
-    public class ApplicationContext
+    public class ApplicationContext : IDisposable
    {
    	/// <summary>
        /// Constructor
-        /// </summary>
-        internal ApplicationContext()
+        /// </summary>        
+        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
+            : this(dbContext, serviceContext, true)
    	{
-			//create a new application cache from the HttpRuntime.Cache
-    		ApplicationCache = HttpRuntime.Cache == null 
-				? new CacheHelper(new Cache()) 
-				: new CacheHelper(HttpRuntime.Cache);
+    			
    	}

+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="dbContext"></param>
+        /// <param name="serviceContext"></param>
+        /// <param name="enableCache"></param>
+        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, bool enableCache)
+            : this(enableCache)
+        {
+            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() : this(true)
+		{			
+		}
+
+        /// <summary>
+        /// Constructor used to specify if we will enable application cache or not
+        /// </summary>
+        /// <param name="enableCache"></param>
+        internal ApplicationContext(bool enableCache)
+        {
+            //create a new application cache from the HttpRuntime.Cache
+            ApplicationCache = HttpRuntime.Cache == null
+                ? new CacheHelper(new System.Web.Caching.Cache(), enableCache)
+                : new CacheHelper(HttpRuntime.Cache, enableCache);
+        }
+
 		/// <summary>
    	/// Singleton accessor
    	/// </summary>
@@ -50,7 +83,10 @@ 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);
-        public bool IsReady
+		private DatabaseContext _databaseContext;
+		private ServiceContext _services;
+
+		public bool IsReady
        {
            get
            {
@@ -106,7 +142,7 @@ namespace Umbraco.Core
 				try
 				{
 					string configStatus = ConfigurationStatus;
-					string currentVersion = GlobalSettings.CurrentVersion;
+					string currentVersion = UmbracoVersion.Current.ToString(3);


 					if (currentVersion != configStatus)
@@ -149,6 +185,89 @@ 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; }
+		}
+
+
+        private volatile bool _disposed;
+        private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+
+        /// <summary>
+        /// This will dispose and reset all resources used to run the application
+        /// </summary>
+        /// <remarks>
+        /// IMPORTANT: Never dispose this object if you require the Umbraco application to run, disposing this object
+        /// is generally used for unit testing and when your application is shutting down after you have booted Umbraco.
+        /// </remarks>
+        void IDisposable.Dispose()
+        {
+            // Only operate if we haven't already disposed
+            if (_disposed) return;
+
+            using (new WriteLock(_disposalLocker))
+            {
+                // Check again now we're inside the lock
+                if (_disposed) return;
+
+                //clear the cache
+                if (ApplicationCache != null)
+                {
+                    ApplicationCache.ClearAllCache();    
+                }
+                //reset all resolvers
+                ResolverCollection.ResetAll();
+                //reset resolution itself (though this should be taken care of by resetting any of the resolvers above)
+                Resolution.Reset();
+                
+                //reset the instance objects
+                this.ApplicationCache = null;
+                if (_databaseContext != null) //need to check the internal field here
+                {
+                    if (DatabaseContext.IsDatabaseConfigured)
+                    {
+                        DatabaseContext.Database.Dispose();       
+                    }                    
+                }
+                this.DatabaseContext = null;
+                this.Services = null;
+                this._isReady = false; //set the internal field
+                
+                // Indicate that the instance has been disposed.
+                _disposed = true;
+            }
        }
    }
 }
@@ -0,0 +1,119 @@
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// A plugin type that allows developers to execute code during the Umbraco bootup process
+    /// </summary>
+    /// <remarks>
+    /// Allows you to override the methods that you would like to execute code for: ApplicationInitialized, ApplicationStarting, ApplicationStarted.
+    /// 
+    /// By default none of these methods will execute if the Umbraco application is not configured or if the Umbraco database is not configured, however
+    /// if you need these methods to execute even if either of these are not configured you can override the properties: 
+    /// ExecuteWhenApplicationNotConfigured and ExecuteWhenDatabaseNotConfigured
+    /// </remarks>
+    public abstract class ApplicationEventHandler : IApplicationEventHandler
+    {
+        public void OnApplicationInitialized(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            if (ShouldExecute(applicationContext))
+            {
+                ApplicationInitialized(umbracoApplication, applicationContext);
+            }
+        }
+
+        public void OnApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            if (ShouldExecute(applicationContext))
+            {
+                ApplicationStarting(umbracoApplication, applicationContext);
+            }
+        }
+
+        public void OnApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            if (ShouldExecute(applicationContext))
+            {
+                ApplicationStarted(umbracoApplication, applicationContext);
+            }
+        }
+
+        /// <summary>
+        /// Overridable method to execute when the ApplicationContext is created and other static objects that require initialization have been setup
+        /// </summary>
+        /// <param name="umbracoApplication"></param>
+        /// <param name="applicationContext"></param>
+        protected virtual void ApplicationInitialized(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            
+        }
+
+        /// <summary>
+        /// OVerridable method to execute when All resolvers have been initialized but resolution is not frozen so they can be modified in this method
+        /// </summary>
+        /// <param name="umbracoApplication"></param>
+        /// <param name="applicationContext"></param>
+        protected virtual void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+
+        }
+
+        /// <summary>
+        /// Overridable method to execute when Bootup is completed, this allows you to perform any other bootup logic required for the application.
+        /// Resolution is frozen so now they can be used to resolve instances.
+        /// </summary>
+        /// <param name="umbracoApplication"></param>
+        /// <param name="applicationContext"></param>
+        protected virtual void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+
+        }
+
+        /// <summary>
+        /// Determine if the methods should execute based on the configuration status of the application.
+        /// </summary>
+        /// <param name="applicationContext"></param>
+        /// <returns></returns>
+        private bool ShouldExecute(ApplicationContext applicationContext)
+        {
+            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.IsDatabaseConfigured)
+            {
+                return true;
+            }
+
+            if (!applicationContext.IsConfigured && ExecuteWhenApplicationNotConfigured)
+            {
+                return true;
+            }
+
+            if (!applicationContext.DatabaseContext.IsDatabaseConfigured && ExecuteWhenDatabaseNotConfigured)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// A flag to determine if the overridable methods for this class will execute even if the 
+        /// Umbraco application is not configured
+        /// </summary>
+        /// <remarks>
+        /// An Umbraco Application is not configured when it requires a new install or upgrade. When the latest version in the
+        /// assembly does not match the version in the config.
+        /// </remarks>
+        protected virtual bool ExecuteWhenApplicationNotConfigured
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// A flag to determine if the overridable methods for this class will execute even if the 
+        /// Umbraco database is not configured
+        /// </summary>
+        /// <remarks>
+        /// The Umbraco database is not configured when we cannot connect to the database or when the database tables are not installed.
+        /// </remarks>
+        protected virtual bool ExecuteWhenDatabaseNotConfigured
+        {
+            get { return false; }
+        }
+    }
+}
@@ -0,0 +1,13 @@
+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);
+         }
+    }
+}
@@ -0,0 +1,30 @@
+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);
+        }
+    }
+}
@@ -0,0 +1,85 @@
+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
+    }
+}
@@ -0,0 +1,29 @@
+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
+                                                        });
+        }
+    }
+}
@@ -0,0 +1,17 @@
+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);
+    }
+}
@@ -0,0 +1,51 @@
+namespace Umbraco.Core.Cache
+{
+
+    /// <summary>
+    /// Constants storing cache keys used in caching
+    /// </summary>
+    public static class CacheKeys
+    {
+        public const string ApplicationTreeCacheKey = "ApplicationTreeCache";
+        public const string ApplicationsCacheKey = "ApplicationCache";
+
+        public const string UserTypeCacheKey = "UserTypeCache";
+
+        public const string ContentItemCacheKey = "contentItem";
+
+        public const string MediaCacheKey = "UL_GetMedia";
+
+        public const string MacroXsltCacheKey = "macroXslt_";
+        public const string MacroCacheKey = "UmbracoMacroCache";
+        public const string MacroHtmlCacheKey = "macroHtml_";
+        public const string MacroControlCacheKey = "macroControl_";
+        public const string MacroHtmlDateAddedCacheKey = "macroHtml_DateAdded_";
+        public const string MacroControlDateAddedCacheKey = "macroControl_DateAdded_";
+
+        public const string MemberLibraryCacheKey = "UL_GetMember";
+        public const string MemberBusinessLogicCacheKey = "MemberCacheItem_";
+
+        public const string TemplateFrontEndCacheKey = "template";
+        public const string TemplateBusinessLogicCacheKey = "UmbracoTemplateCache";
+
+        public const string UserContextCacheKey = "UmbracoUserContext";
+        public const string UserContextTimeoutCacheKey = "UmbracoUserContextTimeout";
+        public const string UserCacheKey = "UmbracoUser";
+
+        public const string ContentTypeCacheKey = "UmbracoContentType";
+
+        public const string ContentTypePropertiesCacheKey = "ContentType_PropertyTypes_Content:";
+        
+        public const string PropertyTypeCacheKey = "UmbracoPropertyTypeCache";
+
+        public const string LanguageCacheKey = "UmbracoLanguageCache";
+
+        public const string DomainCacheKey = "UmbracoDomainList";
+
+        public const string StylesheetCacheKey = "UmbracoStylesheet";
+        public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";
+
+        public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
+
+    }
+}
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a basic cache provider
+    /// </summary>
+    /// <remarks>
+    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, ETC...
+    /// </remarks>
+    internal abstract class CacheProviderBase
+    {
+        public abstract void ClearAllCache();
+        public abstract void ClearCacheItem(string key);
+        public abstract void ClearCacheObjectTypes(string typeName);
+        public abstract void ClearCacheObjectTypes<T>();
+        public abstract void ClearCacheByKeySearch(string keyStartsWith);
+        public abstract void ClearCacheByKeyExpression(string regexString);
+        public abstract IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith);
+        public abstract T GetCacheItem<T>(string cacheKey);
+        public abstract T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem);
+    }
+}
@@ -0,0 +1,67 @@
+using System;
+using Umbraco.Core.Events;
+using Umbraco.Core.Sync;
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A base class for cache refreshers to inherit from that ensures the correct events are raised
+    /// when cache refreshing occurs.
+    /// </summary>
+    /// <typeparam name="TInstanceType">The real cache refresher type, this is used for raising strongly typed events</typeparam>
+    public abstract class CacheRefresherBase<TInstanceType> : ICacheRefresher
+        where TInstanceType : ICacheRefresher
+    {
+        /// <summary>
+        /// An event that is raised when cache is updated on an individual server
+        /// </summary>
+        /// <remarks>
+        /// This event will fire on each server configured for an Umbraco project whenever a cache refresher
+        /// is updated.
+        /// </remarks>
+        public static event TypedEventHandler<TInstanceType, CacheRefresherEventArgs> CacheUpdated;
+
+        /// <summary>
+        /// Raises the event
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="args"></param>
+        protected static void OnCacheUpdated(TInstanceType sender, CacheRefresherEventArgs args)
+        {
+            if (CacheUpdated != null)
+            {
+                CacheUpdated(sender, args);
+            }
+        }
+
+        /// <summary>
+        /// Returns the real instance of the object ('this') for use  in strongly typed events
+        /// </summary>
+        protected abstract TInstanceType Instance { get; }
+
+        public abstract Guid UniqueIdentifier { get; }
+
+        public abstract string Name { get; }
+
+        public virtual void RefreshAll()
+        {
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(null, MessageType.RefreshAll));
+        }
+
+        public virtual void Refresh(int id)
+        {
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+        }
+
+        public virtual void Remove(int id)
+        {
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(id, MessageType.RemoveById));
+        }
+
+        public virtual void Refresh(Guid id)
+        {
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+        }
+    }
+}
@@ -0,0 +1,19 @@
+using System;
+using Umbraco.Core.Sync;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Event args for cache refresher updates
+    /// </summary>
+    public class CacheRefresherEventArgs : EventArgs
+    {
+        public CacheRefresherEventArgs(object msgObject, MessageType type)
+        {
+            MessageType = type;
+            MessageObject = msgObject;
+        }
+        public object MessageObject { get; private set; }
+        public MessageType MessageType { get; private set; }
+    }
+}
@@ -0,0 +1,356 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Web.Caching;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
+    /// </summary>
+    internal class HttpRuntimeCacheProvider : RuntimeCacheProviderBase
+    {
+        private readonly System.Web.Caching.Cache _cache;
+        private static readonly object Locker = new object();
+
+        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
+        {
+            _cache = cache;
+        }
+
+        /// <summary>
+        /// Clears everything in umbraco's runtime cache, which means that not only
+        /// umbraco content is removed, but also other cache items from pages running in
+        /// the same application / website. Use with care :-)
+        /// </summary>
+        public override void ClearAllCache()
+        {
+            var cacheEnumerator = _cache.GetEnumerator();
+            while (cacheEnumerator.MoveNext())
+            {
+                _cache.Remove(cacheEnumerator.Key.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache with the given key 
+        /// </summary>
+        /// <param name="key">Key</param>
+        public override void ClearCacheItem(string key)
+        {
+            // NH 10 jan 2012
+            // Patch by the always wonderful Stéphane Gay to avoid cache null refs
+            lock (Locker)
+            {
+                if (_cache[key] == null) return;
+                _cache.Remove(key); ;
+            }
+        }
+
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
+        /// </summary>
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        public override void ClearCacheObjectTypes(string typeName)
+        {
+            try
+            {
+                lock (Locker)
+                {
+                    foreach (DictionaryEntry c in _cache)
+                    {
+                        if (_cache[c.Key.ToString()] != null
+                            && _cache[c.Key.ToString()].GetType().ToString().InvariantEquals(typeName))
+                        {
+                            _cache.Remove(c.Key.ToString());
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error<CacheHelper>("Cache clearing error", e);
+            }
+        }
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type specified
+        /// </summary>
+        public override void ClearCacheObjectTypes<T>()
+        {
+            try
+            {
+                lock (Locker)
+                {
+                    foreach (DictionaryEntry c in _cache)
+                    {
+                        if (_cache[c.Key.ToString()] != null
+                            && _cache[c.Key.ToString()].GetType() == typeof(T))
+                        {
+                            _cache.Remove(c.Key.ToString());
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error<CacheHelper>("Cache clearing error", e);
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        public override void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            foreach (DictionaryEntry c in _cache)
+            {
+                if (c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith))
+                {
+                    ClearCacheItem((string)c.Key);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        public override void ClearCacheByKeyExpression(string regexString)
+        {
+            foreach (DictionaryEntry c in _cache)
+            {
+                if (c.Key is string && Regex.IsMatch(((string)c.Key), regexString))
+                {
+                    ClearCacheItem((string)c.Key);
+                }
+            }
+        }
+
+        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            return (from DictionaryEntry c in _cache
+                    where c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith)
+                    select c.Value.TryConvertTo<T>()
+                    into attempt
+                    where attempt.Success
+                    select attempt.Result).ToList();
+        }
+
+        /// <summary>
+        /// Returns a cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey)
+        {
+            var result = _cache.Get(cacheKey);
+            if (result == null)
+            {
+                return default(TT);
+            }
+            return result.TryConvertTo<TT>().Result;
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, CacheItemPriority.Normal, null, null, null, getCacheItem, Locker);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            TimeSpan? timeout, Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, null, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
+                                            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
+                                            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, priority, refreshAction, null, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override TT GetCacheItem<TT>(string cacheKey,
+                                            CacheItemPriority priority,
+                                            CacheItemRemovedCallback refreshAction,
+                                            CacheDependency cacheDependency,
+                                            TimeSpan? timeout,
+                                            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem, Locker);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="syncLock"></param>
+        /// <returns></returns>
+        private TT GetCacheItem<TT>(string cacheKey,
+                                     CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
+                                     CacheDependency cacheDependency, TimeSpan? timeout, Func<TT> getCacheItem, object syncLock)
+        {
+            var result = _cache.Get(cacheKey);
+            if (result == null)
+            {
+                lock (syncLock)
+                {
+                    result = _cache.Get(cacheKey);
+                    if (result == null)
+                    {
+                        result = getCacheItem();
+                        if (result != null)
+                        {
+                            //we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
+                            _cache.Insert(cacheKey, result, cacheDependency,
+                                          timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
+                                          TimeSpan.Zero, priority, refreshAction);
+                        }
+                    }
+                }
+            }
+            return result.TryConvertTo<TT>().Result;
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                Func<T> getCacheItem)
+        {
+            InsertCacheItem(cacheKey, priority, null, null, null, getCacheItem);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                TimeSpan? timeout,
+                                                Func<T> getCacheItem)
+        {
+            InsertCacheItem(cacheKey, priority, null, null, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                CacheDependency cacheDependency,
+                                                TimeSpan? timeout,
+                                                Func<T> getCacheItem)
+        {
+            InsertCacheItem(cacheKey, priority, null, cacheDependency, timeout, getCacheItem);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public override void InsertCacheItem<T>(string cacheKey,
+                                                CacheItemPriority priority,
+                                                CacheItemRemovedCallback refreshAction,
+                                                CacheDependency cacheDependency,
+                                                TimeSpan? timeout,
+                                                Func<T> getCacheItem)
+        {
+            object result = getCacheItem();
+            if (result != null)
+            {
+                //we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
+                _cache.Insert(cacheKey, result, cacheDependency,
+                              timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
+                              TimeSpan.Zero, priority, refreshAction);
+            }
+        }
+
+    }
+}
@@ -0,0 +1,18 @@
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Strongly type cache refresher that is able to refresh cache of real instances of objects as well as IDs
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <remarks>
+    /// This is much better for performance when we're not running in a load balanced environment so we can refresh the cache
+    /// against a already resolved object instead of looking the object back up by id. 
+    /// </remarks>
+    interface ICacheRefresher<T> : ICacheRefresher
+    {
+        void Refresh(T instance);
+        void Remove(T instance);
+    }
+}
@@ -0,0 +1,16 @@
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
+    /// </summary>
+    interface IJsonCacheRefresher : ICacheRefresher
+    {
+        /// <summary>
+        /// Refreshes, clears, etc... any cache based on the information provided in the json
+        /// </summary>
+        /// <param name="jsonPayload"></param>
+        void Refresh(string jsonPayload);
+    }
+}
@@ -0,0 +1,20 @@
+using Umbraco.Core.Sync;
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A base class for json cache refreshers that ensures the correct events are raised when 
+    /// cache refreshing occurs.
+    /// </summary>
+    /// <typeparam name="TInstanceType">The real cache refresher type, this is used for raising strongly typed events</typeparam>
+    public abstract class JsonCacheRefresherBase<TInstanceType> : CacheRefresherBase<TInstanceType>, IJsonCacheRefresher 
+        where TInstanceType : ICacheRefresher
+    {        
+
+        public virtual void Refresh(string jsonPayload)
+        {            
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(jsonPayload, MessageType.RefreshByJson));
+        }
+    }
+}
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    internal class NullCacheProvider : RuntimeCacheProviderBase
+    {
+        public override void ClearAllCache()
+        {
+        }
+
+        public override void ClearCacheItem(string key)
+        {
+        }
+
+        public override void ClearCacheObjectTypes(string typeName)
+        {
+        }
+
+        public override void ClearCacheObjectTypes<T>()
+        {
+        }
+
+        public override void ClearCacheByKeySearch(string keyStartsWith)
+        {
+        }
+
+        public override void ClearCacheByKeyExpression(string regexString)
+        {
+        }
+
+        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            return Enumerable.Empty<T>();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey)
+        {
+            return default(T);
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem)
+        {
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+        }
+
+        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
+        {
+        }
+    }
+}
@@ -0,0 +1,24 @@
+using System;
+using System.Text;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a runtime cache provider
+    /// </summary>
+    /// <remarks>
+    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, ETC...
+    /// </remarks>
+    internal abstract class RuntimeCacheProviderBase : CacheProviderBase
+    {
+        public abstract T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
+        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
+    }
+}
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that statically caches everything in an in memory dictionary
+    /// </summary>
+    internal class StaticCacheProvider : CacheProviderBase
+    {
+        private readonly ConcurrentDictionary<string, object> _staticCache = new ConcurrentDictionary<string, object>();
+
+        public override void ClearAllCache()
+        {
+            _staticCache.Clear();
+        }
+
+        public override void ClearCacheItem(string key)
+        {
+            object val;
+            _staticCache.TryRemove(key, out val);
+        }
+
+        public override void ClearCacheObjectTypes(string typeName)
+        {
+            foreach (var key in _staticCache.Keys)
+            {
+                if (_staticCache[key] != null
+                    && _staticCache[key].GetType().ToString().InvariantEquals(typeName))
+                {
+                    object val;
+                    _staticCache.TryRemove(key, out val);
+                }
+            }
+        }
+
+        public override void ClearCacheObjectTypes<T>()
+        {
+            foreach (var key in _staticCache.Keys)
+            {
+                if (_staticCache[key] != null
+                    && _staticCache[key].GetType() == typeof(T))
+                {
+                    object val;
+                    _staticCache.TryRemove(key, out val);
+                }
+            }
+        }
+
+        public override void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            foreach (var key in _staticCache.Keys)
+            {
+                if (key.InvariantStartsWith(keyStartsWith))
+                {
+                    ClearCacheItem(key);
+                }
+            }
+        }
+
+        public override void ClearCacheByKeyExpression(string regexString)
+        {
+            foreach (var key in _staticCache.Keys)
+            {
+                if (Regex.IsMatch(key, regexString))
+                {
+                    ClearCacheItem(key);
+                }
+            }
+        }
+
+        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            return (from KeyValuePair<string, object> c in _staticCache
+                    where c.Key.InvariantStartsWith(keyStartsWith)
+                    select c.Value.TryConvertTo<T>()
+                    into attempt
+                    where attempt.Success
+                    select attempt.Result).ToList();
+        }
+
+        public override T GetCacheItem<T>(string cacheKey)
+        {
+            var result = _staticCache[cacheKey];
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+
+        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
+        {
+            return (T)_staticCache.GetOrAdd(cacheKey, getCacheItem);
+        }
+        
+    }
+}
@@ -0,0 +1,25 @@
+using Umbraco.Core.Sync;
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A base class for cache refreshers to inherit from that ensures the correct events are raised
+    /// when cache refreshing occurs.
+    /// </summary>
+    /// <typeparam name="TInstanceType">The real cache refresher type, this is used for raising strongly typed events</typeparam>
+    /// <typeparam name="TEntityType">The entity type that this refresher can update cache for</typeparam>
+    public abstract class TypedCacheRefresherBase<TInstanceType, TEntityType> : CacheRefresherBase<TInstanceType>, ICacheRefresher<TEntityType>
+        where TInstanceType : ICacheRefresher
+    {
+        public virtual void Refresh(TEntityType instance)
+        {
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(instance, MessageType.RefreshByInstance));
+        }
+
+        public virtual void Remove(TEntityType instance)
+        {
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(instance, MessageType.RemoveByInstance));
+        }
+    }
+}
@@ -3,8 +3,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Caching;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;

 namespace Umbraco.Core
@@ -13,31 +15,198 @@ namespace Umbraco.Core
 	/// <summary>
 	/// Class that is exposed by the ApplicationContext for application wide caching purposes
 	/// </summary>
-	/// <remarks>
-	/// This class may be opened publicly at some point but needs a review of what is absoletely necessary.
-	/// </remarks>
-	public class CacheHelper
+    public class CacheHelper
 	{
-		private readonly Cache _cache;
+	    private readonly bool _enableCache;
+        private readonly CacheProviderBase _staticCache;
+        private readonly CacheProviderBase _nullStaticCache = new NullCacheProvider();
+        private readonly RuntimeCacheProviderBase _httpCache;
+        private readonly RuntimeCacheProviderBase _nullHttpCache = new NullCacheProvider();

 		public CacheHelper(System.Web.Caching.Cache cache)
+            : this(cache, true)
 		{
-			_cache = cache;
 		}

-		private static readonly object Locker = new object();
+	    internal CacheHelper(System.Web.Caching.Cache cache, bool enableCache)
+            : this(new HttpRuntimeCacheProvider(cache), enableCache)
+	    {            
+	    }
+
+        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, bool enableCache)
+            : this(httpCacheProvider, new StaticCacheProvider(), enableCache)
+        {
+        }
+
+        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, CacheProviderBase staticCacheProvider, bool enableCache)
+        {
+            _httpCache = httpCacheProvider;
+            _staticCache = staticCacheProvider;
+            _enableCache = enableCache;
+        }
+
+        #region Static cache

        /// <summary>
-        /// Clears everything in umbraco's runtime cache, which means that not only
-        /// umbraco content is removed, but also other cache items from pages running in
-        /// the same application / website. Use with care :-)
+        /// Clears the item in umbraco's static cache
+        /// </summary>
+        internal void ClearAllStaticCache()
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearAllCache();
+            }
+            else
+            {
+                _staticCache.ClearAllCache();
+            }
+        }
+
+        /// <summary>
+        /// Clears the item in umbraco's static cache with the given key 
+        /// </summary>
+        /// <param name="key">Key</param>
+        internal void ClearStaticCacheItem(string key)
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheItem(key);
+            }
+            else
+            {
+                _staticCache.ClearCacheItem(key);
+            }
+        }
+
+        /// <summary>
+        /// Clears all objects in the static cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
+        /// </summary>
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        internal void ClearStaticCacheObjectTypes(string typeName)
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheObjectTypes(typeName);
+            }
+            else
+            {
+                _staticCache.ClearCacheObjectTypes(typeName);
+            }
+        }
+
+        /// <summary>
+        /// Clears all objects in the static cache with the System.Type specified
+        /// </summary>
+        internal void ClearStaticCacheObjectTypes<T>()
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheObjectTypes<T>();
+            }
+            else
+            {
+                _staticCache.ClearCacheObjectTypes<T>();
+            }
+        }
+
+        /// <summary>
+        /// Clears all static cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        internal void ClearStaticCacheByKeySearch(string keyStartsWith)
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheByKeySearch(keyStartsWith);
+            }
+            else
+            {
+                _staticCache.ClearCacheByKeySearch(keyStartsWith);
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        internal void ClearStaticCacheByKeyExpression(string regexString)
+        {
+            if (!_enableCache)
+            {
+                _nullStaticCache.ClearCacheByKeyExpression(regexString);
+            }
+            else
+            {
+                _staticCache.ClearCacheByKeyExpression(regexString);
+            }
+        }
+
+        internal IEnumerable<T> GetStaticCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            if (!_enableCache)
+            {
+                return _nullStaticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+            }
+            else
+            {
+                return _staticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+            }
+        }
+
+        /// <summary>
+        /// Returns a static cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        internal TT GetStaticCacheItem<TT>(string cacheKey)
+        {
+            if (!_enableCache)
+            {
+                return _nullStaticCache.GetCacheItem<TT>(cacheKey);
+            }
+            else
+            {
+                return _staticCache.GetCacheItem<TT>(cacheKey);
+            }
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the static cache with all of the default parameters
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        internal TT GetStaticCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                return _nullStaticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+            }
+            else
+            {
+                return _staticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+            }
+        }
+
+        #endregion
+
+
+	    #region Runtime/Http Cache
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache
        /// </summary>
        public void ClearAllCache()
-        {                         
-			var cacheEnumerator = _cache.GetEnumerator();
-            while (cacheEnumerator.MoveNext())
+        {
+            if (!_enableCache)
            {
-                _cache.Remove(cacheEnumerator.Key.ToString());
+                _nullHttpCache.ClearAllCache();
+            }
+            else
+            {
+                _httpCache.ClearAllCache();
            }
        }

@@ -47,12 +216,13 @@ namespace Umbraco.Core
        /// <param name="key">Key</param>
        public void ClearCacheItem(string key)
        {
-            // NH 10 jan 2012
-            // Patch by the always wonderful Stéphane Gay to avoid cache null refs
-            lock (Locker)
+            if (!_enableCache)
            {
-	            if (_cache[key] == null) return;
-	            _cache.Remove(key);;
+                _nullHttpCache.ClearCacheItem(key);
+            }
+            else
+            {
+                _httpCache.ClearCacheItem(key);
            }
        }

@@ -64,19 +234,28 @@ namespace Umbraco.Core
        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
        public void ClearCacheObjectTypes(string typeName)
        {
-            try
+            if (!_enableCache)
            {
-				lock (Locker)
-				{
-					foreach (var c in from DictionaryEntry c in _cache where _cache[c.Key.ToString()] != null && _cache[c.Key.ToString()].GetType().ToString() == typeName select c)
-					{
-						_cache.Remove(c.Key.ToString());
-					}
-				}	            
+                _nullHttpCache.ClearCacheObjectTypes(typeName);
            }
-            catch (Exception e)
+            else
            {
-				LogHelper.Error<CacheHelper>("Cache clearing error", e);
+                _httpCache.ClearCacheObjectTypes(typeName);
+            }
+        }
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type specified
+        /// </summary>
+        public void ClearCacheObjectTypes<T>()
+        {
+            if (!_enableCache)
+            {
+                _nullHttpCache.ClearCacheObjectTypes<T>();
+            }
+            else
+            {
+                _httpCache.ClearCacheObjectTypes<T>();
            }
        }

@@ -86,79 +265,298 @@ namespace Umbraco.Core
        /// <param name="keyStartsWith">The start of the key</param>
        public void ClearCacheByKeySearch(string keyStartsWith)
        {
-	        foreach (var c in from DictionaryEntry c in _cache where c.Key is string && ((string)c.Key).StartsWith(keyStartsWith) select c)
-	        {
-		        ClearCacheItem((string)c.Key);
-	        }
+            if (!_enableCache)
+            {
+                _nullHttpCache.ClearCacheByKeySearch(keyStartsWith);
+            }
+            else
+            {
+                _httpCache.ClearCacheByKeySearch(keyStartsWith);
+            }
        }
-		
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        public void ClearCacheByKeyExpression(string regexString)
+        {
+            if (!_enableCache)
+            {
+                _nullHttpCache.ClearCacheByKeyExpression(regexString);
+            }
+            else
+            {
+                _httpCache.ClearCacheByKeyExpression(regexString);
+            }
+        }
+
+        public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+            }
+            else
+            {
+                return _httpCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+            }
+        }
+
+        /// <summary>
+        /// Returns a cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        public TT GetCacheItem<TT>(string cacheKey)
+        {
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey);
+            }
+            else
+            {
+                return _httpCache.GetCacheItem<TT>(cacheKey);
+            }
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+            }
+            else
+            {
+                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+            }
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
        public TT GetCacheItem<TT>(string cacheKey,
            TimeSpan timeout, Func<TT> getCacheItem)
        {
-            return GetCacheItem(cacheKey, null, timeout, getCacheItem);
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
+            }
+            else
+            {
+                return _httpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
+            }
        }

+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            return GetCacheItem(cacheKey, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
+            }
+            else
+            {
+                return _httpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
+            }
        }

+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            return GetCacheItem(cacheKey, priority, refreshAction, null, timeout, getCacheItem);
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
+            }
+            else
+            {
+                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
+            }
        }

+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
        public TT GetCacheItem<TT>(string cacheKey,
-            CacheItemPriority priority, 
-			CacheItemRemovedCallback refreshAction,
-            CacheDependency cacheDependency, 
-			TimeSpan timeout, 
-			Func<TT> getCacheItem)
+            CacheItemPriority priority,
+            CacheItemRemovedCallback refreshAction,
+            CacheDependency cacheDependency,
+            TimeSpan timeout,
+            Func<TT> getCacheItem)
        {
-	        return GetCacheItem(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem, Locker);
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+            }
+            else
+            {
+                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+            }
        }

-		/// <summary>
-		/// This is used only for legacy purposes as I did not want to change all of the locking to one lock found on this object, 
-		/// however, the reason this is used for legacy purposes is because I see zero reason to use different sync locks, just the one
-		/// lock (Locker) on this class should be sufficient.
-		/// </summary>
-		/// <typeparam name="TT"></typeparam>
-		/// <param name="cacheKey"></param>
-		/// <param name="priority"></param>
-		/// <param name="refreshAction"></param>
-		/// <param name="cacheDependency"></param>
-		/// <param name="timeout"></param>
-		/// <param name="getCacheItem"></param>
-		/// <param name="syncLock"></param>
-		/// <returns></returns>
-		internal TT GetCacheItem<TT>(string cacheKey,
-			CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
-			CacheDependency cacheDependency, TimeSpan timeout, Func<TT> getCacheItem, object syncLock)
-		{
-			var result = _cache.Get(cacheKey);
-			if (result == null)
-			{
-				lock (syncLock)
-				{
-					result = _cache.Get(cacheKey);
-					if (result == null)
-					{
-						result = getCacheItem();
-						if (result != null)
-						{
-							//we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
-							_cache.Insert(cacheKey, result, cacheDependency, DateTime.Now.Add(timeout), TimeSpan.Zero, priority, refreshAction);
-						}
-					}
-				}
-			}
-			return (TT)result;
-		}
-    }
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority,
+            CacheDependency cacheDependency,
+            Func<TT> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
+            }
+            else
+            {
+                return _httpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
+            }
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="getCacheItem"></param>
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       Func<T> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
+            }
+            else
+            {
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
+            }
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       TimeSpan timeout,
+                                       Func<T> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
+            }
+            else
+            {
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
+            }
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       CacheDependency cacheDependency,
+                                       TimeSpan timeout,
+                                       Func<T> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
+            }
+            else
+            {
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
+            }
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       CacheItemRemovedCallback refreshAction,
+                                       CacheDependency cacheDependency,
+                                       TimeSpan? timeout,
+                                       Func<T> getCacheItem)
+        {
+            if (!_enableCache)
+            {
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+            }
+            else
+            {
+                _httpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+            }
+        } 
+        #endregion
+
+	}

 }
@@ -31,7 +31,7 @@ namespace Umbraco.Core
 		{
 			get
 			{
-				EnsureIdsAreTracked();
+				EnsureIsInitialized();
 				return Values;
 			}
 		}
@@ -0,0 +1,35 @@
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    /// <summary>
+    /// Attribute to add a Friendly Name string with an UmbracoObjectType enum value
+    /// </summary>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
+    internal class FriendlyNameAttribute : Attribute
+    {
+        /// <summary>
+        /// friendly name value
+        /// </summary>
+        private readonly string _friendlyName;
+
+        /// <summary>
+        /// Initializes a new instance of the FriendlyNameAttribute class
+        /// Sets the friendly name value
+        /// </summary>
+        /// <param name="friendlyName">attribute value</param>
+        public FriendlyNameAttribute(string friendlyName)
+        {
+            this._friendlyName = friendlyName;
+        }
+
+        /// <summary>
+        /// Gets the friendly name
+        /// </summary>
+        /// <returns>string of friendly name</returns>
+        public override string ToString()
+        {
+            return this._friendlyName;
+        }
+    }
+}
@@ -0,0 +1,26 @@
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    /// <summary>
+    /// Attribute to associate a GUID string and Type with an UmbracoObjectType Enum value
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    internal class UmbracoObjectTypeAttribute : Attribute
+    {
+        public UmbracoObjectTypeAttribute(string objectId)
+        {
+            ObjectId = new Guid(objectId);
+        }
+
+        public UmbracoObjectTypeAttribute(string objectId, Type modelType)
+        {
+            ObjectId = new Guid(objectId);
+            ModelType = modelType;
+        }
+
+        public Guid ObjectId { get; private set; }
+
+        public Type ModelType { get; private set; }
+    }
+}
@@ -0,0 +1,167 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// A thread-safe representation of a <see cref="HashSet{T}"/>. 
+    /// Enumerating this collection is thread-safe and will only operate on a clone that is generated before returning the enumerator.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    [Serializable]
+    public class ConcurrentHashSet<T> : ICollection<T>
+    {
+        private readonly HashSet<T> _innerSet = new HashSet<T>();
+        private readonly ReaderWriterLockSlim _instanceLocker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the collection.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
+        /// </returns>
+        /// <filterpriority>1</filterpriority>
+        public IEnumerator<T> GetEnumerator()
+        {
+            return GetThreadSafeClone().GetEnumerator();
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through a collection.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+        /// </returns>
+        /// <filterpriority>2</filterpriority>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        /// <summary>
+        /// Removes the first occurrence of a specific object from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+        /// </summary>
+        /// <returns>
+        /// true if <paramref name="item"/> was successfully removed from the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false. This method also returns false if <paramref name="item"/> is not found in the original <see cref="T:System.Collections.Generic.ICollection`1"/>.
+        /// </returns>
+        /// <param name="item">The object to remove from the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        public bool Remove(T item)
+        {
+            using (new WriteLock(_instanceLocker))
+            {
+                return _innerSet.Remove(item);
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
+        /// </summary>
+        /// <returns>
+        /// The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
+        /// </returns>
+        /// <filterpriority>2</filterpriority>
+        public int Count
+        {
+            get { return GetThreadSafeClone().Count; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
+        /// </summary>
+        /// <returns>
+        /// true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
+        /// </returns>
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Adds an item to the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+        /// </summary>
+        /// <param name="item">The object to add to the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        public void Add(T item)
+        {
+            using (new WriteLock(_instanceLocker))
+            {
+                _innerSet.Add(item);
+            }
+        }
+        
+        /// <summary>
+        /// Attempts to add an item to the collection
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public bool TryAdd(T item)
+        {
+            var clone = GetThreadSafeClone();
+            if (clone.Contains(item)) return false;
+            using (new WriteLock(_instanceLocker))
+            {
+                //double check
+                if (_innerSet.Contains(item)) return false;
+                _innerSet.Add(item);
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Removes all items from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+        /// </summary>
+        /// <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only. </exception>
+        public void Clear()
+        {
+            using (new WriteLock(_instanceLocker))
+            {
+                _innerSet.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the <see cref="T:System.Collections.Generic.ICollection`1"/> contains a specific value.
+        /// </summary>
+        /// <returns>
+        /// true if <paramref name="item"/> is found in the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false.
+        /// </returns>
+        /// <param name="item">The object to locate in the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+        public bool Contains(T item)
+        {
+            return GetThreadSafeClone().Contains(item);
+        }
+
+        /// <summary>
+        /// Copies the elements of the <see cref="T:System.Collections.Concurrent.IProducerConsumerCollection`1"/> to an <see cref="T:System.Array"/>, starting at a specified index.
+        /// </summary>
+        /// <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from the <see cref="T:System.Collections.Concurrent.IProducerConsumerCollection`1"/>. The array must have zero-based indexing.</param><param name="index">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is a null reference (Nothing in Visual Basic).</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="index"/> is less than zero.</exception><exception cref="T:System.ArgumentException"><paramref name="index"/> is equal to or greater than the length of the <paramref name="array"/> -or- The number of elements in the source <see cref="T:System.Collections.Concurrent.ConcurrentQueue`1"/> is greater than the available space from <paramref name="index"/> to the end of the destination <paramref name="array"/>.</exception>
+        public void CopyTo(T[] array, int index)
+        {
+            var clone = GetThreadSafeClone();
+            clone.CopyTo(array, index);
+        }
+
+        private HashSet<T> GetThreadSafeClone()
+        {
+            HashSet<T> clone = null;
+            using (new WriteLock(_instanceLocker))
+            {
+                clone = new HashSet<T>(_innerSet, _innerSet.Comparer);
+            }
+            return clone;
+        }
+
+        /// <summary>
+        /// Copies the elements of the <see cref="T:System.Collections.ICollection"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
+        /// </summary>
+        /// <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"/>. The <see cref="T:System.Array"/> must have zero-based indexing. </param><param name="index">The zero-based index in <paramref name="array"/> at which copying begins. </param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null. </exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="index"/> is less than zero. </exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"/> is greater than the available space from <paramref name="index"/> to the end of the destination <paramref name="array"/>. </exception><exception cref="T:System.ArgumentException">The type of the source <see cref="T:System.Collections.ICollection"/> cannot be cast automatically to the type of the destination <paramref name="array"/>. </exception><filterpriority>2</filterpriority>
+        public void CopyTo(Array array, int index)
+        {
+            var clone = GetThreadSafeClone();
+            Array.Copy(clone.ToArray(), 0, array, index, clone.Count);
+        }
+    }
+}
@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// A case-insensitive configuration converter for enumerations.
+    /// </summary>
+    /// <typeparam name="T">The type of the enumeration.</typeparam>
+    public class CaseInsensitiveEnumConfigConverter<T> : ConfigurationConverterBase
+        where T : struct
+    {
+        public override object ConvertFrom(ITypeDescriptorContext ctx, CultureInfo ci, object data)
+        {
+            if (data == null)
+                throw new ArgumentNullException("data");
+
+            //return Enum.Parse(typeof(T), (string)data, true);
+
+            T value;
+            if (Enum.TryParse((string)data, true, out value))
+                return value;
+
+            throw new Exception(string.Format("\"{0}\" is not valid {1} value. Valid values are: {2}.",
+                data, typeof(T).Name,
+                string.Join(", ", Enum.GetValues(typeof(T)).Cast<T>())));
+        }
+    }
+}
@@ -0,0 +1,50 @@
+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;
+        }
+    }
+}
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core.Configuration
+{
+	/// <summary>
+	/// Indicates the configuration key for a section or a group.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+	public sealed class ConfigurationKeyAttribute : Attribute
+	{
+	    /// <summary>
+	    /// Initializes a new instance of the <see cref="ConfigurationKeyAttribute"/> class with a configuration key.
+	    /// </summary>
+	    /// <param name="configurationKey">The configurationkey.</param>
+	    public ConfigurationKeyAttribute(string configurationKey)
+	    {
+	        ConfigurationKey = configurationKey;
+	    }
+
+        /// <summary>
+        /// Gets or sets the configuration key.
+        /// </summary>
+        public string ConfigurationKey { get; private set; }
+	}
+}
@@ -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,10 +26,8 @@ namespace Umbraco.Core.Configuration
    {

        #region Private static fields
-        
-		// CURRENT UMBRACO VERSION ID
-    	private const string CurrentUmbracoVersion = "4.11.9";

+        private static Version _version;
        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;
@@ -44,15 +42,24 @@ namespace Umbraco.Core.Configuration
        #endregion

        /// <summary>
-        /// used for unit tests
+        /// 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 ResetCache()
+        private static void ResetInternal()
        {
            _reservedUrlsCache = null;
            _reservedPaths = null;
            _reservedUrls = null;
        }

+        /// <summary>
+        /// Resets settings that were set programmatically, to their initial values.
+        /// </summary>
+        /// <remarks>To be used in unit tests.</remarks>
+        internal static void Reset()
+        {
+            ResetInternal();
+        }
+
    	/// <summary>
        /// Gets the reserved urls from web.config.
        /// </summary>
@@ -111,10 +118,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;
            }
        }

@@ -126,9 +133,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;
            }
        }

@@ -140,37 +147,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.
+        /// <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");
-				}
+        /// </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).
@@ -190,23 +197,44 @@ 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
            {
-				return ConfigurationManager.AppSettings.ContainsKey("umbracoDbDSN")
-					? ConfigurationManager.AppSettings["umbracoDbDSN"]
-					: string.Empty;	          				
+                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;
            }
            set
            {
                if (DbDsn != value)
                {
-                    SaveSetting("umbracoDbDSN", value);
+                    if (value.ToLower().Contains("SQLCE4Umbraco.SqlCEHelper".ToLower()))
+                    {
+                        ApplicationContext.Current.DatabaseContext.ConfigureEmbeddedDatabaseConnection();
+                    }
+                    else
+                    {
+                        ApplicationContext.Current.DatabaseContext.ConfigureDatabaseConnection(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>
@@ -215,16 +243,17 @@ 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>
@@ -232,32 +261,57 @@ namespace Umbraco.Core.Configuration
        /// <param name="value">Value of the setting to be saved.</param>
        internal static void SaveSetting(string key, string value)
        {
-            var webConfig = new WebConfigurationFileMap();
-            var vDirs = webConfig.VirtualDirectories;
-            var physicalPathToRoot = FullpathToRoot;
-            foreach (VirtualDirectoryMapping v in webConfig.VirtualDirectories)
-            {
-                if (v.IsAppRoot)
-                {
-                    physicalPathToRoot = v.PhysicalDirectory;
-                }
-            }
+            var fileName = GetFullWebConfigFileName();
+            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);

-            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").Where(s => s.Attribute("key").Value == key).FirstOrDefault();
+            var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
            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);
+            xml.Save(fileName, SaveOptions.DisableFormatting);
            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>
@@ -297,14 +351,14 @@ namespace Umbraco.Core.Configuration
                try
                {
                    string configStatus = ConfigurationStatus;
-                    string currentVersion = CurrentVersion;
+                    string currentVersion = UmbracoVersion.Current.ToString(3);


                    if (currentVersion != configStatus)
                    {
-                    	LogHelper.Debug<GlobalSettings>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");                    	
+                        LogHelper.Debug<GlobalSettings>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
                    }
-                        
+

                    return (configStatus == currentVersion);
                }
@@ -361,17 +415,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>
@@ -380,9 +434,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;
            }
        }

@@ -394,9 +448,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;
            }
        }

@@ -408,9 +462,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;
            }
        }

@@ -422,9 +476,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;
            }
        }

@@ -438,14 +492,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;
+                }
            }
        }

@@ -453,12 +507,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
            {
-                // change this to be hardcoded in the binary
-                return CurrentUmbracoVersion;
+                return UmbracoVersion.Current.ToString(3);
            }
        }

@@ -466,12 +520,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
            {
-                string[] version = CurrentVersion.Split(".".ToCharArray());
-                return int.Parse(version[0]);
+                return UmbracoVersion.Current.Major;
            }
        }

@@ -479,12 +533,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
            {
-                string[] version = CurrentVersion.Split(".".ToCharArray());
-                return int.Parse(version[1]);
+                return UmbracoVersion.Current.Minor;
            }
        }

@@ -492,12 +546,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
            {
-                string[] version = CurrentVersion.Split(".".ToCharArray());
-                return int.Parse(version[2]);
+                return UmbracoVersion.Current.Build;
            }
        }

@@ -505,15 +559,12 @@ 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
            {
-                string[] version = CurrentVersion.Split(".".ToCharArray());
-                if (version.Length > 3)
-                    return version[3];
-                else
-                    return "";
+                return Umbraco.Core.Configuration.UmbracoVersion.CurrentComment;
            }
        }

@@ -533,6 +584,16 @@ namespace Umbraco.Core.Configuration
            return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1;
        }

+        public static bool RequestIsInUmbracoApplication(HttpContextBase context)
+        {
+            return context.Request.Path.ToLower().IndexOf(IOHelper.ResolveUrl(SystemDirectories.Umbraco).ToLower()) > -1;
+        }
+
+        public static bool RequestIsLiveEditRedirector(HttpContextBase context)
+        {
+            return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1;
+        }
+
        /// <summary>
        /// Gets a value indicating whether umbraco should force a secure (https) connection to the backoffice.
        /// </summary>
@@ -563,59 +624,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>
@@ -623,7 +684,7 @@ namespace Umbraco.Core.Configuration
        /// 	<c>true</c> if the specified URL is reserved; otherwise, <c>false</c>.
        /// </returns>
        public static bool IsReservedPathOrUrl(string url)
-        {			
+        {
            if (_reservedUrlsCache == null)
            {
                lock (Locker)
@@ -662,114 +723,114 @@ namespace Umbraco.Core.Configuration
                }
            }

-			//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);
+                }
+            }
+        }

    }



-    
+
 }
@@ -0,0 +1,190 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.InfrastructureSettings
+{
+    public class Infrastructure : ConfigurationSection
+    {
+        private const string InfrastructureSectionName = "umbraco/infrastructure";
+
+        public static Infrastructure Instance
+        {
+            get { return (Infrastructure) ConfigurationManager.GetSection(InfrastructureSectionName); }
+        }
+
+        #region RepositoriesSection Property
+
+        internal const string RepositoriesPropertyName = "repositories";
+
+        [ConfigurationProperty(RepositoriesPropertyName, IsRequired = true, IsKey = false, IsDefaultCollection = false)]
+        public Repositories Repositories
+        {
+            get { return ((Repositories)base[RepositoriesPropertyName]); }
+            set { base[RepositoriesPropertyName] = value; }
+        }
+
+        #endregion
+
+        #region PublishingStrategy Property
+
+        internal const string PublishingStrategyPropertyName = "publishingStrategy";
+
+        [ConfigurationProperty(PublishingStrategyPropertyName, IsRequired = true, IsKey = false, IsDefaultCollection = false)]
+        public PublishingProvider PublishingStrategy
+        {
+            get { return ((PublishingProvider)base[PublishingStrategyPropertyName]); }
+            set { base[PublishingStrategyPropertyName] = value; }
+        }
+
+        #endregion
+    }
+
+    public class Repositories : ConfigurationElement
+    {
+        [ConfigurationProperty("", IsDefaultCollection = true, IsRequired = true)]
+        public RepositoryElementCollection Repository
+        {
+            get { return ((RepositoryElementCollection)(base[""])); }
+        }
+    }
+
+    [ConfigurationCollection(typeof(Repository), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate, AddItemName = RepositoryPropertyName)]
+    public class RepositoryElementCollection : ConfigurationElementCollection
+    {
+        internal const string RepositoryPropertyName = "repository";
+
+        public override ConfigurationElementCollectionType CollectionType
+        {
+            get
+            {
+                return ConfigurationElementCollectionType.BasicMapAlternate;
+            }
+        }
+
+        protected override string ElementName
+        {
+            get
+            {
+                return RepositoryPropertyName;
+            }
+        }
+
+        protected override bool IsElementName(string elementName)
+        {
+            return elementName == RepositoryPropertyName;
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((Repository)element).InterfaceShortTypeName;
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new Repository();
+        }
+
+        #region Indexer
+
+        public Repository this[int index]
+        {
+            get { return (Repository)base.BaseGet(index); }
+        }
+
+        public Repository this[string interfaceShortTypeName]
+        {
+            get { return (Repository)base.BaseGet(interfaceShortTypeName); }
+        }
+
+        #endregion
+
+        #region Add
+
+        public void Add(Repository repository)
+        {
+            BaseAdd(repository);
+        }
+
+        #endregion
+
+        #region Remove
+
+        public void Remove(Repository repository)
+        {
+            BaseRemove(repository);
+        }
+
+        #endregion
+
+        #region GetItem
+
+        public Repository GetItemAt(int index)
+        {
+            return (Repository)BaseGet(index);
+        }
+
+        public Repository GetItemByKey(string interfaceShortTypeName)
+        {
+            return (Repository)BaseGet(interfaceShortTypeName);
+        }
+
+        #endregion
+
+        public bool ContainsKey(string interfaceShortName)
+        {
+            bool result = false;
+            object[] keys = this.BaseGetAllKeys();
+            foreach (object key in keys)
+            {
+                if ((string)key == interfaceShortName)
+                {
+                    result = true;
+                    break;
+
+                }
+            }
+            return result;
+        }
+    }
+
+    public class Repository : ConfigurationElement
+    {
+        internal const string InterfaceShortTypeNamePropertyName = "interfaceShortTypeName";
+
+        [ConfigurationPropertyAttribute(InterfaceShortTypeNamePropertyName, IsRequired = true, IsKey = true, IsDefaultCollection = false)]
+        public string InterfaceShortTypeName
+        {
+            get { return (string) base[InterfaceShortTypeNamePropertyName]; }
+            set { base[InterfaceShortTypeNamePropertyName] = value; }
+        }
+
+        internal const string RepositoryFullTypeNamePropertyName = "repositoryFullTypeName";
+
+        [ConfigurationPropertyAttribute(RepositoryFullTypeNamePropertyName, IsRequired = true, IsKey = false, IsDefaultCollection = false)]
+        public string RepositoryFullTypeName
+        {
+            get { return (string)base[RepositoryFullTypeNamePropertyName]; }
+            set { base[RepositoryFullTypeNamePropertyName] = value; }
+        }
+
+        internal const string CacheProviderFullTypeNamePropertyName = "cacheProviderFullTypeName";
+
+        [ConfigurationPropertyAttribute(CacheProviderFullTypeNamePropertyName, IsRequired = true, IsKey = false, IsDefaultCollection = false)]
+        public string CacheProviderFullTypeName
+        {
+            get { return (string)base[CacheProviderFullTypeNamePropertyName]; }
+            set { base[CacheProviderFullTypeNamePropertyName] = value; }
+        }
+    }
+
+    public class PublishingProvider : ConfigurationElement
+    {
+        internal const string TypePropertyName = "type";
+
+        [ConfigurationPropertyAttribute(TypePropertyName, IsRequired = true, IsKey = false, IsDefaultCollection = false)]
+        public string Type
+        {
+            get { return (string)base[TypePropertyName]; }
+            set { base[TypePropertyName] = value; }
+        }
+    }
+}
@@ -0,0 +1,33 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration
+{
+    // note - still must work on how to support read-only and ResetSection for collections
+    // note - still must work on how to spread config over files (aka DeepConfig in v5)
+
+    /// <summary>
+    /// Represents an Umbraco section within the configuration file.
+    /// </summary>
+    /// <remarks>
+    /// <para>The requirement for these sections is to be read-only.</para>
+    /// <para>However for unit tests purposes it is internally possible to override some values, and
+    /// then calling <c>>ResetSection</c> should cancel these changes and bring the section back to
+    /// what it was originally.</para>
+    /// <para>The <c>UmbracoSettings.For{T}</c> method will return a section, either one that
+    /// is in the configuration file, or a section that was created with default values.</para>
+    /// </remarks>
+    public abstract class UmbracoConfigurationSection : ConfigurationSection
+    {
+        /// <summary>
+        /// Gets a value indicating whether the section actually is in the configuration file.
+        /// </summary>
+        protected bool IsPresent { get { return ElementInformation.IsPresent; } }
+
+        /// <summary>
+        /// Resets settings that were set programmatically, to their initial values.
+        /// </summary>
+        /// <remarks>>To be used in unit tests.</remarks>
+        internal protected virtual void ResetSection()
+        { }
+    }
+}
@@ -6,9 +6,11 @@ using System.Threading;
 using System.Web;
 using System.Web.Caching;
 using System.Xml;
+using System.Configuration;

 using System.Collections.Generic;
 using Umbraco.Core.Logging;
+using Umbraco.Core.CodeAnnotations;


 namespace Umbraco.Core.Configuration
@@ -20,6 +22,8 @@ namespace Umbraco.Core.Configuration

 	//TODO: Re-enable logging !!!!

+    //TODO: We need to convert this to a real section, it's currently using HttpRuntime.Cache to detect cahnges, this is real poor, especially in a console app
+
 	/// <summary>
 	/// The UmbracoSettings Class contains general settings information for the entire Umbraco instance based on information from the /config/umbracoSettings.config file
 	/// </summary>
@@ -52,14 +56,14 @@ namespace Umbraco.Core.Configuration
        /// <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()
+		private static void ResetInternal()
 		{
 			_addTrailingSlash = null;			
 			_forceSafeAliases = null;
 			_useLegacySchema = null;
 			_useDomainPrefixes = null;
 			_umbracoLibraryCacheDuration = null;
-			_trySkipIisCustomErrors = null;
+            SettingsFilePath = null;
 		}

 		internal const string TempFriendlyXmlChildContainerNodename = ""; // "children";
@@ -131,7 +135,7 @@ namespace Umbraco.Core.Configuration
 		/// </summary>
 		/// <param name="key">The xpath query to the specific node.</param>
 		/// <returns>If found, it returns the specific configuration xml node.</returns>
-		public static XmlNode GetKeyAsNode(string key)
+		internal static XmlNode GetKeyAsNode(string key)
 		{
 			if (key == null)
 				throw new ArgumentException("Key cannot be null");
@@ -146,7 +150,7 @@ namespace Umbraco.Core.Configuration
 		/// </summary>
 		/// <param name="key">The key.</param>
 		/// <returns></returns>
-		public static string GetKey(string key)
+        internal static string GetKey(string key)
 		{
 			EnsureSettingsDocument();

@@ -183,7 +187,7 @@ namespace Umbraco.Core.Configuration
 		/// <value>
 		/// 	<c>true</c> if new directories are allowed otherwise, <c>false</c>.
 		/// </value>
-		public static bool UploadAllowDirectories
+        internal static bool UploadAllowDirectories
 		{
 			get { return bool.Parse(GetKey("/settings/content/UploadAllowDirectories")); }
 		}
@@ -210,7 +214,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets a value indicating whether logging is enabled in umbracoSettings.config (/settings/logging/enableLogging).
 		/// </summary>
 		/// <value><c>true</c> if logging is enabled; otherwise, <c>false</c>.</value>
-		public static bool EnableLogging
+        internal static bool EnableLogging
 		{
 			get
 			{
@@ -225,7 +229,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets a value indicating whether logging happens async.
 		/// </summary>
 		/// <value><c>true</c> if async logging is enabled; otherwise, <c>false</c>.</value>
-		public static bool EnableAsyncLogging
+        internal static bool EnableAsyncLogging
 		{
 			get
 			{
@@ -240,7 +244,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Gets the assembly of an external logger that can be used to store log items in 3rd party systems
 		/// </summary>
-		public static string ExternalLoggerAssembly
+        internal static string ExternalLoggerAssembly
 		{
 			get
 			{
@@ -252,7 +256,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Gets the type of an external logger that can be used to store log items in 3rd party systems
 		/// </summary>
-		public static string ExternalLoggerType
+        internal static string ExternalLoggerType
 		{
 			get
 			{
@@ -264,7 +268,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Long Audit Trail to external log too
 		/// </summary>
-		public static bool ExternalLoggerLogAuditTrail
+        internal static bool ExternalLoggerLogAuditTrail
 		{
 			get
 			{
@@ -283,7 +287,7 @@ namespace Umbraco.Core.Configuration
        /// <summary>
        /// Keep user alive as long as they have their browser open? Default is true
        /// </summary>
-        public static bool KeepUserLoggedIn
+        internal static bool KeepUserLoggedIn
        {
            get
            {
@@ -298,7 +302,7 @@ namespace Umbraco.Core.Configuration
        /// <summary>
        /// Enables the experimental canvas (live) editing on the frontend of the website
        /// </summary>
-        public static bool EnableCanvasEditing
+        internal static bool EnableCanvasEditing
        {
            get
            {
@@ -313,7 +317,7 @@ namespace Umbraco.Core.Configuration
        /// <summary>
 		/// Show disabled users in the tree in the Users section in the backoffice
 		/// </summary>
-		public static bool HideDisabledUsersInBackoffice
+        internal static bool HideDisabledUsersInBackoffice
 		{
 			get
 			{
@@ -329,7 +333,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets a value indicating whether the logs will be auto cleaned
 		/// </summary>
 		/// <value><c>true</c> if logs are to be automatically cleaned; otherwise, <c>false</c></value>
-		public static bool AutoCleanLogs
+        internal static bool AutoCleanLogs
 		{
 			get
 			{
@@ -344,7 +348,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Gets the value indicating the log cleaning frequency (in miliseconds)
 		/// </summary>
-		public static int CleaningMiliseconds
+        internal static int CleaningMiliseconds
 		{
 			get
 			{
@@ -356,7 +360,7 @@ namespace Umbraco.Core.Configuration
 			}
 		}

-		public static int MaxLogAge
+        internal static int MaxLogAge
 		{
 			get
 			{
@@ -372,7 +376,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the disabled log types.
 		/// </summary>
 		/// <value>The disabled log types.</value>
-		public static XmlNode DisabledLogTypes
+        internal static XmlNode DisabledLogTypes
 		{
 			get { return GetKeyAsNode("/settings/logging/disabledLogTypes"); }
 		}
@@ -381,7 +385,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the package server url.
 		/// </summary>
 		/// <value>The package server url.</value>
-		public static string PackageServer
+        internal static string PackageServer
 		{
 			get { return "packages.umbraco.org"; }
 		}
@@ -392,15 +396,14 @@ namespace Umbraco.Core.Configuration
 		/// Gets a value indicating whether umbraco will use domain prefixes.
 		/// </summary>
 		/// <value><c>true</c> if umbraco will use domain prefixes; otherwise, <c>false</c>.</value>
-		// TODO rename as EnforceAbsoluteUrls
-		public static bool UseDomainPrefixes
+        internal static bool UseDomainPrefixes
 		{
 			get
 			{
                // default: false
                return _useDomainPrefixes ?? GetKeyValue("/settings/requestHandler/useDomainPrefixes", false);
 			}
-			internal set
+			/*internal*/ set
 			{
                // for unit tests only
                _useDomainPrefixes = value;
@@ -413,7 +416,7 @@ namespace Umbraco.Core.Configuration
 		/// This will add a trailing slash (/) to urls when in directory url mode
 		/// NOTICE: This will always return false if Directory Urls in not active
 		/// </summary>
-		public static bool AddTrailingSlash
+        internal static bool AddTrailingSlash
 		{
 			get
 			{
@@ -421,7 +424,7 @@ namespace Umbraco.Core.Configuration
                return GlobalSettings.UseDirectoryUrls
                    && (_addTrailingSlash ?? GetKeyValue("/settings/requestHandler/addTrailingSlash", false));
 			}
-			internal set
+			/*internal*/ set
 			{
                // for unit tests only
                _addTrailingSlash = value;
@@ -432,7 +435,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets a value indicating whether umbraco will use ASP.NET MasterPages for rendering instead of its propriatary templating system.
 		/// </summary>
 		/// <value><c>true</c> if umbraco will use ASP.NET MasterPages; otherwise, <c>false</c>.</value>
-		public static bool UseAspNetMasterPages
+        internal static bool UseAspNetMasterPages
 		{
 			get
 			{
@@ -454,7 +457,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets a value indicating whether umbraco will attempt to load any skins to override default template files
 		/// </summary>
 		/// <value><c>true</c> if umbraco will override templates with skins if present and configured <c>false</c>.</value>
-		public static bool EnableTemplateFolders
+        internal static bool EnableTemplateFolders
 		{
 			get
 			{
@@ -478,7 +481,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml
 		/// </summary>
-		public static IEnumerable<string> NotDynamicXmlDocumentElements
+        internal static IEnumerable<string> NotDynamicXmlDocumentElements
 		{
 			get
 			{
@@ -502,7 +505,7 @@ namespace Umbraco.Core.Configuration
 		private static IEnumerable<RazorDataTypeModelStaticMappingItem> _razorDataTypeModelStaticMapping;
 		private static readonly ReaderWriterLockSlim Lock = new ReaderWriterLockSlim();

-		public static IEnumerable<RazorDataTypeModelStaticMappingItem> RazorDataTypeModelStaticMapping
+		internal static IEnumerable<RazorDataTypeModelStaticMappingItem> RazorDataTypeModelStaticMapping
 		{
 			get
 			{
@@ -567,7 +570,7 @@ namespace Umbraco.Core.Configuration
 		/// <value>
 		/// 	<c>true</c> if umbraco will clone XML cache on publish; otherwise, <c>false</c>.
 		/// </value>
-		public static bool CloneXmlCacheOnPublish
+        internal static bool CloneXmlCacheOnPublish
 		{
 			get
 			{
@@ -589,7 +592,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets a value indicating whether rich text editor content should be parsed by tidy.
 		/// </summary>
 		/// <value><c>true</c> if content is parsed; otherwise, <c>false</c>.</value>
-		public static bool TidyEditorContent
+        internal static bool TidyEditorContent
 		{
 			get { return bool.Parse(GetKey("/settings/content/TidyEditorContent")); }
 		}
@@ -598,7 +601,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the encoding type for the tidyied content.
 		/// </summary>
 		/// <value>The encoding type as string.</value>
-		public static string TidyCharEncoding
+        internal static string TidyCharEncoding
 		{
 			get
 			{
@@ -615,12 +618,12 @@ namespace Umbraco.Core.Configuration
 		/// Gets the property context help option, this can either be 'text', 'icon' or 'none'
 		/// </summary>
 		/// <value>The property context help option.</value>
-		public static string PropertyContextHelpOption
+        internal static string PropertyContextHelpOption
 		{
 			get { return GetKey("/settings/content/PropertyContextHelpOption").ToLower(); }
 		}

-		public static string DefaultBackofficeProvider
+        internal static string DefaultBackofficeProvider
 		{
 			get
 			{
@@ -637,37 +640,36 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes
 		/// </summary>
-		public static bool ForceSafeAliases
+        internal static bool ForceSafeAliases
 		{
 			get
 			{
                // default: true
                return _forceSafeAliases ?? GetKeyValue("/settings/content/ForceSafeAliases", true);
 			}
-			internal set
+			/*internal*/ set
 			{
 				// used for unit  testing
 				_forceSafeAliases = value;
 			}
 		}

-        private static bool? _trySkipIisCustomErrors;
+        /// <summary>
+        /// Gets a value indicating whether to try to skip IIS custom errors.
+        /// </summary>
+        [UmbracoWillObsolete("Use UmbracoSettings.For<WebRouting>.TrySkipIisCustomErrors instead.")]
+        internal static bool TrySkipIisCustomErrors
+        {
+            get { return GetKeyValue("/settings/web.routing/@trySkipIisCustomErrors", false); }
+        }

        /// <summary>
-        /// Gets or sets a value indicating where to try to skip IIS custom errors.
+        /// Gets a value indicating whether internal redirect preserves the template.
        /// </summary>
-        public static bool TrySkipIisCustomErrors
-        {
-            get
-            {
-                // default: false
-                return _trySkipIisCustomErrors ?? GetKeyValue("/settings/web.routing/@trySkipIisCustomErrors", false);
-            }
-            internal set
-            {
-                // used for unit  testing
-                _trySkipIisCustomErrors = value;
-            }
+        [UmbracoWillObsolete("Use UmbracoSettings.For<WebRouting>.InternalRedirectPerservesTemplate instead.")]
+        internal static bool InternalRedirectPreservesTemplate
+	    {
+            get { return GetKeyValue("/settings/web.routing/@internalRedirectPreservesTemplate", false); }
        }

        /// <summary>
@@ -686,7 +688,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the allowed image file types.
 		/// </summary>
 		/// <value>The allowed image file types.</value>
-		public static string ImageFileTypes
+        internal static string ImageFileTypes
 		{
 			get { return GetKey("/settings/content/imaging/imageFileTypes").ToLowerInvariant(); }
 		}
@@ -695,7 +697,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the allowed script file types.
 		/// </summary>
 		/// <value>The allowed script file types.</value>
-		public static string ScriptFileTypes
+        internal static string ScriptFileTypes
 		{
 			get { return GetKey("/settings/content/scripteditor/scriptFileTypes"); }
 		}
@@ -706,14 +708,14 @@ namespace Umbraco.Core.Configuration
 		/// Gets the duration in seconds to cache queries to umbraco library member and media methods
 		/// Default is 1800 seconds (30 minutes)
 		/// </summary>
-		public static int UmbracoLibraryCacheDuration
+        internal static int UmbracoLibraryCacheDuration
 		{
 			get
 			{
                // default: 1800
                return _umbracoLibraryCacheDuration ?? GetKeyValue("/settings/content/UmbracoLibraryCacheDuration", 1800);
 			}
-			internal set
+			/*internal*/ set
            {
                // for unit tests only
                _umbracoLibraryCacheDuration = value;
@@ -724,7 +726,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the path to the scripts folder used by the script editor.
 		/// </summary>
 		/// <value>The script folder path.</value>
-		public static string ScriptFolderPath
+        internal static string ScriptFolderPath
 		{
 			get { return GetKey("/settings/content/scripteditor/scriptFolderPath"); }
 		}
@@ -732,7 +734,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Enabled or disable the script/code editor
 		/// </summary>
-		public static bool ScriptDisableEditor
+        internal static bool ScriptDisableEditor
 		{
 			get
 			{
@@ -750,7 +752,7 @@ namespace Umbraco.Core.Configuration
 		/// ex: existingnodename.aspx would become existingnodename(1).aspx if a node with the same name is found 
 		/// </summary>
 		/// <value><c>true</c> if umbraco ensures unique node naming; otherwise, <c>false</c>.</value>
-		public static bool EnsureUniqueNaming
+        internal static bool EnsureUniqueNaming
 		{
 			get
 			{
@@ -769,7 +771,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the notification email sender.
 		/// </summary>
 		/// <value>The notification email sender.</value>
-		public static string NotificationEmailSender
+        internal static string NotificationEmailSender
 		{
 			get { return GetKey("/settings/content/notifications/email"); }
 		}
@@ -780,7 +782,7 @@ namespace Umbraco.Core.Configuration
 		/// <value>
 		/// 	<c>true</c> if html notification-emails are disabled; otherwise, <c>false</c>.
 		/// </value>
-		public static bool NotificationDisableHtmlEmail
+        internal static bool NotificationDisableHtmlEmail
 		{
 			get
 			{
@@ -793,12 +795,12 @@ namespace Umbraco.Core.Configuration
 		/// Gets the allowed attributes on images.
 		/// </summary>
 		/// <value>The allowed attributes on images.</value>
-		public static string ImageAllowedAttributes
+        internal static string ImageAllowedAttributes
 		{
 			get { return GetKey("/settings/content/imaging/allowedAttributes"); }
 		}

-		public static XmlNode ImageAutoFillImageProperties
+        internal static XmlNode ImageAutoFillImageProperties
 		{
 			get { return GetKeyAsNode("/settings/content/imaging/autoFillImageProperties"); }
 		}
@@ -807,7 +809,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the scheduled tasks as XML
 		/// </summary>
 		/// <value>The scheduled tasks.</value>
-		public static XmlNode ScheduledTasks
+        internal static XmlNode ScheduledTasks
 		{
 			get { return GetKeyAsNode("/settings/scheduledTasks"); }
 		}
@@ -816,7 +818,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets a list of characters that will be replaced when generating urls
 		/// </summary>
 		/// <value>The URL replacement characters.</value>
-		public static XmlNode UrlReplaceCharacters
+        internal static XmlNode UrlReplaceCharacters
 		{
 			get { return GetKeyAsNode("/settings/requestHandler/urlReplacing"); }
 		}
@@ -824,7 +826,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Whether to replace double dashes from url (ie my--story----from--dash.aspx caused by multiple url replacement chars
 		/// </summary>
-		public static bool RemoveDoubleDashesFromUrlReplacing
+        internal static bool RemoveDoubleDashesFromUrlReplacing
 		{
 			get
 			{
@@ -845,7 +847,7 @@ namespace Umbraco.Core.Configuration
 		/// Used for load-balancing high-traffic sites.
 		/// </summary>
 		/// <value><c>true</c> if umbraco uses distributed calls; otherwise, <c>false</c>.</value>
-		public static bool UseDistributedCalls
+        internal static bool UseDistributedCalls
 		{
 			get
 			{
@@ -865,7 +867,7 @@ namespace Umbraco.Core.Configuration
 		/// Gets the ID of the user with access rights to perform the distributed calls.
 		/// </summary>
 		/// <value>The distributed call user.</value>
-		public static int DistributedCallUser
+        internal static int DistributedCallUser
 		{
 			get
 			{
@@ -883,7 +885,7 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Gets the html injected into a (x)html page if Umbraco is running in preview mode
 		/// </summary>
-		public static string PreviewBadge
+        internal static string PreviewBadge
 		{
 			get
 			{
@@ -904,7 +906,7 @@ namespace Umbraco.Core.Configuration
 		/// and update their content cache accordingly, ensuring a consistent cache on all servers
 		/// </summary>
 		/// <value>The distribution servers.</value>
-		public static XmlNode DistributionServers
+        internal static XmlNode DistributionServers
 		{
 			get
 			{
@@ -924,7 +926,7 @@ namespace Umbraco.Core.Configuration
 		/// A help page configuration specify language, user type, application, application url and 
 		/// the target help page url.
 		/// </summary>
-		public static XmlNode HelpPages
+        internal static XmlNode HelpPages
 		{
 			get
 			{
@@ -946,7 +948,7 @@ namespace Umbraco.Core.Configuration
 		/// All packages installed from a repository gets the repository alias included in the install information
 		/// </summary>
 		/// <value>The repository servers.</value>
-		public static XmlNode Repositories
+        internal static XmlNode Repositories
 		{
 			get
 			{
@@ -969,7 +971,7 @@ namespace Umbraco.Core.Configuration
 		/// <value>
 		/// 	<c>true</c> if umbraco will use the viewstate mover module; otherwise, <c>false</c>.
 		/// </value>
-		public static bool UseViewstateMoverModule
+        internal static bool UseViewstateMoverModule
 		{
 			get
 			{
@@ -991,7 +993,7 @@ namespace Umbraco.Core.Configuration
 		/// Tells us whether the Xml Content cache is disabled or not
 		/// Default is enabled
 		/// </summary>
-		public static bool IsXmlContentCacheDisabled
+        internal static bool IsXmlContentCacheDisabled
 		{
 			get
 			{
@@ -1016,7 +1018,7 @@ namespace Umbraco.Core.Configuration
 		/// Makes it possible to updates environments by syncing the umbraco.config file across instances
 		/// Relates to http://umbraco.codeplex.com/workitem/30722
 		/// </summary>
-		public static bool XmlContentCheckForDiskChanges
+        internal static bool XmlContentCheckForDiskChanges
 		{
 			get
 			{
@@ -1041,7 +1043,7 @@ namespace Umbraco.Core.Configuration
 		/// If disabled, only documents will generate data.
 		/// This feature is useful if anyone would like to see how data looked at a given time
 		/// </summary>
-		public static bool EnableGlobalPreviewStorage
+        internal static bool EnableGlobalPreviewStorage
 		{
 			get
 			{
@@ -1069,14 +1071,14 @@ namespace Umbraco.Core.Configuration
 		/// <value>
 		/// 	<c>true</c> if yes, use the old node/data model; otherwise, <c>false</c>.
 		/// </value>
-		public static bool UseLegacyXmlSchema
+        internal static bool UseLegacyXmlSchema
 		{
 			get
 			{
                // default: true
                return _useLegacySchema ?? GetKeyValue("/settings/content/UseLegacyXmlSchema", false);
 			}
-			internal set
+			/*internal*/ set
 			{
 				// used for unit testing
 				_useLegacySchema = value;
@@ -1084,7 +1086,7 @@ namespace Umbraco.Core.Configuration
 		}

 		[Obsolete("This setting is not used anymore, the only file extensions that are supported are .cs and .vb files")]
-		public static IEnumerable<string> AppCodeFileExtensionsList
+        internal static IEnumerable<string> AppCodeFileExtensionsList
 		{
 			get
 			{
@@ -1095,7 +1097,7 @@ namespace Umbraco.Core.Configuration
 		}

 		[Obsolete("This setting is not used anymore, the only file extensions that are supported are .cs and .vb files")]
-		public static XmlNode AppCodeFileExtensions
+        internal static XmlNode AppCodeFileExtensions
 		{
 			get
 			{
@@ -1117,7 +1119,7 @@ namespace Umbraco.Core.Configuration
 		/// Tells us whether the Xml to always update disk cache, when changes are made to content
 		/// Default is enabled
 		/// </summary>
-		public static bool ContinouslyUpdateXmlDiskCache
+        internal static bool ContinouslyUpdateXmlDiskCache
 		{
 			get
 			{
@@ -1143,7 +1145,7 @@ namespace Umbraco.Core.Configuration
 		/// have a splash page
 		/// Default is disabled
 		/// </summary>
-		public static bool EnableSplashWhileLoading
+        internal static bool EnableSplashWhileLoading
 		{
 			get
 			{
@@ -1164,7 +1166,7 @@ namespace Umbraco.Core.Configuration
 		}

 		private static bool? _resolveUrlsFromTextString;
-		public static bool ResolveUrlsFromTextString
+        internal static bool ResolveUrlsFromTextString
 		{
 			get
 			{
@@ -1201,7 +1203,7 @@ namespace Umbraco.Core.Configuration
 		/// is used instead of the masterpages editor
 		/// </summary>
 		/// <value><c>true</c> if umbraco defaults to using MVC views for templating, otherwise <c>false</c>.</value>
-		public static RenderingEngine DefaultRenderingEngine
+        internal static RenderingEngine DefaultRenderingEngine
 		{
 			get
 			{
@@ -1225,6 +1227,12 @@ namespace Umbraco.Core.Configuration
 				}
 				return _defaultRenderingEngine.Value;
 			}
+            //internal set
+            //{
+            //    _defaultRenderingEngine = value;
+            //    var node = UmbracoSettingsXmlDoc.DocumentElement.SelectSingleNode("/settings/templates/defaultRenderingEngine");
+            //    node.InnerText = value.ToString();
+            //}
 		}

 		private static MacroErrorBehaviour? _macroErrorBehaviour;
@@ -1236,7 +1244,7 @@ namespace Umbraco.Core.Configuration
 		/// - 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
+        internal static MacroErrorBehaviour MacroErrorBehaviour
 		{
 			get
 			{
@@ -1261,7 +1269,7 @@ namespace Umbraco.Core.Configuration
 				return _macroErrorBehaviour.Value;
 			}
 		}
-
+		
 		private static IconPickerBehaviour? _iconPickerBehaviour;

        /// <summary>
@@ -1271,7 +1279,7 @@ namespace Umbraco.Core.Configuration
        /// - 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
+        internal static IconPickerBehaviour IconPickerBehaviour
 		{
 			get
 			{
@@ -1480,6 +1488,80 @@ namespace Umbraco.Core.Configuration
 			}

 			#endregion
-		}
-	}
+        }
+
+        #region Extensible settings
+
+        /// <summary>
+        /// Resets settings that were set programmatically, to their initial values.
+        /// </summary>
+        /// <remarks>To be used in unit tests.</remarks>
+        internal static void Reset()
+        {
+            ResetInternal();
+
+            using (new WriteLock(SectionsLock))
+            {
+                foreach (var section in Sections.Values)
+                    section.ResetSection();
+            }
+        }
+
+        private static readonly ReaderWriterLockSlim SectionsLock = new ReaderWriterLockSlim();
+        private static readonly Dictionary<Type, UmbracoConfigurationSection> Sections = new Dictionary<Type, UmbracoConfigurationSection>();
+
+        /// <summary>
+        /// Gets the specified UmbracoConfigurationSection.
+        /// </summary>
+        /// <typeparam name="T">The type of the UmbracoConfigurationSectiont.</typeparam>
+        /// <returns>The UmbracoConfigurationSection of the specified type.</returns>
+        public static T For<T>()
+            where T : UmbracoConfigurationSection, new()
+        {
+            var sectionType = typeof (T);
+            using (new WriteLock(SectionsLock))
+            {
+                if (Sections.ContainsKey(sectionType)) return Sections[sectionType] as T;
+
+                var attr = sectionType.GetCustomAttribute<ConfigurationKeyAttribute>(false);
+                if (attr == null)
+                    throw new InvalidOperationException(string.Format("Type \"{0}\" is missing attribute ConfigurationKeyAttribute.", sectionType.FullName));
+
+                var sectionKey = attr.ConfigurationKey;
+                if (string.IsNullOrWhiteSpace(sectionKey))
+                    throw new InvalidOperationException(string.Format("Type \"{0}\" ConfigurationKeyAttribute value is null or empty.", sectionType.FullName));
+
+                var section = GetSection(sectionType, sectionKey);
+
+                Sections[sectionType] = section;
+                return section as T;
+            }
+        }
+
+        private static UmbracoConfigurationSection GetSection(Type sectionType, string key)
+        {
+            if (!sectionType.Inherits<UmbracoConfigurationSection>())
+                 throw new ArgumentException(string.Format(
+                    "Type \"{0}\" does not inherit from UmbracoConfigurationSection.", sectionType.FullName), "sectionType");
+
+            var section = ConfigurationManager.GetSection(key);
+
+            if (section != null && section.GetType() != sectionType)
+                throw new InvalidCastException(string.Format("Section at key \"{0}\" is of type \"{1}\" and not \"{2}\".",
+                    key, section.GetType().FullName, sectionType.FullName));
+
+            if (section != null) return section as UmbracoConfigurationSection;
+
+            section = Activator.CreateInstance(sectionType) as UmbracoConfigurationSection;
+
+            if (section == null)
+                throw new NullReferenceException(string.Format(
+                    "Activator failed to create an instance of type \"{0}\" for key\"{1}\" and returned null.",
+                    sectionType.FullName, key));
+
+            return section as UmbracoConfigurationSection;
+        }
+
+        #endregion
+    }
 }
@@ -0,0 +1,32 @@
+using System;
+using System.Reflection;
+
+namespace Umbraco.Core.Configuration
+{
+    public class UmbracoVersion
+    {
+        private static readonly Version Version = new Version("6.1.1");
+
+        /// <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 ""; } }
+
+        // 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(); } }
+    }
+}
@@ -0,0 +1,46 @@
+namespace Umbraco.Core
+{
+	public static partial class Constants
+	{
+		/// <summary>
+		/// Defines the alias identifiers for Umbraco's core application sections.
+		/// </summary>
+		public static class Applications
+		{
+			/// <summary>
+			/// Application alias for the content section.
+			/// </summary>
+			public const string Content = "content";
+
+			/// <summary>
+			/// Application alias for the developer section.
+			/// </summary>
+			public const string Developer = "developer";
+
+			/// <summary>
+			/// Application alias for the media section.
+			/// </summary>
+			public const string Media = "media";
+
+			/// <summary>
+			/// Application alias for the members section.
+			/// </summary>
+			public const string Members = "member";
+
+			/// <summary>
+			/// Application alias for the settings section.
+			/// </summary>
+			public const string Settings = "settings";
+
+			/// <summary>
+			/// Application alias for the translation section.
+			/// </summary>
+			public const string Translation = "translation";
+
+			/// <summary>
+			/// Application alias for the users section.
+			/// </summary>
+			public const string Users = "users";
+		}
+	}
+}
@@ -0,0 +1,105 @@
+namespace Umbraco.Core
+{
+	public static partial class Constants
+	{
+		/// <summary>
+		/// Defines the identifiers for property-type alias conventions that are used within the Umbraco core.
+		/// </summary>
+		public static class Conventions
+		{
+			/// <summary>
+			/// Constants for Umbraco Content property aliases.
+			/// </summary>
+			public static class Content
+			{
+				/// <summary>
+				/// Property alias for the Content's Url (internal) redirect.
+				/// </summary>
+				public const string InternalRedirectId = "umbracoInternalRedirectId";
+
+				/// <summary>
+				/// Property alias for the Content's navigational hide, (not actually used in core code).
+				/// </summary>
+				public const string NaviHide = "umbracoNaviHide";
+
+				/// <summary>
+				/// Property alias for the Content's Url redirect.
+				/// </summary>
+				public const string Redirect = "umbracoRedirect";
+
+				/// <summary>
+				/// Property alias for the Content's Url alias.
+				/// </summary>
+				public const string UrlAlias = "umbracoUrlAlias";
+
+				/// <summary>
+				/// Property alias for the Content's Url name.
+				/// </summary>
+				public const string UrlName = "umbracoUrlName";
+			}
+
+			/// <summary>
+			/// Constants for Umbraco Media property aliases.
+			/// </summary>
+			public static class Media
+			{
+				/// <summary>
+				/// Property alias for the Media's file name.
+				/// </summary>
+				public const string File = "umbracoFile";
+
+				/// <summary>
+				/// Property alias for the Media's width.
+				/// </summary>
+				public const string Width = "umbracoWidth";
+
+				/// <summary>
+				/// Property alias for the Media's height.
+				/// </summary>
+				public const string Height = "umbracoHeight";
+
+				/// <summary>
+				/// Property alias for the Media's file size (in bytes).
+				/// </summary>
+				public const string Bytes = "umbracoBytes";
+
+				/// <summary>
+				/// Property alias for the Media's file extension.
+				/// </summary>
+				public const string Extension = "umbracoExtension";
+			}
+
+			/// <summary>
+			/// Defines the alias identifiers for Umbraco media types.
+			/// </summary>
+			public static class MediaTypes
+			{
+				/// <summary>
+				/// MediaType alias for a file.
+				/// </summary>
+				public const string File = "File";
+
+				/// <summary>
+				/// MediaType alias for a folder.
+				/// </summary>
+				public const string Folder = "Folder";
+
+				/// <summary>
+				/// MediaType alias for an image.
+				/// </summary>
+				public const string Image = "Image";
+			}
+
+			/// <summary>
+			/// Constants for Umbraco URLs/Querystrings.
+			/// </summary>
+			public static class Url
+			{
+				/// <summary>
+				/// Querystring parameter name used for Umbraco's alternative template functionality.
+				/// </summary>
+				public const string AltTemplate = "altTemplate";
+			}
+		}
+	}
+}
@@ -0,0 +1,86 @@
+namespace Umbraco.Core
+{
+	public static partial class Constants
+	{
+		/// <summary>
+		/// Defines the identifiers for Umbraco object types as constants for easy centralized access/management.
+		/// </summary>
+		public static class ObjectTypes
+		{
+			/// <summary>
+			/// Guid for a Content Item object.
+			/// </summary>
+			public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";
+
+			/// <summary>
+			/// Guid for a Content Item Type object.
+			/// </summary>
+			public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";
+
+			/// <summary>
+			/// Guid for the Content Recycle Bin.
+			/// </summary>
+			public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8";
+
+			/// <summary>
+			/// Guid for a DataType object.
+			/// </summary>
+			public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C";
+
+			/// <summary>
+			/// Guid for a Document object.
+			/// </summary>
+			public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
+
+			/// <summary>
+			/// Guid for a Document Type object.
+			/// </summary>
+			public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB";
+
+			/// <summary>
+			/// Guid for a Media object.
+			/// </summary>
+			public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";
+
+			/// <summary>
+			/// Guid for the Media Recycle Bin.
+			/// </summary>
+			public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113";
+
+			/// <summary>
+			/// Guid for a Media Type object.
+			/// </summary>
+			public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E";
+
+			/// <summary>
+			/// Guid for a Member object.
+			/// </summary>
+			public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";
+
+			/// <summary>
+			/// Guid for a Member Group object.
+			/// </summary>
+			public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";
+
+			/// <summary>
+			/// Guid for a Member Type object.
+			/// </summary>
+			public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43";
+
+			/// <summary>
+			/// Guid for a Stylesheet object.
+			/// </summary>
+			public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840";
+
+			/// <summary>
+			/// Guid for the System Root.
+			/// </summary>
+			public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D";
+
+			/// <summary>
+			/// Guid for a Template object.
+			/// </summary>
+			public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";
+		}
+	}
+}
--- a/Show More
+++ b/Show More