Bump version

2014-10-08 09:44:59 +02:00
4060 changed files with 133090 additions and 353382 deletions
@@ -1,131 +1,88 @@
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-.DS_Store
-._.DS_Store
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-*.suo
-[sS]ource
-[sS]andbox
-umbraco.config
-*.vs10x
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-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/[Mm]edia/*
-src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
-src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
-!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
-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/UmbracoExamine.PDF*zip
-build/*.nupkg
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-*.orig
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/[Vv]iews/*.cshtml
-src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/Umbraco.Web.UI/[Vv]iews/*
-src/packages/
-src/packages/repositories.config
-
-src/Umbraco.Web.UI/[Ww]eb.config
-*.transformed
-webpihash.txt
-
-node_modules
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
-build/_BuildOutput/
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-tools/NDepend/
-
-src/Umbraco.Web.UI/App_Plugins/*
-src/*.psess
-src/*.vspx
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
-NDependOut/*
-*.ndproj
-QueryResult.htm
-*.ndproj
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-
-src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
-src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
-src/Umbraco.Web.UI/umbraco/plugins/*
-src/Umbraco.Web.UI/umbraco/js/init.js
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/Umbraco.Web.UI.Client/bower_components/*
-/src/Umbraco.Web.UI/Umbraco/preview
-
-#Ignore Rule for output of generated documentation files from Grunt docserve
-src/Umbraco.Web.UI.Client/docs/api
-src/*.boltdata/
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
-/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
-src/umbraco.sln.ide/*
-build/UmbracoCms.*/
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+[Bb]in
+[Db]ebug*/
+obj/
+[Rr]elease*/
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+*.suo
+[sS]ource
+[sS]andbox
+umbraco.config
+*.vs10x
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+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/[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/*
+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
+src/Umbraco.Web.UI/web.config
+*.orig
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+webpihash.txt
+
+node_modules
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+build/_BuildOutput/
+tools/NDepend/
+src/*.vspx
+src/*.psess
+NDependOut/*
+*.ndproj
+QueryResult.htm
+*.ndproj
+src/Umbraco.Tests/Views/web.config
@@ -1,9 +1,9 @@
-# The MIT License (MIT) #
-
-Copyright (c) 2013 Umbraco
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# The MIT License (MIT) #
+
+Copyright (c) 2013 Umbraco
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,40 +1,33 @@
-Umbraco CMS
-===========
-Umbraco is a free open source Content Management System built on the ASP.NET platform.
-
-## Building Umbraco from source ##
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt dev` in `src\Umbraco.Web.UI.Client`.
- 
-If you're interested in making changes to Belle make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
-
-## Watch a five minute introduction video ##
-
-[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
-
-## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
-
-**More than 177,000 sites trust Umbraco** 
-
-For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
-
-Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
-
-To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
-
-## Downloading ##
-
-The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
-
-## Forums ##
-
-We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
-
-## Contribute to Umbraco ##
-
-If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
-
-## Found a bug? ##
-
-Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
-
-To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
+Umbraco CMS
+===========
+## Watch a five minute introduction video ##
+
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+
+## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
+
+**More than 177,000 sites trust Umbraco** 
+
+For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
+
+Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
+
+To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
+
+## Downloading ##
+
+The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
+
+## Forums ##
+
+We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
+
+## Contribute to Umbraco ##
+
+If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
+
+## Found a bug? ##
+
+Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+
+To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
@@ -1,170 +0,0 @@
-/* File    : TOC.css
-// Author  : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 09/07/2007
-//
-// Stylesheet for the table of content
-*/
-
-*
-{
-	margin: 0px 0px 0px 0px;
-	padding: 0px 0px 0px 0px;
-}
-
-body
-{
-    font-family: Segoe UI, Arial, Verdana, Helvetica, sans-serif;
-    font-size: 0.9em;
-    background-color: white;
-    color: White;
-	overflow: hidden;
-}
-
-input
-{
-	padding:5px;
-	margin: 3px 0px 3px 0px
-}
-
-img
-{
-    border: 0;
-    margin-left: 5px;
-    margin-right: 2px;
-}
-
-img.TreeNodeImg
-{
-    cursor: pointer;
-}
-
-img.TOCLink
-{
-    cursor: pointer;
-    margin-left: 0;
-    margin-right: 0;
-}
-
-a.SelectedNode, a.UnselectedNode
-{
-	color: #333;
-    text-decoration: none;
-	padding: 1px 3px 1px 3px;
-    white-space: nowrap;
-}
-
-a.SelectedNode
-{
-	background-color: #ffffff;
-    border: solid 1px #999999;
-	padding: 0px 2px 0px 2px;
-}
-
-a.UnselectedNode:hover, a.SelectedNode:hover
-{
-    background-color: #cccccc;
-    border: solid 1px #999999;
-	padding: 0px 2px 0px 2px;
-}
-
-.Visible
-{
-    display: block;
-    margin-left: 2em;
-}
-
-.Hidden
-{
-    display: none;
-}
-
-.Tree
-{
-	background-color: #fff;
-	color: #333;
-    width: 300px;
-	overflow: auto;
-}
-
-.TreeNode, .TreeItem
-{
-    white-space: nowrap;
-    margin: 2px 2px 2px 2px;
-}
-
-.TOCDiv
-{
-	position: relative;
-	float: left;
-	width: 300px;
-    height: 100%;
-}
-
-.TOCSizer
-{
-	clear: none;
-	float: left;
-	width: 10px;
-    height: 100%;    
-    background-image: url("Splitter.gif");
-    background-position:center center;
-	background-repeat:no-repeat;
-	position: relative;
-	cursor: w-resize;
-	border-left: solid 1px #CCC;
-}
-
-.TopicContent
-{
-	position: relative;
-	float: right;
-    background-color: white;
-    height: 100%;
-}
-
-.SearchOpts
-{
-    padding: 5px 5px 10px 5px;    
-    color: black;
-    width: 300px;
-	border-bottom: solid lightgrey 1px;
-	height: 110px !important;
-}
-
-.NavOpts
-{
-    padding: 5px 5px 6px 5px;    
-    color: black;
-    width: 300px;
-	border-bottom: solid lightgrey 1px;
-}
-
-.NavOpts img {
-	display:inline-block;
-	margin: 0px 5px 0px 5px;
-}
-
-.IndexOpts
-{
-    padding: 5px 5px 6px 5px;        
-    color: black;
-    width: 300px;
-	border-bottom: solid lightgrey 1px;
-}
-
-.IndexItem
-{
-    white-space: nowrap;
-    margin: 2px 2px 2px 2px;
-}
-
-.IndexSubItem
-{
-    white-space: nowrap;
-    margin: 2px 2px 2px 12px;
-}
-
-.PaddedText
-{
-    margin: 10px 10px 10px 10px;
-}
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <!-- The configuration and platform will be used to determine which
-         assemblies to include from solution and project documentation
-         sources -->
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{cb4d85f1-7390-40ee-b41f-a724bb8fddea}</ProjectGuid>
-    <SHFBSchemaVersion>1.9.5.0</SHFBSchemaVersion>
-    <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
-         Studio adds them anyway -->
-    <AssemblyName>Documentation</AssemblyName>
-    <RootNamespace>Documentation</RootNamespace>
-    <Name>Documentation</Name>
-    <!-- SHFB properties -->
-    <FrameworkVersion>.NET Framework 4.5</FrameworkVersion>
-    <OutputPath>.\Output\</OutputPath>
-    <HtmlHelpName>UmbracoClassLibrary</HtmlHelpName>
-    <Language>en-US</Language>
-    <BuildAssemblerVerbosity>OnlyErrors</BuildAssemblerVerbosity>
-    <BuildLogFile>csharp-api-docs.log</BuildLogFile>
-    <HelpFileFormat>Website</HelpFileFormat>
-    <IndentHtml>True</IndentHtml>
-    <KeepLogFile>False</KeepLogFile>
-    <DisableCodeBlockComponent>False</DisableCodeBlockComponent>
-    <CppCommentsFixup>False</CppCommentsFixup>
-    <CleanIntermediates>True</CleanIntermediates>
-    <SyntaxFilters>CSharp</SyntaxFilters>
-    <SdkLinkTarget>Blank</SdkLinkTarget>
-    <RootNamespaceContainer>False</RootNamespaceContainer>
-    <PresentationStyle>VS2010</PresentationStyle>
-    <Preliminary>False</Preliminary>
-    <NamingMethod>Guid</NamingMethod>
-    <HelpTitle>Umbraco .Net Class Library</HelpTitle>
-    <ContentPlacement>AboveNamespaces</ContentPlacement>
-    <VisibleItems>Attributes, InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
-    <ComponentConfigurations />
-    <DocumentationSources>
-      <DocumentationSource sourceFile="..\..\src\Umbraco.Core\Umbraco.Core.csproj" />
-<DocumentationSource sourceFile="..\..\src\Umbraco.Core\bin\Release\Umbraco.Core.xml" />
-<DocumentationSource sourceFile="..\..\src\Umbraco.Web\Umbraco.Web.csproj" />
-<DocumentationSource sourceFile="..\..\src\Umbraco.Web\bin\Release\umbraco.xml" /></DocumentationSources>
-    <WebsiteSdkLinkType>None</WebsiteSdkLinkType>
-    <HtmlSdkLinkType>None</HtmlSdkLinkType>
-    <IncludeFavorites>False</IncludeFavorites>
-    <BinaryTOC>True</BinaryTOC>
-    <MissingTags>Summary, AutoDocumentCtors, AutoDocumentDispose</MissingTags>
-    <TransformComponentArguments>
-      <Argument Key="logoFile" Value="" />
-      <Argument Key="logoHeight" Value="" />
-      <Argument Key="logoWidth" Value="" />
-      <Argument Key="logoAltText" Value="" />
-      <Argument Key="logoPlacement" Value="left" />
-      <Argument Key="logoAlignment" Value="left" />
-    </TransformComponentArguments>
-    <ApiFilter>
-      <Filter entryType="Namespace" fullName="CookComputing.Blogger" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="CookComputing.MetaWeblog" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="dashboardUtilities" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="presentation.umbraco.webservices" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco" isExposed="False" xmlns="">
-  <Filter entryType="Class" fullName="umbraco.content" filterName="content" isExposed="True" />
-  <Filter entryType="Delegate" fullName="umbraco.content.ContentCacheDatabaseLoadXmlStringEventHandler" filterName="content.ContentCacheDatabaseLoadXmlStringEventHandler" isExposed="False" />
-  <Filter entryType="Delegate" fullName="umbraco.content.ContentCacheLoadNodeEventHandler" filterName="content.ContentCacheLoadNodeEventHandler" isExposed="False" />
-  <Filter entryType="Delegate" fullName="umbraco.content.DocumentCacheEventHandler" filterName="content.DocumentCacheEventHandler" isExposed="False" />
-  <Filter entryType="Delegate" fullName="umbraco.content.RefreshContentEventHandler" filterName="content.RefreshContentEventHandler" isExposed="False" />
-  <Filter entryType="Class" fullName="umbraco.ContentExtensions" filterName="ContentExtensions" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.ContentTypeExtensions" filterName="ContentTypeExtensions" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.item" filterName="item" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.library" filterName="library" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.macro" filterName="macro" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.MacroCacheContent" filterName="MacroCacheContent" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.MacroRenderingEventArgs" filterName="MacroRenderingEventArgs" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.MediaExtensions" filterName="MediaExtensions" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.MemberExtensions" filterName="MemberExtensions" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.page" filterName="page" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.PreValueExtensions" filterName="PreValueExtensions" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.RelationTypeExtensions" filterName="RelationTypeExtensions" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.template" filterName="template" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.UmbracoObjectTypeExtensions" filterName="UmbracoObjectTypeExtensions" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.uQuery" filterName="uQuery" isExposed="True" />
-  <Filter entryType="Interface" fullName="umbraco.uQuery.IGetProperty" filterName="uQuery.IGetProperty" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.uQuery.Members" filterName="uQuery.Members" isExposed="True" />
-  <Filter entryType="Enumeration" fullName="umbraco.uQuery.UmbracoObjectType" filterName="uQuery.UmbracoObjectType" isExposed="True" />
-</Filter>
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.create.controls" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer.RelationTypes" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer.RelationTypes.TreeMenu" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.members" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.modal" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.scripts" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.stylesheet" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.cms.presentation.user" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.controls" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.controls.GenericProperties" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.controls.Images" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.controls.Tree" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.developer" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.dialogs" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.js" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.layoutControls" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.NodeFactory" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.actions" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.channels" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.channels.businesslogic" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.create" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.developer.packages" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.dialogs" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.masterpages" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.members" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.nodeFactory" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.org.umbraco.update" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.plugins.tinymce3" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.preview" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.Search" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.settings" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.templateControls" isExposed="False" xmlns="">
-  <Filter entryType="Class" fullName="umbraco.presentation.templateControls.Item" filterName="Item" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.presentation.templateControls.ItemRenderer" filterName="ItemRenderer" isExposed="True" />
-  <Filter entryType="Class" fullName="umbraco.presentation.templateControls.Macro" filterName="Macro" isExposed="True" />
-  <Filter entryType="Enumeration" fullName="umbraco.presentation.templateControls.Macro.RenderEvents" filterName="Macro.RenderEvents" isExposed="False" />
-</Filter>
-<Filter entryType="Namespace" fullName="umbraco.presentation.tinymce3" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.translation" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.channels" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.controls" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.create" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.developer.Xslt" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.dialogs" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.masterpages" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.members" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.plugins.tinymce3" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.Search" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.translation" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.webservices" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.urlRewriter" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.Web.UI" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.presentation.webservices" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.scripting" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.settings" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="Umbraco.Web.org.umbraco.our" isExposed="False" xmlns="" />
-<Filter entryType="Namespace" fullName="umbraco.webservices" isExposed="False" xmlns="" /></ApiFilter>
-  </PropertyGroup>
-  <!-- There are no properties for these groups.  AnyCPU needs to appear in
-       order for Visual Studio to perform the build.  The others are optional
-       common platform types that may appear. -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
-  </PropertyGroup>
-  <!-- Import the SHFB build targets -->
-  <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>
@@ -1,64 +1,33 @@
-@ECHO OFF
-IF NOT EXIST UmbracoVersion.txt (
-	ECHO UmbracoVersion.txt missing!
-	GOTO :showerror
-)
-
-REM Get the version and comment from UmbracoVersion.txt lines 2 and 3
-SET "release="
-SET "comment="
-FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
-FOR /F "skip=2 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED comment SET "comment=%%i"
-
-REM If there's arguments on the command line overrule UmbracoVersion.txt and use that as the version
-IF [%1] NEQ [] (SET release=%1)
-IF [%2] NEQ [] (SET comment=%2) ELSE (IF [%1] NEQ [] (SET "comment="))
-
-SET version=%release%
-
-IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
-ECHO Building Umbraco %version%
-
-ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
-
-ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice
-SET nuGetFolder=%CD%\..\src\packages\
-..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore >NUL
-..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder%
-
-ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
-RD ..\src\Umbraco.Web.UI.Client\build /Q /S
-RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
-
-ECHO Removing existing built files to make sure everything is clean as a whistle
-RMDIR /Q /S _BuildOutput
-DEL /F /Q UmbracoCms.*.zip
-DEL /F /Q UmbracoExamine.*.zip
-DEL /F /Q UmbracoCms.*.nupkg
-DEL /F /Q webpihash.txt
-
-ECHO Making sure Git is in the path so that the build can succeed
-CALL InstallGit.cmd
-ECHO Performing MSBuild and producing Umbraco binaries zip files
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
-
-ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
-attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
-
-ECHO Adding Web.config transform files to the NuGet package
-REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
-REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
-
-ECHO Packing the NuGet release files
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
-                        
-IF ERRORLEVEL 1 GOTO :showerror
-
-GOTO :EOF
-
-:showerror
-PAUSE
+@ECHO OFF
+SET release=6.2.4
+SET comment=
+SET version=%release%
+
+IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
+
+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
+
+%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
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\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
+
+..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
+..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
+
+IF ERRORLEVEL 1 GOTO :showerror
+
+GOTO :EOF
+
+:showerror
+PAUSE
@@ -1,3 +1,4 @@
+
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <!-- 
@@ -13,18 +14,18 @@

  <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">
+ 
+ <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" />
+        <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 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)
@@ -47,11 +48,11 @@
                    }
                }
            ]]>
-      </Code>
+        </Code>
    </Task>
-  </UsingTask>
-
+ </UsingTask>

+ 
  <!-- 
 ****************************************************
 VARIABLES 
@@ -81,13 +82,16 @@
    <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
    <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
    <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
-    <ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
+   <ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
    <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>
@@ -98,6 +102,7 @@
    <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" />
@@ -109,16 +114,16 @@
 *****************************************************
 -->

-  <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
+ <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
    <Message Text="Build finished" />
-  </Target>
-
-  <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
-    <ItemGroup>
+ </Target>
+ 
+ <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
+   <ItemGroup>
      <WebPiFile Include="$(BuildZipFileNameWebPi)" />
-    </ItemGroup>
-    <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
-    <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
+   </ItemGroup>
+   <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
+   <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
  </Target>

  <Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
@@ -145,33 +150,22 @@
        DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />

    <!-- Zip the files -->
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
  </Target>

  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
    <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />

-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
+    <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>
-  
-  <Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
+
+  <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
    <MakeDir Directories="@(SystemFolders)" />
  </Target>

-  <Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
-    <ItemGroup>
-      <BelleFiles Include="..\src\Umbraco.Web.UI.Client\build\belle\**\*.*" Exclude="..\src\Umbraco.Web.UI.Client\build\belle\index.html" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(BelleFiles)"
-          DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
-          OverwriteReadOnlyFiles="true"
-          SkipUnchangedFiles="false" />
-  </Target>
-
  <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
    <!-- Copy SQL CE -->
    <ItemGroup>
@@ -204,7 +198,7 @@
  </Target>

  <!-- Copy the transformed web.config file to the root -->
-  <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
+ <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
    <ItemGroup>
      <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
    </ItemGroup>
@@ -213,24 +207,24 @@
        DestinationFiles="$(WebAppFolder)Web.config"
        OverwriteReadOnlyFiles="true"
        SkipUnchangedFiles="false" />
-  </Target>
-
-  <!-- Copy the config files and rename them to *.config.transform -->
-  <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
+ </Target>
+ 
+ <!-- Copy the config files and rename them to *.config.transform -->
+ <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
    <ItemGroup>
-      <ConfigFiles Include="$(WebAppFolder)config\*.config;$(WebAppFolder)config\*.js" />
-      <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(ConfigFiles)"
-        DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
-
-    <Copy SourceFiles="@(WebConfigTransformFile)"
-      DestinationFiles="$(ConfigsFolder)Web.config.transform"
-      OverwriteReadOnlyFiles="true"
-      SkipUnchangedFiles="false" />
+     <ConfigFiles Include="$(WebAppFolder)config\*.config" />
+	 <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
+   </ItemGroup>
+   
+   <Copy SourceFiles="@(ConfigFiles)"
+       DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+	   
+   <Copy SourceFiles="@(WebConfigTransformFile)"
+	   DestinationFiles="$(ConfigsFolder)Web.config.transform"
+	   OverwriteReadOnlyFiles="true"
+	   SkipUnchangedFiles="false" />
  </Target>

  <!-- Copy the xml documentation to the bin folder -->
@@ -247,31 +241,68 @@
  </Target>

  <!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
+  <!-- Also, it places umbraco.XmlSerializers.dll in the root, even though it's also in the bin folder. Kill! -->
  <Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
-    <ItemGroup>
-      <PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+	<ItemGroup>
+		<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+		<XmlSerializersDll Include="$(WebAppFolder)umbraco.XmlSerializers.dll" />
    </ItemGroup>
-    <RemoveDir Directories="@(PresentationFolderToDelete)" />
+	<RemoveDir Directories="@(PresentationFolderToDelete)" />
+    <Delete Files="@(XmlSerializersDll)" />
  </Target>

