Merge pull request #567 from readingdancer/Fix_issue_U4-4585

Fix so Login screen now works correctly with Umbraco UI Localization settings.
Ignore VS15 generated files
2014-11-26 12:03:46 +01:00 · 2014-11-26 11:31:22 +01:00 · 2014-11-26 10:31:13 +01:00 · 2014-11-25 19:14:35 +00:00
3795 changed files with 120858 additions and 239446 deletions
@@ -1,10 +0,0 @@
-root=true
-
-[*]
-end_of_line = lf
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-[*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]
-indent_size = 4
@@ -1,145 +1,113 @@
-*.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
-src/Umbraco.Web.UI/Config/ClientDependency.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/loader.dev.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.*/
-src/.vs/
-src/Umbraco.Web.UI/umbraco/js/install.loader.js
-src/Umbraco.Tests/media
-tools/docfx/*
-apidocs/_site/*
-apidocs/api/*
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-build/msbuild.log
-.vs/
-src/packages/
+*.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/*.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/[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.sln.ide
@@ -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,52 +1,40 @@
 Umbraco CMS
 ===========
-The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 390,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
-
-[![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
-
-## Umbraco CMS ##
-Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
-
+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 vs` in `src\Umbraco.Web.UI.Client`.
+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 without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). 
+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.

-Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
+## Watch a five minute introduction video ##

-## Watch an introduction video ##
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)

-[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
+## Umbraco - the simple, flexible and friendly ASP.NET CMS ##

-## Umbraco - The Friendly CMS ##
+**More than 177,000 sites trust Umbraco** 

-For the first time on the Microsoft platform, there is 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. 
+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. 

-Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
+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.  

-Used by more than 350,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 200,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
-
-To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
-
-## Why Open Source? ##
-As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
+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 [https://our.umbraco.org/download](https://our.umbraco.org/download).
+The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).

 ## Forums ##

-Peer-to-peer support is available 24/7 at the community forum on [https://our.umbraco.org](https://our.umbraco.org). 
+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 ##

-Umbraco is contribution focused and community driven. If you want to contribute back to Umbraco please check out our [guide to contributing](https://our.umbraco.org/contribute).
+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](https://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+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).
+To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
@@ -1,18 +0,0 @@
-apiRules:
-  - include:
-      uidRegex: ^Umbraco\.Core
-  - exclude:
-      uidRegex: ^umbraco\.Web\.org
-  - include:
-      uidRegex: ^Umbraco\.Web
-  - exclude:
-      hasAttribute:
-      uid: System.ComponentModel.EditorBrowsableAttribute
-      ctorArguments:
-        - System.ComponentModel.EditorBrowsableState.Never
-  - exclude:
-      uidRegex: ^umbraco\.
-  - exclude:
-      uidRegex: ^CookComputing\.	  
-  - exclude:
-      uidRegex: ^.*$
@@ -1,75 +0,0 @@
-{
-  "metadata": [
-    {
-      "src": [
-        {
-          "files": [
-            "Umbraco.Core/Umbraco.Core.csproj",
-            "Umbraco.Web/Umbraco.Web.csproj"
-          ],
-          "exclude": [
-            "**/obj/**",
-            "**/bin/**",
-            "_site/**"
-          ],
-          "cwd": "../src"
-        }
-      ],
-      "dest": "../apidocs/api",
-      "filter": "../apidocs/docfx.filter.yml"
-    }
-  ],
-  "build": {
-    "content": [
-      {
-        "files": [
-          "api/**.yml",
-          "api/index.md"
-        ]
-      },
-      {
-        "files": [
-          "articles/**.md",
-          "articles/**/toc.yml",
-          "toc.yml",
-          "*.md"
-        ],
-        "exclude": [
-          "obj/**",
-          "_site/**"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "images/**"
-        ],
-        "exclude": [
-          "obj/**",
-          "_site/**"
-        ]
-      }
-    ],
-    "overwrite": [
-      {
-        "files": [
-          "**.md"
-        ],
-        "exclude": [
-          "obj/**",
-          "_site/**"
-        ]
-      }
-    ],
-    "globalMetadata": {
-      "_appTitle": "Umbraco c# Api docs",
-      "_enableSearch": true,
-      "_disableContribution": false
-    },
-    "dest": "_site",
-    "template": [
-      "default", "umbracotemplate"
-    ]
-  }
-}
@@ -1,7 +0,0 @@
-
-# Umbraco c# API reference
-
-## Quick Links:
-
-### [Umbraco.Core](api/Umbraco.Core.html) docs
-### [Umbraco.Web](api/Umbraco.Web.html) docs
@@ -1,5 +0,0 @@
-
- name: Umbraco.Core Documentation
-  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Core.html
- name: Umbraco.Web Documentation
-  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Web.html
@@ -1,257 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-{{^_disableContribution}}
-{{#sourceurl}}<a href="{{sourceurl}}" class="btn btn-primary pull-right mobile-hide">{{__global.viewSource}}</a>{{/sourceurl}}
-{{/_disableContribution}}
-<h1 id="{{id}}" data-uid="{{uid}}">{{>partials/title}}</h1>
-<div class="markdown level0 summary">{{{summary}}}</div>
-<div class="markdown level0 conceptual">{{{conceptual}}}</div>
-{{#inheritance.0}}
-<div class="inheritance">
-  <h5>{{__global.inheritance}}</h5>
-{{#inheritance}}
-    <div class="level{{index}}">{{{specName.0.value}}}</div>
-{{/inheritance}}
-    <div class="level{{item.level}}"><span class="xref">{{item.name.0.value}}</span></div>
-</div>
-{{/inheritance.0}}
-<h6><strong>{{__global.namespace}}</strong>:{{namespace}}</h6>
-<h6><strong>{{__global.assembly}}</strong>:{{assemblies.0}}.dll</h6>
-<h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
-<div class="codewrapper">
-  <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
-</div>
-{{#syntax.parameters.0}}
-<h5 class="parameters">{{__global.parameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.name}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/syntax.parameters.0}}
-{{#syntax.parameters}}
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td><em>{{{id}}}</em></td>
-      <td>{{{description}}}</td>
-    </tr>
-{{/syntax.parameters}}
-{{#syntax.parameters.0}}
-  </tbody>
-</table>
-{{/syntax.parameters.0}}
-{{#syntax.return}}
-<h5 class="returns">{{__global.returns}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-  </tbody>
-</table>
-{{/syntax.return}}
-{{#syntax.typeParameters.0}}
-<h5 class="typeParameters">{{__global.typeParameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.name}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/syntax.typeParameters.0}}
-{{#syntax.typeParameters}}
-    <tr>
-      <td><em>{{{id}}}</em></td>
-      <td>{{{description}}}</td>
-    </tr>
-{{/syntax.typeParameters}}
-{{#syntax.typeParameters.0}}
-  </tbody>
-</table>
-{{/syntax.typeParameters.0}}
-{{#remarks}}
-<h5 id="{{id}}_remarks"><strong>{{__global.remarks}}</strong></h5>
-<div class="markdown level0 remarks">{{{remarks}}}</div>
-{{/remarks}}
-{{#example.0}}
-<h5 id="{{id}}_examples"><strong>{{__global.examples}}</strong></h5>
-{{/example.0}}
-{{#example}}
-{{{.}}}
-{{/example}}
-{{#children}}
-<h3 id="{{id}}">{{>partials/classSubtitle}}</h3>
-{{#children}}
-{{^_disableContribution}}
-{{#sourceurl}}
-<span class="small pull-right mobile-hide">
-  <a href="{{sourceurl}}">{{__global.viewSource}}</a>
-</span>{{/sourceurl}}
-{{/_disableContribution}}
-<h4 id="{{id}}" data-uid="{{uid}}">{{name.0.value}}</h4>
-<div class="markdown level1 summary">{{{summary}}}</div>
-<div class="markdown level1 conceptual">{{{conceptual}}}</div>
-<h5 class="decalaration">{{__global.declaration}}</h5>
-{{#syntax}}
-<div class="codewrapper">
-  <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
-</div>
-{{#parameters.0}}
-<h5 class="parameters">{{__global.parameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.name}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/parameters.0}}
-{{#parameters}}
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td><em>{{{id}}}</em></td>
-      <td>{{{description}}}</td>
-    </tr>
-{{/parameters}}
-{{#parameters.0}}
-  </tbody>
-</table>
-{{/parameters.0}}
-{{#return}}
-<h5 class="returns">{{__global.returns}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-  </tbody>
-</table>
-{{/return}}
-{{#typeParameters.0}}
-<h5 class="typeParameters">{{__global.typeParameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.name}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/typeParameters.0}}
-{{#typeParameters}}
-    <tr>
-      <td><em>{{{id}}}</em></td>
-      <td>{{{description}}}</td>
-    </tr>
-{{/typeParameters}}
-{{#typeParameters.0}}
-  </tbody>
-</table>
-{{/typeParameters.0}}
-{{#fieldValue}}
-<h5 class="fieldValue">{{__global.fieldValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-  </tbody>
-</table>
-{{/fieldValue}}
-{{#propertyValue}}
-<h5 class="propertyValue">{{__global.propertyValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-  </tbody>
-</table>
-{{/propertyValue}}
-{{#eventType}}
-<h5 class="eventType">{{__global.eventType}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.description}}</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-  </tbody>
-</table>
-{{/eventType}}
-{{/syntax}}
-{{#remarks}}
-<h5 id="{{id}}_remarks">{{__global.remarks}}</h5>
-<div class="markdown level1 remarks">{{{remarks}}}</div>
-{{/remarks}}
-{{#example.0}}
-<h5 id="{{id}}_examples">{{__global.examples}}</h5>
-{{/example.0}}
-{{#example}}
-{{{.}}}
-{{/example}}
-{{#exceptions.0}}
-<h5 class="exceptions">{{__global.exceptions}}</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>{{__global.type}}</th>
-      <th>{{__global.condition}}</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/exceptions.0}}
-{{#exceptions}}
-    <tr>
-      <td>{{{type.specName.0.value}}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-{{/exceptions}}
-{{#exceptions.0}}
-  </tbody>
-</table>
-{{/exceptions.0}}
-{{/children}}
-{{/children}}
@@ -1,13 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<footer>
-  <div class="grad-bottom"></div>
-  <div class="footer">
-    <div class="container">
-      <span class="pull-right">
-        <a href="#top">Back to top</a>
-      </span>
-      <span>Copyright © 2016 Umbraco<br>Generated by <strong>DocFX</strong></span>
-    </div>
-  </div>
-</footer>
@@ -1,18 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title>{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}</title>
-  <meta name="viewport" content="width=device-width">
-  <meta name="title" content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
-  <meta name="generator" content="docfx {{_docfxVersion}}">
-  {{#_description}}<meta name="description" content="{{_description}}">{{/_description}}
-  <link rel="icon" type="image/png" href="https://our.umbraco.org/assets/images/app-icons/favicon.png">
-  <link rel="stylesheet" href="{{_rel}}styles/docfx.vendor.css">
-  <link rel="stylesheet" href="{{_rel}}styles/docfx.css">
-  <link rel="stylesheet" href="{{_rel}}styles/main.css">
-  <meta property="docfx:navrel" content="{{_navRel}}">
-  <meta property="docfx:tocrel" content="{{_tocRel}}">
-  {{#_enableSearch}}<meta property="docfx:rel" content="{{_rel}}">{{/_enableSearch}}
-</head>
@@ -1,18 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-{{^_disableContribution}}
-{{#sourceurl}}
-<a href="{{sourceurl}}" class="btn btn-primary pull-right mobile-hide">{{__global.viewSource}}</a>
-{{/sourceurl}}
-{{/_disableContribution}}
-<h1 id="{{id}}" data-uid="{{uid}}">{{>partials/title}}</h1>
-<div class="markdown level0 summary">{{{summary}}}</div>
-<div class="markdown level0 conceptual">{{{conceptual}}}</div>
-<div class="markdown level0 remarks">{{{remarks}}}</div>
-{{#children}}
-  <h3 id="{{id}}">{{>partials/namespaceSubtitle}}</h3>
-  {{#children}}
-    <h4>{{{specName.0.value}}}</h4>
-    <section>{{{summary}}}</section>
-  {{/children}}
-{{/children}}
@@ -1,22 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-<nav id="autocollapse" class="navbar navbar-inverse ng-scope" role="navigation">
-  <div class="container">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-	  <a class="navbar-brand" href="/" alt="Our Umbraco"></a>
-    </div>
-    <div class="collapse navbar-collapse" id="navbar">
-      <form class="navbar-form navbar-right" role="search" id="search">
-        <div class="form-group">
-          <input type="text" class="form-control" id="search-query" placeholder="Search" autocomplete="off">
-        </div>
-      </form>
-    </div>
-  </div>
-</nav>
@@ -1,101 +0,0 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
-
-{{^_disableContribution}}
-{{#sourceurl}}<a href="{{sourceurl}}" class="btn btn-primary pull-right mobile-hide">View Source</a>{{/sourceurl}}
-{{/_disableContribution}}
-<h1 id="{{htmlId}}" data-uid="{{uid}}" class="text-capitalize">{{name}}</h1>
-{{#summary}}
-<div class="markdown level0 summary">{{{summary}}}</div>
-{{/summary}}
-{{#description}}
-<div class="markdown level0 description">{{{description}}}</div>
-{{/description}}
-{{#conceptual}}
-  <div class="markdown level0 conceptual">{{{conceptual}}}</div>
-{{/conceptual}}
-{{#children}}
-{{^_disableContribution}}
-{{#sourceurl}}
-<span class="small pull-right mobile-hide">
-  <a href="{{sourceurl}}">View Source</a>
-</span>{{/sourceurl}}
-{{/_disableContribution}}
- <h3 id="{{htmlId}}" data-uid="{{uid}}" class="text-capitalize">{{operationId}}</h3>
-{{#summary}}
-<div class="markdown level1 summary">{{{summary}}}</div>
-{{/summary}}
-{{#description}}
-<div class="markdown level1 description">{{{description}}}</div>
-{{/description}}
-{{#conceptual}}
-  <div class="markdown level1 conceptual">{{{conceptual}}}</div>
-{{/conceptual}}
-<h5>Request</h5>
-<div class="codewrapper">
-  <pre><code class="lang-restApi hljs">{{operation}} {{path}}</code></pre>
-</div>
-{{#parameters.0}}
-<h5>Parameters</h5>
-<table class="table table-bordered table-striped table-condensed">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Type</th>
-      <th>Value</th>
-      <th>Notes</th>
-    </tr>
-  </thead>
-  <tbody>
-{{/parameters.0}}
-{{#parameters}}
-    <tr>
-      <td><em>{{#required}}*{{/required}}{{name}}</em></td>
-      <td>{{type}}</td>
-      <td>{{default}}</td>
-      <td>{{{description}}}</td>
-    </tr>
-  {{/parameters}}
-  {{#parameters.0}}
-  </tbody>
-</table>
-{{/parameters.0}}
-{{#responses.0}}
-<div class="responses">
-  <h5>Responses</h5>
-  <table class="table table-bordered table-striped table-condensed">
-    <thead>
-      <tr>
-        <th>Status Code</th>
-        <th>Description</th>
-        <th>Samples</th>
-      </tr>
-    </thead>
-    <tbody>
-{{/responses.0}}
-{{#responses}}
-    <tr>
-      <td><span class="status">{{statusCode}}</span></td>
-      <td>{{{description}}}</td>
-      <td class="sample-response">
-        {{#examples}}
-        <div class="mime-type">
-          <i>Mime type: </i><span class="mime">{{mimeType}}</span>
-        </div>
-        <pre class="response-content"><code class="lang-js json hljs">{{content}}</code></pre>
-        {{/examples}}
-      </td>
-    </tr>
-  {{/responses}}
-  {{#responses.0}}
-    </tbody>
-  </table>
-</div>
-{{/responses.0}}
-{{#footer}}
-<div class="markdown level1 api-footer">{{{footer}}}</div>
-{{/footer}}
-{{/children}}
-{{#footer}}
-<div class="markdown level0 api-footer">{{{footer}}}</div>
-{{/footer}}
-
@@ -1,73 +0,0 @@
-body {
-	color: rgba(0,0,0,.8);
-}
-.navbar-inverse {
-  background: #a3db78;
-}
-.navbar-inverse .navbar-nav>li>a, .navbar-inverse .navbar-text {
-  color: rgba(0,0,0,.8);
-}
-
-.navbar-inverse {
-    border-color: transparent;
-}
-
-.sidetoc {
-  background-color: #f5fbf1;
-}
-body .toc {
-  background-color: #f5fbf1;
-}
-.sidefilter {
-  background-color: #daf0c9;
-}
-.subnav {
-  background-color: #f5fbf1;
-}
-
-.navbar-inverse .navbar-nav>.active>a {
-	color: rgba(0,0,0,.8);
-    background-color: #daf0c9;
-}
-
-.navbar-inverse .navbar-nav>.active>a:focus, .navbar-inverse .navbar-nav>.active>a:hover {
-	color: rgba(0,0,0,.8);
-    background-color: #daf0c9;
-}
-
-.btn-primary {
-    color: rgba(0,0,0,.8);
-    background-color: #fff;
-    border-color: rgba(0,0,0,.8);
-}
-.btn-primary:hover {
-    background-color: #daf0c9;
-	color: rgba(0,0,0,.8);
-	border-color: rgba(0,0,0,.8);
-}
-
-.toc .nav > li > a {
-    color: rgba(0,0,0,.8);
-}
-
-button, a {
-    color: #f36f21;
-}
-
-button:hover,
-button:focus,
-a:hover,
-a:focus {
-  color: #143653;
-  text-decoration: none;
-}
-
-.navbar-header .navbar-brand {
-    background: url(https://our.umbraco.org/assets/images/logo.svg) left center no-repeat;
-    background-size: 40px auto;
-    width:50px;
-}
-
-.toc .nav > li.active > a {
-    color: #f36f21;
-}
@@ -1,58 +0,0 @@
-version: '{build}'
-shallow_clone: true
-build_script:
- cmd: >-
-    SET SLN=%CD%
-
-    SET SRC=%SLN%\src
-
-    SET PACKAGES=%SRC%\packages
-
-    CD build
-
-    SET "release="
-
-    FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
-
-    ECHO "Restoring NuGet into %PACKAGES%"
-    
-    %SRC%\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
-    
-    %SRC%\.nuget\NuGet.exe restore %SRC%\umbraco.sln -Verbosity Quiet -NonInteractive -PackagesDirectory %PACKAGES%
-
-    ECHO Building Release %release% build%APPVEYOR_BUILD_NUMBER%
-    
-    SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-    
-    SET MSBUILD="C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe"
-
-    XCOPY "%SRC%\Umbraco.Tests\unit-test-log4net.CI.config" "%SRC%\Umbraco.Tests\unit-test-log4net.config" /Y
-    
-    %MSBUILD% "%SLN%/src/Umbraco.Tests/Umbraco.Tests.csproj" /consoleloggerparameters:Summary;ErrorsOnly;WarningsOnly /p:NugetPackagesDirectory=%PACKAGES%
-    
-    build.bat -integration -release:%release% -comment:build%APPVEYOR_BUILD_NUMBER% -nugetfolder:%PACKAGES%
-    
-test:
-  assemblies: src\Umbraco.Tests\bin\Debug\Umbraco.Tests.dll
-artifacts:
- path: build\UmbracoCms.*
-  name: UmbracoFiles
- path: build\msbuild.log
-  name: BuildLog
-deploy:
- provider: AzureBlob
-  storage_account_name: umbraconightlies
-  storage_access_key:
-    secure: bmEMml2SF7QLHULiePa/a01XOeIa2SxJeXuaZ+1R27b+Vb2nNUQVYiPlUyF2cZAFSHI/zO/LekRsVU1rTescGhJjF7SSjKybymI3p+F/OWpwqiu2WfFee1ofXBFx8QHw
-  container: umbraco-750
-  artifact: UmbracoFiles
-  on:
-    branch: dev-v7
-notifications:
- provider: Slack
-  auth_token:
-    secure: v2csJi2V5ghR0rPdODK8GJdOGNCA+XaK84iQ9MdPOClqB+VU+40ybdKp6gPirGSH
-  channel: '#build-umbraco-core'
-  on_build_success: false
-  on_build_failure: true
-  on_build_status_changed: false
@@ -0,0 +1,170 @@
+/* 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;
+}
@@ -0,0 +1,172 @@
+<?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,174 +1,71 @@
@ECHO OFF
-
-:: UMBRACO BUILD FILE
-
-
-:: ensure we have UmbracoVersion.txt
 IF NOT EXIST UmbracoVersion.txt (
-	ECHO UmbracoVersion.txt is missing!
-	GOTO error
+	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
+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 process args
+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 INTEGRATION=0
-SET nuGetFolder=%CD%\..\src\packages
-SET SKIPNUGET=0
+SET version=%release%

-:processArgs
+IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
+ECHO Building Umbraco %version%

-:: grab the first parameter as a whole eg "/action:start"
-:: end if no more parameter
-SET SWITCHPARSE=%1
-IF [%SWITCHPARSE%] == [] goto endProcessArgs
+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%

-:: get switch and value
-SET SWITCH=
-SET VALUE=
-FOR /F "tokens=1,* delims=: " %%a IN ("%SWITCHPARSE%") DO SET SWITCH=%%a& SET VALUE=%%b
+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
+..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/
+..\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%

-:: route arg
-IF '%SWITCH%'=='/release' GOTO argRelease
-IF '%SWITCH%'=='-release' GOTO argRelease
-IF '%SWITCH%'=='/comment' GOTO argComment
-IF '%SWITCH%'=='-comment' GOTO argComment
-IF '%SWITCH%'=='/integration' GOTO argIntegration
-IF '%SWITCH%'=='-integration' GOTO argIntegration
-IF '%SWITCH%'=='/nugetfolder' GOTO argNugetFolder
-IF '%SWITCH%'=='-nugetfolder' GOTO argNugetFolder
-IF '%SWITCH%'=='/skipnuget' GOTO argSkipNuget
-IF '%SWITCH%'=='-skipnuget' GOTO argSkipNuget
-ECHO "Invalid switch %SWITCH%"
-GOTO error
-
-:: handle each arg
-
-:argRelease
-set RELEASE=%VALUE%
-SHIFT
-goto processArgs
-
-:argComment
-SET COMMENT=%VALUE%
-SHIFT
-GOTO processArgs
-
-:argIntegration
-SET INTEGRATION=1
-SHIFT
-GOTO processArgs
-
-:argNugetFolder
-SET nuGetFolder=%VALUE%
-SHIFT
-GOTO processArgs
-
-:argSkipNuget
-SET SKIPNUGET=1
-SHIFT
-GOTO processArgs
-
-:endProcessArgs 
-
-REM run
-
-SET VERSION=%RELEASE%
-IF [%COMMENT%] EQU [] (SET VERSION=%RELEASE%) ELSE (SET VERSION=%RELEASE%-%COMMENT%)
-
-ECHO ################################################################
-ECHO Building Umbraco %VERSION%
-ECHO ################################################################
-
-SET MSBUILDPATH=C:\Program Files (x86)\MSBuild\14.0\Bin
-SET MSBUILD="%MSBUILDPATH%\MsBuild.exe"
-SET PATH="%MSBUILDPATH%";%PATH%
-
-ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %RELEASE%
-
-ECHO.
-ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
+ECHO Removing the belle build 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.
 ECHO Removing existing built files to make sure everything is clean as a whistle
 RMDIR /Q /S _BuildOutput
-DEL /F /Q UmbracoCms.*.zip 2>NUL
-DEL /F /Q UmbracoExamine.*.zip 2>NUL
-DEL /F /Q UmbracoCms.*.nupkg 2>NUL
-DEL /F /Q webpihash.txt 2>NUL
+DEL /F /Q UmbracoCms.*.zip
+DEL /F /Q UmbracoCms.*.nupkg
+DEL /F /Q webpihash.txt

-ECHO.
-ECHO Making sure Git is in the path so that the build can succeed
-CALL InstallGit.cmd
-
-REM Adding the default Git path so that if it's installed it can actually be found
-REM This is necessary because SETLOCAL is on in InstallGit.cmd so that one might find Git, 
-REM but the path setting is lost due to SETLOCAL 
-SET PATH="C:\Program Files (x86)\Git\cmd";"C:\Program Files\Git\cmd";%PATH%
-
-ECHO.
-ECHO Making sure we have a web.config
-IF NOT EXIST "%CD%\..\src\Umbraco.Web.UI\web.config" COPY "%CD%\..\src\Umbraco.Web.UI\web.Template.config" "%CD%\..\src\Umbraco.Web.UI\web.config"
-
-ECHO.
-ECHO Reporting NuGet version
-"%CD%\..\src\.nuget\NuGet.exe" help | findstr "^NuGet Version:"
-
-ECHO.
-ECHO Restoring NuGet packages
-ECHO Into %nuGetFolder%
-"%CD%\..\src\.nuget\NuGet.exe" restore "%CD%\..\src\umbraco.sln" -Verbosity Quiet -NonInteractive -PackagesDirectory "%nuGetFolder%"
-IF ERRORLEVEL 1 GOTO :error
-
-ECHO.
-ECHO.
 ECHO Performing MSBuild and producing Umbraco binaries zip files
-ECHO This takes a few minutes and logging is set to report warnings
-ECHO and errors only so it might seems like nothing is happening for a while. 
-ECHO You can check the msbuild.log file for progress.
-ECHO.
-%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%RELEASE% /p:BUILD_COMMENT=%COMMENT% /p:NugetPackagesDirectory="%nuGetFolder%" /consoleloggerparameters:Summary;ErrorsOnly /fileLogger
-IF ERRORLEVEL 1 GOTO error
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%

-ECHO.
-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 dummy files to include in the NuGet package so that empty folders actually get created
+SET dummytext=This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete.
+ECHO %dummytext% > .\_BuildOutput\WebApp\App_Code\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\App_Data\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\css\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\masterpages\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\media\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\scripts\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\usercontrols\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
+ECHO %dummytext% > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt

-IF %SKIPNUGET% EQU 1 GOTO success
-
-ECHO.
 ECHO Adding Web.config transform files to the NuGet package
+REN .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform

-ECHO.
 ECHO Packing the NuGet release files
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %VERSION% -Symbols -Verbosity quiet
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %VERSION% -Verbosity quiet
-IF ERRORLEVEL 1 GOTO error
+..\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

-:success
-ECHO.
-ECHO No errors were detected!
-ECHO There may still be some in the output, which you would need to investigate.
-ECHO Warnings are usually normal.
-ECHO.
-ECHO.
 GOTO :EOF

-:error
-
-ECHO.
-ECHO Errors were detected!
-ECHO.
-
-REM don't pause if continuous integration else the build server waits forever
-REM before cancelling the build (and, there is noone to read the output anyways)
-IF %INTEGRATION% NEQ 1 PAUSE
+:showerror
+PAUSE
@@ -1,8 +1,9 @@
+
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <!--
+  <!-- 
 ****************************************************
- INCLUDES
+ INCLUDES 
 *****************************************************
 -->

@@ -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)
@@ -35,9 +36,9 @@
                        {
                            using (var cryptoProvider = new SHA1CryptoServiceProvider())
                            {
-
+                                
                                var fileHash = cryptoProvider.ComputeHash(stream);
-
+                                
                                using (TextWriter w = new StreamWriter(OutputFile, false))
                                {
                                    w.WriteLine(string.Join("", fileHash.Select(b => b.ToString("x2"))));
@@ -47,14 +48,14 @@
                    }
                }
            ]]>
-      </Code>
+        </Code>
    </Task>
-  </UsingTask>
+ </UsingTask>

-
-  <!--
+ 
+  <!-- 
 ****************************************************
- VARIABLES
+ VARIABLES 
 *****************************************************
 -->

@@ -68,12 +69,6 @@
  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!=''">
    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)</DECIMAL_BUILD_NUMBER>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_NIGHTLY)'!=''">
-    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_NIGHTLY)</DECIMAL_BUILD_NUMBER>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''">
-    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)</DECIMAL_BUILD_NUMBER>
-  </PropertyGroup>

  <PropertyGroup>
    <BuildConfiguration>Release</BuildConfiguration>
@@ -87,37 +82,48 @@
    <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>
+    <SystemFolders Include="$(WebAppFolder)App_Plugins" />
+    <SystemFolders Include="$(WebAppFolder)App_Code" />
    <SystemFolders Include="$(WebAppFolder)App_Data" />
    <SystemFolders Include="$(WebAppFolder)Media" />
+    <SystemFolders Include="$(WebAppFolder)Masterpages" />
+    <SystemFolders Include="$(WebAppFolder)Scripts" />
+    <SystemFolders Include="$(WebAppFolder)Css" />
+    <SystemFolders Include="$(WebAppFolder)MacroScripts" />
+    <SystemFolders Include="$(WebAppFolder)Xslt" />
+    <SystemFolders Include="$(WebAppFolder)UserControls" />
    <SystemFolders Include="$(WebAppFolder)Views" />
  </ItemGroup>

-  <!--
+  <!-- 
 ****************************************************
- TARGETS
+ TARGETS 
 *****************************************************
 -->

-  <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">
@@ -144,14 +150,14 @@
        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 -x![Content_Types].xml >NUL" />
+    <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 >NUL" />
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22 -x!dotLess.Core.dll -x![Content_Types].xml >NUL" />
+    <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>
@@ -163,20 +169,20 @@
  <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" />
+    </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>
      <SQLCE4Files
-     Include="..\src\packages\SqlServerCE.4.0.0.1\**\*.*"
-     Exclude="..\src\packages\SqlServerCE.4.0.0.1\lib\**\*;..\src\packages\SqlServerCE.4.0.0.1\**\*.nu*"
+     Include="..\src\packages\SqlServerCE.4.0.0.0\**\*.*"
+     Exclude="..\src\packages\SqlServerCE.4.0.0.0\lib\**\*;..\src\packages\SqlServerCE.4.0.0.0\**\*.nu*"
 		/>
    </ItemGroup>

@@ -203,7 +209,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>
@@ -212,30 +218,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" />
-      <CustomLanguageFiles Include="$(WebAppFolder)config\lang\*.xml" />
-      <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(ConfigFiles)"
-        DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
-
-    <Copy SourceFiles="@(CustomLanguageFiles)"
-      DestinationFiles="@(CustomLanguageFiles->'$(ConfigsFolder)Lang\%(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 -->
@@ -253,93 +253,78 @@

  <!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
  <Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
-    <ItemGroup>
-      <PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+	<ItemGroup>
+		<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
    </ItemGroup>
-    <RemoveDir Directories="@(PresentationFolderToDelete)" />
+	<RemoveDir Directories="@(PresentationFolderToDelete)" />
  </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);Verbosity=minimal" 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;Rebuild;" 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>
-      <NewVersion Condition="'$(BUILD_NIGHTLY)'!=''">$(BUILD_RELEASE)-$(BUILD_NIGHTLY)</NewVersion>
-      <NewVersion Condition="'$(BUILD_COMMENT)'!='' And '$(BUILD_NIGHTLY)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)</NewVersion>
-    </PropertyGroup>
+  <Target Name="CompileExternalExamineProjects" DependsOnTargets="SetVersionNumber">
+    <Message Text="Building externally shipped examine projects" Importance="high" />

-    <!-- Match & replace 3 and 4 digit version numbers and -beta and +nightly (if they're there) -->
+    <!-- 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"
      Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
      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;"/>
-
-    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
-	  Condition="'$(BUILD_NIGHTLY)'!=''"
-      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
-      ReplacementText="CurrentComment { get { return &quot;$(BUILD_NIGHTLY)&quot;"/>
-	  
-    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
-	  Condition="'$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''"
-      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
-      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)-$(BUILD_NIGHTLY)&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;)"/>
-    <FileUpdate
-      Condition="'$(BUILD_NIGHTLY)'!=''"
-      Files="..\src\SolutionInfo.cs"
-      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
-      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_NIGHTLY)&quot;)"/>
-	<FileUpdate
-      Condition="'$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''"
-      Files="..\src\SolutionInfo.cs"
-      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
-      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)&quot;)"/>
-    <FileUpdate
-      Condition="'$(BUILD_COMMENT)'=='' AND '$(BUILD_NIGHTLY)'==''"
-      Files="..\src\SolutionInfo.cs"
-      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
-      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
-
-    <!--This updates the copyright year-->
-    <FileUpdate
-      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.props"
+             Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
+			 Query="//x:UmbracoVersion"
+			 Value="$(NewVersion)" />
  </Target>
 </Project>
@@ -1,6 +1,4 @@
@ECHO OFF
-SETLOCAL
-
 SET release=%1
 ECHO Installing Npm NuGet Package

@@ -8,14 +6,17 @@ SET nuGetFolder=%CD%\..\src\packages\
 ECHO Configured packages folder: %nuGetFolder%
 ECHO Current folder: %CD%

-%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet
+%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 Adding Npm and Node to path 
-REM SETLOCAL is on, so changes to the path not persist to the actual user's path
-PATH=%npmPath%;%nodePath%;%PATH%
+ECHO Temporarily adding Npm and Node to path
+SET oldPath=%PATH%
+
+path=%npmPath%;%nodePath%;%PATH%
+
+ECHO %path%

 SET buildFolder=%CD%

@@ -23,11 +24,13 @@ 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 cache clean --quiet
-call npm install --quiet
-call npm install -g grunt-cli --quiet
-call npm install -g bower --quiet
+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,20 +0,0 @@
-@ECHO OFF
-SETLOCAL
-
-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%  -Verbosity quiet
-
-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 Adding Npm and Node to path 
-REM SETLOCAL is on, so changes to the path not persist to the actual user's path
-PATH=%npmPath%;%nodePath%;%PATH%
-
-Powershell.exe -ExecutionPolicy Unrestricted  -File .\BuildDocs.ps1
@@ -1,100 +1,27 @@
-$PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path);
-$RepoRoot = (get-item $PSScriptFilePath).Directory.Parent.FullName;
-$SolutionRoot = Join-Path -Path $RepoRoot "src";
-$ToolsRoot = Join-Path -Path $RepoRoot "tools";
-$DocFx = Join-Path -Path $ToolsRoot "docfx\docfx.exe"
-$DocFxFolder = (Join-Path -Path $ToolsRoot "docfx")
-$DocFxJson = Join-Path -Path $RepoRoot "apidocs\docfx.json"
-$7Zip = Join-Path -Path $ToolsRoot "7zip\7za.exe"
-$DocFxSiteOutput = Join-Path -Path $RepoRoot "apidocs\_site\*.*"
-$NgDocsSiteOutput = Join-Path -Path $RepoRoot "src\Umbraco.Web.UI.Client\docs\api\*.*"
-$ProgFiles86 = [Environment]::GetEnvironmentVariable("ProgramFiles(x86)");
-$MSBuild = "$ProgFiles86\MSBuild\14.0\Bin\MSBuild.exe"
+##We cannot continue if sandcastle is not installed determined by env variable: SHFBROOT

-
-################ Do the UI docs
-
-"Changing to Umbraco.Web.UI.Client folder"
-cd ..
-cd src\Umbraco.Web.UI.Client
-Write-Host $(Get-Location)
-
-"Creating build folder so MSBuild doesn't run the whole grunt build"
-if (-Not (Test-Path "build")) {
-    md "build"
-}
-
-"Installing node"
-# Check if Install-Product exists, should only exist on the build server
-if (Get-Command Install-Product -errorAction SilentlyContinue)
+if (-not (Test-Path Env:\SHFBROOT))
 {
-    Install-Product node ''
+	throw "The docs cannot be build, install Sandcastle help file builder"
 }

-"Installing node modules"
-& npm install
+$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"

-"Installing grunt"
-& npm install -g grunt-cli
+"Building docs with project file:  $ProjFile"

-"Moving back to build folder"
-cd ..
-cd ..
-cd build
-Write-Host $(Get-Location)
+$MSBuild = "$Env:SYSTEMROOT\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"

- & grunt --gruntfile ../src/umbraco.web.ui.client/gruntfile.js docs
+# build it!
+& $MSBuild "$ProjFile"

-# change baseUrl
-$BaseUrl = "https://our.umbraco.org/apidocs/ui/"
-$IndexPath = "../src/umbraco.web.ui.client/docs/api/index.html"
-(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
-# zip it
+# remove files left over
+Remove-Item $BuildRoot\* -include csharp-api-docs.shfbproj_*

-& $7Zip a -tzip ui-docs.zip $NgDocsSiteOutput -r
+# copy our custom styles in
+Copy-Item $BuildRoot\ApiDocs\TOC.css $OutputPath\TOC.css

-################ Do the c# docs
-
-# Build the solution in debug mode
-$SolutionPath = Join-Path -Path $SolutionRoot -ChildPath "umbraco.sln"
-& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount /t:Clean
-if (-not $?)
-{
-	throw "The MSBuild process returned an error code."
-}
-& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount
-if (-not $?)
-{
-	throw "The MSBuild process returned an error code."
-}
-
-# Go get docfx if we don't hae it
-$FileExists = Test-Path $DocFx 
-If ($FileExists -eq $False) {
-
-	If(!(Test-Path $DocFxFolder))
-	{
-		New-Item $DocFxFolder -type directory
-	}	
-	
-	$DocFxZip = Join-Path -Path $ToolsRoot "docfx\docfx.zip"
-	$DocFxSource = "https://github.com/dotnet/docfx/releases/download/v1.9.4/docfx.zip"
-	Invoke-WebRequest $DocFxSource -OutFile $DocFxZip
-
-	#unzip it	
-	& $7Zip e $DocFxZip "-o$DocFxFolder"
-}
-
-#clear site
-If(Test-Path(Join-Path -Path $RepoRoot "apidocs\_site"))
-{
-	Remove-Item $DocFxSiteOutput -recurse
-}
-
-# run it!
-& $DocFx metadata $DocFxJson
-& $DocFx build $DocFxJson
-
-# zip it
-
-& $7Zip a -tzip csharp-docs.zip $DocFxSiteOutput -r
+""
+"Done!"
@@ -1,63 +0,0 @@
-@ECHO OFF
-SETLOCAL
-REM SETLOCAL is on, so changes to the path not persist to the actual user's path
-
-git.exe --version
-IF %ERRORLEVEL%==9009 GOTO :trydefaultpath
-REM OK, DONE
-GOTO :EOF
-
-:trydefaultpath
-PATH=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
-git.exe --version
-IF %ERRORLEVEL%==9009 GOTO :showerror
-REM OK, DONE
-GOTO :EOF
-
-:showerror
-ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd nor in C:\Program Files\Git\cmd
-SET /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
-IF %install%==y (
-	:: Create a temporary batch file to execute either after elevating to admin or as-is when the user is already admin
-	ECHO @ECHO OFF > "%temp%\ChocoInstallGit.cmd"
-	ECHO SETLOCAL >> "%temp%\ChocoInstallGit.cmd"
-	ECHO ECHO Installing Chocolatey first >> "%temp%\ChocoInstallGit.cmd"
-	ECHO @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" >> "%temp%\ChocoInstallGit.cmd"
-	ECHO SET PATH=%%PATH%%;%%ALLUSERSPROFILE%%\chocolatey\bin >> "%temp%\ChocoInstallGit.cmd"
-	ECHO choco install git -y >> "%temp%\ChocoInstallGit.cmd"
-	
-	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
-pushd %~dp0
-    :: Running prompt elevated
-
-:: --> Check for permissions
->nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
-
-:: --> If error flag set, we do not have admin.
-IF '%errorlevel%' NEQ '0' (
-    GOTO UACPrompt
-) ELSE ( GOTO gotAdmin )
-
-:UACPrompt
-    ECHO You're not currently running this with admin privileges, we'll now try to execute the install of Git through Chocolatey after elevating to admin privileges
-    ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
-    ECHO UAC.ShellExecute "%temp%\ChocoInstallGit.cmd", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
-	
-    "%temp%\getadmin.vbs"
-    EXIT /B
-	
-:gotAdmin
-    IF EXIST "%temp%\getadmin.vbs" ( DEL "%temp%\getadmin.vbs" )
-    pushd "%CD%"
-    CD /D "%~dp0"
-	
-    CALL "%temp%\ChocoInstallGit.cmd"
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>UmbracoCms.Core.AllBinaries</id>
+        <version>6.1.2</version>
+        <title>Umbraco Cms Core All Binaries</title>
+        <authors>Morten Christensen</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 and all of the dependant 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 and all of the dependant assemblies needed to run Umbraco Cms</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+    </metadata>
+    <files>
+        <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
+		<file src="..\_BuildOutput\bin\AutoMapper.dll" target="lib\AutoMapper.dll" />
+        <file src="..\_BuildOutput\bin\AutoMapper.Net4.dll" target="lib\AutoMapper.Net4.dll" />
+        <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
+        <file src="..\_BuildOutput\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
+        <file src="..\_BuildOutput\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
+        <file src="..\_BuildOutput\bin\cms.dll" target="lib\cms.dll" />
+        <file src="..\_BuildOutput\bin\controls.dll" target="lib\controls.dll" />
+        <file src="..\_BuildOutput\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
+        <file src="..\_BuildOutput\bin\Examine.dll" target="lib\Examine.dll" />
+        <file src="..\_BuildOutput\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
+        <file src="..\_BuildOutput\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
+        <file src="..\_BuildOutput\bin\ImageProcessor.dll" target="lib\ImageProcessor.dll" />
+        <file src="..\_BuildOutput\bin\ImageProcessor.Web.dll" target="lib\ImageProcessor.Web.dll" />
+        <file src="..\_BuildOutput\bin\interfaces.dll" target="lib\interfaces.dll" />
+        <file src="..\_BuildOutput\bin\log4net.dll" target="lib\log4net.dll" />
+        <file src="..\_BuildOutput\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.dll" target="lib\Microsoft.Threading.Tasks.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.Extensions.dll" target="lib\Microsoft.Threading.Tasks.Extensions.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
+        <file src="..\_BuildOutput\bin\Microsoft.Web.Mvc.FixedDisplayModes.dll" target="lib\Microsoft.Web.Mvc.FixedDisplayModes.dll" />
+        <file src="..\_BuildOutput\bin\MiniProfiler.dll" target="lib\MiniProfiler.dll" />
+        <file src="..\_BuildOutput\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
+        <file src="..\_BuildOutput\bin\Newtonsoft.Json.dll" target="lib\Newtonsoft.Json.dll" />
+        <file src="..\_BuildOutput\bin\NuGet.Core.dll" target="lib\NuGet.Core.dll" />
+        <file src="..\_BuildOutput\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
+        <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
+        <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.dll" target="lib\System.Net.Http.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.Extensions.dll" target="lib\System.Net.Http.Extensions.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.Formatting.dll" target="lib\System.Net.Http.Formatting.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.Primitives.dll" target="lib\System.Net.Http.Primitives.dll" />
+        <file src="..\_BuildOutput\bin\System.Net.Http.WebRequest.dll" target="lib\System.Net.Http.WebRequest.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Helpers.dll" target="lib\System.Web.Helpers.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Http.dll" target="lib\System.Web.Http.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Http.WebHost.dll" target="lib\System.Web.Http.WebHost.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Mvc.dll" target="lib\System.Web.Mvc.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.Razor.dll" target="lib\System.Web.Razor.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.Administration.dll" target="lib\System.Web.WebPages.Administration.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.Deployment.dll" target="lib\System.Web.WebPages.Deployment.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.dll" target="lib\System.Web.WebPages.dll" />
+        <file src="..\_BuildOutput\bin\System.Web.WebPages.Razor.dll" target="lib\System.Web.WebPages.Razor.dll" />
+        <file src="..\_BuildOutput\bin\TidyNet.dll" target="lib\TidyNet.dll" />
+        <file src="..\_BuildOutput\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.dll" target="lib\umbraco.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
+        <file src="..\_BuildOutput\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
+        <file src="..\_BuildOutput\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
+        <file src="..\_BuildOutput\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
+        <file src="..\_BuildOutput\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
+    </files>
+</package>
@@ -0,0 +1,71 @@
+<?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://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>
+    </metadata>
+    <files>
+        <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.dll" target="lib" />
+        <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.pdb" target="lib" />
+		<file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
+		
+		<file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.dll" target="lib" />
+		<file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.pdb" target="lib" />
+		<file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
+		
+        <file src="..\..\src\umbraco.cms\obj\Debug\cms.dll" target="lib" />
+        <file src="..\..\src\umbraco.cms\obj\Debug\cms.pdb" target="lib" />
+		<file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
+		
+        <file src="..\..\src\umbraco.controls\obj\Debug\controls.dll" target="lib" />
+        <file src="..\..\src\umbraco.controls\obj\Debug\controls.pdb" target="lib" />
+		<file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
+		
+        <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.dll" target="lib" />
+        <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.pdb" target="lib" />
+		<file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
+        
+		<file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.dll" target="lib" />
+		<file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.pdb" target="lib" />
+		<file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+		
+        <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.dll" target="lib" />
+        <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.pdb" target="lib" />
+		<file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
+		
+        <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.dll" target="lib" />
+        <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.pdb" target="lib" />
+		<file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
+		
+        <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.dll" target="lib" />
+        <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.pdb" target="lib" />
+		<file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
+				
+        <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.dll" target="lib" />
+        <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.pdb" target="lib" />
+		<file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
+		
+        <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.dll" target="lib" />
+        <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.pdb" target="lib" />
+		<file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
+		
+        <file src="..\..\src\bin\Debug\Umbraco.Web.UI.dll" target="lib" />
+        <file src="..\..\src\bin\Debug\Umbraco.Web.UI.pdb" target="lib" />
+		<file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
+				
+        <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.dll" target="lib" />
+        <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.pdb" target="lib" />
+		<file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />		
+    </files>
+</package>
@@ -1,108 +1,73 @@
 <?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="log4net" version="[2.0.8,3.0.0)" />
-      <dependency id="Log4Net.Async" version="[2.0.4,3.0.0)" />
-      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
-      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
-      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />
-      <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
-      <dependency id="HtmlAgilityPack" version="[1.4.9.5, 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.9, 7.0.0)" />
-      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
-      <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
-      <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Examine" version="[0.1.82, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.3, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.3, 5.0.0)" />
-      <dependency id="semver" version="[2.0.4, 3.0.0)" />
-	  <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
-      <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\net45\businesslogic.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\net45\businesslogic.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\net45\cms.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\net45\cms.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\net45\controls.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\net45\controls.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\net45\interfaces.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\net45\interfaces.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\net45\log4net.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net45\SQLCE4Umbraco.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net45\SQLCE4Umbraco.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net45\System.Data.SqlServerCe.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net45\System.Data.SqlServerCe.Entity.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\net45\TidyNet.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\net45\Umbraco.Core.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\net45\Umbraco.Core.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\net45\umbraco.DataLayer.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\net45\umbraco.DataLayer.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\net45\umbraco.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\net45\umbraco.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\net45\umbraco.editorControls.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\net45\umbraco.editorControls.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net45\umbraco.MacroEngines.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net45\umbraco.MacroEngines.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\net45\umbraco.providers.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\net45\umbraco.providers.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net45\Umbraco.Web.UI.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net45\Umbraco.Web.UI.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\net45\UmbracoExamine.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\net45\UmbracoExamine.xml" />
-    <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>
-</package>
+    <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://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="AutoMapper" version="[3.0.0, 4.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[6.0.4, 7.0.0)" />
+            <dependency id="Examine" version="[0.1.57, 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\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.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.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\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,52 +1,46 @@
 <?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="[10.0.2, 11.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
-      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-	  <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
-    </dependencies>
-  </metadata>
+    <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://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\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\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+	<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\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="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
-    <file src="tools\processing.config.install.xdt" target="Content\Config\imageprocessor\processing.config.install.xdt" />
-    <file src="tools\cache.config.install.xdt" target="Content\Config\imageprocessor\cache.config.install.xdt" />
    <file src="build\**" target="build" />
  </files>
-</package>
+</package>
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CopyUmbracoFilesToWebRootForDeploy" AfterTargets="CopyAllFilesToSingleFolderForMsdeploy">
-    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="$(_PackageTempDir)\%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>  
  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
-	<!-- This copies the files listed in `AddUmbracoFilesToOutput` to the webroot during NuGet install and should -->
-	<!-- not be altered to support automated builds, use `CopyUmbracoFilesToWebRootForDeploy` for that instead -->
    <PropertyGroup>
      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
    </PropertyGroup>
@@ -58,4 +47,4 @@
      </FilesForPackagingFromProject>
    </ItemGroup>
  </Target>
-</Project>
+</Project>
@@ -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,95 +0,0 @@
-<?xml version="1.0"?>
-<dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <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)" xdt:Transform="InsertIfMissing">
-    <areas xdt:Transform="InsertIfMissing">
-      <area xdt:Transform="InsertIfMissing">developer</area>
-    </areas>  
-  </section>
-  
-  <section alias="StartupDeveloperDashboardSection">
-    <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)" xdt:Transform="InsertIfMissing">
-	<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)" xdt:Transform="InsertIfMissing">
-    <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="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <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" />
-    
-  <section alias="StartupDashboardSection">
-	<tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-	<tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-  </section>
-
-  <section alias="RedirectUrlManagement" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas>
-      <area>content</area>
-    </areas>
-    <tab caption="Redirect URL Management">
-      <control>
-        views/dashboard/developer/redirecturls.html
-      </control>
-    </tab>
-  </section>
-
-  <section alias="UmbracoHealthCheck" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas>
-      <area>developer</area>
-    </areas>
-    <tab caption="Health Check">
-      <control>
-        views/dashboard/developer/healthcheck.html
-      </control>
-    </tab>
-  </section>
-</dashBoard>
@@ -1,24 +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,39 +0,0 @@
-
-  _    _ __  __ ____  _____           _____ ____  
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
-                                                   
----------------------------------------------------
-
-*** IMPORTANT NOTICE FOR 7.6 UPGRADES ***
-
-Be sure to read the version specific upgrade information before proceeding:
-https://our.umbraco.org/documentation/Getting-Started/Setup/Upgrading/version-specific#version-7-6-0
-
-You will most likely need to make some changes to your web.config and you will need to be 
-aware of the breaking changes listed there to see if these affect your installation.
-
-
-Don't forget to build!
-
-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,42 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(name)" 
-		xdt:Transform="SetAttributes(type)">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(name)" 
-		xdt:Transform="SetAttributes(type)" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(name)" 
-		xdt:Transform="SetAttributes(type)" />
-    </sectionGroup>
-  </configSections>
-  
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(factoryType)" 
-		xdt:Transform="SetAttributes(factoryType)" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-		<add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />        
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  
-  <system.web>
-      <pages
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-			xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)" 
-			xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
-      <controls>
-        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" 
-			xdt:Locator="Match(namespace)" 
-			xdt:Transform="SetAttributes(assembly)" />
-      </controls>
-    </pages>
-  </system.web>
-  
-</configuration>
@@ -1,411 +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="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" 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" />
-    <siteMap xdt:Transform="InsertIfMissing">
-      <providers xdt:Transform="InsertIfMissing">
-        <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
-      </providers>
-    </siteMap>
-    <httpRuntime xdt:Transform="InsertIfMissing" />
-    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
-
-    <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.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" 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" />
-        <add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel.Annotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel.EventBasedAsync, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Contracts, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Debug, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Tools, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Dynamic.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Globalization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Expressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Queryable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.NetworkInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.Requests, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ObjectModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit.ILGeneration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit.Lightweight, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Duplex, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.Encoding.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.RegularExpressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-      </assemblies>
-    </compilation>
-
-    <compilation>
-      <assemblies>
-        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.XmlSerializer" 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)" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.XmlSerializer" 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" />
-      <!-- Note, we're removing the one that starts with a space here, don't correct it -->
-      <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
-      <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=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" 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>
-
-    <security xdt:Transform="InsertIfMissing">
-      <requestFiltering xdt:Transform="InsertIfMissing">
-        <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
-      </requestFiltering>
-    </security>
-
-  </system.webServer>
-
-  <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='HtmlAgilityPack')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
-      <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" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
-    </assemblyBinding>
-  </runtime>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
-      </dependentAssembly>
-      <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-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.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>
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<caching xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <caches>
-    <cache name="DiskCache" trimCache="false" xdt:Transform="SetAttributes(trimCache)" xdt:Locator="Match(name)"  />
-  </caches>
-</caching>
@@ -1,30 +1,18 @@
-param($installPath, $toolsPath, $package, $project)
-
-Write-Host "installPath:" "${installPath}"
-Write-Host "toolsPath:" "${toolsPath}"
-
-Write-Host " "
+param($rootPath, $toolsPath, $package, $project)

 if ($project) {
 	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
-
-	# Create paths and list them
-	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
-	Write-Host "projectPath:" "${projectPath}"		
-	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
-	Write-Host "backupPath:" "${backupPath}"		
+	$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
 	$copyLogsPath = Join-Path $backupPath "CopyLogs"
-	Write-Host "copyLogsPath:" "${copyLogsPath}"			
-	$umbracoBinFolder = Join-Path $projectPath "bin"
-	Write-Host "umbracoBinFolder:" "${umbracoBinFolder}"		
-
+	$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
 	
 	# After backing up, remove all umbraco 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) {
 		$umbracoBinBackupPath = Join-Path $backupPath "bin"
 		
@@ -32,13 +20,14 @@ if ($project) {
 		
 		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
 		
-		# Delete files Umbraco ships with
+		# 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\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.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 }
@@ -48,17 +37,16 @@ if ($project) {
 		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.ModelsBuilder.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.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 $umbracoBinFolder "amd64"
+		$amd64Folder = Join-Path $projectDestinationPath "bin\amd64"
 		if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false }
-		$x86Folder = Join-Path $umbracoBinFolder "x86"
-		if(Test-Path $x86Folder) { Remove-Item $x86Folder -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 }
@@ -70,29 +58,12 @@ if ($project) {
 		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.IO.RecyclableMemoryStream.dll) { Remove-Item $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.OAuth.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.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.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\Owin.dll) { Remove-Item $umbracoBinFolder\Owin.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Semver.dll) { Remove-Item $umbracoBinFolder\Semver.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Collections.Immutable.dll) { Remove-Item $umbracoBinFolder\System.Collections.Immutable.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Reflection.Metadata.dll) { Remove-Item $umbracoBinFolder\System.Reflection.Metadata.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Net.Http.Extensions.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Extensions.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.Net.Http.Primitives.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Primitives.dll -Force -Confirm:$false }	
 		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.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 }
@@ -100,6 +71,6 @@ if ($project) {
 		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 }		
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }
 	}
 }
@@ -1,121 +1,48 @@
-param($installPath, $toolsPath, $package, $project)
-
-Write-Host "installPath:" "${installPath}"
-Write-Host "toolsPath:" "${toolsPath}"
-
-Write-Host " "
+param($rootPath, $toolsPath, $package, $project)

 if ($project) {
 	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
-
-	# Create paths and list them
-	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
-	Write-Host "projectPath:" "${projectPath}"
-	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
-	Write-Host "backupPath:" "${backupPath}"
+	$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
 	$copyLogsPath = Join-Path $backupPath "CopyLogs"
-	Write-Host "copyLogsPath:" "${copyLogsPath}"	
-	$webConfigSource = Join-Path $projectPath "Web.config"
-	Write-Host "webConfigSource:" "${webConfigSource}"
-	$configFolder = Join-Path $projectPath "Config"
-	Write-Host "configFolder:" "${configFolder}"
-
+	
 	# 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	
-	if(Test-Path $configFolder) {
-		$umbracoBackupPath = Join-Path $backupPath "Config"
+	# 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
+	$umbracoFolder = Join-Path $projectDestinationPath "Umbraco"
+	if(Test-Path $umbracoFolder) {
+		$umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco"
+		
+		$umbracoBackupPath = Join-Path $backupPath "Umbraco"
 		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
 		
-		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
+		robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
+		robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
 	}
-	
-	# Copy umbraco and umbraco_files from package to project folder
-	$umbracoFolder = Join-Path $projectPath "Umbraco"
-	New-Item -ItemType Directory -Force -Path $umbracoFolder
-	$umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco"		
-	$umbracoBackupPath = Join-Path $backupPath "Umbraco"
-	New-Item -ItemType Directory -Force -Path $umbracoBackupPath		
-	robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
-	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log

-	$umbracoClientFolder = Join-Path $projectPath "Umbraco_Client"	
-	New-Item -ItemType Directory -Force -Path $umbracoClientFolder
-	$umbracoClientFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco_Client"		
-	$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
-	New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath		
-	robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
-	robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
-
-	$copyWebconfig = $true
-	$destinationWebConfig = Join-Path $projectPath "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 $installPath "UmbracoFiles\Web.config"
-		Copy-Item $packageWebConfigSource $destinationWebConfig -Force
-
-		# Copy files that don't get automatically copied for Website projects
-		# We do this here, when copyWebconfig is true because we only want to do it for new installs
-		# If this is an upgrade then the files should already be there
-		$splashesSource = Join-Path $installPath "UmbracoFiles\Config\splashes\*.*"
-		$splashesDestination = Join-Path $projectPath "Config\splashes\"
-		New-Item $splashesDestination -Type directory
-		Copy-Item $splashesSource $splashesDestination -Force
-
-		$sqlCe64Source = Join-Path $installPath "UmbracoFiles\bin\amd64\*"
-		$sqlCe64Destination = Join-Path $projectPath "bin\amd64\"
-		Copy-Item $sqlCe64Source $sqlCe64Destination -Force
+	$umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client"	
+	if(Test-Path $umbracoClientFolder) {
+		$umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client"
 		
-		$sqlCex86Source = Join-Path $installPath "UmbracoFiles\bin\x86\*"
-		$sqlCex86Destination = Join-Path $projectPath "bin\x86\"
-		Copy-Item $sqlCex86source $sqlCex86Destination -Force
+		$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
+		New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath
+		
+		robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
+		robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
+	}

-		$umbracoUIXMLSource = Join-Path $installPath "UmbracoFiles\Umbraco\Config\Create\UI.xml"
-		$umbracoUIXMLDestination = Join-Path $projectPath "Umbraco\Config\Create\UI.xml"
-		Copy-Item $umbracoUIXMLSource $umbracoUIXMLDestination -Force
-	} else {
-		$upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*"
-		$upgradeView = Join-Path $umbracoFolder "Views\install\"
-		Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}"
-		Copy-Item $upgradeViewSource $upgradeView -Force
-	}
-	
-	$installFolder = Join-Path $projectPath "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,20 +0,0 @@
-<?xml version="1.0"?>
-<log4net xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <appender name="AsynchronousLog4NetAppender" xdt:Transform="Remove" xdt:Locator="Match(name)" /> 
-  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core" xdt:Transform="Insert" >
-    <appender-ref ref="rollingFile" />
-  </appender>
-  
-  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender" xdt:Transform="InsertIfMissing">
-    <file value="App_Data\Logs\UmbracoTraceLog.txt" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <appendToFile value="true" />
-    <rollingStyle value="Date" />
-    <maximumFileSize value="5MB" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
-    </layout>
-    <encoding value="utf-8" />
-  </appender>
-</log4net>
-
@@ -1 +0,0 @@
-<processing xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xdt:Transform="SetAttributes(preserveExifMetaData)" preserveExifMetaData="true" />
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<trees xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--Content-->
-  <add alias="content" application="content"
-       xdt:Locator="Match(application,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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  
-  <!--Media-->
-  <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(application,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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  
-  <!--Settings-->
-  <add application="settings" alias="nodeTypes"  
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing" />
-  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" 
-       xdt:Locator="Match(application,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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" /> 
-  
-  <add application="settings" alias="partialViews" type="Umbraco.Web.Trees.PartialViewsTree, umbraco"
-       xdt:Locator="Match(application,alias,type)"
-       xdt:Transform="Remove()" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, umbraco" sortOrder="2"
-       xdt:Locator="Match(application,alias)"
-       xdt:Transform="InsertIfMissing"  />
-  
-  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add alias="dictionary" application="settings"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="RemoveAttributes(action)" />
-  <add application="settings" alias="languages" title="Languages" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="5" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" initialize="true" alias="mediaTypes" title="Media Types" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="7" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-
-  <!--Developer-->
-  <add alias="packager" application="developer"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add alias="packagerPackages" application="developer"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, umbraco" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing"  />
-  
-  <!-- Before 7.4 this tree had the alias 'dataType', without the 's' on the end, this is here to rename it  -->
-  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco"
-       xdt:Locator="Match(application,type)" 
-       xdt:Transform="SetAttributes(alias,sortOrder)" />
-	   
-  <!-- Yes, set the sortOrder again, like above because.. sometimes apparently we already have a dataTypes node and we can't remove more than one.. if they're equal though (same alias,application and sortOrder) it doesn't throw an error -->   
-  <add sortOrder="1" alias="dataTypes" application="developer"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes(sortOrder)" />
-	   
-  <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" 
-       xdt:Locator="Match(application,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(application,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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco"
-       xdt:Locator="Match(application,alias,type)" 
-       xdt:Transform="Remove()" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder"
-       xdt:Locator="Match(application,alias)"
-       xdt:Transform="InsertIfMissing"  />
-  
-  <add application="developer" alias="python" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-
-  <!--Users-->
-  <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" 
-       xdt:Locator="Match(application,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(application,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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-
-  <!--Members-->
-  <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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="member" alias="memberGroup"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing" />
-  <add application="member" alias="memberType"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add application="member" sortOrder="1" alias="memberTypes" initialize="true" title="Member Types" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing" />
-
-  <!--Translation-->
-  <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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add alias="openTasks" application="translation"
-       xdt:Locator="Match(application,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(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add alias="yourTasks" application="translation"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="RemoveAttributes(action)" />
-</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>
@@ -45,6 +45,9 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
 echo Removing masterpage files
 del ..\src\Umbraco.Web.UI\masterpages\*.*

+echo Removing view files
+del ..\src\Umbraco.Web.UI\Views\*.*
+
 echo Removing razor files
 del ..\src\Umbraco.Web.UI\macroScripts\*.*

@@ -101,9 +104,7 @@ echo Removing user control files
 FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A

 echo Removing view files
-ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
-ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A

 echo Removing razor files
 FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
@@ -54,6 +54,9 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
 echo Removing masterpage files
 del ..\src\Umbraco.Web.UI\masterpages\*.*

+echo Removing view files
+del ..\src\Umbraco.Web.UI\Views\*.*
+
 echo Removing razor files
 del ..\src\Umbraco.Web.UI\macroScripts\*.*

@@ -119,9 +122,7 @@ echo Removing user control files
 FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A

 echo Removing view files
-ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
-ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A

 echo Removing razor files
 FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
@@ -150,9 +151,6 @@ rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
 echo Start with a clean web.config
 copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y

-echo Start with a clean web.config
-copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
-
 echo "Umbraco install reverted to clean install"
 pause 
 exit
@@ -1,3 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.6.0
-RC2
+7.1.9
@@ -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
@@ -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>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-    <add key="umbracocore" value="http://www.myget.org/f/umbracocore/" />
-  </packageSources>
-</configuration>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -47,13 +47,13 @@
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
      <Private>True</Private>
+      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.dll</HintPath>
    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
      <Private>True</Private>
+      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -77,9 +77,8 @@
    <Compile Include="SqlCEUtility.cs" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="app.config" />
+    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String></wpf:ResourceDictionary>
@@ -40,10 +40,15 @@ namespace SqlCE4Umbraco
            var localConnection = new SqlCeConnection(ConnectionString);
            if (!System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
            {
-                using (var sqlCeEngine = new SqlCeEngine(ConnectionString))
-                {
-                    sqlCeEngine.CreateDatabase();
-                }
+                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();    
+                //}
            }
        }

@@ -180,16 +185,12 @@ namespace SqlCE4Umbraco
        /// <returns>The return value of the command.</returns>
        protected override object ExecuteScalar(string commandText, SqlCeParameter[] parameters)
        {
-#if DEBUG && DebugDataLayer
+            #if DEBUG && DebugDataLayer
                // Log Query Execution
                Trace.TraceInformation(GetType().Name + " SQL ExecuteScalar: " + commandText);
-#endif
-            using (var cc = UseCurrentConnection)
-            {
-                return SqlCeApplicationBlock.ExecuteScalar(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters);
-            }
+            #endif
+
+            return SqlCeApplicationBlock.ExecuteScalar(ConnectionString, CommandType.Text, commandText, parameters);
        }

        /// <summary>
@@ -202,17 +203,12 @@ namespace SqlCE4Umbraco
        /// </returns>
        protected override int ExecuteNonQuery(string commandText, SqlCeParameter[] parameters)
        {
-#if DEBUG && DebugDataLayer
+            #if DEBUG && DebugDataLayer
                // Log Query Execution
                Trace.TraceInformation(GetType().Name + " SQL ExecuteNonQuery: " + commandText);
-#endif
+            #endif

-            using (var cc = UseCurrentConnection)
-            {
-                return SqlCeApplicationBlock.ExecuteNonQuery(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters);
-            }
+            return SqlCeApplicationBlock.ExecuteNonQuery(ConnectionString, CommandType.Text, commandText, parameters);
        }

        /// <summary>
@@ -225,26 +221,20 @@ namespace SqlCE4Umbraco
        /// </returns>
        protected override IRecordsReader ExecuteReader(string commandText, SqlCeParameter[] parameters)
        {
-#if DEBUG && DebugDataLayer
+            #if DEBUG && DebugDataLayer
                // Log Query Execution
                Trace.TraceInformation(GetType().Name + " SQL ExecuteReader: " + commandText);
-#endif
+            #endif

-            using (var cc = UseCurrentConnection)
-            {
-                return new SqlCeDataReaderHelper(SqlCeApplicationBlock.ExecuteReader(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters));
-            }
+            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));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastiaan Janssen	25c68a5a36	Merge pull request #567 from readingdancer/Fix_issue_U4-4585 Fix so Login screen now works correctly with Umbraco UI Localization settings.	2014-11-26 12:03:46 +01:00
Sebastiaan Janssen	82d433d291	Ignore VS15 generated files	2014-11-26 11:31:22 +01:00
Sebastiaan Janssen	69ae715998	Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken. Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.	2014-11-26 10:31:13 +01:00
Chris Houston	87ae16b89a	Fix for issue http://issues.umbraco.org/issue/U4-4585 "I cant change UI language for the login screen in Umbraco 7.1.6" Also added a couple more Spanish translations to the Language file.	2014-11-25 19:14:35 +00:00
				`@@ -1 +0,0 @@`
				`<processing xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xdt:Transform="SetAttributes(preserveExifMetaData)" preserveExifMetaData="true" />`