-  <Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
-
+  <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;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+    <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="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
-    <PropertyGroup>
-      <NewVersion>$(BUILD_RELEASE)</NewVersion>
-      <NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
-    </PropertyGroup>
+  <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)'!=''">
+	<PropertyGroup>
+		<NewVersion>$(BUILD_RELEASE)</NewVersion>
+		<NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
+	</PropertyGroup>
    <!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
    <FileUpdate
      Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
@@ -279,37 +310,11 @@
      ReplacementText="$(BUILD_RELEASE)"/>

    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
-      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
+      Regex="CurrentComment { get { return &quot;([a-zA-Z]+)?&quot;"
      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>
-
-    <!--This updates the AssemblyFileVersion for the solution to the umbraco version-->
-    <FileUpdate
-      Files="..\src\SolutionInfo.cs"
-      Regex="AssemblyFileVersion\(&quot;(.+)?&quot;\)"
-      ReplacementText="AssemblyFileVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
-
-    <!--This updates the AssemblyInformationalVersion for the solution to the umbraco version and comment-->
-    <FileUpdate 
-      Condition="'$(BUILD_COMMENT)'!=''"
-      Files="..\src\SolutionInfo.cs"
-      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
-      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_COMMENT)&quot;)"/>
-    <FileUpdate 
-      Condition="'$(BUILD_COMMENT)'==''"
-      Files="..\src\SolutionInfo.cs"
-      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
-      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
-    
-    <!--This updates the copyright year-->
-    <FileUpdate 
-      Condition="'$(BUILD_COMMENT)'==''"
-      Files="..\src\SolutionInfo.cs"
-      Regex="AssemblyCopyright\(&quot;Copyright © Umbraco (\d{4})&quot;\)"
-      ReplacementText="AssemblyCopyright(&quot;Copyright © Umbraco $([System.DateTime]::Now.ToString(`yyyy`))&quot;)"/>
-
-    <XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.props"
-               Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
-         Query="//x:UmbracoVersion"
-         Value="$(NewVersion)" />
+	<XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.targets"
+             Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
+			 Query="//x:UmbracoVersion"
+			 Value="$(NewVersion)" />
  </Target>
 </Project>
@@ -1,36 +0,0 @@
-@ECHO OFF
-SET release=%1
-ECHO Installing Npm NuGet Package
-
-SET nuGetFolder=%CD%\..\src\packages\
-ECHO Configured packages folder: %nuGetFolder%
-ECHO Current folder: %CD%
-
-%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%
-
-for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
-for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
-
-ECHO Temporarily adding Npm and Node to path
-SET oldPath=%PATH%
-
-path=%npmPath%;%nodePath%;%PATH%
-
-ECHO %path%
-
-SET buildFolder=%CD%
-
-ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
-CD %CD%\..\src\Umbraco.Web.UI.Client\
-
-ECHO Do npm install and the grunt build of Belle
-call npm install
-call npm install -g grunt-cli
-call npm install -g bower
-call grunt build --buildversion=%release%
-
-ECHO Reset path to what it was before
-path=%oldPath%
-
-ECHO Move back to the build folder
-CD %buildFolder% 
@@ -1,27 +0,0 @@
-##We cannot continue if sandcastle is not installed determined by env variable: SHFBROOT
-
-if (-not (Test-Path Env:\SHFBROOT))
-{
-	throw "The docs cannot be build, install Sandcastle help file builder"
-}
-
-$PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path).FullName
-$BuildRoot = Split-Path -Path $PSScriptFilePath -Parent
-$OutputPath = Join-Path -Path $BuildRoot -ChildPath "ApiDocs\Output"
-$ProjFile = Join-Path -Path $BuildRoot -ChildPath "ApiDocs\csharp-api-docs.shfbproj"
-
-"Building docs with project file:  $ProjFile"
-
-$MSBuild = "$Env:SYSTEMROOT\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
-
-# build it!
-& $MSBuild "$ProjFile"
-
-# remove files left over
-Remove-Item $BuildRoot\* -include csharp-api-docs.shfbproj_*
-
-# copy our custom styles in
-Copy-Item $BuildRoot\ApiDocs\TOC.css $OutputPath\TOC.css
-
-""
-"Done!"
@@ -1,33 +0,0 @@
-@ECHO OFF
-SET oldPath=%PATH%
-
-git.exe 2> NUL
-if %ERRORLEVEL%==9009 GOTO :trydefaultpath
-GOTO :EOF
-
-:trydefaultpath
-path=C:\Program Files (x86)\Git\cmd;%PATH%
-git.exe 2> NUL
-if %ERRORLEVEL%==9009 GOTO :showerror
-GOTO :EOF
-
-:showerror
-path=%oldPath%
-ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\bin 
-set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
-if %install%==y (
-	GOTO :installgit
-) else (
-	GOTO :cantcontinue
-)
-
-:cantcontinue
-ECHO Can't complete the build without Git being in the path. Please add it to be able to continue.
-GOTO :EOF
-
-:installgit
-ECHO Installing Chocolatey first
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
-ECHO Installing Git through Chocolatey
-choco install git
-path=C:\Program Files (x86)\Git\cmd;%path%
@@ -1,103 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>UmbracoCms.Core</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms Core Binaries</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-    <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.30506.0,6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi" version="[4.0.30506,6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi.WebHost" version="[4.0.30506, 6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi.Core" version="[4.0.30506, 6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.30506, 6.0.0)" />
-      <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" />
-      <dependency id="Microsoft.Net.Http" version="[2.0.20710.0, 3.0.0)" />
-      <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
-      <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
-      <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
-      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
-      <dependency id="MySql.Data" version="[6.9.6, 7.0.0)" />
-      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.8.3.1, 2.0.0)" />
-      <dependency id="ClientDependency-Mvc" version="[1.8.0, 2.0.0)" />
-      <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
-      <dependency id="Examine" version="[0.1.63, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[3.3.1, 5.0.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\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\interfaces.dll" target="lib\interfaces.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\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\SQLCE4Umbraco.xml" />
-    <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\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.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.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\UmbracoExamine.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
-    <file src="tools\install.core.ps1" target="tools\install.ps1" />
-
-	<!-- Added to be able to produce a symbols package -->
-	<file src="..\_BuildOutput\bin\SQLCE4Umbraco.pdb" target="lib" />
-    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
-	<file src="..\_BuildOutput\bin\businesslogic.pdb" target="lib" />
-    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
-	<file src="..\_BuildOutput\bin\cms.pdb" target="lib" />
-    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
-	<file src="..\_BuildOutput\bin\controls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
-	<file src="..\_BuildOutput\bin\interfaces.pdb" target="lib" />
-    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
-	<file src="..\_BuildOutput\bin\Umbraco.Core.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
-	<file src="..\_BuildOutput\bin\umbraco.DataLayer.pdb" target="lib" />
-    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
-	<file src="..\_BuildOutput\bin\umbraco.editorControls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
-	<file src="..\_BuildOutput\bin\umbraco.MacroEngines.pdb" target="lib" />
-    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
-	<file src="..\_BuildOutput\bin\umbraco.providers.pdb" target="lib" />
-    <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
-	<file src="..\_BuildOutput\bin\umbraco.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
-	<file src="..\_BuildOutput\bin\Umbraco.Web.UI.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
-	<file src="..\_BuildOutput\bin\UmbracoExamine.pdb" target="lib" />
-    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />	
-  </files>
+    <metadata>
+        <id>UmbracoCms.Core</id>
+        <version>6.2.3</version>
+        <title>Umbraco Cms Core Binaries</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+        <projectUrl>http://umbraco.com/</projectUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <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.30506.0,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi" version="[4.0.30506,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.WebHost" version="[4.0.30506, 5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.Core" version="[4.0.30506, 5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.30506, 5.0.0)" />
+            <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" />
+            <dependency id="Microsoft.Net.Http" version="[2.0.20710.0, 3.0.0)" />
+            <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
+            <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
+            <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
+            <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
+            <dependency id="MySql.Data" version="[6.6.5]" />
+            <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
+            <dependency id="ClientDependency" version="[1.7.1.2, 2.0.0)" />
+            <dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[4.5.11, 6.0.0)" />
+            <dependency id="Examine" version="[0.1.57, 1.0.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\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\interfaces.dll" target="lib\interfaces.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\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\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" />
+        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
+        <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\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="tools\install.core.ps1" target="tools\install.ps1" />
+    </files>
 </package>
@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="2.8">
-    <id>UmbracoCms</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
-    <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-    <dependencies>
-      <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
-    </dependencies>
-  </metadata>
+    <metadata>
+        <id>UmbracoCms</id>
+        <version>6.2.3</version>
+        <title>Umbraco Cms</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+        <projectUrl>http://umbraco.com/</projectUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
+        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <dependencies>
+            <dependency id="UmbracoCms.Core" version="[$version$]" />
+        </dependencies>
+    </metadata>
  <files>
-    <file src="..\_BuildOutput\Configs\**" target="Content\Config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
-    <file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" exclude="..\_BuildOutput\WebApp\Views\Web.config" />
-    <file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
-    <file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
-    <file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-    <file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-    <file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
-    <file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
-    <file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
-    <file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
-    <file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-    <file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
+	<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
+	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
+	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
+	<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\Views\**" target="Content\Views" exclude="..\_BuildOutput\WebApp\Views\Web.config" />
+	<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\Global.asax" target="Content\Global.asax" />
+	<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
+	<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />	
+	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
+	<file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\config\splashes" />
+	<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="tools\install.ps1" target="tools\install.ps1" />
    <file src="tools\Readme.txt" target="tools\Readme.txt" />
-    <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
-    <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
-    <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
-    <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-    <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
-    <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
-    <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
    <file src="build\**" target="build" />
  </files>
 </package>
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>UmbracoExamine.PDF</id>
-    <version>0.7.0</version>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>UmbracoExmine.PDF</description>
-    <tags>umbraco</tags>
-    <dependencies>
-      <dependency id="UmbracoCms.Core" version="[7.0.0, 8.0.0)" />
-      <dependency id="iTextSharp" version="[5.5.3, 6.0.0)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\_BuildOutput\UmbracoExamine.PDF\UmbracoExamine.PDF.dll" target="lib\UmbracoExamine.PDF.dll" />
-    <file src="..\_BuildOutput\UmbracoExamine.PDF\UmbracoExamine.PDF.XML" target="lib\UmbracoExamine.PDF.XML" />
-  </files>
-</package>
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <CopyAllFilesToSingleFolderForPackageDependsOn>
      AddUmbracoFilesToOutput;
      $(CopyAllFilesToSingleFolderForPackageDependsOn);
    </CopyAllFilesToSingleFolderForPackageDependsOn>
-    <CopyAllFilesToSingleFolderForMsdeployDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
      AddUmbracoFilesToOutput;
      $(CopyAllFilesToSingleFolderForPackageDependsOn);
    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UmbracoVersion>6.2.4</UmbracoVersion>
+  </PropertyGroup>
  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
+      <UmbracoFilesFolder>..\packages\UmbracoCms.$(UmbracoVersion)\UmbracoFiles\</UmbracoFilesFolder>
    </PropertyGroup>
    <ItemGroup>
      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
@@ -30,9 +33,6 @@
      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
        <Dir>Config\Splashes</Dir>
      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\data\**\*">
-        <Dir>data</Dir>
-      </CustomFilesToInclude>
      <CustomFilesToInclude Include=".\umbraco\**\*">
        <Dir>umbraco</Dir>
      </CustomFilesToInclude>
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<clientDependency xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <fileRegistration>
-    <providers>
-      <add name="CanvasProvider" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </providers>
-  </fileRegistration>
-</clientDependency>
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
-      <control showOnce="true" addPanel="true" panelCaption="" xdt:Transform="InsertIfMissing">
-        views/dashboard/settings/settingsdashboardintro.html
-      </control>
-    </tab>
-  </section>
-
-  <section alias="StartupFormsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas>
-      <area>forms</area>
-    </areas>
-    <tab caption="Install Umbraco Forms">
-      <control showOnce="true" addPanel="true" panelCaption="">
-        views/dashboard/forms/formsdashboardintro.html
-      </control>
-    </tab>
-  </section>
-
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
-      <control showOnce="true" addPanel="true" panelCaption="">
-        views/dashboard/developer/developerdashboardvideos.html
-      </control>
-    </tab>
-    <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-  </section>
-  
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
-      <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
-      <control>
-        views/dashboard/developer/examinemanagement.html
-      </control>
-    </tab>    
-  </section>
-  
-  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
-    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
-      <control showOnce="false" addPanel="false" panelCaption="">
-        views/dashboard/media/mediafolderbrowser.html
-      </control>
-    </tab>
-  </section>
-  
-  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Get Started" xdt:Transform="Insert">
-      <access>
-        <grant>admin</grant>
-      </access>
-      <control showOnce="true" addPanel="true" panelCaption="">
-        views/dashboard/default/startupdashboardintro.html
-      </control>
-    </tab>
-    <tab caption="Change password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Transform="Insert">
-      <control showOnce="false" addPanel="false" panelCaption="">
-        views/dashboard/ChangePassword.html
-      </control>
-    </tab>
-    <tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-  </section>
-  
-  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Get Started" xdt:Transform="Insert">
-      <control showOnce="true" addPanel="true" panelCaption="">
-        views/dashboard/members/membersdashboardvideos.html
-      </control>
-    </tab>
-  </section>
-  
-  <section alias="uGoLiveDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
-  
-  <section alias="ExamineManagement" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
-</dashBoard>
@@ -1,23 +1,26 @@
-
-  _    _ __  __ ____  _____           _____ ____  
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
-                                                   
----------------------------------------------------
-
-Don't forget to build!
+A note about running Umbraco from Visual Studio.

 When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
 file (and config files in the config folder). 
+We will overwrite Web.config anyway but we keep a backup in the App_Data\NuGetBackup folder. There you'll 
+find a folder with the current date and time in which the backup has been placed. Make sure to merge the 
+new file with the old backup files before you proceed.
+The web.config will be overwritten by default to ensure that it has the necessary settings from the current release. 

-This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
+We've also overwritten all the files in the Umbraco and Umbraco_Client folder, these have also been backed up in 
+App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or a package
+might have added. Only the existing files were overwritten. If you customized anything then make sure to do a compare 
+and merge with the NuGetBackup folder.
+
+The config files found in the config folder will usually not be changed for patch releases, so they can usually be skipped,
+but the web.config will have to have its previous "umbracoConfigurationStatus"-appsetting and "umbracoDbDSN" connection string
+copied over (as a minimum).
+
+This nuget package includes build targets that extends the creation of a deploy package, which is generated by 
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
 Publish this won't affect you.
-The following items will now be automatically included when creating a deploy package or publishing to the file 
-system: umbraco, umbraco_client, config\splashes and global.asax.
+These things will now be automatically included when creating a deploy package or publishing to the file system:
+umbraco, umbraco_client, config\splashes and global.asax.

 Please read the release notes on our.umbraco.org:
 http://our.umbraco.org/contribute/releases
@@ -1,33 +0,0 @@
-
-  _    _ __  __ ____  _____           _____ ____  
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
-                                                   
----------------------------------------------------
-
-Don't forget to build!
-
-When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
-file (and config files in the config folder). 
-
-We've done our best to transform your configuration files but in case something is not quite right: remember we
-backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
-
-We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in 
-App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or 
-a package might have added. Only the existing files were overwritten. If you customized anything then make 
-sure to do a compare and merge with the NuGetBackup folder.
-
-This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
-Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
-Publish this won't affect you.
-The following items will now be automatically included when creating a deploy package or publishing to the file 
-system: umbraco, umbraco_client, config\splashes and global.asax.
-
-Please read the release notes on our.umbraco.org:
-http://our.umbraco.org/contribute/releases
-
- Umbraco
@@ -1,182 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
-
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
-		<section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-	</sectionGroup>
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
-      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </sectionGroup>
-  </configSections>
-
-  <appSettings xdt:Transform="InsertIfMissing" />
-  <appSettings>
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-  </appSettings>
-
-  <umbracoConfiguration xdt:Transform="InsertIfMissing">
-    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-  </umbracoConfiguration>
-
-  <FileSystemProviders xdt:Transform="Remove" />
-  <BaseRestExtensions xdt:Transform="Remove" />
-
-  <system.data xdt:Transform="InsertIfMissing">
-    <DbProviderFactories xdt:Transform="InsertIfMissing">
-      <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
-      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />	  
-      <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
-    </DbProviderFactories>
-  </system.data>
-  <clientDependency xdt:Transform="RemoveAttributes(version)" />
-
-  <system.web xdt:Transform="InsertIfMissing" />
-  <system.web>
-    <siteMap xdt:Transform="Remove" />
-    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
-    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
-    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
-    <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
-    <compilation xdt:Transform="InsertIfMissing" />
-    <compilation>
-      <assemblies xdt:Transform="InsertIfMissing" />
-      <assemblies>
-        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)"
-    xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-      </assemblies>
-    </compilation>
-
-    <compilation>
-      <assemblies>
-        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-      </assemblies>
-    </compilation>
-
-    <xhtmlConformance xdt:Transform="Remove" />
-
-    <httpModules xdt:Transform="InsertIfMissing" />
-    <httpModules>
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </httpModules>
-
-    <httpHandlers xdt:Transform="InsertIfMissing" />
-    <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
-    </httpHandlers>
-  </system.web>
-
-  <system.webServer xdt:Transform="InsertIfMissing" />
-  <system.webServer>
-    <modules xdt:Transform="InsertIfMissing" />
-    <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
-      <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <!-- Inserts it as the first element. Also see http://stackoverflow.com/a/19041487/5018 -->
-      <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Insert" />
-
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </modules>
-
-    <staticContent xdt:Transform="InsertIfMissing" />
-    <staticContent>
-      <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-    </staticContent>
-
-    <handlers>
-      <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </handlers>
-  </system.webServer>
-
-  <system.codedom xdt:Transform="Remove" />
-
-  <runtime xdt:Transform="InsertIfMissing" />
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
-  </runtime>
-  
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
-    </assemblyBinding>
-  </runtime>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-
-  <system.web.webPages.razor xdt:Transform="Remove" />
-  
-  <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="umbraco" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-	  <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
-  
-  <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="App_Plugins" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-	  <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
-  
-</configuration>
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<applications xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <add alias="content" icon="traycontent" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="media" icon="traymedia" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="settings" icon="traysettings" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="developer" icon="traydeveloper" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="users" icon="trayusers" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="member" icon="traymember" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="forms" name="Forms" icon="icon-umb-contour" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing" />
-  <add alias="translation" icon="traytranslation" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon,sortOrder)" />
-</applications>
@@ -10,7 +10,7 @@ if ($project) {
 	New-Item -ItemType Directory -Force -Path $backupPath
 	New-Item -ItemType Directory -Force -Path $copyLogsPath
 	
-	# After backing up, remove all umbraco dlls from bin folder in case dll files are included in the VS project
+	# After backing up, remove all dlls from bin folder in case dll files are included in the VS project
 	# See: http://issues.umbraco.org/issue/U4-4930
 	$umbracoBinFolder = Join-Path $projectDestinationPath "bin"
 	if(Test-Path $umbracoBinFolder) {
@@ -19,56 +19,6 @@ if ($project) {
 		New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
 		
 		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
-		
-		# Delete files Umbraco brings in
-		if(Test-Path $umbracoBinFolder\businesslogic.dll) { Remove-Item $umbracoBinFolder\businesslogic.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\cms.dll) { Remove-Item $umbracoBinFolder\cms.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\controls.dll) { Remove-Item $umbracoBinFolder\controls.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\interfaces.dll) { Remove-Item $umbracoBinFolder\interfaces.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\log4net.dll) { Remove-Item $umbracoBinFolder\log4net.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\SQLCE4Umbraco.dll) { Remove-Item $umbracoBinFolder\SQLCE4Umbraco.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\TidyNet.dll) { Remove-Item $umbracoBinFolder\TidyNet.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.dll) { Remove-Item $umbracoBinFolder\umbraco.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.Core.dll) { Remove-Item $umbracoBinFolder\Umbraco.Core.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.DataLayer.dll) { Remove-Item $umbracoBinFolder\umbraco.DataLayer.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.editorControls.dll) { Remove-Item $umbracoBinFolder\umbraco.editorControls.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.MacroEngines.dll) { Remove-Item $umbracoBinFolder\umbraco.MacroEngines.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.providers.dll) { Remove-Item $umbracoBinFolder\umbraco.providers.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\UmbracoExamine.dll) { Remove-Item $umbracoBinFolder\UmbracoExamine.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\UrlRewritingNet.UrlRewriter.dll) { Remove-Item $umbracoBinFolder\UrlRewritingNet.UrlRewriter.dll -Force -Confirm:$false }
-		
-		# Delete files Umbraco depends upon
-		$amd64Folder = Join-Path $projectDestinationPath "bin\amd64"
-		if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false }
-		$x86Folder = Join-Path $projectDestinationPath "bin\x86"
-		if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false }		
-		if(Test-Path $umbracoBinFolder\AutoMapper.dll) { Remove-Item $umbracoBinFolder\AutoMapper.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\AutoMapper.Net4.dll) { Remove-Item $umbracoBinFolder\AutoMapper.Net4.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ClientDependency.Core.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ClientDependency.Core.Mvc.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.Mvc.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\CookComputing.XmlRpcV2.dll) { Remove-Item $umbracoBinFolder\CookComputing.XmlRpcV2.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Examine.dll) { Remove-Item $umbracoBinFolder\Examine.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\HtmlAgilityPack.dll) { Remove-Item $umbracoBinFolder\HtmlAgilityPack.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ICSharpCode.SharpZipLib.dll) { Remove-Item $umbracoBinFolder\ICSharpCode.SharpZipLib.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.Razor.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.WebPages.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Deployment.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Deployment.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }
+		Remove-Item $umbracoBinFolder\*.dll -Force -Confirm:$false
 	}
 }
@@ -1,28 +1,23 @@
 param($rootPath, $toolsPath, $package, $project)

-if ($project) {
-	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
+if ($project) {	
+    $dateTime = Get-Date -Format yyyyMMdd-HHmmss
 	$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
 	$copyLogsPath = Join-Path $backupPath "CopyLogs"
-	$projectDestinationPath = Split-Path $project.FullName -Parent
-
+	
 	# Create backup folder and logs folder if it doesn't exist yet
 	New-Item -ItemType Directory -Force -Path $backupPath
 	New-Item -ItemType Directory -Force -Path $copyLogsPath
 	
 	# Create a backup of original web.config
+	$projectDestinationPath = Split-Path $project.FullName -Parent
 	$webConfigSource = Join-Path $projectDestinationPath "Web.config"
 	Copy-Item $webConfigSource $backupPath -Force
 	
-	# Backup config files folder
-	$configFolder = Join-Path $projectDestinationPath "Config"
-	if(Test-Path $configFolder) {
-		$umbracoBackupPath = Join-Path $backupPath "Config"
-		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
-		
-		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
-	}
-	
+	# Copy Web.config from package to project folder
+	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\Web.config"
+	Copy-Item $umbracoFilesPath $projectDestinationPath -Force
+
 	# Copy umbraco and umbraco_files from package to project folder
 	# This is only done when these folders already exist because we 
 	# only want to do this for upgrades
@@ -47,46 +42,6 @@ if ($project) {
 		robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
 		robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
 	}
-
-	$copyWebconfig = $true
-	$destinationWebConfig = Join-Path $projectDestinationPath "Web.config"
-
-	if(Test-Path $destinationWebConfig) 
-	{
-		Try 
-		{
-			[xml]$config = Get-Content $destinationWebConfig
-			
-			$config.configuration.appSettings.ChildNodes | ForEach-Object { 
-				if($_.key -eq "umbracoConfigurationStatus") 
-				{
-					# The web.config has an umbraco-specific appSetting in it
-					# don't overwrite it and let config transforms do their thing
-					$copyWebconfig = $false 
-				}
-			}
-		} 
-		Catch { }
-	}
-	
-	if($copyWebconfig -eq $true) 
-	{
-		$packageWebConfigSource = Join-Path $rootPath "UmbracoFiles\Web.config"
-		Copy-Item $packageWebConfigSource $destinationWebConfig -Force
-	} 
-
-	$installFolder = Join-Path $projectDestinationPath "Install"
-	if(Test-Path $installFolder) {
-		Remove-Item $installFolder -Force -Recurse -Confirm:$false
-	}
-	
-	# Open appropriate readme
-	if($copyWebconfig -eq $true)  
-	{
-		$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
-	} 
-	else 
-	{	
-		$DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt')
-	}
+	# Open readme.txt file
+	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
 }
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<trees xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add alias="content" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(silent)" />
-  <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="templates" title="Templates" type="umbraco.loadTemplates, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add alias="dictionary" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
-  <add application="settings" alias="languages" title="Languages" type="umbraco.loadLanguages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="mediaTypes" title="Media Types" type="umbraco.loadMediaTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="nodeTypes" title="Document Types" type="umbraco.loadNodeTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add initialize="true" sortOrder="0" alias="datatype" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="member" alias="memberGroup" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="member" alias="memberType" title="Member Types" type="umbraco.loadMemberTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add alias="openTasks" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
-  <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add alias="yourTasks" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
-  <add application="developer" alias="python" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
-</trees>
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<settings xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <content>
-    <EnableCanvasEditing xdt:Transform="Remove" />
-  </content>
-  
-  <webservices xdt:Transform="Remove" />
-</settings>
@@ -1,2 +0,0 @@
-# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.2.6
@@ -0,0 +1,13 @@
+Umbraco CMS version 4.5 is licensed under the OSI approved MIT License:
+
+Copyright (c) 2007-2010 umbraco I/S.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Umbraco versions prior to 4.5 were licensed under a combination of MIT and a propriatary UI license.  The license history can be found here:
+http://umbraco.codeplex.com/license
@@ -0,0 +1,33 @@
+Umbraco - the simple, flexible and friendly ASP.NET CMS
+=======================================================
+For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 57.000 active websites including Heinz.com, Peugeot.com, NAIAS.com and Microsofts documentinteropinitiative.org website you can be sure that the technology is proven, stable and scales.
+
+More info at http://umbraco.com
+
+Exploring the repository
+========================
+Most contributors will work on their own fork and should pick the branch in which they need their fix. For more information see:
+http://our.umbraco.org/contribute/guidelines-for-core-contribution
+
+Exploring the source
+====================
+The Umbraco source code is never required for you to start building sites. If you are not using the source code for debugging purposes or to contribute to the source then please download the binaries listed at http://umbraco.codeplex.com
+
+With that said, the Umbraco solution can be opened in Visual Studio 2010 with SP1 installed or Visual Studio 2012.
+
+Contributing
+============
+Umbraco is Open Source which means you can contribute to make it great!
+Read all about it at http://our.umbraco.org/contribute
+
+Forums
+======
+We have a forum running on http://our.umbraco.org for friendly community support.
+
+Documentation
+=============
+Our documentation section provides help on installing and using Umbraco including API reference documentation: http://our.umbraco.org/documentation
+
+Submitting Issues
+=================
+Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our online guide at http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature
@@ -18,13 +18,13 @@
    
    <ItemGroup Condition=" '$(PackageSources)' == '' ">
        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <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/" />		
+      <PackageSource Include="http://www.myget.org/F/umbracocore/" />
    </ItemGroup>

    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
@@ -41,7 +41,7 @@
    
    <PropertyGroup>
        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
        
        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
@@ -50,14 +50,9 @@
        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
        
        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-        
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>

        <!-- We need to ensure packages are restored prior to assembly resolve -->
        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
@@ -75,6 +70,7 @@
    <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
@@ -123,7 +119,7 @@

                    Log.LogMessage("Downloading latest version of NuGet.exe...");
                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);

                    return true;
                }
@@ -135,4 +131,23 @@
            </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>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<actionScriptProperties analytics="false" mainApplicationPath="DesktopMediaUploader.mxml" projectUUID="9115d8c5-0cb4-4a34-8702-48456cca7762" version="6">
+  <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+    <compilerSourcePath/>
+    <libraryPath defaultLinkType="0">
+      <libraryPathEntry kind="4" path="">
+        <excludedEntries>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flex.swc" useDefaultLinkType="false"/>
+        </excludedEntries>
+      </libraryPathEntry>
+      <libraryPathEntry kind="1" linkType="1" path="libs"/>
+    </libraryPath>
+    <sourceAttachmentPath/>
+  </compiler>
+  <applications>
+    <application path="DesktopMediaUploader.mxml">
+      <airExcludes>
+        <airExclude path="assets/dmu_orange.fla"/>
+        <airExclude path="assets/logo.psd"/>
+        <airExclude path="assets/icon-128-old.png"/>
+        <airExclude path="assets/icon-128.psd"/>
+      </airExcludes>
+    </application>
+  </applications>
+  <modules/>
+  <buildCSSFiles/>
+</actionScriptProperties>
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="2"/>
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>DesktopMediaUploader</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.flexbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.apollobuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.adobe.flexbuilder.project.apollonature</nature>
+		<nature>com.adobe.flexbuilder.project.flexnature</nature>
+		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,3 @@
+#Tue Jul 20 11:35:49 BST 2010
+eclipse.preferences.version=1
+encoding/<project>=utf-8
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<application xmlns="http://ns.adobe.com/air/application/2.0">
+
+<!-- Adobe AIR Application Descriptor File Template.
+
+	Specifies parameters for identifying, installing, and launching AIR applications.
+
+	xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/2.0
+			The last segment of the namespace specifies the version 
+			of the AIR runtime required for this application to run.
+			
+	minimumPatchLevel - The minimum patch level of the AIR runtime required to run 
+			the application. Optional.
+-->
+
+	<!-- A universally unique application identifier. Must be unique across all AIR applications.
+	     Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+	<id>org.umbraco.DesktopMediaUploader</id>
+
+	<!-- Used as the filename for the application. Required. -->
+	<filename>Desktop Media Uploader</filename>
+
+	<!-- The name that is displayed in the AIR application installer. 
+	     May have multiple values for each language. See samples or xsd schema file. Optional. -->
+	<name>Desktop Media Uploader</name>
+
+	<!-- An application version designator (such as "v1", "2.5", or "Alpha 1"). Required. -->
+	<version>v2.1.0</version>
+
+	<!-- Description, displayed in the AIR application installer.
+	     May have multiple values for each language. See samples or xsd schema file. Optional. -->
+	<description>
+		This application allows you to upload media to an Umbraco website directly from your desktop.
+	</description>
+
+	<!-- Copyright information. Optional -->
+	<copyright>2010 Umbraco.org</copyright>
+
+	<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
+	<!-- <publisherID></publisherID> -->
+
+	<!-- Settings for the application's initial window. Required. -->
+	<initialWindow>
+		<!-- The main SWF or HTML file of the application. Required. -->
+		<!-- Note: In Flash Builder, the SWF reference is set automatically. -->
+		<content>DesktopMediaUploader.swf</content>
+		
+		<!-- The title of the main window. Optional. -->
+		<!-- <title></title> -->
+
+		<!-- The type of system chrome to use (either "standard" or "none"). Optional. Default standard. -->
+		<!-- <systemChrome></systemChrome> -->
+
+		<!-- Whether the window is transparent. Only applicable when systemChrome is none. Optional. Default false. -->
+		<!-- <transparent></transparent> -->
+
+		<!-- Whether the window is initially visible. Optional. Default false. -->
+		<!-- <visible></visible> -->
+
+		<!-- Whether the user can minimize the window. Optional. Default true. -->
+		<!-- <minimizable></minimizable> -->
+
+		<!-- Whether the user can maximize the window. Optional. Default true. -->
+		<!-- <maximizable></maximizable> -->
+
+		<!-- Whether the user can resize the window. Optional. Default true. -->
+		<!-- <resizable></resizable> -->
+
+		<!-- The window's initial width in pixels. Optional. -->
+		<!-- <width></width> -->
+
+		<!-- The window's initial height in pixels. Optional. -->
+		<!-- <height></height> -->
+
+		<!-- The window's initial x position. Optional. -->
+		<!-- <x></x> -->
+
+		<!-- The window's initial y position. Optional. -->
+		<!-- <y></y> -->
+
+		<!-- The window's minimum size, specified as a width/height pair in pixels, such as "400 200". Optional. -->
+		<!-- <minSize></minSize> -->
+
+		<!-- The window's initial maximum size, specified as a width/height pair in pixels, such as "1600 1200". Optional. -->
+		<!-- <maxSize></maxSize> -->
+	</initialWindow>
+
+    <!-- We recommend omitting the supportedProfiles element, -->
+    <!-- which in turn permits your application to be deployed to all -->
+    <!-- devices supported by AIR. If you wish to restrict deployment -->
+    <!-- (i.e., to only mobile devices) then add this element and list -->
+    <!-- only the profiles which your application does support. -->
+    <!-- <supportedProfiles>desktop extendedDesktop mobileDevice extendedMobileDevice</supportedProfiles> -->
+
+	<!-- The subpath of the standard default installation location to use. Optional. -->
+	<!-- <installFolder></installFolder> -->
+
+	<!-- The subpath of the Programs menu to use. (Ignored on operating systems without a Programs menu.) Optional. -->
+	<!-- <programMenuFolder></programMenuFolder> -->
+
+	<!-- The icon the system uses for the application. For at least one resolution,
+		 
+	     specify the path to a PNG file included in the AIR package. Optional. -->
+	<icon>
+
+		<image16x16>assets/icon-16.png</image16x16>
+
+		<image32x32>assets/icon-32.png</image32x32>
+
+		<image48x48>assets/icon-48.png</image48x48>
+
+		<image128x128>assets/icon-128.png</image128x128>
+
+	</icon>
+
+	<!-- Whether the application handles the update when a user double-clicks an update version
+	of the AIR file (true), or the default AIR application installer handles the update (false).
+	Optional. Default false. -->
+	<!-- <customUpdateUI></customUpdateUI> -->
+	
+	<!-- Whether the application can be launched when the user clicks a link in a web browser.
+	Optional. Default false. -->
+	<allowBrowserInvocation>true</allowBrowserInvocation>
+
+	<!-- Listing of file types for which the application can register. Optional. -->
+	<!-- <fileTypes> -->
+
+		<!-- Defines one file type. Optional. -->
+		<!-- <fileType> -->
+
+			<!-- The name that the system displays for the registered file type. Required. -->
+			<!-- <name></name> -->
+
+			<!-- The extension to register. Required. -->
+			<!-- <extension></extension> -->
+			
+			<!-- The description of the file type. Optional. -->
+			<!-- <description></description> -->
+			
+			<!-- The MIME content type. -->
+			<!-- <contentType></contentType> -->
+			
+			<!-- The icon to display for the file type. Optional. -->
+			<!-- <icon>
+				<image16x16></image16x16>
+				<image32x32></image32x32>
+				<image48x48></image48x48>
+				<image128x128></image128x128>
+			</icon> -->
+			
+		<!-- </fileType> -->
+	<!-- </fileTypes> -->
+
+</application>
@@ -0,0 +1,90 @@
+/* CSS file */
+@namespace s "library://ns.adobe.com/flex/spark";
+@namespace mx "library://ns.adobe.com/flex/mx";
+
+
+global
+{
+	focus-color: #EEB470;
+	selection-color: #EEB470;
+	roll-over-color: #EEEEEE;
+}
+
+mx|Tree
+{
+	textSelectedColor: #ffffff;
+	textRollOverColor: #000000;
+	selection-color: #f36f21;
+	roll-over-color: #cccccc;
+}
+
+#grpSignInForm s|Label
+{
+	paddingTop: 5px;
+}
+
+#grpSignInForm s|CheckBox s|Label
+{
+	paddingTop: 0;
+}
+
+.header
+{
+	borderColor: #7a7a7a;
+	backgroundColor: #7a7a7a;	
+	paddingTop: 25px;
+	paddingBottom: 25px;
+	paddingLeft: 25px;
+	paddingRight: 25px;
+}
+
+.header mx|Label
+{
+	color: #ffffff;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+.header s|DropDownList
+{
+	skinClass: ClassReference('org.umbraco.desktopmediauploader.skins.HeaderDropDownListSkin');
+	color: #ffffff;
+	content-background-color: #7a7a7a;
+	roll-over-color: #f36f22;
+}
+
+.header s|DropDownList s|Label
+{
+	font-size: 12px;
+	font-weight: normal;
+}
+
+#btnSignIn,
+#btnUpload
+{
+	cornerRadius: 5px;
+	borderThickness: 2px;
+	downSkin: Embed(source="assets/dmu_orange.swf", symbol="Button_downSkin");
+	overSkin: Embed(source="assets/dmu_orange.swf", symbol="Button_overSkin");
+	upSkin: Embed(source="assets/dmu_orange.swf", symbol="Button_upSkin");
+	paddingLeft: 20px;
+	paddingRight: 20px;
+	paddingTop: 7px;
+	paddingBottom: 7px;
+	color: #ffffff;
+	font-weight: bold;
+	font-size: 14px;
+	text-roll-over-color: #ffffff;
+	text-selected-color: #ffffff;
+	text-disabled-color: #cccccc;
+}
+
+.signOutButton
+{	
+	skinClass: ClassReference('org.umbraco.desktopmediauploader.skins.SignOutButtonSkin');
+}
+
+.removeButton
+{	
+	skinClass: ClassReference('org.umbraco.desktopmediauploader.skins.RemoveButtonSkin');
+}
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:WindowedApplication xmlns:fx="http://ns.adobe.com/mxml/2009" 
+					   xmlns:s="library://ns.adobe.com/flex/spark" 
+					   xmlns:mx="library://ns.adobe.com/flex/mx"
+					   skinClass="org.umbraco.desktopmediauploader.skins.ApplicationSkin" 
+					   width="330" height="600" showStatusBar="false" 
+					   xmlns:views="org.umbraco.desktopmediauploader.views.*"
+					   windowComplete="init();" >
+	
+	<fx:Style source="DesktopMediaUploader.css"/>
+	
+	<fx:Script>
+		<![CDATA[
+			
+			import org.umbraco.desktopmediauploader.events.*;
+			import org.umbraco.desktopmediauploader.util.*;
+			
+			import mx.controls.Alert;
+			
+			protected function init():void
+			{
+				StageHelper.stage = stage;
+				
+				NativeApplication.nativeApplication.addEventListener(BrowserInvokeEvent.BROWSER_INVOKE, app_BrowserInvoke);
+				
+				vwSignIn.addEventListener(SignedInEvent.SIGNED_IN, vwSignIn_SignedIn);
+				vwUpload.addEventListener(SignedOutEvent.SIGNED_OUT, vwUpload_SignOut);
+				
+				vwSignIn.init();
+			}
+			
+			protected function app_BrowserInvoke(e:BrowserInvokeEvent):void
+			{
+				vwSignIn.visible = true;
+				vwUpload.visible = false;
+			}
+			
+			protected function vwSignIn_SignedIn(e:SignedInEvent):void
+			{				
+				vwSignIn.visible = false;
+				vwUpload.visible = true;
+			}
+			
+			protected function vwUpload_SignOut(e:SignedOutEvent):void
+			{
+				vwSignIn.visible = true;
+				vwUpload.visible = false;
+			}
+			
+		]]>
+	</fx:Script>
+	
+	<fx:Declarations>
+		<!-- Place non-visual elements (e.g., services, value objects) here -->
+	</fx:Declarations>
+
+	
+	<views:SignInView id="vwSignIn" left="0" top="0" right="0" bottom="0">
+	</views:SignInView>
+	
+	<views:UploadView id="vwUpload" left="0" top="0" bottom="0" right="0" 
+					  visible="false">
+	</views:UploadView>
+	
+</s:WindowedApplication>
@@ -0,0 +1,21 @@
+package
+{
+	public class Model
+	{
+		[Bindable] public static var url:String;
+		[Bindable] public static var username:String;
+		[Bindable] public static var password:String;
+		[Bindable] public static var ticket:String;
+		
+		[Bindable] public static var displayName:String;
+		[Bindable] public static var umbracoPath:String;
+		[Bindable] public static var maxRequestLength:Number;
+		
+		[Bindable] public static var currentFolder:XML;
+		
+		[Bindable] public static var folderId:Number = 0;
+		[Bindable] public static var folderName:String = "";
+		[Bindable] public static var folderPath:String = "";
+		[Bindable] public static var replaceExisting:Boolean = false;
+	}
+}
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:TitleWindow xmlns:fx="http://ns.adobe.com/mxml/2009" 
+			   xmlns:s="library://ns.adobe.com/flex/spark" 
+			   xmlns:mx="library://ns.adobe.com/flex/mx" 
+			   width="260" height="350" title="Select a folder..." creationComplete="folderPickerDialog_CreationComplete(event)" 
+			   close="folderPickerDialog_Close(event)" borderVisible="true" chromeColor="#EEEEEE" borderColor="#666666">
+	<s:layout>
+		<s:VerticalLayout/>
+	</s:layout>
+	
+	<fx:Script>
+		<![CDATA[
+			import org.umbraco.desktopmediauploader.events.*;
+			import org.umbraco.desktopmediauploader.net.*;
+			
+			import mx.controls.Alert;
+			import mx.events.CloseEvent;
+			import mx.events.FlexEvent;
+			import mx.managers.*;
+
+			protected function folderPickerDialog_CreationComplete(event:FlexEvent):void
+			{
+				CursorManager.setBusyCursor();
+				
+				DmuRequest.makeRequest(DmuRequestAction.FOLDER_LIST,
+					folderListLoader_Complete,
+					folderListLoader_Error);
+			}
+			
+			protected function folderListLoader_Complete(event:DmuRequestEvent):void
+			{
+				CursorManager.removeBusyCursor();
+				
+				var xml:XML = event.result;
+				
+				trFolders.dataProvider = xml.folder;
+				trFolders.labelField = "@name";
+				trFolders.validateNow();
+				
+				// Reselect current folder
+				if (Model.folderId)
+				{
+					var node:XMLList = xml..folder.(@id == Model.folderId.toString());
+					if (node.length() > 0)
+					{
+						expandParents(node[0]);
+
+						trFolders.selectedItem = node[0];
+						
+						var idx:int = trFolders.getItemIndex(node[0]);
+						trFolders.scrollToIndex(idx);
+					}
+					else
+					{
+						Model.folderId = undefined;
+						Model.folderName = undefined;
+					}
+				}
+			}
+			
+			protected function folderListLoader_Error(event:Event):void
+			{
+				CursorManager.removeBusyCursor();
+				
+				Alert.show("Unable to load folder list", "Ooops!");
+			}
+			
+			protected function folderPickerDialog_Close(event:CloseEvent):void
+			{
+				PopUpManager.removePopUp(this);
+			}
+
+
+			protected function trFolders_DoubleClick(event:MouseEvent):void
+			{
+				var item:XML = trFolders.selectedItem as XML;
+				
+				Model.currentFolder = item;
+				Model.folderId = item.@id;
+				Model.folderName = item.@name;
+				
+				var pathItem:XML = item;
+				var path:String = pathItem.@name;
+				while(pathItem.parent())
+				{
+					pathItem = pathItem.parent();
+					
+					if(pathItem.@name != undefined)
+					{
+						path = pathItem.@name +"/"+ path;
+					}
+				}
+				
+				Model.folderPath = path;
+				
+				PopUpManager.removePopUp(this);
+			}
+			
+			private function expandParents(node:XML):void 
+			{	
+				if (node && !trFolders.isItemOpen(node)) 
+				{
+					trFolders.expandItem(node, true);
+					expandParents(node.parent());
+				}
+			}
+
+		]]>
+	</fx:Script>
+	
+	<fx:Declarations>
+		<!-- Place non-visual elements (e.g., services, value objects) here -->
+	</fx:Declarations>
+	
+	<mx:Tree width="100%" height="100%" id="trFolders"
+			 defaultLeafIcon="@Embed('assets/folder.png')" 
+			 folderClosedIcon="@Embed('assets/folder.png')" 
+			 folderOpenIcon="@Embed('assets/folder-open.png')" 
+			 paddingLeft="5" paddingRight="5" paddingTop="2" paddingBottom="2" 
+			 doubleClickEnabled="true" doubleClick="trFolders_DoubleClick(event)" borderVisible="false"></mx:Tree>
+	
+</s:TitleWindow>
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:BorderContainer xmlns:fx="http://ns.adobe.com/mxml/2009" 
+				   xmlns:s="library://ns.adobe.com/flex/spark" 
+				   xmlns:mx="library://ns.adobe.com/flex/mx"
+				   backgroundColor="#e7e7e7" borderColor="#CCCCCC" 
+				   width="100%" height="30">
+	
+	<fx:Declarations>
+		<!-- Place non-visual elements (e.g., services, value objects) here -->
+	</fx:Declarations>
+	
+	<fx:Script>
+		<![CDATA[
+			
+			[Bindable] public var totalItems:int;
+			
+			protected function btnUploadRemove_Click(event:MouseEvent):void
+			{
+				dispatchEvent(new Event(Event.CANCEL));
+			}
+			
+		]]>
+	</fx:Script>
+	
+	<mx:Image left="7" source="@Embed('assets/information.png')" width="16" height="16" verticalCenter="0"/>
+	<mx:Label id="lblUploadName" text="Total of {totalItems} File{(totalItems == 1)? '' : 's'}" fontWeight="bold" fontSize="12" color="#999999" left="27" truncateToFit="true" minWidth="0" right="35" verticalCenter="0"/>
+	<s:Button id="btnUploadRemove" width="16" height="16" top="5" right="5" useHandCursor="true" buttonMode="true" styleName="removeButton" click="btnUploadRemove_Click(event)" />
+	
+</s:BorderContainer>
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:BorderContainer xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:mx="library://ns.adobe.com/flex/mx" 
+		 backgroundColor="#F5F5F5" borderColor="#CCCCCC" 
+		 borderColor.Error="#C50101" backgroundColor.Error="#F3DBDB"
+		 height.Ready="45" height="60" width="100%">
+	
+	<s:layout>
+		<s:BasicLayout/>
+	</s:layout>
+	
+	<fx:Script>
+		<![CDATA[
+			
+			import org.umbraco.desktopmediauploader.events.*;
+			import org.umbraco.desktopmediauploader.net.*;
+			import org.umbraco.desktopmediauploader.util.*;
+			
+			import flash.desktop.*;
+			import flash.events.*;
+			import flash.filesystem.*;
+			import flash.net.*;
+			
+			import org.osmf.utils.URL;
+
+			[Bindable] public var file:FileReference;
+			[Bindable] public var path:String;
+			
+			[Bindable] public var uploading:Boolean = false;;
+			[Bindable] public var uploaded:Boolean = false;
+			
+			public function get fullPath():String
+			{
+				return path + "/" + file.name;
+			}
+			
+			protected function btnUploadRemove_Click(event:MouseEvent):void
+			{
+				cancel();
+			}
+			
+			protected function file_Complete(event:DataEvent):void
+			{
+				uploading = false;
+
+				var result:String = StringHelper.cleanXmlString(event.data);
+				var xml:XML = new XML(result);
+				if (xml.@success == "true")
+				{
+					uploaded = true;
+					
+					dispatchEvent(new Event(Event.COMPLETE));
+				}
+				else
+				{
+					file_SecurityError(new SecurityErrorEvent(SecurityErrorEvent.SECURITY_ERROR));
+				}
+			}
+			
+			protected function file_Progress(event:ProgressEvent):void
+			{
+				dispatchEvent(event);
+			}
+			
+			protected function file_HttpError(event:HTTPStatusEvent):void
+			{
+				setCurrentState("Error");
+				
+				dispatchEvent(event);
+			}
+			
+			protected function file_IOError(event:IOErrorEvent):void
+			{
+				setCurrentState("Error");
+				
+				dispatchEvent(event);
+			}
+			
+			protected function file_SecurityError(event:SecurityErrorEvent):void
+			{
+				setCurrentState("Error");
+				
+				dispatchEvent(event);
+			}
+			
+			public function upload():void
+			{
+				setCurrentState("Uploading");
+				
+				uploading = true;
+				
+				var vars:URLVariables = new URLVariables();
+				vars.parentNodeId = Model.folderId;
+				vars.replaceExisting = Model.replaceExisting ? "1" : "0";
+				vars.path = path;
+					
+				var req:URLRequest = DmuRequest.getRequest(DmuRequestAction.UPLOAD, vars);
+				
+				file.addEventListener(DataEvent.UPLOAD_COMPLETE_DATA, file_Complete);
+				file.addEventListener(ProgressEvent.PROGRESS, file_Progress);
+				file.addEventListener(HTTPStatusEvent.HTTP_STATUS, file_HttpError);
+				file.addEventListener(IOErrorEvent.IO_ERROR, file_IOError);
+				file.addEventListener(SecurityErrorEvent.SECURITY_ERROR, file_SecurityError);
+				file.upload(req);
+			}
+			
+			public function pause():void
+			{
+				if (uploading)
+					file.cancel();
+				
+				uploading = false;
+			}
+			
+			public function cancel():void
+			{
+				pause();
+				
+				dispatchEvent(new Event(Event.CANCEL));
+			}
+			
+			private function trim( s:String ):String
+			{
+				return s.replace( /^([\s|\t|\n]+)?(.*)([\s|\t|\n]+)?$/gm, "$2" );
+			}
+			
+		]]>
+	</fx:Script>
+	
+	<s:states>
+		<s:State name="Ready"/>
+		<s:State name="Uploading"/>
+		<s:State name="Error"/>
+	</s:states>
+	
+	<mx:Image top="6" left="5" source="@Embed('assets/page.png')"/>
+	<mx:Label id="lblUploadName" text="{file.name}" fontWeight="bold" color="#000000" left="40" top="4" truncateToFit="true" minWidth="0" right="35" />
+	<s:Button id="btnUploadRemove" width="16" height="16" top="5" right="5" useHandCursor="true" buttonMode="true" click="btnUploadRemove_Click(event)" styleName="removeButton" />
+	<mx:ProgressBar id="pbUploadProgress" labelPlacement="top" label="" source="{file}" bottom="5" left="5" right="5" excludeFrom="Ready" />
+	<mx:Label id="lblUploadPath" left="40" top="20" right="35" fontSize="11" color="#CCCCCC" truncateToFit="true" minWidth="0" fontAntiAliasType="advanced" fontGridFitType="pixel" fontThickness="200" fontSharpness="400"
+			  htmlText="&lt;font color='#666666'&gt;{Model.folderPath.replace(/\//g, ' › ')}&lt;/font&gt;{path.replace(/\//g, ' › ')}"/>
+	
+</s:BorderContainer>
@@ -0,0 +1,19 @@
+package org.umbraco.desktopmediauploader.events
+{
+	import flash.events.Event;
+	
+	public class DmuRequestEvent extends Event
+	{
+		public static const SUCCESS:String = "success";
+		public static const ERROR:String = "error";
+		
+		public var result:XML;
+		
+		public function DmuRequestEvent(type:String, result:XML = null, bubbles:Boolean=false, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+			
+			this.result = result;
+		}
+	}
+}
@@ -0,0 +1,18 @@
+package org.umbraco.desktopmediauploader.events
+{
+	import flash.events.Event;
+	
+	public class SignedInEvent extends Event
+	{
+		public static const SIGNED_IN:String = "signedIn";
+		
+		public function SignedInEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+
+		override public function clone():Event {
+			return new SignedInEvent(type, bubbles, cancelable);
+		}
+	}
+}
@@ -0,0 +1,18 @@
+package org.umbraco.desktopmediauploader.events
+{
+	import flash.events.Event;
+	
+	public class SignedOutEvent extends Event
+	{
+		public static const SIGNED_OUT:String = "signedOut";
+
+		public function SignedOutEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+
+		override public function clone():Event {
+			return new SignedOutEvent(type, bubbles, cancelable);
+		}
+	}
+}
@@ -0,0 +1,77 @@
+package org.umbraco.desktopmediauploader.net
+{
+	import org.umbraco.desktopmediauploader.events.*;
+	import org.umbraco.desktopmediauploader.util.*;
+	
+	import flash.events.*;
+	import flash.net.*;
+	
+	public class DmuRequest extends EventDispatcher
+	{
+		public function DmuRequest(action:String, vars:URLVariables = null, target:IEventDispatcher = null)
+		{
+			super(target);
+			
+			var req:URLRequest = getRequest(action, vars);
+			
+			var loader:URLLoader = new URLLoader();
+			loader.addEventListener(Event.COMPLETE, loader_Success);
+			loader.addEventListener(IOErrorEvent.IO_ERROR, loader_Error);
+			loader.load(req);
+		}
+		
+		private function loader_Success(event:Event):void
+		{
+			var loader:URLLoader = event.target as URLLoader;
+			if (loader != null)
+			{
+				var result:String = StringHelper.cleanXmlString(loader.data);
+				var xml:XML = new XML(result);
+				if (xml.@success == "true")
+				{
+					dispatchEvent(new DmuRequestEvent(DmuRequestEvent.SUCCESS, xml));
+				}
+				else
+				{
+					loader_Error();
+				}
+			}
+			else
+			{
+				loader_Error();
+			}
+		}
+		
+		private function loader_Error(event:IOErrorEvent = null):void
+		{
+			dispatchEvent(new DmuRequestEvent(DmuRequestEvent.ERROR));
+		}
+		
+		public static function getRequest(action:String, vars:URLVariables = null):URLRequest
+		{
+			var loaderUrl:String = Model.url +"/umbraco/webservices/mediauploader.ashx";
+			
+			if (vars == null)
+				vars = new URLVariables();
+			
+			vars.action = action;
+			vars.username = Model.username;
+			vars.password = Model.password;
+			vars.ticket = Model.ticket;
+			
+			var req:URLRequest = new URLRequest(loaderUrl);
+			req.data = vars;
+			req.method = URLRequestMethod.POST;
+			
+			return req;
+		}
+		
+		public static function makeRequest(action:String, successCallback:Function, errorCallback:Function,
+										   vars:URLVariables = null):void
+		{
+			var req:DmuRequest = new DmuRequest(action, vars);
+			req.addEventListener(DmuRequestEvent.SUCCESS, successCallback);
+			req.addEventListener(DmuRequestEvent.ERROR, errorCallback);
+		}
+	}
+}
@@ -0,0 +1,9 @@
+package org.umbraco.desktopmediauploader.net
+{
+	public class DmuRequestAction
+	{
+		public static var CONFIG:String = "config";
+		public static var FOLDER_LIST:String = "folderList";
+		public static var UPLOAD:String = "upload";
+	}
+}
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- http://blog.flexexamples.com/2009/03/13/setting-a-linear-gradient-background-on-an-fxapplication-container-in-flex-gumbo/ -->
+<s:Skin xmlns:fx="http://ns.adobe.com/mxml/2009"
+		xmlns:s="library://ns.adobe.com/flex/spark"
+		xmlns:fb="http://ns.adobe.com/flashbuilder/2009"
+		alpha.disabled="0.5"
+		alpha.disabledWithControlBar="0.5">
+	
+	<s:states>
+		<s:State name="normal" />
+		<s:State name="disabled" />
+		<s:State name="normalWithControlBar" />
+		<s:State name="disabledWithControlBar" />
+		<s:State name="normalAndInactive" />
+	</s:states>
+	
+	<fx:Metadata>
+		<![CDATA[
+		[HostComponent("spark.components.Application")]
+		]]>
+	</fx:Metadata>
+	
+	<!-- fill -->
+	<!---
+	A rectangle with a solid color fill that forms the background of the application.
+	The color of the fill is set to the Application's backgroundColor property.
+	-->
+	<s:Rect id="backgroundRect" left="0" right="0" top="0" bottom="0"  >
+		<s:fill>
+			<s:LinearGradient rotation="90">
+				<s:GradientEntry color="#cccccc" />
+				<s:GradientEntry color="#eeeeee" ratio="0.2" />
+				<s:GradientEntry color="#ffffff" ratio="0.8" />
+			</s:LinearGradient>
+		</s:fill>
+	</s:Rect>
+	
+	<s:Group left="0" right="0" top="0" bottom="0">
+		<s:layout>
+			<s:VerticalLayout gap="0" horizontalAlign="justify" />
+		</s:layout>
+		
+		<s:Group id="topGroup" minWidth="0" minHeight="0"
+				 includeIn="normalWithControlBar, disabledWithControlBar" >
+			
+			<!-- layer 0: control bar highlight -->
+			<s:Rect left="0" right="0" top="0" bottom="1" >
+				<s:stroke>
+					<s:LinearGradientStroke rotation="90" weight="1">
+						<s:GradientEntry color="0xFFFFFF" />
+						<s:GradientEntry color="0xD8D8D8" />
+					</s:LinearGradientStroke>
+				</s:stroke>
+			</s:Rect>
+			
+			<!-- layer 1: control bar fill -->
+			<s:Rect left="1" right="1" top="1" bottom="2" >
+				<s:fill>
+					<s:LinearGradient rotation="90">
+						<s:GradientEntry color="0xEDEDED" />
+						<s:GradientEntry color="0xCDCDCD" />
+					</s:LinearGradient>
+				</s:fill>
+			</s:Rect>
+			
+			<!-- layer 2: control bar divider line -->
+			<s:Rect left="0" right="0" bottom="0" height="1" alpha="0.55">
+				<s:fill>
+					<s:SolidColor color="0x000000" />
+				</s:fill>
+			</s:Rect>
+			
+			<!-- layer 3: control bar -->
+			<s:Group id="controlBarGroup" left="0" right="0" top="1" bottom="1" minWidth="0" minHeight="0">
+				<s:layout>
+					<s:HorizontalLayout paddingLeft="10" paddingRight="10" paddingTop="7" paddingBottom="7" gap="10" />
+				</s:layout>
+			</s:Group>
+		</s:Group>
+		
+		<s:Group id="contentGroup" width="100%" height="100%" minWidth="0" minHeight="0" />
+		
+	</s:Group>
+	
+</s:Skin>
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+
+ADOBE SYSTEMS INCORPORATED
+Copyright 2009 Adobe Systems Incorporated
+All Rights Reserved.
+
+NOTICE: Adobe permits you to use, modify, and distribute this file
+in accordance with the terms of the license agreement accompanying it.
+
+-->
+
+<!--- The default skin class for a Spark DefaultItemRenderer class.  
+
+@langversion 3.0
+@playerversion Flash 10
+@playerversion AIR 1.5
+@productversion Flex 4
+-->
+<s:ItemRenderer focusEnabled="false" xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" useHandCursor="true" buttonMode="true">
+	
+	<s:states>
+		<s:State name="normal" />            
+		<s:State name="hovered" />
+		<s:State name="selected" />
+		<s:State name="normalAndShowsCaret"/>
+		<s:State name="hoveredAndShowsCaret"/>
+		<s:State name="selectedAndShowsCaret"/>
+	</s:states>
+	
+	<s:Rect left="0" right="0" top="0" bottom="0">
+		<s:stroke.normalAndShowsCaret>
+			<s:SolidColorStroke 
+				color="{getStyle('selectionColor')}" 
+				weight="1"/>
+		</s:stroke.normalAndShowsCaret>
+		<s:stroke.hoveredAndShowsCaret>
+			<s:SolidColorStroke 
+				color="{getStyle('selectionColor')}" 
+				weight="1"/>
+		</s:stroke.hoveredAndShowsCaret>
+		<s:stroke.selectedAndShowsCaret>
+			<s:SolidColorStroke 
+				color="{getStyle('selectionColor')}" 
+				weight="1"/>
+		</s:stroke.selectedAndShowsCaret>
+		<s:fill>
+			<s:SolidColor 
+				color.normal="0x9a9a9a" 
+				color.normalAndShowsCaret="0x9a9a9a" 
+				color.hovered="{getStyle('rollOverColor')}"	
+				color.hoveredAndShowsCaret="{getStyle('rollOverColor')}"
+				color.selected="{getStyle('selectionColor')}"
+				color.selectedAndShowsCaret="{getStyle('selectionColor')}"
+				/>
+		</s:fill>
+	</s:Rect>
+	<s:Label id="labelDisplay" verticalCenter="0" left="5" right="5" top="6" bottom="4"/>
+	
+</s:ItemRenderer>
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ADOBE SYSTEMS INCORPORATED
+Copyright 2009 Adobe Systems Incorporated
+All Rights Reserved.
+
+NOTICE: Adobe permits you to use, modify, and distribute this file
+in accordance with the terms of the license agreement accompanying it.
+
+-->
+<!--- The default skin class for the anchor button on a Spark DropDownList component.  
+
+@see spark.components.DropDownList        
+@see spark.skins.spark.DropDownListSkin
+
+@langversion 3.0
+@playerversion Flash 10
+@playerversion AIR 1.5
+@productversion Flex 4
+-->
+<s:Skin xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" 
+		xmlns:fb="http://ns.adobe.com/flashbuilder/2009" minWidth="21" minHeight="21">
+	
+	<fx:Metadata>
+		<![CDATA[ 
+		/** 
+		* @copy spark.skins.spark.ApplicationSkin#hostComponent
+		*/
+		[HostComponent("spark.components.Button")]
+		]]>
+	</fx:Metadata> 
+	
+	
+	<!-- states -->
+	<s:states>
+		<s:State name="up" />
+		<s:State name="over" />
+		<s:State name="down" />
+		<s:State name="disabled" />
+	</s:states>
+
+	<!-- Layer 2: innerFill -->
+	<s:Rect id="innerFill" left="0" right="0" top="0" bottom="0" radiusX="0">
+		<s:fill>
+			<s:SolidColor color="0x9a9a9a" color.up="0x8a8a8a" />
+		</s:fill>
+	</s:Rect>
+	
+	<!-- layer 8: arrow -->
+	<!--- The arrow graphic displayed in the anchor button. -->
+	<s:Path right="6" verticalCenter="0" id="arrow"
+			data="M 7.03 0.5 C 7.43 0.9 7.43 1.55 7.03 1.95 L 4.64 4.34 C 4.24 4.74 3.59 4.74 3.19 4.34 L 0.8 1.95 C 0.4 1.55 0.4 0.9 0.8 0.5 L 7.03 0.5 Z">
+		<s:fill>
+			<s:SolidColor color="0xFFFFFF" />
+		</s:fill>
+	</s:Path>
+</s:Skin>
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ADOBE SYSTEMS INCORPORATED
+Copyright 2009 Adobe Systems Incorporated
+All Rights Reserved.
+
+NOTICE: Adobe permits you to use, modify, and distribute this file
+in accordance with the terms of the license agreement accompanying it.
+
+--> 
+<!--- The default skin class for the Spark DropDownList component. 
+The skin for the anchor button for a DropDownList component 
+is defined by the DropDownListButtonSkin class.  
+
+@see spark.components.DropDownList        
+@see spark.skins.spark.DropDownListButtonSkin
+
+@langversion 3.0
+@playerversion Flash 10
+@playerversion AIR 1.5
+@productversion Flex 4
+-->
+<s:Skin xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" 
+		xmlns:fb="http://ns.adobe.com/flashbuilder/2009" alpha.disabled=".5"> 
+	
+	<!-- host component -->
+	<fx:Metadata>
+		<![CDATA[ 
+		/** 
+		* @copy spark.skins.spark.ApplicationSkin#hostComponent
+		*/
+		[HostComponent("spark.components.DropDownList")]
+		]]>
+	</fx:Metadata> 
+	
+	<s:states>
+		<s:State name="normal" />
+		<s:State name="open" />
+		<s:State name="disabled" />
+	</s:states>
+	
+	<!--- 
+	The PopUpAnchor control that opens the drop-down list. 
+	-->
+	<s:PopUpAnchor id="popUp"  displayPopUp.normal="false" displayPopUp.open="true" includeIn="open"
+				   left="0" right="0" top="0" bottom="0" itemDestructionPolicy="auto"
+				   popUpPosition="below" popUpWidthMatchesAnchorWidth="true">
+		
+		<!--- 
+		The drop down area of the skin. 
+		This includes borders, background colors, scrollers, and filters. 
+		-->
+		<s:Group id="dropDown" maxHeight="134" >
+			
+			<!-- fill -->
+			<!---  
+			Defines the appearance of drop-down list's background fill.
+			-->
+			<s:Rect id="background" left="0" right="0" top="0" bottom="0" >
+				<s:fill>
+					<!---  
+					The color of the drop down's background fill.
+					The default color is 0xFFFFFF.
+					-->
+					<s:SolidColor id="bgFill" color="0x9a9a9a" />
+				</s:fill>
+			</s:Rect>
+			
+			<s:Scroller id="scroller" left="0" top="0" right="0" bottom="0" hasFocusableChildren="false" minViewportInset="1">
+				<!---  
+				The container for the data items in the drop-down list.
+				-->
+				<s:DataGroup id="dataGroup" itemRenderer="org.umbraco.desktopmediauploader.skins.DefaultItemRenderer">
+					<s:layout>
+						<s:VerticalLayout gap="0" horizontalAlign="contentJustify"/>
+					</s:layout>
+				</s:DataGroup> 
+			</s:Scroller>
+		</s:Group>
+	</s:PopUpAnchor>
+	
+	<!--- The anchor button used by the DropDownList. The default skin is DropDownListButtonSkin. -->
+	<s:Button id="openButton" left="0" right="0" top="0" bottom="0" focusEnabled="false"
+			  skinClass="org.umbraco.desktopmediauploader.skins.HeaderDropDownListButtonSkin" />  
+	
+	<!--- The prompt area of the DropDownList. -->
+	<s:Label id="labelDisplay" verticalAlign="middle" maxDisplayedLines="1" 
+			 mouseEnabled="false" mouseChildren="false"
+			 left="5" right="20" top="2" bottom="2" width="75" verticalCenter="1" /> 
+	
+</s:Skin>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:SparkSkin xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" 
+             xmlns:fb="http://ns.adobe.com/flashbuilder/2009" 
+			 xmlns:mx="library://ns.adobe.com/flex/mx"
+			minWidth="21" minHeight="21" alpha.disabled="0.5">
+    
+    <!-- host component -->
+    <fx:Metadata>
+        <![CDATA[ 
+        	[HostComponent("spark.components.Button")]
+        ]]>
+    </fx:Metadata>
+    
+    <!-- states -->
+    <s:states>
+        <s:State name="up" />
+        <s:State name="over" />
+        <s:State name="down" />
+        <s:State name="disabled" />
+    </s:states>
+    
+	<mx:Image source="@Embed('assets/cross-grey.png')"
+		source.over="@Embed('assets/cross.png')"    
+		/>
+    
+</s:SparkSkin>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:SparkSkin xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" 
+             xmlns:fb="http://ns.adobe.com/flashbuilder/2009" 
+			 xmlns:mx="library://ns.adobe.com/flex/mx"
+			minWidth="21" minHeight="21" alpha.disabled="0.5">
+    
+    <!-- host component -->
+    <fx:Metadata>
+        <![CDATA[ 
+        	[HostComponent("spark.components.Button")]
+        ]]>
+    </fx:Metadata>
+    
+    <!-- states -->
+    <s:states>
+        <s:State name="up" />
+        <s:State name="over" />
+        <s:State name="down" />
+        <s:State name="disabled" />
+    </s:states>
+    
+	<mx:Image source="@Embed('assets/power.png')"
+		source.over="@Embed('assets/power-over.png')"    
+		/>
+    
+</s:SparkSkin>
@@ -0,0 +1,176 @@
+package org.umbraco.desktopmediauploader.util
+{
+	import flash.utils.ByteArray;
+	
+	public class Base64
+	{
+		private static const _encodeChars:Vector.<int> = InitEncoreChar();
+		private static const _decodeChars:Vector.<int> = InitDecodeChar();
+		
+		public static function encode(data:ByteArray):String
+		{
+			var out:ByteArray = new ByteArray();
+			//Presetting the length keep the memory smaller and optimize speed since there is no "grow" needed
+			out.length = (2 + data.length - ((data.length + 2) % 3)) * 4 / 3; //Preset length //1.6 to 1.5 ms
+			var i:int = 0;
+			var r:int = data.length % 3;
+			var len:int = data.length - r;
+			var c:int;   //read (3) character AND write (4) characters
+			
+			while (i < len)
+			{
+				//Read 3 Characters (8bit * 3 = 24 bits)
+				c = data[i++] << 16 | data[i++] << 8 | data[i++];   
+				
+				//Cannot optimize this to read int because of the positioning overhead. (as3 bytearray seek is slow)
+				//Convert to 4 Characters (6 bit * 4 = 24 bits)
+				c = (_encodeChars[c >>> 18] << 24) | (_encodeChars[c >>> 12 & 0x3f] << 16) | (_encodeChars[c >>> 6 & 0x3f] << 8 ) | _encodeChars[c & 0x3f];
+				
+				//Optimization: On older and slower computer, do one write Int instead of 4 write byte: 1.5 to 0.71 ms
+				out.writeInt(c);
+				/*
+				out.writeByte(_encodeChars[c >> 18] );
+				out.writeByte(_encodeChars[c >> 12 & 0x3f]);
+				out.writeByte(_encodeChars[c >> 6 & 0x3f]);
+				out.writeByte(_encodeChars[c & 0x3f]);
+				*/
+			}   
+			
+			if (r == 1) //Need two "=" padding
+			{
+				//Read one char, write two chars, write padding
+				c = data[i];
+				c = (_encodeChars[c >>> 2] << 24) | (_encodeChars[(c & 0x03) << 4] << 16) | 61 << 8 | 61;
+				out.writeInt(c);
+			}
+			else if (r == 2) //Need one "=" padding
+			{
+				c = data[i++] << 8 | data[i];
+				c = (_encodeChars[c >>> 10] << 24) | (_encodeChars[c >>> 4 & 0x3f] << 16) | (_encodeChars[(c & 0x0f) << 2] << 8 ) | 61;
+				out.writeInt(c);
+			}   
+			
+			out.position = 0;
+			return out.readUTFBytes(out.length);
+		}   
+		
+		public static function decode(str:String):ByteArray
+		{
+			var c1:int;
+			var c2:int;
+			var c3:int;
+			var c4:int;
+			var i:int;
+			var len:int;
+			var out:ByteArray;
+			len = str.length;
+			i = 0;
+			out = new ByteArray();
+			var byteString:ByteArray = new ByteArray();
+			byteString.writeUTFBytes(str);
+			while (i < len)
+			{
+				//c1
+				do
+				{
+					c1 = _decodeChars[byteString[i++]];
+				} while (i < len && c1 == -1);
+				if (c1 == -1) break;   
+				
+				//c2
+				do
+				{
+					c2 = _decodeChars[byteString[i++]];
+				} while (i < len && c2 == -1);
+				if (c2 == -1) break;    
+				
+				out.writeByte((c1 << 2) | ((c2 & 0x30) >> 4));   
+				
+				//c3
+				do
+				{
+					c3 = byteString[i++];
+					if (c3 == 61) return out;   
+					
+					c3 = _decodeChars[c3];
+				} while (i < len && c3 == -1);
+				if (c3 == -1) break;   
+				
+				out.writeByte(((c2 & 0x0f) << 4) | ((c3 & 0x3c) >> 2));   
+				
+				//c4
+				do {
+					c4 = byteString[i++];
+					if (c4 == 61) return out;
+					
+					c4 = _decodeChars[c4];
+				} while (i < len && c4 == -1);
+				if (c4 == -1) break;   
+				
+				out.writeByte(((c3 & 0x03) << 6) | c4);   
+				
+			}
+			return out;
+		}   
+		
+		public static function encodeString(value : String) : String
+		{
+			const source : ByteArray = new ByteArray();
+			source.writeUTFBytes(value);
+			return encode(source);
+		}
+		
+		public static function decodeToString(str : String) : String
+		{
+			return decode(str).toString();
+		}
+		
+		public static function InitEncoreChar() : Vector.<int>
+		{
+			var encodeChars:Vector.<int> = new Vector.<int>();
+			
+			// We could push the number directly, but i think it's nice to see the characters (with no overhead on encode/decode)
+			var chars:String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+			for (var i:int = 0; i < 64; i++)
+			{
+				encodeChars.push(chars.charCodeAt(i));
+			}
+			/*
+			encodeChars.push(
+			65, 66, 67, 68, 69, 70, 71, 72,
+			73, 74, 75, 76, 77, 78, 79, 80,
+			81, 82, 83, 84, 85, 86, 87, 88,
+			89, 90, 97, 98, 99, 100, 101, 102,
+			103, 104, 105, 106, 107, 108, 109, 110,
+			111, 112, 113, 114, 115, 116, 117, 118,
+			119, 120, 121, 122, 48, 49, 50, 51,
+			52, 53, 54, 55, 56, 57, 43, 47);
+			*/
+			return encodeChars;
+		}
+		
+		public static function InitDecodeChar() : Vector.<int>
+		{
+			var decodeChars:Vector.<int> = new Vector.<int>();
+			
+			decodeChars.push(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+				52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+				-1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+				15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+				-1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+				41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+				-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1);
+			return decodeChars;
+		}
+	}
+
+}
@@ -0,0 +1,47 @@
+package org.umbraco.desktopmediauploader.util
+{
+	import flash.display.Stage;
+	import flash.events.Event;
+
+	public class StageHelper
+	{
+		private static var _stage:Stage;
+		private static var _resizeListenerSet:Boolean = false;
+		
+		[Bindable]
+		public static var stageWidth:int = 0;
+		
+		[Bindable]
+		public static var stageHeight:int = 0;
+		
+		public function StageHelper()
+		{ }
+		
+		public static function set stage(value:Stage):void
+		{
+			_stage = value;
+			
+			addResizeListener();
+			
+			stage_resize();
+		}
+		
+		private static function addResizeListener():void
+		{
+			if (_resizeListenerSet)
+				return;
+			
+			if(!_stage)
+				return;
+			
+			_stage.addEventListener(Event.RESIZE, stage_resize);
+			_resizeListenerSet = true;
+		}
+		
+		private static function stage_resize(e:Event = null):void
+		{
+			stageWidth = _stage.stageWidth;
+			stageHeight = _stage.stageHeight;
+		}
+	}
+}
@@ -0,0 +1,16 @@
+package org.umbraco.desktopmediauploader.util
+{
+	import mx.utils.*;
+	
+	public class StringHelper
+	{
+		public static function cleanXmlString(str:String):String
+		{
+			// Remove any Byte Order Markers
+			str = str.replace(String.fromCharCode(65279), "");
+			
+			// Trim whitespace
+			return StringUtil.trim(str);
+		}
+	}
+}
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:mx="library://ns.adobe.com/flex/mx" 
+		 width="100%" height="100%"
+		 show="vwSignIn_ShowHandler(event);">
+	
+	<s:layout>
+		<s:BasicLayout/>
+	</s:layout>
+
+	<fx:Script>
+		<![CDATA[
+			import org.umbraco.desktopmediauploader.events.*;
+			import org.umbraco.desktopmediauploader.net.*;
+			import org.umbraco.desktopmediauploader.util.*;
+			
+			import mx.controls.Alert;
+			import mx.managers.*;
+			import mx.events.FlexEvent;
+			
+
+			public function init():void
+			{
+				NativeApplication.nativeApplication.addEventListener(BrowserInvokeEvent.BROWSER_INVOKE, app_BrowserInvoke);
+				
+				reset();
+				
+				if(chkAutoSignIn.selected)
+				{
+					doSignIn();
+				}
+			}
+			
+			protected function vwSignIn_ShowHandler(event:FlexEvent):void
+			{
+				reset();
+			}
+			
+			protected function app_BrowserInvoke(e:BrowserInvokeEvent):void
+			{
+				var encLaunchArg:String = unescape(e.arguments[0]);
+				var launchArg:String = Base64.decodeToString(encLaunchArg);
+				var launchArgs:Array = launchArg.split(";");
+				
+				Model.url = parseUrl(launchArgs[0]);
+				Model.username = launchArgs[1];
+				Model.password = "";
+				Model.ticket = launchArgs[2];
+				
+				// Ok, time to hit the server
+				CursorManager.setBusyCursor();
+				this.enabled = false;
+				
+				// Authenticate credentials
+				// NB: As every request authenticates anyway, just load config
+				// and if it fails, assume login was invalid
+				DmuRequest.makeRequest(DmuRequestAction.CONFIG,
+					configRequest_Success,
+					configRequest_Error);
+			}
+			
+			protected function reset():void
+			{
+				chkRememberMe.selected = (getEncryptedValue("dmu_rememberme") == "true");
+				chkRememberPassword.selected = (getEncryptedValue("dmu_rememberpassword") == "true");
+				chkAutoSignIn.selected = (getEncryptedValue("dmu_autosignin") == "true");
+				
+				if (chkRememberMe.selected)
+				{
+					txtUrl.text = getEncryptedValue("dmu_url");
+					txtUsername.text = getEncryptedValue("dmu_username");
+					if (chkRememberPassword.selected)
+					{
+						txtPassword.text = getEncryptedValue("dmu_password");
+					}
+				}
+			}
+			
+			protected function txtPassword_Enter(event:Event):void
+			{
+				doSignIn();
+			}
+			
+			protected function btnSignIn_clickHandler(event:MouseEvent=null):void
+			{
+				doSignIn();
+			}
+			
+			protected function configRequest_Success(event:DmuRequestEvent):void
+			{
+				this.enabled = true;
+				CursorManager.removeBusyCursor();
+				
+				var xml:XML = event.result;
+				
+				// Store config
+				Model.displayName = xml.displayName;
+				Model.umbracoPath = xml.umbracoPath;
+				Model.maxRequestLength = Number(xml.maxRequestLength);
+
+				// Remember login
+				if(!Model.ticket || Model.ticket == "")
+				{
+					setEncryptedValue("dmu_url", (chkRememberMe.selected)? Model.url : null);
+					setEncryptedValue("dmu_username", (chkRememberMe.selected)? Model.username : null);
+					setEncryptedValue("dmu_password", (chkRememberMe.selected && chkRememberPassword.selected) ? Model.password : null);
+					setEncryptedValue("dmu_rememberme", chkRememberMe.selected.toString());
+					setEncryptedValue("dmu_rememberpassword", chkRememberPassword.selected.toString());
+					setEncryptedValue("dmu_autosignin", chkAutoSignIn.selected.toString());
+				}
+				
+				dispatchEvent(new SignedInEvent(SignedInEvent.SIGNED_IN));
+			}
+			
+			protected function configRequest_Error(event:Event):void
+			{
+				this.enabled = true;
+				CursorManager.removeBusyCursor();
+				
+				Alert.show("Invalid login", "Ooops!");
+			}
+			
+			private function doSignIn():void
+			{
+				Model.url = parseUrl(txtUrl.text);
+				Model.username = txtUsername.text;
+				Model.password = txtPassword.text;
+				Model.ticket = "";
+				
+				// Ok, time to hit the server
+				CursorManager.setBusyCursor();
+				this.enabled = false;
+				
+				// Authenticate credentials
+				// NB: As every request authenticates anyway, just load config
+				// and if it fails, assume login was invalid
+				DmuRequest.makeRequest(DmuRequestAction.CONFIG,
+					configRequest_Success,
+					configRequest_Error);
+			}
+			
+			private function parseUrl(url:String):String
+			{
+				var urlPattern:RegExp = /^((?P<scheme>https?):\/\/)(?P<hostname>[^:\/\s]+)(?P<port>:([^\/]*))?((?P<path>(\/\w+)*\/)(?P<filename>[-\w.]+[^#?\s]*)?(?P<query>\?([^#]*))?(?P<fragment>#(.*))?)?$/gi;
+				var result:Array = urlPattern.exec(url.toLowerCase());
+				if (result != null && result.length > 0)
+				{
+					var parsedUrl:String = result.scheme + "://" + result.hostname + result.port + result.path + result.filename;
+					
+					while(parsedUrl.substr(parsedUrl.length - 1) == "/")
+					{
+						parsedUrl = parsedUrl.substr(0, parsedUrl.length - 1);
+					}
+					
+					return parsedUrl;
+				}
+				return url;
+			}
+			
+			private function setEncryptedValue(key:String, value:String):void
+			{
+				if (value != null)
+				{
+					var data:ByteArray = new ByteArray();
+					data.writeUTFBytes(value);
+					EncryptedLocalStore.setItem(key, data);
+				}
+				else
+				{
+					EncryptedLocalStore.removeItem(key);
+				}
+			}
+			
+			private function getEncryptedValue(key:String):String
+			{
+				var data:ByteArray = EncryptedLocalStore.getItem(key);
+				return (data != null) ? data.readUTFBytes(data.length) : null;
+			}
+
+		]]>
+	</fx:Script>
+
+	<fx:Metadata>
+		[Event(name="signedIn", type="org.umbraco.desktopmediauploader.events.SignedInEvent")]
+	</fx:Metadata>
+	
+	<fx:Declarations>
+		<!-- Place non-visual elements (e.g., services, value objects) here -->
+	</fx:Declarations>
+	
+	<mx:Image horizontalCenter="0" source="@Embed('assets/logo.png')" verticalCenter="-145"/>
+	<s:VGroup id="grpSignInForm" height="200" bottom="105" left="25" right="25">
+		<s:Label text="URL" fontWeight="bold"/>
+		<s:TextInput width="100%" id="txtUrl" text="@{Model.url}"/>
+		<s:Label text="Username" fontWeight="bold"/>
+		<s:TextInput width="100%" id="txtUsername" text="@{Model.username}"/>
+		<s:Label text="Password" fontWeight="bold"/>
+		<s:TextInput width="100%" id="txtPassword" displayAsPassword="true" text="@{Model.password}" enter="txtPassword_Enter(event)" />
+		<s:CheckBox label="Remember Me" id="chkRememberMe" change="(!chkRememberMe.selected) ? chkRememberPassword.selected = chkAutoSignIn.selected = false : null"/>
+		<s:CheckBox label="Remember Password" id="chkRememberPassword" enabled="{chkRememberMe.selected}" change="(!chkRememberPassword.selected) ? chkAutoSignIn.selected = false : null"/>
+		<s:CheckBox label="Sign In Automaticaly" id="chkAutoSignIn" enabled="{chkRememberPassword.selected}"/>
+	</s:VGroup>
+	<mx:Button label="Sign In" bottom="25" id="btnSignIn" click="btnSignIn_clickHandler(event)" left="25" right="25" height="35" useHandCursor="true" buttonMode="true" styleName=""/>
+	
+</s:Group>
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:mx="library://ns.adobe.com/flex/mx" 
+		 xmlns:components="org.umbraco.desktopmediauploader.components.*"
+		 width="100%" height="100%" 
+		 creationComplete="vwUpload_CreationCompleteHandler(event)" 
+		 show="vwUpload_ShowHandler(event);">
+	
+	<s:layout>
+		<s:BasicLayout/>
+	</s:layout>
+	
+	<fx:Script>
+		<![CDATA[
+			import org.umbraco.desktopmediauploader.components.*;
+			import org.umbraco.desktopmediauploader.events.*;
+			import org.umbraco.desktopmediauploader.net.*;
+			import org.umbraco.desktopmediauploader.util.*;
+			
+			import flash.desktop.*;
+			import flash.events.*;
+			import flash.filesystem.File;
+			import flash.net.*;
+			
+			import mx.collections.Sort;
+			import mx.collections.SortField;
+			import mx.controls.Alert;
+			import mx.controls.Menu;
+			import mx.core.ScrollPolicy;
+			import mx.events.FlexEvent;
+			import mx.managers.*;
+			
+			import spark.events.IndexChangeEvent;
+			
+			[Bindable] public var currentUploadItem:UploadItem;
+			[Bindable] public var uploadItems:ArrayCollection;
+			
+			[Bindable] private var uploading:Boolean = false;
+			
+			protected function vwUpload_CreationCompleteHandler(event:FlexEvent):void
+			{
+				uploadItems = new ArrayCollection();
+				
+				addEventListener(NativeDragEvent.NATIVE_DRAG_ENTER, vwUpload_DragEnter);
+				addEventListener(NativeDragEvent.NATIVE_DRAG_DROP, vwUpload_DragDrop);
+				
+				dmuStatus.addEventListener(Event.CANCEL, dmuStatus_Cancel);
+			}
+			
+			protected function vwUpload_ShowHandler(event:FlexEvent):void
+			{
+				reset();
+			}
+			
+			private function vwUpload_DragEnter(e:NativeDragEvent) :void
+			{
+				var valid:Boolean = false;
+				if(e.clipboard.hasFormat(ClipboardFormats.FILE_LIST_FORMAT))
+				{
+					// Only allow drop if at least 1 file is valid
+					var files:Array = e.clipboard.getData(ClipboardFormats.FILE_LIST_FORMAT) as Array;
+					for each (var f:File in files)
+					{
+						if (isValidFile(f))
+						{
+							valid = true;
+							break;
+						}
+					}
+
+					if (valid)
+						NativeDragManager.acceptDragDrop(this);
+				}
+			}
+			
+			private function vwUpload_DragDrop(e:NativeDragEvent) :void
+			{
+				var files:Array = e.clipboard.getData(ClipboardFormats.FILE_LIST_FORMAT) as Array;
+				
+				addFilesToQueue(files);
+				
+				// Sort alphabeticlly
+				var sf:SortField = new SortField("fullPath", true);
+				var s:Sort = new Sort();
+				s.fields = [sf];
+				
+				uploadItems.sort = s;
+				uploadItems.refresh();
+				
+				for(var i:int = 0; i < uploadItems.length; i++)
+				{
+					grpUploadItemContainer.addElement(uploadItems[i]);
+				}
+			}
+			
+			private function reset():void
+			{
+				Model.currentFolder = undefined;
+				Model.folderId = undefined;
+				Model.folderName = undefined;
+				Model.folderPath = undefined;
+				
+				uploading = false;
+				currentUploadItem == null;
+				
+				dmuStatus_Cancel();
+			}
+			
+			private function isValidFile(file:File, path:String = ""):Boolean
+			{
+				var queued:Boolean = false;
+				
+				var i:int = uploadItems.length;
+				while(i--)
+				{
+					var uploadItem:UploadItem = uploadItems[i] as UploadItem;
+					if (uploadItem != null && uploadItem.file.name == file.name && uploadItem.path == path && uploadItem.file.size == file.size)
+					{
+						queued = true;
+						break;
+					}
+				}
+				
+				// TODO: Handle .lnk files?
+				// TODO: What to do with zip files?
+				return (!file.isSymbolicLink && 
+					!file.isPackage && 
+					!file.isHidden && 
+					!queued &&
+					file.size <= (Model.maxRequestLength * 1024));
+			}
+			
+			private function addFilesToQueue(files:Array, path:String = ""):void
+			{
+				for each (var f:File in files)
+				{
+					if(f.isDirectory)
+					{
+						addFilesToQueue(f.getDirectoryListing(), path + "/" + f.name)
+					} 
+					else if (isValidFile(f, path))
+					{
+						addFileToQueue(FileReference(f), path);
+					}
+				}
+			}
+			
+			private function addFileToQueue(file:FileReference, path:String):void
+			{
+				var uploadItem:UploadItem = new UploadItem();
+				uploadItem.file = file;
+				uploadItem.path = path;
+				uploadItem.addEventListener(Event.COMPLETE, uploadItem_Complete);
+				uploadItem.addEventListener(Event.CANCEL, uploadItem_Cancel);
+				uploadItem.addEventListener(HTTPStatusEvent.HTTP_STATUS, uploadItem_Error);
+				uploadItem.addEventListener(IOErrorEvent.IO_ERROR, uploadItem_Error);
+				uploadItem.addEventListener(SecurityErrorEvent.SECURITY_ERROR, uploadItem_Error);
+				
+				grpUploadItemContainer.addElement(uploadItem);
+				uploadItems.addItem(uploadItem);
+			}
+			
+			protected function ddlConnectedTo_Close(e:Event):void
+			{
+				var oldIndex:Number = ddlConnectedTo.selectedIndex;
+				ddlConnectedTo.selectedIndex = -1;
+				
+				if (oldIndex >= 0)
+				{
+					switch(ddlConnectedTo.dataProvider[oldIndex])
+					{
+						case "Launch Site":
+							navigateToURL(new URLRequest(Model.url));
+							break;
+						case "Launch Admin":
+							navigateToURL(new URLRequest(Model.url + Model.umbracoPath + "/"));
+							break;
+					}
+				}
+			}
+			
+			protected function btnSignOut_Click(e:Event):void
+			{
+				if (uploading)
+					Alert.show("Unable to sign out whilst uploading files.", "Ooops!");
+				else 
+					dispatchEvent(new SignedOutEvent(SignedOutEvent.SIGNED_OUT));
+			}
+			
+			protected function uploadItem_Complete(e:Event):void
+			{
+				uploadItem_Cancel(e);
+				
+				uploading = false;
+				currentUploadItem == null;
+				
+				if (uploadItems.length > 0)
+					btnUpload_Click();
+				else
+					Alert.show("Upload complete.", "Woo hoo!");
+			}
+			
+			protected function uploadItem_Cancel(e:Event):void
+			{
+				var uploadItem:UploadItem = e.target as UploadItem;
+				
+				var i:uint = uploadItems.length;
+				while(i--)
+				{
+					var uploadItem2:UploadItem = uploadItems[i] as UploadItem;
+					if(uploadItem2.file.name == uploadItem.file.name && uploadItem2.path == uploadItem.path)
+					{
+						grpUploadItemContainer.removeElement(uploadItem);
+						uploadItems.removeItemAt(i);
+						break;
+					}
+				}
+			}
+			
+			protected function uploadItem_Error(e:Event):void
+			{
+				// TODO: Move item to bottom?
+			}
+
+			protected function dmuStatus_Cancel(event:Event = null):void
+			{
+				var i:uint = uploadItems.length;
+				while(i--)
+				{
+					uploadItems[i].cancel();
+				}
+			}
+
+			protected function btnUploadTo_Click(event:MouseEvent):void
+			{
+				var win:FolderPickerDialog = PopUpManager.createPopUp(this, FolderPickerDialog, true) as FolderPickerDialog;
+
+				PopUpManager.centerPopUp(win);
+			}
+
+
+			protected function btnUpload_Click(event:MouseEvent = null):void
+			{
+				var uploadItem:UploadItem;
+				var i:int;
+				
+				if (!uploading)
+				{
+					uploading = false;
+					currentUploadItem = null;
+					
+					for(i = 0; i < uploadItems.length; i++)
+					{
+						uploadItem = uploadItems[i] as UploadItem;
+						if (!uploadItem.uploaded)
+						{
+							currentUploadItem = uploadItem;
+							currentUploadItem.upload();
+							uploading = true;
+							break;
+						}
+					}
+				}
+				else
+				{
+					for(i = 0; i < uploadItems.length; i++)
+					{
+						uploadItem = uploadItems[i] as UploadItem;
+						if (!uploadItem.uploaded)
+						{
+							uploadItem.pause();
+						}
+					}
+					
+					uploading = false;
+					currentUploadItem = null;
+				}
+			}
+
+		]]>
+	</fx:Script>
+	
+	<fx:Metadata>
+		[Event(name="signedOut", type="org.umbraco.desktopmediauploader.events.SignedOutEvent")]
+	</fx:Metadata>
+	
+	<fx:Declarations>
+		<fx:Array id="uploadMenuItems">
+			<fx:Object label="Clear Queue" />
+			<fx:Object type="separator" />
+			<fx:Object label="Overwrite existing files" type="check" />
+			<fx:Object label="Auto extract zip files" type="check" />
+		</fx:Array>
+	</fx:Declarations>
+	
+	<s:BorderContainer top="0" left="0" right="0" height="70" styleName="header">
+		<mx:Image source="@Embed('assets/icon-48.png')" x="10" y="10" />
+		<mx:Label id="lblName" text="{Model.displayName}" left="64" y="10" right="50" truncateToFit="true" minWidth="0" />
+		<s:DropDownList id="ddlConnectedTo" prompt="{Model.url}" close="ddlConnectedTo_Close(event)" x="65" y="33" typicalItem="{Model.url}" maxWidth="{StageHelper.stageWidth - 90}" open="ddlConnectedTo.scroller.setStyle('horizontalScrollPolicy', ScrollPolicy.OFF);" useHandCursor="true" buttonMode="true">
+			<mx:ArrayCollection>
+				<fx:String>Launch Site</fx:String>
+				<fx:String>Launch Admin</fx:String>
+			</mx:ArrayCollection>
+		</s:DropDownList>
+		<s:Button id="btnSignOut" width="13" height="15" top="11" right="25" useHandCursor="true" buttonMode="true" styleName="signOutButton" click="btnSignOut_Click(event)" />
+		
+	</s:BorderContainer>
+	
+	<s:VGroup top="90" left="25" right="25" gap="5">
+		<s:Label text="Upload files to..."/>
+		<s:Button id="btnUploadTo" label="{(Model.folderPath) ? Model.folderPath.replace(/\//g, ' › ') : 'Please select...'}"  width="100%" click="btnUploadTo_Click(event)" creationComplete="btnUploadTo.labelDisplay.setStyle('textAlign','left')"  height="25" useHandCursor="true" buttonMode="true" />
+	</s:VGroup>
+	
+	<s:BorderContainer top="150" left="25" right="25" bottom="100" borderColor="#CCCCCC" backgroundColor="#FFFFFF">
+		<s:Scroller width="100%" height="100%">
+			<s:Group id="grpUploadItemContainer">
+				<s:layout>
+					<s:VerticalLayout paddingLeft="5" paddingRight="5" paddingTop="5" paddingBottom="5" gap="5"/>
+				</s:layout>
+				<components:StatusItem id="dmuStatus" visible="{uploadItems.length &gt; 0}" includeInLayout="{uploadItems.length &gt; 0}" totalItems="{uploadItems.length}" />
+				<s:Label text="Drag Files and Folders Here To Upload" verticalAlign="middle" textAlign="center" 
+						 width="100%" height="100%" fontSize="20" color="#CCCCCC" id="lblInstructions" 
+						 paddingLeft="20" paddingRight="20" paddingTop="20" paddingBottom="20"
+						 visible="{uploadItems.length == 0}" includeInLayout="{uploadItems.length == 0}"/>
+			</s:Group>
+		</s:Scroller>
+	</s:BorderContainer>
+	<s:CheckBox x="25" bottom="73" label="Overwrite existing files with the same filename?" id="chkReplace" selected="@{Model.replaceExisting}"  color="#333333"/>
+	<mx:Button id="btnUpload" label="{!uploading ? 'Upload' : 'Cancel'}" useHandCursor="{btnUpload.enabled}" buttonMode="{btnUpload.enabled}" bottom="25" enabled="{uploadItems.length > 0 &amp;&amp; Model.folderId}" styleName="orange" height="35" left="25" right="25" click="btnUpload_Click(event)"/>
+</s:Group>
@@ -0,0 +1,31 @@
+/*******************************************************************************************
+
+    Umbraco database installation script for SQL CE (upgrade from Umbraco 4.0.x)
+ 
+	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+ 
+    Database version: 4.8.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.
+    The first 3 digits depict the Umbraco version, the last digit is the database version.
+    (e.g. version 4.0.0.3 means "Umbraco version 4.0.0, database version 3")
+    
+    Check-in policy: only commit this script if
+     * you ran the Umbraco installer completely;
+     * you ran it on the targetted database system;
+     * you ran the Runway and Module installations;
+     * you were able to browse the Boost site;
+     * you were able to open the Umbraco administration panel;
+     * you have documented the code change in this script;
+     * you have incremented the version number in this script.
+ 
+	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+
+********************************************************************************************/
+
+/* REMOVE CONSTRAINTS */
+ALTER TABLE [umbracoUser2app] DROP CONSTRAINT [FK_umbracoUser2app_umbracoApp] 
+;
+ALTER TABLE [umbracoAppTree] DROP CONSTRAINT [FK_umbracoAppTree_umbracoApp] 
+;
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>SQLCE4Umbraco</RootNamespace>
    <AssemblyName>SQLCE4Umbraco</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SccProjectName>
    </SccProjectName>
@@ -22,7 +22,6 @@
    </SccProvider>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -32,7 +31,6 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -42,7 +40,6 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <DocumentationFile>bin\Release\SQLCE4Umbraco.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@@ -73,13 +70,26 @@
    <Compile Include="SqlCEInstaller.cs" />
    <Compile Include="SqlCEParameter.cs" />
    <Compile Include="SqlCeProviderException.cs" />
+    <Compile Include="SqlCEResources1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>SqlCEResources.resx</DependentUpon>
+    </Compile>
    <Compile Include="SqlCETableUtility.cs" />
    <Compile Include="SqlCEUtility.cs" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="app.config" />
+    <Content Include="Sql\Total.sql" />
    <None Include="app.config" />
    <None Include="packages.config" />
+    <None Include="Sql\Version4_1_Upgrade.sql" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SqlCEResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>SqlCEResources1.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
@@ -42,13 +42,6 @@ namespace SqlCE4Umbraco
            {
                var sqlCeEngine = new SqlCeEngine(ConnectionString);
                sqlCeEngine.CreateDatabase();
-
-                // SD: Pretty sure this should be in a using clause but i don't want to cause unknown side-effects here
-                // since it's been like this for quite some time
-                //using (var sqlCeEngine = new SqlCeEngine(ConnectionString))
-                //{
-                //    sqlCeEngine.CreateDatabase();    
-                //}
            }
        }

@@ -229,17 +222,5 @@ namespace SqlCE4Umbraco
            return new SqlCeDataReaderHelper(SqlCeApplicationBlock.ExecuteReader(ConnectionString, CommandType.Text,
                                                            commandText, parameters));
        }
-
-
-        internal IRecordsReader ExecuteReader(string commandText)
-        {
-            return ExecuteReader(commandText, new SqlCEParameter(string.Empty, string.Empty));
-        }
-
-
-        internal int ExecuteNonQuery(string commandText)
-        {
-            return ExecuteNonQuery(commandText, new SqlCEParameter(string.Empty, string.Empty));
-        }
    }
 }
@@ -17,7 +17,6 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// Database installer for an SQL Server data source.
    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
    {
        #region Private Constants
@@ -98,7 +97,7 @@ namespace SqlCE4Umbraco
 		/// </summary>
 		protected override string FullInstallSql
 		{
-			get { return string.Empty; }
+			get { return SqlCEResources.Total; }
 		}


@@ -107,7 +106,11 @@ namespace SqlCE4Umbraco
 		/// </summary>
 		protected override string UpgradeSql
 		{
-			get { return string.Empty; }
+			get
+			{
+				string upgradeFile = string.Format("{0}_Upgrade", CurrentVersion.ToString());
+				return SqlCEResources.ResourceManager.GetString(upgradeFile);
+			}
 		}

        // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
@@ -1,127 +1,127 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="applications" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>applications.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-  <data name="trees" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>trees.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Total" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>sql\total.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="Version4_1_Upgrade" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>sql\version4_1_upgrade.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
@@ -1,78 +1,107 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.MacroEngines.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Strings {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Strings() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("umbraco.MacroEngines.Resources.Strings", typeof(Strings).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot;?&gt;
-        ///&lt;configuration&gt;
-        ///
-        ///  &lt;configSections&gt;
-        ///    &lt;sectionGroup name=&quot;system.web.webPages.razor&quot; type=&quot;System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35&quot;&gt;
-        ///      &lt;section name=&quot;host&quot; type=&quot;System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35&quot; requirePermission=&quot;false&quot; /&gt;
-        ///      &lt;section name=&quot;page [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string WebConfig {
-            get {
-                return ResourceManager.GetString("WebConfig", resourceCulture);
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18010
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace SQLCE4Umbraco {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class SqlCEResources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal SqlCEResources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SQLCE4Umbraco.SqlCEResources", typeof(SqlCEResources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to /*******************************************************************************************
+        ///
+        ///
+        ///
+        ///
+        ///
+        ///
+        ///
+        ///    Umbraco database installation script for SQL Server CE 4
+        /// 
+        ///IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+        /// 
+        ///    Database version: 4.10.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.
+        ///    The first 3 digits depict the Umbraco [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string Total {
+            get {
+                return ResourceManager.GetString("Total", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to /*******************************************************************************************
+        ///
+        ///    Umbraco database installation script for SQL CE (upgrade from Umbraco 4.0.x)
+        /// 
+        ///	IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+        /// 
+        ///    Database version: 4.8.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.
+        ///    The first 3 digits depict the [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string Version4_1_Upgrade {
+            get {
+                return ResourceManager.GetString("Version4_1_Upgrade", resourceCulture);
+            }
+        }
+    }
+}
@@ -11,7 +11,6 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// SQL Server implementation of <see cref="DefaultTableUtility&lt;S&gt;"/>.
    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCETableUtility : DefaultTableUtility<SqlCEHelper>
    {
        /// <summary>
@@ -6,7 +6,6 @@
 * 
 ***********************************************************************************/

-using System;
 using umbraco.DataLayer.SqlHelpers.SqlServer;
 using umbraco.DataLayer.Utility;
 using umbraco.DataLayer.Utility.Installer;
@@ -17,7 +16,6 @@ namespace SqlCE4Umbraco
    /// <summary>
    /// Utility for an SQL Server data source.
    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
    public class SqlCEUtility : DefaultUtility<SqlCEHelper>
    {
        #region Public Constructors
@@ -2,10 +2,6 @@
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
@@ -1,8 +1,8 @@
-using System.Reflection;
+using System.Reflection;
 using System.Resources;

-[assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2015")]
+[assembly: AssemblyCompany("umbraco")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -10,6 +10,3 @@ using System.Resources;


 [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyFileVersion("7.2.6")]
-[assembly: AssemblyInformationalVersion("7.2.6")]
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;
@@ -34,17 +33,6 @@ namespace Umbraco.Core
 			}
 		}

-        /// <summary>
-        /// Gets an Action if it exists.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        internal IAction GetAction<T>()
-            where T : IAction
-        {
-            return Actions.SingleOrDefault(x => x.GetType() == typeof (T));
-        }
-
 		protected override IEnumerable<IAction> CreateInstances()
 		{					
 			var actions = new List<IAction>();
@@ -5,7 +5,6 @@ using System.Web;
 using System.Web.Caching;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Services;
@@ -13,7 +12,7 @@ using Umbraco.Core.Services;

 namespace Umbraco.Core
 {
-	/// <summary>
+    /// <summary>
    /// the Umbraco Application context
    /// </summary>
    /// <remarks>
@@ -21,7 +20,7 @@ namespace Umbraco.Core
    /// </remarks>
    public class ApplicationContext : IDisposable
    {
-        
+
        /// <summary>
        /// Constructor
        /// </summary>
@@ -47,19 +46,19 @@ namespace Umbraco.Core
            ApplicationCache = cache;
        }

-	    /// <summary>
-	    /// A method used to set and/or ensure that a global ApplicationContext singleton is created.
-	    /// </summary>
-	    /// <param name="appContext">
-	    /// The instance to set on the global application singleton
-	    /// </param>
-	    /// <param name="replaceContext">If set to true and the singleton is already set, it will be replaced</param>
-	    /// <returns></returns>
-	    /// <remarks>
-	    /// This is NOT thread safe 
-	    /// </remarks>
-	    public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
-	    {
+        /// <summary>
+        /// A method used to set and/or ensure that a global ApplicationContext singleton is created.
+        /// </summary>
+        /// <param name="appContext">
+        /// The instance to set on the global application singleton
+        /// </param>
+        /// <param name="replaceContext">If set to true and the singleton is already set, it will be replaced</param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is NOT thread safe 
+        /// </remarks>
+        public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
+        {
            if (ApplicationContext.Current != null)
            {
                if (!replaceContext)
@@ -67,23 +66,23 @@ namespace Umbraco.Core
            }
            ApplicationContext.Current = appContext;
            return ApplicationContext.Current;
-	    }
+        }

-	    /// <summary>
-	    /// A method used to create and ensure that a global ApplicationContext singleton is created.
-	    /// </summary>
-	    /// <param name="cache"></param>
-	    /// <param name="replaceContext">
-	    /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app 
-	    /// startup if for some reason the boot manager is not the umbraco boot manager.
-	    /// </param>
-	    /// <param name="dbContext"></param>
-	    /// <param name="serviceContext"></param>
-	    /// <returns></returns>
-	    /// <remarks>
-	    /// This is NOT thread safe 
-	    /// </remarks>
-	    public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
+        /// <summary>
+        /// A method used to create and ensure that a global ApplicationContext singleton is created.
+        /// </summary>
+        /// <param name="cache"></param>
+        /// <param name="replaceContext">
+        /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app 
+        /// startup if for some reason the boot manager is not the umbraco boot manager.
+        /// </param>
+        /// <param name="dbContext"></param>
+        /// <param name="serviceContext"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is NOT thread safe 
+        /// </remarks>
+        public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
        {
            if (ApplicationContext.Current != null)
            {
@@ -95,28 +94,28 @@ namespace Umbraco.Core
            return ApplicationContext.Current;
        }

-	    /// <summary>
-    	/// Singleton accessor
-    	/// </summary>
-    	public static ApplicationContext Current { get; internal set; }
+        /// <summary>
+        /// Singleton accessor
+        /// </summary>
+        public static ApplicationContext Current { get; internal set; }

-		/// <summary>
-		/// Returns the application wide cache accessor
-		/// </summary>
-		/// <remarks>
-		/// Any caching that is done in the application (app wide) should be done through this property
-		/// </remarks>
-		public CacheHelper ApplicationCache { get; private set; }
+        /// <summary>
+        /// Returns the application wide cache accessor
+        /// </summary>
+        /// <remarks>
+        /// Any caching that is done in the application (app wide) should be done through this property
+        /// </remarks>
+        public CacheHelper ApplicationCache { get; private set; }

-    	// IsReady is set to true by the boot manager once it has successfully booted
+        // IsReady is set to true by the boot manager once it has successfully booted
        // note - the original umbraco module checks on content.Instance in umbraco.dll
        //   now, the boot task that setup the content store ensures that it is ready
        bool _isReady = false;
-		readonly ManualResetEventSlim _isReadyEvent = new ManualResetEventSlim(false);
-		private DatabaseContext _databaseContext;
-		private ServiceContext _services;
+        readonly ManualResetEventSlim _isReadyEvent = new ManualResetEventSlim(false);
+        private DatabaseContext _databaseContext;
+        private ServiceContext _services;

-		public bool IsReady
+        public bool IsReady
        {
            get
            {
@@ -126,14 +125,14 @@ namespace Umbraco.Core
            {
                AssertIsNotReady();
                _isReady = value;
-				_isReadyEvent.Set();
+                _isReadyEvent.Set();
            }
        }

-		public bool WaitForReady(int timeout)
-		{
-			return _isReadyEvent.WaitHandle.WaitOne(timeout);
-		}
+        public bool WaitForReady(int timeout)
+        {
+            return _isReadyEvent.WaitHandle.WaitOne(timeout);
+        }


        // notes
@@ -149,11 +148,11 @@ namespace Umbraco.Core
            // todo - we should not do this - ok for now
            get
            {
-            	return Configured;
+                return Configured;
            }
        }

-	    /// <summary>
+        /// <summary>
        /// The original/first url that the web application executes
        /// </summary>
        /// <remarks>
@@ -165,52 +164,45 @@ namespace Umbraco.Core
        /// </remarks>
        internal string OriginalRequestUrl { get; set; }

-	    private bool _versionsDifferenceReported;
+        private bool Configured
+        {
+            get
+            {
+                try
+                {
+                    string configStatus = ConfigurationStatus;
+                    string currentVersion = UmbracoVersion.Current.ToString(3);

-        /// <summary>
-        /// Checks if the version configured matches the assembly version
-        /// </summary>
-		private bool Configured
-		{
-			get
-			{
-				try
-				{
-					var configStatus = ConfigurationStatus;
-					var currentVersion = UmbracoVersion.Current.ToString(3);
-				    var ok = configStatus == currentVersion;

-					if (ok == false && _versionsDifferenceReported == false)
-					{
-                        // remember it's been reported so we don't flood the log
-                        // no thread-safety so there may be a few log entries, doesn't matter
-                        _versionsDifferenceReported = true;
+                    if (currentVersion != configStatus)
+                    {
                        LogHelper.Info<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
-					}
-						
-					return ok;
-				}
-				catch
-				{
-					return false;
-				}
-			}
-		}
+                    }

-		private string ConfigurationStatus
-		{
-			get
-			{
-				try
-				{
-					return ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
-				}
-				catch
-				{
-					return String.Empty;
-				}
-			}			
-		}
+
+                    return (configStatus == currentVersion);
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        private string ConfigurationStatus
+        {
+            get
+            {
+                try
+                {
+                    return ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
+                }
+                catch
+                {
+                    return String.Empty;
+                }
+            }
+        }

        private void AssertIsReady()
        {
@@ -224,39 +216,39 @@ namespace Umbraco.Core
                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; }
-		}
+        /// <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;
@@ -282,26 +274,26 @@ namespace Umbraco.Core
                //clear the cache
                if (ApplicationCache != null)
                {
-                    ApplicationCache.ClearAllCache();    
+                    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();       
-                    }                    
+                        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;
            }
@@ -47,7 +47,7 @@ namespace Umbraco.Core
        }

        /// <summary>
-        /// Overridable method to execute when All resolvers have been initialized but resolution is not frozen so they can be modified in this method
+        /// 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>
@@ -74,7 +74,7 @@ namespace Umbraco.Core
        /// <returns></returns>
        private bool ShouldExecute(ApplicationContext applicationContext)
        {
-            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.CanConnect)
+            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.IsDatabaseConfigured)
            {
                return true;
            }
@@ -84,7 +84,7 @@ namespace Umbraco.Core
                return true;
            }

-            if (!applicationContext.DatabaseContext.CanConnect && ExecuteWhenDatabaseNotConfigured)
+            if (!applicationContext.DatabaseContext.IsDatabaseConfigured && ExecuteWhenDatabaseNotConfigured)
            {
                return true;
            }
@@ -1,207 +0,0 @@
-using System;
-using System.Runtime.ConstrainedExecution;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core
-{
-    // http://blogs.msdn.com/b/pfxteam/archive/2012/02/12/10266988.aspx
-    //
-    // notes:
-    // - this is NOT a reader/writer lock
-    // - this is NOT a recursive lock
-    //
-    // using a named Semaphore here and not a Mutex because mutexes have thread
-    // affinity which does not work with async situations
-    //
-    // it is important that managed code properly release the Semaphore before
-    // going down else it will maintain the lock - however note that when the
-    // whole process (w3wp.exe) goes down and all handles to the Semaphore have
-    // been closed, the Semaphore system object is destroyed - so in any case
-    // an iisreset should clean up everything
-    //
-    internal class AsyncLock
-    {
-        private readonly SemaphoreSlim _semaphore;
-        private readonly Semaphore _semaphore2;
-        private readonly IDisposable _releaser;
-        private readonly Task<IDisposable> _releaserTask;
-
-        public AsyncLock()
-            : this (null)
-        { }
-
-        public AsyncLock(string name)
-        {
-            // WaitOne() waits until count > 0 then decrements count
-            // Release() increments count
-            // initial count: the initial count value
-            // maximum count: the max value of count, and then Release() throws
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                // anonymous semaphore
-                // use one unique releaser, that will not release the semaphore when finalized
-                // because the semaphore is destroyed anyway if the app goes down
-
-                _semaphore = new SemaphoreSlim(1, 1); // create a local (to the app domain) semaphore
-                _releaser = new SemaphoreSlimReleaser(_semaphore);
-                _releaserTask = Task.FromResult(_releaser);
-            }
-            else
-            {
-                // named semaphore
-                // use dedicated releasers, that will release the semaphore when finalized
-                // because the semaphore is system-wide and we cannot leak counts
-
-                _semaphore2 = new Semaphore(1, 1, name); // create a system-wide named semaphore
-            }
-        }
-
-        private IDisposable CreateReleaser()
-        {
-            // for anonymous semaphore, use the unique releaser, else create a new one
-            return _semaphore != null
-                ? _releaser // (IDisposable)new SemaphoreSlimReleaser(_semaphore)
-                : (IDisposable)new NamedSemaphoreReleaser(_semaphore2);
-        }
-
-        public Task<IDisposable> LockAsync()
-        {
-            var wait = _semaphore != null 
-                ? _semaphore.WaitAsync() 
-                : WaitOneAsync(_semaphore2);
-
-            return wait.IsCompleted 
-                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-                : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
-                    this, CancellationToken.None,
-                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        }
-
-        public IDisposable Lock()
-        {
-            if (_semaphore != null)
-                _semaphore.Wait();
-            else
-                _semaphore2.WaitOne();
-            return _releaser ?? CreateReleaser(); // anonymous vs named
-        }
-
-        public IDisposable Lock(int millisecondsTimeout)
-        {
-            var entered = _semaphore != null
-                ? _semaphore.Wait(millisecondsTimeout)
-                : _semaphore2.WaitOne(millisecondsTimeout);
-            if (entered == false)
-                throw new TimeoutException("Failed to enter the lock within timeout.");
-            return _releaser ?? CreateReleaser(); // anonymous vs named
-        }
-
-        // note - before making those classes some structs, read 
-        // about "impure methods" and mutating readonly structs...
-
-        private class NamedSemaphoreReleaser : CriticalFinalizerObject, IDisposable
-        {
-            private readonly Semaphore _semaphore;
-
-            internal NamedSemaphoreReleaser(Semaphore semaphore)
-            {
-                _semaphore = semaphore;
-            }
-
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            private void Dispose(bool disposing)
-            {
-                // critical
-                _semaphore.Release();
-            }
-
-            // we WANT to release the semaphore because it's a system object
-            // ie a critical non-managed resource - so we inherit from CriticalFinalizerObject
-            // which means that the finalizer "should" run in all situations
-
-            // however... that can fail with System.ObjectDisposedException because the
-            // underlying handle was closed... because we cannot guarantee that the semaphore
-            // is not gone already... unless we get a GCHandle = GCHandle.Alloc(_semaphore);
-            // which should keep it around and then we free the handle?
-
-            // so... I'm not sure this is safe really...
-
-            ~NamedSemaphoreReleaser()
-            {
-                Dispose(false);
-            }
-        }
-
-        private class SemaphoreSlimReleaser : IDisposable
-        {
-            private readonly SemaphoreSlim _semaphore;
-
-            internal SemaphoreSlimReleaser(SemaphoreSlim semaphore)
-            {
-                _semaphore = semaphore;
-            }
-
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            private void Dispose(bool disposing)
-            {
-                if (disposing)
-                {
-                    // normal
-                    _semaphore.Release();
-                }
-            }
-
-            ~SemaphoreSlimReleaser()
-            {
-                Dispose(false);
-            }
-        }
-
-        // http://stackoverflow.com/questions/25382583/waiting-on-a-named-semaphore-with-waitone100-vs-waitone0-task-delay100
-        // http://blog.nerdbank.net/2011/07/c-await-for-waithandle.html
-        // F# has a AwaitWaitHandle method that accepts a time out... and seems pretty complex...
-        // version below should be OK
-
-        private static Task WaitOneAsync(WaitHandle handle)
-        {
-            var tcs = new TaskCompletionSource<object>();
-            var callbackHandleInitLock = new object();
-            lock (callbackHandleInitLock)
-            {
-                RegisteredWaitHandle callbackHandle = null;
-                // ReSharper disable once RedundantAssignment
-                callbackHandle = ThreadPool.RegisterWaitForSingleObject(
-                    handle,
-                    (state, timedOut) =>
-                    {
-                        tcs.SetResult(null);
-
-                        // we take a lock here to make sure the outer method has completed setting the local variable callbackHandle.
-                        lock (callbackHandleInitLock)
-                        {
-                            // ReSharper disable once PossibleNullReferenceException
-                            // ReSharper disable once AccessToModifiedClosure
-                            callbackHandle.Unregister(null);
-                        }
-                    },
-                    /*state:*/ null,
-                    /*millisecondsTimeOutInterval:*/ Timeout.Infinite,
-                    /*executeOnlyOnce:*/ true);
-            }
-
-            return tcs.Task;
-        }
-    }
-}
@@ -1,174 +1,174 @@
-using System;
-using Umbraco.Core.Dynamics;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents the result of an operation attempt.
-    /// </summary>
-    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-    [Serializable]
-	public struct Attempt<T>
-	{
-		private readonly bool _success;
-		private readonly T _result;
-		private readonly Exception _exception;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
-        /// </summary>
-        public bool Success
-		{
-			get { return _success; }
-		}
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        public Exception Exception { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
-        public Exception Error { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the attempt result.
-        /// </summary>
-        public T Result
-		{
-			get { return _result; }
-		}
-
-        // optimize, use a singleton failed attempt
-		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
-
-        /// <summary>
-        /// Represents an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
-        public static readonly Attempt<T> False = Failed; 
-
-        // private - use Succeed() or Fail() methods to create attempts
-        private Attempt(bool success, T result, Exception exception)
-        {
-            _success = success;
-            _result = result;
-            _exception = exception;
-        }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
-        /// </summary>
-        /// <param name="success">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(bool success, T result)
-            : this(success, result, null)
-        { }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(Exception exception)
-            : this(false, default(T), exception)
-        { }
-
-        /// <summary>
-        /// Creates a successful attempt.
-        /// </summary>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed()
-        {
-            return new Attempt<T>(true, default(T), null);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed(T result)
-        {
-            return new Attempt<T>(true, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail()
-        {
-            return Failed;
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(Exception exception)
-        {
-            return new Attempt<T>(false, default(T), exception);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result)
-        {
-            return new Attempt<T>(false, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result, Exception exception)
-        {
-            return new Attempt<T>(false, result, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition)
-        {
-            return condition ? new Attempt<T>(true, default(T), null) : Failed;
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition, T result)
-        {
-            return new Attempt<T>(condition, result, null);
-        }
-
-        /// <summary>
-        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
-        /// </summary>
-        /// <param name="a"></param>
-        /// <returns></returns>
-        public static implicit operator bool(Attempt<T> a)
-        {
-            return a.Success;
-        }
-    }
+using System;
+using Umbraco.Core.Dynamics;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Represents the result of an operation attempt.
+    /// </summary>
+    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+    [Serializable]
+	public struct Attempt<T>
+	{
+		private readonly bool _success;
+		private readonly T _result;
+		private readonly Exception _exception;
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
+        /// </summary>
+        public bool Success
+		{
+			get { return _success; }
+		}
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        public Exception Exception { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
+        public Exception Error { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the attempt result.
+        /// </summary>
+        public T Result
+		{
+			get { return _result; }
+		}
+
+        // optimize, use a singleton failed attempt
+		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
+
+        /// <summary>
+        /// Represents an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
+        public static readonly Attempt<T> False = Failed; 
+
+        // private - use Succeed() or Fail() methods to create attempts
+        private Attempt(bool success, T result, Exception exception)
+        {
+            _success = success;
+            _result = result;
+            _exception = exception;
+        }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
+        /// </summary>
+        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(bool success, T result)
+            : this(success, result, null)
+        { }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(Exception exception)
+            : this(false, default(T), exception)
+        { }
+
+        /// <summary>
+        /// Creates a successful attempt.
+        /// </summary>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed()
+        {
+            return new Attempt<T>(true, default(T), null);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed(T result)
+        {
+            return new Attempt<T>(true, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail()
+        {
+            return Failed;
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(Exception exception)
+        {
+            return new Attempt<T>(false, default(T), exception);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result)
+        {
+            return new Attempt<T>(false, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result, Exception exception)
+        {
+            return new Attempt<T>(false, result, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition)
+        {
+            return condition ? new Attempt<T>(true, default(T), null) : Failed;
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition, T result)
+        {
+            return new Attempt<T>(condition, result, null);
+        }
+
+        /// <summary>
+        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
+        /// </summary>
+        /// <param name="a"></param>
+        /// <returns></returns>
+        public static implicit operator bool(Attempt<T> a)
+        {
+            return a.Success;
+        }
+    }
 }
@@ -54,8 +54,5 @@ namespace Umbraco.Core.Cache

        public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
        public const string DataTypePreValuesCacheKey = "UmbracoPreVal";
-
-        public const string IdToKeyCacheKey = "UI2K";
-        public const string KeyToIdCacheKey = "UK2I";
    }
 }
@@ -1,70 +1,70 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Extensions for strongly typed access
-    /// </summary>
-    public static class CacheProviderExtensions
-    {
-        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
-            string cacheKey,
-            Func<T> getCacheItem,
-            TimeSpan? timeout,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null)
-        {
-            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
-            return result == null ? default(T) : result.TryConvertTo<T>().Result;
-        }
-
-        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
-            string cacheKey,
-            Func<T> getCacheItem,
-            TimeSpan? timeout = null,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null)
-        {
-            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
-        }
-
-        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
-        {
-            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
-            return result.Select(x => x.TryConvertTo<T>().Result);
-        }
-
-        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this ICacheProvider provider, string regexString)
-        {
-            var result = provider.GetCacheItemsByKeyExpression(regexString);
-            return result.Select(x => x.TryConvertTo<T>().Result);
-        }
-
-        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
-        {
-            var result = provider.GetCacheItem(cacheKey);
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
-        }
-
-        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
-        {
-            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Extensions for strongly typed access
+    /// </summary>
+    internal static class CacheProviderExtensions
+    {
+        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            return result == null ? default(T) : result.TryConvertTo<T>().Result;
+        }
+
+        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+        }
+
+        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
+        {
+            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
+        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this ICacheProvider provider, string regexString)
+        {
+            var result = provider.GetCacheItemsByKeyExpression(regexString);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
+        {
+            var result = provider.GetCacheItem(cacheKey);
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+    }
 }
@@ -1,241 +1,204 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace Umbraco.Core.Cache
-{
-    internal abstract class DictionaryCacheProviderBase : ICacheProvider
-    {
-        // prefix cache keys so we know which one are ours
-        protected const string CacheItemPrefix = "umbrtmche";
-
-        // an object that represent a value that has not been created yet
-        protected internal static readonly object ValueNotCreated = new object();
-
-        // manupulate the underlying cache entries
-        // these *must* be called from within the appropriate locks
-        // and use the full prefixed cache keys
-        protected abstract IEnumerable<DictionaryEntry> GetDictionaryEntries();
-        protected abstract void RemoveEntry(string key);
-        protected abstract object GetEntry(string key);
-
-        // read-write lock the underlying cache
-        protected abstract IDisposable ReadLock { get; }
-        protected abstract IDisposable WriteLock { get; }
-
-        protected string GetCacheKey(string key)
-        {
-            return string.Format("{0}-{1}", CacheItemPrefix, key);
-        }
-
-        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
-        {
-            // try to generate the value and if it fails,
-            // wrap in an ExceptionHolder - would be much simpler
-            // to just use lazy.IsValueFaulted alas that field is
-            // internal
-            return new Lazy<object>(() =>
-            {
-                try
-                {
-                    return getCacheItem();
-                }
-                catch (Exception e)
-                {
-                    return new ExceptionHolder(e);
-                }
-            });
-        }
-
-        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
-        {
-            // if onlyIfValueIsCreated, do not trigger value creation
-            // must return something, though, to differenciate from null values
-            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
-
-            // if execution has thrown then lazy.IsValueCreated is false
-            // and lazy.IsValueFaulted is true (but internal) so we use our
-            // own exception holder (see Lazy<T> source code) to return null
-            if (lazy.Value is ExceptionHolder) return null;
-
-            // we have a value and execution has not thrown so returning
-            // here does not throw - unless we're re-entering, take care of it
-            try
-            {
-                return lazy.Value;
-            }
-            catch (InvalidOperationException e)
-            {
-                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
-            }
-        }
-
-        internal class ExceptionHolder
-        {
-            public ExceptionHolder(Exception e)
-            {
-                Exception = e;
-            }
-
-            public Exception Exception { get; private set; }
-        }
-
-        #region Clear
-
-        public virtual void ClearAllCache()
-        {
-            using (WriteLock)
-            {
-                foreach (var entry in GetDictionaryEntries()
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-        }
-
-        public virtual void ClearCacheItem(string key)
-        {
-            var cacheKey = GetCacheKey(key);
-            using (WriteLock)
-            {
-                RemoveEntry(cacheKey);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes(string typeName)
-        {
-            using (WriteLock)
-            {
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x =>
-                    {
-                        // entry.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
-                    })
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        {
-            var typeOfT = typeof(T);
-            using (WriteLock)
-            {
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x =>
-                    {
-                        // entry.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // compare on exact type, don't use "is"
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType() == typeOfT;
-                    })
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        {
-            var typeOfT = typeof(T);
-            var plen = CacheItemPrefix.Length + 1;
-            using (WriteLock)
-            {
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x =>
-                    {
-                        // entry.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // compare on exact type, don't use "is"
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        if (value == null) return true;
-                        return value.GetType() == typeOfT
-                            // run predicate on the 'public key' part only, ie without prefix
-                            && predicate(((string)x.Key).Substring(plen), (T)value);
-                    }))
-                    RemoveEntry((string) entry.Key);
-            }
-        }
-
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            var plen = CacheItemPrefix.Length + 1;
-            using (WriteLock)
-            {
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-        }
-
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        {
-            var plen = CacheItemPrefix.Length + 1;
-            using (WriteLock)
-            {
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-        }
-
-        #endregion
-
-        #region Get
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            var plen = CacheItemPrefix.Length + 1;
-            IEnumerable<DictionaryEntry> entries;
-            using (ReadLock)
-            {
-                entries = GetDictionaryEntries()
-                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
-                    .ToArray(); // evaluate while locked
-            }
-            return entries
-                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                    .Where(x => x != null); // backward compat, don't store null values in the cache
-        }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
-        {
-            const string prefix = CacheItemPrefix + "-";
-            var plen = prefix.Length;
-            IEnumerable<DictionaryEntry> entries;
-            using (ReadLock)
-            {
-                entries = GetDictionaryEntries()
-                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
-                    .ToArray(); // evaluate while locked
-            }
-            return entries
-                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                    .Where(x => x != null); // backward compat, don't store null values in the cache
-        }
-
-        public virtual object GetCacheItem(string cacheKey)
-        {
-            cacheKey = GetCacheKey(cacheKey);
-            Lazy<object> result;
-            using (ReadLock)
-            {
-                result = GetEntry(cacheKey) as Lazy<object>; // null if key not found
-            }
-            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
-        }
-
-        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);
-
-        #endregion
-    }
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Umbraco.Core.Cache
+{
+    internal abstract class DictionaryCacheProviderBase : ICacheProvider
+    {
+        // prefix cache keys so we know which one are ours
+        protected const string CacheItemPrefix = "umbrtmche";
+
+        // an object that represent a value that has not been created yet
+        protected readonly object ValueNotCreated = new object();
+
+        // manupulate the underlying cache entries
+        // these *must* be called from within the appropriate locks
+        // and use the full prefixed cache keys
+        protected abstract IEnumerable<DictionaryEntry> GetDictionaryEntries();
+        protected abstract void RemoveEntry(string key);
+        protected abstract object GetEntry(string key);
+
+        // read-write lock the underlying cache
+        protected abstract IDisposable ReadLock { get; }
+        protected abstract IDisposable WriteLock { get; }
+
+        protected string GetCacheKey(string key)
+        {
+            return string.Format("{0}-{1}", CacheItemPrefix, key);
+        }
+
+        protected object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        {
+            try
+            {
+                // if onlyIfValueIsCreated, do not trigger value creation
+                // must return something, though, to differenciate from null values
+                if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+                return lazy.Value;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        #region Clear
+
+        public virtual void ClearAllCache()
+        {
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            var cacheKey = GetCacheKey(key);
+            using (WriteLock)
+            {
+                RemoveEntry(cacheKey);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
+                    })
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            var typeOfT = typeof(T);
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // compare on exact type, don't use "is"
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        return value == null || value.GetType() == typeOfT;
+                    })
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            var typeOfT = typeof(T);
+            var plen = CacheItemPrefix.Length + 1;
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // compare on exact type, don't use "is"
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        if (value == null) return true;
+                        return value.GetType() == typeOfT
+                            // run predicate on the 'public key' part only, ie without prefix
+                            && predicate(((string)x.Key).Substring(plen), (T)value);
+                    }))
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            IEnumerable<DictionaryEntry> entries;
+            using (ReadLock)
+            {
+                entries = GetDictionaryEntries()
+                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
+                    .ToArray(); // evaluate while locked
+            }
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            const string prefix = CacheItemPrefix + "-";
+            var plen = prefix.Length;
+            IEnumerable<DictionaryEntry> entries;
+            using (ReadLock)
+            {
+                entries = GetDictionaryEntries()
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
+                    .ToArray(); // evaluate while locked
+            }
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            cacheKey = GetCacheKey(cacheKey);
+            Lazy<object> result;
+            using (ReadLock)
+            {
+                result = GetEntry(cacheKey) as Lazy<object>; // null if key not found
+            }
+            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+
+        #endregion
+    }
 }
@@ -1,132 +1,125 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A cache provider that caches items in the HttpContext.Items
-    /// </summary>
-    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
-    {
-        // context provider
-        // the idea is that there is only one, application-wide HttpRequestCacheProvider instance,
-        // that is initialized with a method that returns the "current" context.
-        // NOTE
-        //   but then it is initialized with () => new HttpContextWrapper(HttpContent.Current)
-        //   which is higly inefficient because it creates a new wrapper each time we refer to _context()
-        //   so replace it with _context1 and _context2 below + a way to get context.Items.
-        //private readonly Func<HttpContextBase> _context;
-
-        // NOTE
-        //   and then in almost 100% cases _context2 will be () => HttpContext.Current
-        //   so why not bring that logic in here and fallback on to HttpContext.Current when
-        //   _context1 is null?
-        //private readonly HttpContextBase _context1;
-        //private readonly Func<HttpContext> _context2;
-        private readonly HttpContextBase _context;
-
-        private IDictionary ContextItems
-        {
-            //get { return _context1 != null ? _context1.Items : _context2().Items; }
-            get { return _context != null ? _context.Items : HttpContext.Current.Items; }
-        }
-
-        // for unit tests
-        public HttpRequestCacheProvider(HttpContextBase context)
-        {
-            _context = context;
-        }
-
-        // main constructor
-        // will use HttpContext.Current
-        public HttpRequestCacheProvider(/*Func<HttpContext> context*/)
-        {
-            //_context2 = context;
-        }
-
-        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
-        {
-            const string prefix = CacheItemPrefix + "-";
-            return ContextItems.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
-        }
-
-        protected override void RemoveEntry(string key)
-        {
-            ContextItems.Remove(key);
-        }
-
-        protected override object GetEntry(string key)
-        {
-            return ContextItems[key];
-        }
-
-        #region Lock
-
-        protected override IDisposable ReadLock
-        {
-            // there's no difference between ReadLock and WriteLock here
-            get { return WriteLock; }
-        }
-
-        protected override IDisposable WriteLock
-        {
-            // NOTE
-            //   could think about just overriding base.Locker to return a different
-            //   object but then we'd create a ReaderWriterLockSlim per request,
-            //   which is less efficient than just using a basic monitor lock.
-
-            get
-            {
-                return new MonitorLock(ContextItems.SyncRoot);
-            }
-        }
-
-        #endregion
-
-        #region Get
-
-        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            cacheKey = GetCacheKey(cacheKey);
-
-            Lazy<object> result;
-
-            using (WriteLock)
-            {
-                result = ContextItems[cacheKey] as Lazy<object>; // null if key not found
-
-                // cannot create value within the lock, so if result.IsValueCreated is false, just
-                // do nothing here - means that if creation throws, a race condition could cause
-                // more than one thread to reach the return statement below and throw - accepted.
-                
-                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
-                {
-                    result = GetSafeLazy(getCacheItem);
-                    ContextItems[cacheKey] = result;
-                }
-            }
-
-            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
-            // exceptions (but try again and again) and silently eat them - however at
-            // some point we have to report them - so need to re-throw here
-
-            // this does not throw anymore
-            //return result.Value;
-
-            var value = result.Value; // will not throw (safe lazy)
-            var eh = value as ExceptionHolder;
-            if (eh != null) throw eh.Exception; // throw once!
-            return value;
-        }
-        
-        #endregion
-
-        #region Insert
-        #endregion
-
-    }
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that caches items in the HttpContext.Items
+    /// </summary>
+    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
+    {
+        // context provider
+        // the idea is that there is only one, application-wide HttpRequestCacheProvider instance,
+        // that is initialized with a method that returns the "current" context.
+        // NOTE
+        //   but then it is initialized with () => new HttpContextWrapper(HttpContent.Current)
+        //   which is higly inefficient because it creates a new wrapper each time we refer to _context()
+        //   so replace it with _context1 and _context2 below + a way to get context.Items.
+        //private readonly Func<HttpContextBase> _context;
+
+        // NOTE
+        //   and then in almost 100% cases _context2 will be () => HttpContext.Current
+        //   so why not bring that logic in here and fallback on to HttpContext.Current when
+        //   _context1 is null?
+        //private readonly HttpContextBase _context1;
+        //private readonly Func<HttpContext> _context2;
+        private readonly HttpContextBase _context;
+
+        private IDictionary ContextItems
+        {
+            //get { return _context1 != null ? _context1.Items : _context2().Items; }
+            get { return _context != null ? _context.Items : HttpContext.Current.Items; }
+        }
+
+        // for unit tests
+        public HttpRequestCacheProvider(HttpContextBase context)
+        {
+            _context = context;
+        }
+
+        // main constructor
+        // will use HttpContext.Current
+        public HttpRequestCacheProvider(/*Func<HttpContext> context*/)
+        {
+            //_context2 = context;
+        }
+
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
+        {
+            const string prefix = CacheItemPrefix + "-";
+            return ContextItems.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
+        }
+
+        protected override void RemoveEntry(string key)
+        {
+            ContextItems.Remove(key);
+        }
+
+        protected override object GetEntry(string key)
+        {
+            return ContextItems[key];
+        }
+
+        #region Lock
+
+        protected override IDisposable ReadLock
+        {
+            // there's no difference between ReadLock and WriteLock here
+            get { return WriteLock; }
+        }
+
+        protected override IDisposable WriteLock
+        {
+            // NOTE
+            //   could think about just overriding base.Locker to return a different
+            //   object but then we'd create a ReaderWriterLockSlim per request,
+            //   which is less efficient than just using a basic monitor lock.
+
+            get
+            {
+                return new MonitorLock(ContextItems.SyncRoot);
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            cacheKey = GetCacheKey(cacheKey);
+
+            Lazy<object> result;
+
+            using (WriteLock)
+            {
+                result = ContextItems[cacheKey] as Lazy<object>; // null if key not found
+
+                // cannot create value within the lock, so if result.IsValueCreated is false, just
+                // do nothing here - means that if creation throws, a race condition could cause
+                // more than one thread to reach the return statement below and throw - accepted.
+                
+                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = new Lazy<object>(getCacheItem);
+                    ContextItems[cacheKey] = result;
+                }
+            }
+
+            // this may throw if getCacheItem throws, but this is the only place where
+            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
+            // and pretend exceptions were never inserted into cache to begin with.
+            return result.Value;
+        }
+        
+        #endregion
+
+        #region Insert
+        #endregion
+
+    }
 }
@@ -129,7 +129,7 @@ namespace Umbraco.Core.Cache

                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = GetSafeLazy(getCacheItem);
+                    result = new Lazy<object>(getCacheItem);
                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);

@@ -138,17 +138,10 @@ namespace Umbraco.Core.Cache
                }
            }

-            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
-            // exceptions (but try again and again) and silently eat them - however at
-            // some point we have to report them - so need to re-throw here
-
-            // this does not throw anymore
-            //return result.Value;
-
-            value = result.Value; // will not throw (safe lazy)
-            var eh = value as ExceptionHolder;
-            if (eh != null) throw eh.Exception; // throw once!
-            return value;
+            // this may throw if getCacheItem throws, but this is the only place where
+            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
+            // and pretend exceptions were never inserted into cache to begin with.
+            return result.Value;
        }

        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
@@ -180,7 +173,7 @@ namespace Umbraco.Core.Cache
            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
            // and make sure we don't store a null value.

-            var result = GetSafeLazy(getCacheItem);
+            var result = new Lazy<object>(getCacheItem);
            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
            if (value == null) return; // do not store null values (backward compat)

@@ -1,30 +1,30 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a basic cache provider
-    /// </summary>
-    public interface ICacheProvider
-    {
-        void ClearAllCache();
-        void ClearCacheItem(string key);
-        void ClearCacheObjectTypes(string typeName);
-        void ClearCacheObjectTypes<T>();
-        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
-        void ClearCacheByKeySearch(string keyStartsWith);
-        void ClearCacheByKeyExpression(string regexString);
-        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
-        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
-        
-        /// <summary>
-        /// Returns an item with a given key
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        object GetCacheItem(string cacheKey);
-
-        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
-    }
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a basic cache provider
+    /// </summary>
+    public interface ICacheProvider
+    {
+        void ClearAllCache();
+        void ClearCacheItem(string key);
+        void ClearCacheObjectTypes(string typeName);
+        void ClearCacheObjectTypes<T>();
+        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
+        void ClearCacheByKeySearch(string keyStartsWith);
+        void ClearCacheByKeyExpression(string regexString);
+        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
+        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
+        
+        /// <summary>
+        /// Returns an item with a given key
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        object GetCacheItem(string cacheKey);
+
+        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+    }
 }
@@ -1,35 +1,35 @@
-using System;
-using System.Runtime.Caching;
-using System.Text;
-using System.Web.Caching;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a runtime cache provider
-    /// </summary>
-    /// <remarks>
-    /// </remarks>
-    public interface IRuntimeCacheProvider : ICacheProvider
-    {
-        object GetCacheItem(
-            string cacheKey, 
-            Func<object> getCacheItem, 
-            TimeSpan? timeout,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-
-        void InsertCacheItem(
-            string cacheKey,
-            Func<object> getCacheItem,
-            TimeSpan? timeout = null,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-
-    }
-}
+using System;
+using System.Runtime.Caching;
+using System.Text;
+using System.Web.Caching;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a runtime cache provider
+    /// </summary>
+    /// <remarks>
+    /// </remarks>
+    public interface IRuntimeCacheProvider : ICacheProvider
+    {
+        object GetCacheItem(
+            string cacheKey, 
+            Func<object> getCacheItem, 
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+        void InsertCacheItem(
+            string cacheKey,
+            Func<object> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+    }
+}
--- a/Show More
+++ b/Show More