Reload the node when publishing all unpublished children

.editorconfig

@@ -8,33 +8,9 @@ root = true
 # Use 4 spaces as indentation
 [*]
 insert_final_newline = true
-end_of_line = crlf
 indent_style = space
 indent_size = 4
 
 # Trim trailing whitespace, limited support.
 # https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
-trim_trailing_whitespace = true
-
-[*.{cs,vb}]
-dotnet_style_predefined_type_for_locals_parameters_members = true:error
-
-dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
-dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
-dotnet_naming_rule.private_members_with_underscore.severity = suggestion
-
-dotnet_naming_symbols.private_fields.applicable_kinds           = field
-dotnet_naming_symbols.private_fields.applicable_accessibilities = private
-
-dotnet_naming_style.prefix_underscore.capitalization = camel_case
-dotnet_naming_style.prefix_underscore.required_prefix = _
-
-# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
-[*.cs]
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
-csharp_prefer_braces = false : none
-
-[*.{js,less}]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true

.github/BUILD.md

@@ -1,180 +1,24 @@
-# Umbraco Cms Build
+Umbraco Cms Build
+--
+----
 
-## Are you sure?
+# Quick!
 
-In order to use Umbraco as a CMS and build your website with it, you should not build it yourself. If you're reading this then you're trying to contribute to Umbraco or you're debugging a complex issue.
+To build Umbraco, fire PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `README.md`...). There, trigger the build with the following command:
 
-- Are you about to create a pull request for Umbraco?
-- Are you trying to get to the bottom of a problem in your existing Umbraco installation?
-
-If the answer is yes, please read on. Otherwise, make sure to head on over [to the download page](https://our.umbraco.com/download) and start using Umbraco CMS as intended.
-
-**Table of contents**
-
-[Building from source](#building-from-source)
-  * [The quick build](#quick)
-  * [Build infrastructure](#build-infrastructure)
-    * [Properties](#properties)
-    * [GetUmbracoVersion](#getumbracoversion)
-    * [SetUmbracoVersion](#setumbracoversion)
-    * [Build](#build)
-    * [Build-UmbracoDocs](#build-umbracodocs)
-    * [Verify-NuGet](#verify-nuget)
-  * [Cleaning up](#cleaning-up)
-
-[Azure DevOps](#azure-devops)
-
-[Quirks](#quirks)
-  * [Powershell quirks](#powershell-quirks)
-  * [Git quirks](#git-quirks)
-
-
-## Building from source
-
-Did you read ["Are you sure"](#are-you-sure)?
-
-### Quick!
-
-To build Umbraco, fire up PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `LICENSE.md`...). There, trigger the build with the following command:
-
-    build/build.ps1
+    build\build.ps1
     
-You might run into [Powershell quirks](#powershell-quirks).
+By default, this builds the current version. It is possible to specify a different version as a parameter to the build script: 
 
-### Build Infrastructure
+    build\build.ps1 7.6.44
 
-The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
+Valid version strings are defined in the `Set-UmbracoVersion` documentation below.
 
-    $ubuild = build/build.ps1 -get
-
-The object exposes various properties and methods that can be used to fine-grain build Umbraco. Some, but not all, of them are detailed below.
-    
-#### Properties
-
-The object exposes the following properties:
-
-* `SolutionRoot`: the absolute path to the solution root
-* `VisualStudio`: a Visual Studio object (see below)
-* `NuGet`: the absolute path to the NuGet executable
-* `Zip`: the absolute path to the 7Zip executable
-* `VsWhere`: the absolute path to the VsWhere executable
-* `NodePath`: the absolute path to the Node install
-* `NpmPath`: the absolute path to the Npm install
-
-The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
-
-* `Path`: Visual Studio installation path (eg some place under `Program Files`)
-* `Major`: Visual Studio major version (eg `15` for VS 2017)
-* `Minor`: Visual Studio minor version
-* `MsBUild`: the absolute path to the MsBuild executable
-
-#### GetUmbracoVersion
-
-Gets an object representing the current Umbraco version. Example:
-
-    $v = $ubuild.GetUmbracoVersion()
-    Write-Host $v.Semver
-
-The object exposes the following properties:
-
-* `Semver`: the semver object representing the version
-* `Release`: the main part of the version (eg `7.6.33`)
-* `Comment`: the pre release part of the version (eg `alpha02`)
-* `Build`: the build number part of the version (eg `1234`)
-
-#### SetUmbracoVersion
-
-Modifies Umbraco files with the new version.
-
->This entirely replaces the legacy `UmbracoVersion.txt` file. Do *not* edit version infos in files.
-
-The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
-
-    $ubuild.SetUmbracoVersion("7.6.33")
-    $ubuild.SetUmbracoVersion("7.6.33-alpha.2")
-    $ubuild.SetUmbracoVersion("7.6.33+1234")
-    $ubuild.SetUmbracoVersion("7.6.33-beta.5+5678")
-
-#### Build
-
-Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
-
-    $ubuild.Build()
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-**Note: web.config**
-
-Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
-
-#### Build-UmbracoDocs
-
-Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
-
-    Build-UmbracoDocs
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-#### Verify-NuGet
-
-Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
-
-    Verify-NuGet
-
-### Cleaning up
-
-Once the solution has been used to run a site, one may want to "reset" the solution in order to run a fresh new site again.
-
-At the very minimum, you want
-
-    git clean -Xdf src/Umbraco.Web.UI/App_Data
-    rm src/Umbraco.Web.UI/web.config
-
-Then, a simple 'Rebuild All' in Visual Studio will recreate a fresh `web.config` but should be quite fast (since it does not really need to rebuild anything).
-
-The `clean` Git command force (`-f`) removes (`-X`, note the capital X) all files and directories (`-d`) that are ignored by Git.
-
-This will leave media files and views around, but in most cases, it will be enough.
-
-To perform a more complete clear, you will want to also delete the content of the media, views, scripts... directories.
-
-The following command will force remove all untracked files and directories, whether they are ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
-
-    git clean -xdf .
-    
-For git documentation see:
-* git [clean](<https://git-scm.com/docs/git-clean>)
-* git [reset](<https://git-scm.com/docs/git-reset>)
-
-## Azure DevOps
-
-Umbraco uses Azure DevOps for continuous integration, nightly builds and release builds. The Umbraco CMS project on DevOps [is available for anonymous users](https://umbraco.visualstudio.com/Umbraco%20Cms).
-
-DevOps uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
-
-* `pre-build`: prepares the build
-* `compile-belle`: compiles Belle
-* `compile-umbraco`: compiles Umbraco
-* `pre-tests`: prepares the tests
-* `compile-tests`: compiles the tests
-* `pre-packages`: prepares the packages
-* `pkg-zip`: creates the zip files
-* `pre-nuget`: prepares NuGet packages
-* `pkg-nuget`: creates NuGet packages
-
-All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated DevOps tasks. Similarly, creating the NuGet packages is also performed by dedicated DevOps tasks.
-
-Finally, the produced artifacts are published in two containers that can be downloaded from DevOps: `zips` contains the zip files while `nuget` contains the NuGet packages.
-
->During a DevOps build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in DevOps tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with DevOps at the moment.
-
-## Quirks
-
-### PowerShell Quirks
+## PowerShell Quirks
 
 There is a good chance that running `build.ps1` ends up in error, with messages such as
 
->The file ...\build.ps1 is not digitally signed. You cannot run this script on the current system. For more information about running scripts and setting execution policy, see about_Execution_Policies.
+>The file ...\build\build.ps1 is not digitally signed. You cannot run this script on the current system. For more information about running scripts and setting execution policy, see about_Execution_Policies.
 
 PowerShell has *Execution Policies* that may prevent the script from running. You can check the current policies with:
 
@@ -198,7 +42,7 @@ Alternatively, you can do it at machine level, from within an elevated PowerShel
 
 And *then* the script should run. It *might* however still complain about executing scripts, with messages such as:
 
->Security warning - Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run ...\build.ps1?
+>Security warning - Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run ...\build\build.ps1?
 [D] Do not run  [R] Run once  [S] Suspend  [?] Help (default is "D"):
 
 This is usually caused by the scripts being *blocked*. And that usually happens when the source code has been downloaded as a Zip file. When Windows downloads Zip files, they are marked as *blocked* (technically, they have a Zone.Identifier alternate data stream, with a value of "3" to indicate that they were downloaded from the Internet). And when such a Zip file is un-zipped, each and every single file is also marked as blocked.
@@ -207,6 +51,136 @@ The best solution is to unblock the Zip file before un-zipping: right-click the
 
     PS> Get-ChildItem -Recurse *.* | Unblock-File
 
-### Git Quirks
+## Notes
 
-Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
+Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
+
+# Build
+
+The Umbraco Build solution relies on a PowerShell module. The module needs to be imported into PowerShell. From within Umbraco's repository root:
+
+    build\build.ps1 -ModuleOnly
+
+Or the abbreviated form:
+
+    build\build.ps1 -mo
+
+Once the module has been imported, a set of commands are added to PowerShell.
+
+## Get-UmbracoBuildEnv
+
+Gets the Umbraco build environment ie NuGet, Semver, Visual Studio, etc. Downloads things that can be downloaded such as NuGet. Examples:
+
+    $uenv = Get-UmbracoBuildEnv
+    Write-Host $uenv.SolutionRoot
+    &$uenv.NuGet help
+    
+The object exposes the following properties:
+
+* `SolutionRoot`: the absolute path to the solution root
+* `VisualStudio`: a Visual Studio object (see below)
+* `NuGet`: the absolute path to the NuGet executable
+* `Zip`: the absolute path to the 7Zip executable
+* `VsWhere`: the absolute path to the VsWhere executable
+* `NodePath`: the absolute path to the Node install
+* `NpmPath`: the absolute path to the Npm install
+
+The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
+
+* `Path`: Visual Studio installation path (eg some place under `Program Files`)
+* `Major`: Visual Studio major version (eg `15` for VS 2017)
+* `Minor`: Visual Studio minor version
+* `MsBUild`: the absolute path to the MsBuild executable
+
+## Get-UmbracoVersion
+
+Gets an object representing the current Umbraco version. Example:
+
+    $v = Get-UmbracoVersion
+    Write-Host $v.Semver
+
+The object exposes the following properties:
+
+* `Semver`: the semver object representing the version
+* `Release`: the main part of the version (eg `7.6.33`)
+* `Comment`: the pre release part of the version (eg `alpha02`)
+* `Build`: the build number part of the version (eg `1234`)
+
+## Set-UmbracoVersion
+
+Modifies Umbraco files with the new version.
+
+>This entirely replaces the legacy `UmbracoVersion.txt` file.
+
+The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
+
+    Set-UmbracoVersion 7.6.33
+    Set-UmbracoVersion 7.6.33-alpha02
+    Set-UmbracoVersion 7.6.33+1234
+    Set-UmbracoVersion 7.6.33-beta05+5678
+
+Note that `Set-UmbracoVersion` enforces a slightly more restrictive naming scheme than what semver would tolerate. The pre release part can only be composed of a-z and 0-9, therefore `alpha033` is considered valid but not `alpha.033` nor `alpha033-preview` nor `RC2` (would need to be lowercased `rc2`). 
+
+>It is considered best to add trailing zeroes to pre releases, else NuGet gets the order of versions wrong. So if you plan to have more than 10, but no more that 100 alpha versions, number the versions `alpha00`, `alpha01`, etc. 
+
+## Build-Umbraco
+
+Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
+
+    Build-Umbraco
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+### web.config
+
+Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
+
+## Build-UmbracoDocs
+
+Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
+
+    Build-UmbracoDocs
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+## Verify-NuGet
+
+Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
+
+    Verify-NuGet
+
+# VSTS
+
+Continuous integration, nightly builds and release builds run on VSTS.
+
+VSTS uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
+
+* `pre-build`: prepares the build
+* `compile-belle`: compiles Belle
+* `compile-umbraco`: compiles Umbraco
+* `pre-tests`: prepares the tests
+* `compile-tests`: compiles the tests
+* `pre-packages`: prepares the packages
+* `pkg-zip`: creates the zip files
+* `pre-nuget`: prepares NuGet packages
+* `pkg-nuget`: creates NuGet packages
+
+All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated VSTS tasks. Similarly, creating the NuGet packages is also performed by dedicated VSTS tasks.
+
+Finally, the produced artifacts are published in two containers that can be downloaded from VSTS: `zips` contains the zip files while `nuget` contains the NuGet packages.
+
+>During a VSTS build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in VSTS tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with VSTS at the moment.
+
+# Notes
+
+*This part needs to be cleaned up*
+
+Nightlies should use some sort of build number.
+
+We should increment versions as soon as a version is released. Ie, as soon as `7.6.33` is released, we should `Set-UmbracoVersion 7.6.34-alpha` and push.
+
+NuGet / NuSpec consistency checks are performed in tests. We should move it so it is done as part of the PowerShell script even before we try to compile and run the tests.
+
+There are still a few commands in `build` (to build docs, install Git or cleanup the install) that will need to be migrated to PowerShell.
+
+/eof

.github/CONTRIBUTING.md

@@ -1,187 +1,99 @@
-# Contributing to Umbraco CMS
-
-👍🎉 First off, thanks for taking the time to contribute! 🎉👍
-
-The following is a set of guidelines for contributing to Umbraco CMS.
-
-These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
-
-Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
-
-**Code of conduct**
-
-This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
-
-**Table of contents**
-
-[Contributing code changes](#contributing-code-changes)
-  * [Guidelines for contributions we welcome](#guidelines-for-contributions-we-welcome)
-  * [What can I start with?](#what-can-i-start-with)
-  * [How do I begin?](#how-do-i-begin)
-  * [Pull requests](#pull-requests)
-
-[Reviews](#reviews)
-  * [Styleguides](#styleguides)
-  * [The PR team](#the-pr-team)
-  * [Questions?](#questions)
-
-[Working with the code](#working-with-the-code)
-  * [Building Umbraco from source code](#building-umbraco-from-source-code)
-  * [Working with the source code](#working-with-the-source-code)
-  * [Making changes after the PR was opened](#making-changes-after-the-pr-was-opened)
-  * [Which branch should I target for my contributions?](#which-branch-should-i-target-for-my-contributions)
-  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
-
-## Contributing code changes
-
-This document gives you a quick overview on how to get started.
-
-### Guidelines for contributions we welcome
-
-Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.
-
-We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md). Make sure to talk to us before making large changes.
-
-Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
-
-### What can I start with?
-
-Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` issues](https://github.com/umbraco/Umbraco-CMS/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs+)
-
-### How do I begin?
-
-Great question! The short version goes like this:
-
-  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
-
-  ![Fork the repository](img/forkrepository.png)
-
-  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
-
-  ![Clone the fork](img/clonefork.png)
-
-  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
-  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
-  * **Commit** - done? Yay! 🎉 **Important:** create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`. When you have a branch, commit your changes. Don't commit to `v8/dev`, create a new branch first.
-  * **Push** - great, now you can push the changes up to your fork on GitHub
-  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
-
-  ![Create a pull request](img/createpullrequest.png)
-
-### Pull requests
-The most successful pull requests usually look a like this:
-
-  * Fill in the required template
-  * Include screenshots and animated GIFs in your pull request whenever possible.
-  * Unit tests, while optional are awesome, thank you!
-  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
-
-Again, these are guidelines, not strict requirements.
-
-## Reviews
-
-You've sent us your first contribution, congratulations! Now what?
-
-The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request you to make some additional changes.
-
-We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
-
-- Your PR will get a reply within 48 hours
-- An in-depth reply will be added within at most 2 weeks
-- The PR will be either merged or rejected within at most 4 weeks
-- Sometimes it is difficult to meet these timelines and we'll talk to you
-
-### Styleguides
-
-To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
-
-That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
-
-### The PR team
-
-The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
-
-- [Anders Bjerner](https://github.com/abjerner)
-- [Dave Woestenborghs](https://github.com/dawoe)
-- [Emma Burstow](https://github.com/emmaburstow)
-- [Poornima Nayar](https://github.com/poornimanayar)
-
-These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay.
-
-### Questions?
-
-You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:
-
-- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
-- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
-
-## Working with the code
-
-### Building Umbraco from source code
-
-In order to build the Umbraco source code locally, first make sure you have the following installed.
-
-  * Visual Studio 2017 v15.9.7+
-  * Node v10+
-  * npm v6.4.1+
-
-The easiest way to get started is to run `build.ps1` 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 `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
-
-Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.9.7 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
-
-![Gulp build in Visual Studio](img/gulpbuild.png)
-
-After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
-
-### Working with the source code
-
-Some parts of our source code are over 10 years old now. And when we say "old", we mean "mature" of course!
-
-There's two big areas that you should know about:
-
-  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
-  You may need to run the following commands to set up gulp properly:
-  ```
-  npm cache clean --force
-  npm install
-  npm run build
-  ```
-  2. "The rest" is a C# based codebase, which is mostly ASP.NET MVC based. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
-
-To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
-
-  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
-  * [The C# application](https://our.umbraco.com/apidocs/csharp/)
-
-### Which branch should I target for my contributions?
-
-We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v8/dev`. Whatever the default is, that's where we'd like you to target your contributions.
-
-![Which branch should I target?](img/defaultbranch.png)
-
-### Making changes after the PR was opened
-
-If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
-
-### Keeping your Umbraco fork in sync with the main repository
-
-We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
-
-Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
-
-To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
-
-```
-git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
-```
-
-Then when you want to get the changes from the main repository:
-
-```
-git fetch upstream
-git rebase upstream/v8/dev
-```
-
-In this command we're syncing with the `v8/dev` branch, but you can of course choose another one if needed.
-
-(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/docs/CONTRIBUTING.md) to go to the v8 branch_
+# Contributing to Umbraco CMS
+
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍
+
+The following is a set of guidelines for contributing to Umbraco CMS.
+
+These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
+
+## Contributing code changes
+
+This document gives you a quick overview on how to get started, we will link to in-depth documentation throughout if you need some more background info.
+
+
+## Guidelines for contributions we welcome
+
+Not all changes are wanted so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valueable time.
+
+We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md), make sure to talk to us before making large changes.
+
+Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
+
+## How do I begin?
+
+Great question! The short version goes like this:
+
+  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
+
+  ![Fork the repository](img/forkrepository.png)
+
+  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
+  
+  ![Clone the fork](img/clonefork.png)
+
+  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
+  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
+  * **Commit** - done? Yay! 🎉 It is recommended to create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-U4-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `U4-12345`
+  * **Push** - great, now you can push the changes up to your fork on GitHub
+  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
+
+  ![Create a pull request](img/createpullrequest.png)
+
+### Further reading
+
+At this point you might want to [read on about contributing in depth](CONTRIBUTING_DETAILED.md). 
+
+### Reviews
+
+You've sent us your first contribution, congratulations! Now what?
+
+The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request you to make some additional changes.
+
+We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
+
+- Your PR will get a reply within 48 hours
+- An in-depth reply will be added within at most 2 weeks
+- The PR will be either merged or rejected within at most 4 weeks
+- Sometimes it is difficult to meet these timelines and we'll talk to you
+
+## Styleguides
+
+To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
+
+That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
+
+## The PR team
+
+The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
+
+- [Anders Bjerner](https://github.com/abjerner)
+- [Dave Woestenborghs](https://github.com/dawoe)
+- [Emma Burstow](https://github.com/emmaburstow)
+- [Kyle Weems](https://github.com/cssquirrel)
+- [Poornima Nayar](https://github.com/poornimanayar)
+
+These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay. 
+
+## Questions?
+
+You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:
+
+- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
+- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
+- We're also [active in the Gitter chatroom](https://gitter.im/umbraco/Umbraco-CMS)
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+
+
+## Contributing to Umbraco, in depth
+
+There are other ways to contribute, and there's a few more things that you might be wondering about. We will answer the [most common questions and ways to contribute in our detailed documentation](CONTRIBUTING_DETAILED.md).
+
+## Credits
+
+This contribution guide borrows heavily from the excellent work on [the Atom contribution guide](https://github.com/atom/atom/blob/master/CONTRIBUTING.md). A big [#h5yr](http://h5yr.com/) to them!

.github/CONTRIBUTING_DETAILED.md

@@ -0,0 +1,159 @@
+# Contributing in detail
+
+There's more than one way to contribute to Umbraco, there's some more suggestions below.
+
+When contributing code to Umbraco there's plenty of things you'll want to know, skip down to [What should I know before I get started](#what-should-i-know-before-i-get-started) for the answers to your burning questions.
+
+#### Table Of Contents
+
+[How Can I Contribute?](#how-can-i-contribute)
+  * [Reporting Bugs](#reporting-bugs)
+  * [Suggesting Enhancements](#suggesting-enhancements)
+  * [Your First Code Contribution](#your-first-code-contribution)
+  * [Pull Requests](#pull-requests)
+
+[Styleguides](#styleguides)
+
+[What should I know before I get started?](#what-should-i-know-before-i-get-started)
+  * [Working with the source code](#working-with-the-source-code)
+  * [What branch should I target for my contributions?](#what-branch-should-i-target-for-my-contributions)
+  * [Building Umbraco from source code](#building-umbraco-from-source-code)
+  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
+  
+## How Can I Contribute?
+
+### Reporting Bugs
+This section guides you through submitting a bug report for Umbraco CMS. Following these guidelines helps maintainers and the community understand your report 📝, reproduce the behavior 💻 💻, and find related reports 🔎.
+
+Before creating bug reports, please check [this list](#before-submitting-a-bug-report) as you might find out that you don't need to create one. When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](http://issues.umbraco.org/issues#newissue=61-30118), the information it asks for helps us resolve issues faster.
+
+> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
+
+##### Before Submitting A Bug Report
+
+  * Most importantly, check **if you can reproduce the problem** in the [latest version of Umbraco](https://our.umbraco.com/download/). We might have already fixed your particular problem.
+  * It also helps tremendously to check if the issue you're experiencing is present in **a clean install** of the Umbraco version you're currently using. Custom code can have side-effects that don't occur in a clean install.
+  * **Use the Google**. Whatever you're experiencing, Google it plus "Umbraco" - usually you can get some pretty good hints from the search results, including open issues and further troubleshooting hints.
+  * If you do find and existing issue has **and the issue is still open**, add a comment to the existing issue if you have additional information. If you have the same problem and no new info to add, just "star" the issue.
+
+Explain the problem and include additional details to help maintainers reproduce the problem. The following is a long description which we've boiled down into a few very simple questions in the issue tracker when you create a new issue. We're listing the following hints to indicate that the most successful reports usually have a lot of this ground covered:
+
+  * **Use a clear and descriptive title** for the issue to identify the problem.
+  * **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining which steps you took in the backoffice to get to a certain undesireable result, e.g. you created a document type, inherting 3 levels deep, added a certain datatype, tried to save it and you got an error.
+  * **Provide specific examples to demonstrate the steps**. If you wrote some code, try to provide a code sample as specific as possible to be able to reproduce the behavior.
+  * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
+  * **Explain which behavior you expected to see instead and why.**
+
+Provide more context by answering these questions:
+
+  * **Can you reproduce the problem** when `debug="false"` in your `web.config` file?
+  * **Did the problem start happening recently** (e.g. after updating to a new version of Umbraco) or was this always a problem?
+  * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
+
+Include details about your configuration and environment:
+
+  * **Which version of Umbraco are you using?** 
+  * **What is the environment you're using Umbraco in?** Is this a problem on your local machine or on a server. Tell us about your configuration: Windows version, IIS/IISExpress, database type, etc.
+  * **Which packages do you have installed?**
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for Umbraco, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion 📝 and find related suggestions 🔎.
+
+Most of the suggestions in the [reporting bugs](#reporting-bugs) section also count for suggesting enhancements.
+
+Some additional hints that may be helpful:
+
+  * **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Umbraco which the suggestion is related to.
+  * **Explain why this enhancement would be useful to most Umbraco users** and isn't something that can or should be implemented as a [community package](https://our.umbraco.com/projects/).
+
+### Your First Code Contribution
+
+Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` and issues](http://issues.umbraco.org/issues/U4?q=%28project%3A+%7BU4%7D+Difficulty%3A+%7BVery+Easy%7D+%23Easy+%23Unresolved+Priority%3A+Normal+%23Major+%23Show-stopper+State%3A+-%7BIn+Progress%7D+sort+by%3A+votes+Affected+versions%3A+-6.*+Affected+versions%3A+-4.*%29+OR+%28tag%3A+%7BUp+For+Grabs%7D+%23Unresolved+%29).
+
+The issue list is sorted by total number of upvotes. While not perfect, number of upvotes is a reasonable proxy for impact a given change will have.
+
+### Pull Requests
+
+The most successful pull requests usually look a like this:
+
+  * Fill in the required template
+  * Include screenshots and animated GIFs in your pull request whenever possible.
+  * Unit tests, while optional are awesome, thank you!
+  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
+
+Again, these are guidelines, not strict requirements. 
+
+## Making changes after the PR was opened
+
+If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
+
+## Styleguides
+
+To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
+
+That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc. 
+
+## What should I know before I get started?
+
+### Working with the source code
+
+Some parts of our source code is over 10 years old now. And when we say "old", we mean "mature" of course!
+
+There's two big areas that you should know about:
+
+  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
+  You may need to run the following commands to set up gulp properly:
+  ```
+  npm cache clean
+  npm install -g bower
+  npm install -g gulp
+  npm install -g gulp-cli
+  npm install
+  gulp build
+  ```
+  2. "The rest" is a C# based codebase, with some traces of our WebForms past but mostly ASP.NET MVC based these days. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
+
+To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
+
+  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
+  * [The rest](https://our.umbraco.com/apidocs/csharp/)
+
+### What branch should I target for my contributions?
+
+We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `dev-v7`. Whatever the default is, that's where we'd like you to target your contributions.
+
+![What branch do you want me to target?](img/defaultbranch.png)
+
+### Building Umbraco from source code
+
+The easiest way to get started is to run `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 `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
+
+Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.3 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
+
+![Gulp build in Visual Studio](img/gulpbuild.png)
+
+After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
+
+### Keeping your Umbraco fork in sync with the main repository
+
+We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
+
+Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
+
+To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
+
+```
+git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
+```
+
+Then when you want to get the changes from the main repository:
+
+```
+git fetch upstream
+git rebase upstream/dev-v7
+```
+
+In this command we're syncing with the `dev-v7` branch, but you can of course choose another one if needed.
+
+(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))

.github/CONTRIBUTION_GUIDELINES.md

@@ -0,0 +1,33 @@
+# Contributing to Umbraco CMS
+
+When you’re considering creating a pull request for Umbraco CMS, we will categorize them in two different sizes, small and large.
+
+The process for both sizes is very similar, as [explained in the contribution document](CONTRIBUTING.md#how-do-i-begin).
+
+## Small PRs
+Bug fixes and small improvements - can be recognized by seeing a small number of changes and possibly a small number of new files.
+
+We’re usually able to handle small PRs pretty quickly. A community volunteer will do the initial review and flag it for Umbraco HQ as “community tested”. If everything looks good, it will be merged pretty quickly [as per the described process](REVIEW_PROCESS.md).
+
+### Up for grabs
+
+Umbraco HQ will regularly mark newly created issues on the issue tracker with the `Up for grabs` tag. This means that the proposed changes are wanted in Umbraco but the HQ does not have the time to make them at this time. These issues are usually small enough to fit in the "Small PRs" category and we encourage anyone to pick them up and help out.  
+
+If you do start working on something, make sure leave a small comment on the issue saying something like: "I'm working on this". That way other people stumbling upon the issue know they don't need to pick it up, someone already has.
+
+## Large PRs
+New features and large refactorings - can be recognized by seeing a large number of changes, plenty of new files, updates to package manager files (NuGet’s packages.config, NPM’s packages.json, etc.).  
+
+We would love to follow the same process for larger PRs but this is not always possible due to time limitations and priorities that need to be aligned. We don’t want to put up any barriers, but this document should set the correct expectations.  
+
+Please make sure to describe your idea in an issue, it helps to put in mockup screenshots or videos.  
+
+If the change makes sense for HQ to include in Umbraco CMS we will leave you some feedback on how we’d like to see it being implemented. 
+
+If a larger pull request is encouraged by Umbraco HQ, the process will be similar to what is described in the [small PRs process](#small-prs) above, we’ll get feedback to you within 14 days. Finalizing and merging the PR might take longer though as it will likely need to be picked up by the development team to make sure everything is in order. We’ll keep you posted on the progress.
+
+### Pull request or package?
+
+If it doesn’t fit in CMS right now, we will likely encourage you to make it into a package instead. A package is a great way to check out popularity of a feature, learn how people use it, validate good usability and to fix bugs.  
+
+Eventually, a package could "graduate" to be included in the CMS.  

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +1,11 @@
 ### Prerequisites
 
+- [ ] I have [created an issue](https://github.com/umbraco/Umbraco-CMS/issues) for the proposed changes in this PR, the link is:
 - [ ] I have added steps to test this contribution in the description below
 
-If there's an existing issue for this PR then this fixes <!-- link to the issue here! -->
-
 ### Description
-<!-- 
-    A description of the changes proposed in the pull-request and how to test these changes.
-
-    The most successful pull requests usually look a like this:
-
-    * Fill in this template with details: what did you do, why did you do it, how can we test the changes?
-    * Include screenshots and animated GIFs in your pull request whenever possible.
-    * Unit tests, while optional are awesome, thank you!
-
-    While these are guidelines and not strict requirements, they really help us evaluate your PR quicker.
--->
+<!-- A description of the changes proposed in the pull-request -->
+<!-- Make sure to link to the related issue number so we can easily find it in the issue tracker -->
 
 
 <!-- Thanks for contributing to Umbraco CMS! -->

.github/README.md

@@ -1,40 +1,50 @@
-# [Umbraco CMS](https://umbraco.com) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=v8/dev)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
-
-Umbraco is the friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 500,000 websites worldwide. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
-
-Learn more at [umbraco.com](https://umbraco.com)
-
-<p align="center">
-  <img src="img/logo.png" alt="Umbraco Logo" />
-</p>
-
-See the official [Umbraco website](https://umbraco.com) for an introduction, core mission and values of the product and team behind it.
-
-- [Getting Started](#getting-started)
-- [Documentation](#documentation)
-- [Community](#join-the-umbraco-community)
-- [Contributing](#contributing)
-
-Please also see our [Code of Conduct](CODE_OF_CONDUCT.md).
-
-## Getting Started
-
-[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet, with full support for all your custom .NET code and integrations. You're up and running in less than a minute, and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14-day trial, no credit card needed.
-
-If you want to DIY, you can [download Umbraco]((https://our.umbraco.com/download)) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host it yourself, and handling deployments and upgrades will be all up to you.
-
-## Documentation
-
-The documentation for Umbraco CMS can be found [on Our Umbraco](https://our.umbraco.com/documentation/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
-
-## Join the Umbraco community
-
-Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com/). Our Umbraco features forums for questions and answers, documentation, downloadable plugins for Umbraco, and a rich collection of community resources.
-
-Besides "Our", we all support each other also via Twitter: [Umbraco HQ](https://twitter.com/umbraco), [Release Updates](https://twitter.com/umbracoproject), [#umbraco](https://twitter.com/hashtag/umbraco)
-
-
-## Contributing
-
-Umbraco is contribution-focused and community-driven. If you want to contribute back to the Umbraco source code, please check out our [guide to contributing](CONTRIBUTING.md).
-
+[![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
+
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/tree/temp8) to go to the v8 branch_
+
+Umbraco CMS
+===========
+The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
+
+[![ScreenShot](img/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.
+
+## Watch an introduction video
+
+[![ScreenShot](https://shop.umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
+
+## Umbraco - The Friendly CMS
+
+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.
+
+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 443,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 220,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/case-studies-testimonials/](https://umbraco.com/case-studies-testimonials/)
+
+## 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.
+
+## Trying out Umbraco CMS
+
+[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet with full support for all your custom .NET code and intergrations. You're up and running in less than a minute and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14 day trial, no credit card needed.
+
+If you want to DIY you can [download Umbraco](https://our.umbraco.com/download) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host yourself and handling deployments and upgrades is all down to you.
+
+## Community
+
+Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com). Our Umbraco feature forums for questions and answers, documentation, downloadable plugins for Umbraco and a rich collection of community resources.
+
+## 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](CONTRIBUTING.md).
+
+## 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://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md).
+
+You can comment and report issues on the [github issue tracker](https://github.com/umbraco/Umbraco-CMS/issues).
+Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/) the old issue tracker is in read only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).

.github/REVIEW_PROCESS.md

@@ -0,0 +1,25 @@
+# Review process
+
+You're an awesome person and have sent us your contribution in the form of a pull request! It's now time to relax for a bit and wait for our response. 
+
+In order to set some expectations, here's what happens next.
+
+## Review process
+
+You will get an initial reply within 48 hours (workdays) to acknowledge that we’ve seen your PR and we’ll pick it up as soon as we can.
+
+You will get feedback within at most 14 days after opening the PR. You’ll most likely get feedback sooner though. Then there are a few possible outcomes:
+
+- Your proposed change is awesome! We merge it in and it will be included in the next minor release of Umbraco
+- If the change is a high priority bug fix, we will cherry-pick it into the next patch release as well so that we can release it as soon as possible
+- Your proposed change is awesome but needs a bit more work, we’ll give you feedback on the changes we’d like to see
+- Your proposed change is awesome but.. not something we’re looking to include at this point. We’ll close your PR and the related issue (we’ll be nice about it!)
+
+## Are you still available?
+
+We understand you have other things to do and can't just drop everything to help us out.   
+So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.  
+
+If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.  
+
+There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.

.gitignore

@@ -1,164 +1,144 @@
-#
-# Umbraco Cms Git Ignore
-#
-
-# common files
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*.orig
-*.suo
-*.vs10x
-*.ndproj
-*.ignorer.*
-
-# common directories
-.DS_Store
-._.DS_Store
-.vs/
-/local/
-
-# build directories
-[Bb]in/
-[Db]ebug*/
-[Rr]elease*/
-obj/
-
-# tools
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-tools/NDepend/
-
-
-
-
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-[sS]ource
-[sS]andbox
-umbraco.config
-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
-
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
-src/Umbraco.Web.UI/[Cc]onfig/serilog.config
-src/Umbraco.Web.UI/[Cc]onfig/serilog.user.config
-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
-
-node_modules
-lib-bower
-
-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/*.loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
-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/canvasdesigner.*.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/
-
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/vwd.webinfo
-
-src/Umbraco.Web.UI/App_Plugins/*
-src/*.psess
-src/*.vspx
-
-NDependOut/*
-QueryResult.htm
-
-src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
-src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
-src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/Umbraco.Web.UI.Client/bower_components/*
-/src/Umbraco.Web.UI/[Uu]mbraco/preview
-/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
-
-# ignore rule for clearing out Belle (avoid rebuilding all the time)
-preserve.belle
-
-#Ignore Rule for output of generated documentation files from Grunt docserve
-src/Umbraco.Web.UI.Client/docs/api
-src/*.boltdata/
-src/umbraco.sln.ide/*
-src/.vs/
-
-src/Umbraco.Web.UI/[Jj]s/*
-src/Umbraco.Tests/[Mm]edia
-tools/docfx/*
-apidocs/_site/*
-src/*/project.lock.json
-src/.idea/*
-
-apidocs/api/*
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-src/packages/
-src/PrecompiledWeb/*
-
-# build
-build.out/
-build.tmp/
-build/hooks/
-build/temp/
-
-
-
-# eof
-/src/Umbraco.Web.UI.Client/TESTS-*.xml
-/src/ApiDocs/api/*
+*.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
+*.ncrunchsolution
+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
+
+node_modules
+lib-bower
+
+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/
+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
+/src/Umbraco.Web.UI/Umbraco/preview.old
+
+#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/*
+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
+.vs/
+src/packages/
+src/PrecompiledWeb/*
+
+
+build.out/
+build.tmp/
+build/Modules/*/temp/
+/src/.idea/*

NuGet.Config

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <!--
-    this is Umbraco's NuGet configuration,
-    content of this file is merged with the system-wide configuration,
-    at %APPDATA%\NuGet\NuGet.config
-  -->
-  <packageSources>
-    <add key="UmbracoCoreMyGet" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
-    <add key="ExamineAppVeyor" value="https://ci.appveyor.com/nuget/examine-f73l6qv0oqfh/" />
-  </packageSources>
-</configuration>

apidocs/docfx.json

@@ -0,0 +1,75 @@
+{
+  "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"
+    ]
+  }
+}

apidocs/umbracotemplate/partials/footer.tmpl.partial

@@ -7,7 +7,7 @@
       <span class="pull-right">
         <a href="#top">Back to top</a>
       </span>
-      <span>Copyright © 2016-present Umbraco<br>Generated by <strong>DocFX</strong></span>
+      <span>Copyright © 2016 Umbraco<br>Generated by <strong>DocFX</strong></span>
     </div>
   </div>
 </footer>

appveyor.yml

@@ -0,0 +1,62 @@
+version: '{build}'
+shallow_clone: true
+
+init:
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  
+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

build.bat

@@ -0,0 +1,14 @@
+@ECHO OFF
+powershell .\build\build.ps1
+
+IF ERRORLEVEL 1 (
+	GOTO :error 
+) ELSE (
+	GOTO :EOF 
+)
+
+:error
+ECHO.
+ECHO Can not run build\build.ps1.
+ECHO If this is due to a SecurityError then please refer to BUILD.md for help!
+ECHO.

build/Azure/azuregalleryrelease.ps1

@@ -1,59 +0,0 @@
-Param(
- [string]$GitHubPersonalAccessToken,
- [string]$Directory
-)
-$workingDirectory = $Directory
-CD "$($workingDirectory)"
-
-# Clone repo
-$fullGitUrl = "https://$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
-git clone $($fullGitUrl) $($env:GIT_REPOSITORYNAME) 2>&1 | % { $_.ToString() } 
-
-# Remove everything so that unzipping the release later will update everything
-# Don't remove the readme file nor the git directory
-Write-Host "Cleaning up git directory before adding new version"
-Remove-Item -Recurse "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)\*" -Exclude README.md,.git
-
-# Find release zip
-$zipsDir = "$($workingDirectory)\$($env:BUILD_DEFINITIONNAME)\zips"
-$pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
-Write-Host "Searching for Umbraco release files in $($zipsDir) for a file with pattern $($pattern)"
-$file = (Get-ChildItem "$($zipsDir)" | Where-Object { $_.Name -match "$($pattern)" })
-
-if($file)
-{
-    # Get release name
-    $version = [regex]::Match($($file.Name), $($pattern)).captures.groups[1].value
-    $releaseName = "Umbraco $($version)"
-    Write-Host "Found $($releaseName)"
-    
-    # Unzip into repository to update release
-    Add-Type -AssemblyName System.IO.Compression.FileSystem
-    Write-Host "Unzipping $($file.FullName) to $($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
-    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)")
-    
-    # Telling git who we are
-    git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
-    git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
-    
-    # Commit
-    CD "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
-    Write-Host "Committing Umbraco $($version) Release from Build Output"
-
-    git add . 2>&1 | % { $_.ToString() } 
-    git commit -m " Release $($releaseName) from Build Output" 2>&1 | % { $_.ToString() } 
-
-    # Tag the release
-    git tag -a "v$($version)" -m "v$($version)"
-
-    # Push release to master
-    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$($GitHubPersonalAccessToken)@$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
-    git push $($fullGitAuthUrl) 2>&1 | % { $_.ToString() } 
-
-    #Push tag to master
-    git push $($fullGitAuthUrl) --tags 2>&1 | % { $_.ToString() }
-}
-else
-{
-    Write-Error "Umbraco release file not found, searched in $($workingDirectory)\$($zipsDir) for a file with pattern $($pattern) - canceling"
-}

build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1

@@ -0,0 +1,112 @@
+#
+
+function Build-UmbracoDocs
+{
+  $uenv = Get-UmbracoBuildEnv
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $out = "$($uenv.SolutionRoot)\build.out"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  
+  $buildTemp = "$PSScriptRoot\temp"
+  $cache = 2
+  
+  Prepare-Build -keep $uenv
+
+  ################ Do the UI docs
+  # get a temp clean node env (will restore)
+  Sandbox-Node $uenv
+  
+  Write-Host "Executing gulp docs"
+  
+  push-location "$($uenv.SolutionRoot)\src\Umbraco.Web.UI.Client"
+  write "node version is:" > $tmp\belle-docs.log
+  &node -v >> $tmp\belle-docs.log 2>&1
+  write "npm version is:" >> $tmp\belle-docs.log 2>&1
+  &npm -v >> $tmp\belle-docs.log 2>&1
+  write "executing npm install" >> $tmp\belle-docs.log 2>&1
+  &npm install >> $tmp\belle-docs.log 2>&1
+  write "executing bower install" >> $tmp\belle-docs.log 2>&1
+  &npm install -g bower >> $tmp\belle-docs.log 2>&1
+  write "installing gulp" >> $tmp\belle-docs.log 2>&1
+  &npm install -g gulp >> $tmp\belle-docs.log 2>&1
+  write "installing gulp-cli" >> $tmp\belle-docs.log 2>&1
+  &npm install -g gulp-cli --quiet >> $tmp\belle-docs.log 2>&1
+  write "building docs using gulp" >> $tmp\belle-docs.log 2>&1
+  &gulp docs >> $tmp\belle-docs.log 2>&1
+  pop-location  
+
+  Write-Host "Completed gulp docs build"
+  
+  # fixme - should we filter the log to find errors?
+  #get-content .\build.tmp\belle-docs.log | %{ if ($_ -match "build") { write $_}}
+  
+  # change baseUrl
+  $baseUrl = "https://our.umbraco.com/apidocs/ui/"
+  $indexPath = "$src/Umbraco.Web.UI.Client/docs/api/index.html"
+  (Get-Content $indexPath).Replace("origin + location.href.substr(origin.length).replace(rUrl, indexFile)", "'$baseUrl'") `
+    | Set-Content $indexPath
+    
+  # restore
+  Restore-Node
+  
+  # zip
+  &$uenv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*" `
+    > $null
+
+  ################ Do the c# docs
+  
+  Write-Host "Build C# documentation"
+  
+  # Build the solution in debug mode
+  # FIXME no only a simple compilation should be enough!
+  # FIXME we MUST handle msbuild & co error codes!
+  # FIXME deal with weird things in gitconfig?
+  #Build-Umbraco -Configuration Debug
+  Restore-NuGet $uenv
+  Compile-Umbraco $uenv "Debug" # FIXME different log file!
+  Restore-WebConfig "$src\Umbraco.Web.UI"
+  
+  # ensure we have docfx
+  Get-DocFx $uenv $buildTemp
+
+  # clear
+  $docFxOutput = "$($uenv.SolutionRoot)\apidocs\_site"
+  if (test-path($docFxOutput))
+  {
+    Remove-Directory $docFxOutput
+  }
+
+  # run
+  $docFxJson = "$($uenv.SolutionRoot)\apidocs\docfx.json"
+  push-location "$($uenv.SolutionRoot)\build" # silly docfx.json wants this
+  
+  Write-Host "Run DocFx metadata"
+  Write-Host "Logging to $tmp\docfx.metadata.log"
+  &$uenv.DocFx metadata $docFxJson > "$tmp\docfx.metadata.log"
+  Write-Host "Run DocFx build"
+  Write-Host "Logging to $tmp\docfx.build.log"
+  &$uenv.DocFx build $docFxJson > "$tmp\docfx.build.log"
+  
+  pop-location
+
+  # zip
+  &$uenv.Zip a -tzip -r "$out\csharp-docs.zip" "$docFxOutput\*.*" `
+    > $null
+}
+
+function Get-DocFx($uenv, $buildTemp)
+{
+  $docFx = "$buildTemp\docfx"
+  if (-not (test-path $docFx))
+  {
+    $source = "https://github.com/dotnet/docfx/releases/download/v2.19.2/docfx.zip"
+    Write-Host "Download DocFx from $source"
+    
+    Invoke-WebRequest $source -OutFile "$buildTemp\docfx.zip"
+    
+    &$uenv.Zip x "$buildTemp\docfx.zip" -o"$buildTemp\docfx" -aos > $nul
+    Remove-File "$buildTemp\docfx.zip"  
+  }
+  $uenv | add-member -memberType NoteProperty -name DocFx -value "$docFx\docfx.exe"
+}

build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1

@@ -0,0 +1,182 @@
+#
+# Get-UmbracoBuildEnv
+# Gets the Umbraco build environment
+# Downloads tools if necessary
+#
+function Get-UmbracoBuildEnv
+{
+  # store tools in the module's directory
+  # and cache them for two days
+  $path = "$PSScriptRoot\temp"
+  $src = "$PSScriptRoot\..\..\..\src"
+  $cache = 2
+  
+  if (-not (test-path $path))
+  {
+    mkdir $path > $null
+  }
+
+  # ensure we have NuGet
+  $nuget = "$path\nuget.exe"
+  $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+  if ((test-path $nuget) -and ((ls $nuget).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
+  {
+    Remove-File $nuget
+  }
+  if (-not (test-path $nuget))
+  {
+    Write-Host "Download NuGet..."
+    Invoke-WebRequest $source -OutFile $nuget
+  }
+  
+  # ensure we have 7-Zip
+  $sevenZip = "$path\7za.exe"
+  if ((test-path $sevenZip) -and ((ls $sevenZip).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
+  {
+    Remove-File $sevenZip
+  }
+  if (-not (test-path $sevenZip))
+  {
+    Write-Host "Download 7-Zip..."
+    &$nuget install 7-Zip.CommandLine -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
+    $dir = ls "$path\7-Zip.CommandLine.*" | sort -property Name -descending | select -first 1
+    $file = ls -path "$dir" -name 7za.exe -recurse
+    $file = ls -path "$dir" -name 7za.exe -recurse | select -first 1 #A select is because there is tools\7za.exe & tools\x64\7za.exe
+    mv "$dir\$file" $sevenZip
+    Remove-Directory $dir
+  }
+  
+  # ensure we have vswhere
+  $vswhere = "$path\vswhere.exe"
+  if ((test-path $vswhere) -and ((ls $vswhere).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
+  {
+    Remove-File $vswhere
+  }
+  if (-not (test-path $vswhere))
+  {
+    Write-Host "Download VsWhere..."
+    &$nuget install vswhere -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
+    $dir = ls "$path\vswhere.*" | sort -property Name -descending | select -first 1
+    $file = ls -path "$dir" -name vswhere.exe -recurse
+    mv "$dir\$file" $vswhere
+    Remove-Directory $dir
+  }
+  
+  # ensure we have semver
+  $semver = "$path\Semver.dll"
+  if ((test-path $semver) -and ((ls $semver).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
+  {
+    Remove-File $semver
+  }
+  if (-not (test-path $semver))
+  {
+    Write-Host "Download Semver..."
+    &$nuget install semver -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
+    $dir = ls "$path\semver.*" | sort -property Name -descending | select -first 1
+    $file = "$dir\lib\net452\Semver.dll"
+    if (-not (test-path $file))
+    {
+      Write-Error "Failed to file $file"
+      return
+    }
+    mv "$file" $semver
+    Remove-Directory $dir
+  }
+
+  try
+  {
+    [Reflection.Assembly]::LoadFile($semver) > $null
+  }
+  catch
+  {
+    Write-Error -Exception $_.Exception -Message "Failed to load $semver"
+    break
+  }
+  
+  # ensure we have node
+  $node = "$path\node-v8.12.0-win-x86"
+  $source = "http://nodejs.org/dist/v8.12.0/node-v8.12.0-win-x86.7z "
+  if (-not (test-path $node))
+  {
+    Write-Host "Download Node..."
+    Invoke-WebRequest $source -OutFile "$path\node-v8.12.0-win-x86.7z"
+    &$sevenZip x "$path\node-v8.12.0-win-x86.7z" -o"$path" -aos > $nul
+    Remove-File "$path\node-v8.12.0-win-x86.7z"    
+  }
+  
+  # note: why? node already brings everything we need!
+  ## ensure we have npm
+  #$npm = "$path\npm.*"
+  #$getNpm = $true
+  #if (test-path $npm)
+  #{
+  #  $getNpm = $false
+  #  $tmpNpm = ls "$path\npm.*" | sort -property Name -descending | select -first 1
+  #  if ($tmpNpm.CreationTime -lt [DateTime]::Now.AddDays(-$cache))
+  #  {
+  #    $getNpm = $true
+  #  }
+  #  else
+  #  {
+  #    $npm = $tmpNpm.ToString()
+  #  }
+  #}
+  #if ($getNpm)
+  #{
+  #  Write-Host "Download Npm..."
+  #  &$nuget install npm -OutputDirectory $path -Verbosity quiet
+  #  $npm = ls "$path\npm.*" | sort -property Name -descending | select -first 1
+  #  $npm.CreationTime = [DateTime]::Now
+  #  $npm = $npm.ToString()
+  #}
+  
+  # find visual studio
+  # will not work on VSO but VSO does not need it
+  $vsPath = ""
+  $vsVer = ""
+  $msBuild = $null
+  &$vswhere | foreach {
+    if ($_.StartsWith("installationPath:")) { $vsPath = $_.SubString("installationPath:".Length).Trim() }
+    if ($_.StartsWith("installationVersion:")) { $vsVer = $_.SubString("installationVersion:".Length).Trim() }
+  }
+  if ($vsPath -ne "")
+  {
+    $vsVerParts = $vsVer.Split('.')
+    $vsMajor = [int]::Parse($vsVerParts[0])
+    $vsMinor = [int]::Parse($vsVerParts[1])
+    if ($vsMajor -eq 15) {
+      $msBuild = "$vsPath\MSBuild\$vsMajor.0\Bin"
+    }
+    elseif ($vsMajor -eq 14) {
+      $msBuild = "c:\Program Files (x86)\MSBuild\$vsMajor\Bin"
+    }
+    else 
+    {
+      $msBuild = $null
+    }
+  }
+ 
+  $vs = $null
+  if ($msBuild)
+  {
+    $vs = new-object -typeName PsObject
+    $vs | add-member -memberType NoteProperty -name Path -value $vsPath
+    $vs | add-member -memberType NoteProperty -name Major -value $vsMajor
+    $vs | add-member -memberType NoteProperty -name Minor -value $vsMinor
+    $vs | add-member -memberType NoteProperty -name MsBuild -value "$msBuild\MsBuild.exe"
+  }
+  
+  $solutionRoot = Get-FullPath "$PSScriptRoot\..\..\.."
+  
+  $uenv = new-object -typeName PsObject
+  $uenv | add-member -memberType NoteProperty -name SolutionRoot -value $solutionRoot
+  $uenv | add-member -memberType NoteProperty -name VisualStudio -value $vs
+  $uenv | add-member -memberType NoteProperty -name NuGet -value $nuget
+  $uenv | add-member -memberType NoteProperty -name Zip -value $sevenZip
+  $uenv | add-member -memberType NoteProperty -name VsWhere -value $vswhere
+  $uenv | add-member -memberType NoteProperty -name Semver -value $semver
+  $uenv | add-member -memberType NoteProperty -name NodePath -value $node
+  #$uenv | add-member -memberType NoteProperty -name NpmPath -value $npm
+  
+  return $uenv
+}

build/Modules/Umbraco.Build/Get-UmbracoVersion.ps1

@@ -0,0 +1,26 @@
+#
+# Get-UmbracoVersion
+# Gets the Umbraco version
+#
+function Get-UmbracoVersion
+{  
+  $uenv = Get-UmbracoBuildEnv
+  
+  # parse SolutionInfo and retrieve the version string
+  $filepath = "$($uenv.SolutionRoot)\src\SolutionInfo.cs"
+  $text = [System.IO.File]::ReadAllText($filepath)
+  $match = [System.Text.RegularExpressions.Regex]::Matches($text, "AssemblyInformationalVersion\(`"(.+)?`"\)")
+  $version = $match.Groups[1]
+
+  # semver-parse the version string
+  $semver = [SemVer.SemVersion]::Parse($version)
+  $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch
+
+  $versions = new-object -typeName PsObject
+  $versions | add-member -memberType NoteProperty -name Semver -value $semver
+  $versions | add-member -memberType NoteProperty -name Release -value $release
+  $versions | add-member -memberType NoteProperty -name Comment -value $semver.PreRelease
+  $versions | add-member -memberType NoteProperty -name Build -value $semver.Build
+  
+  return $versions
+}

build/Modules/Umbraco.Build/Get-VisualStudio.ps1

@@ -0,0 +1,30 @@
+# finds msbuild
+function Get-VisualStudio($vswhere)
+{
+  $vsPath = ""
+  $vsVer = ""
+  &$vswhere | foreach {
+    if ($_.StartsWith("installationPath:")) { $vsPath = $_.SubString("installationPath:".Length).Trim() }
+    if ($_.StartsWith("installationVersion:")) { $vsVer = $_.SubString("installationVersion:".Length).Trim() }
+  }
+  if ($vsPath -eq "") { return $null }
+  
+  $vsVerParts = $vsVer.Split('.')
+  $vsMajor = [int]::Parse($vsVerParts[0])
+  $vsMinor = [int]::Parse($vsVerParts[1])
+  if ($vsMajor -eq 15) {
+    $msBuild = "$vsPath\MSBuild\$vsMajor.$vsMinor\Bin"
+  }
+  elseif ($vsMajor -eq 14) {
+    $msBuild = "c:\Program Files (x86)\MSBuild\$vsMajor\Bin"
+  }
+  else { return $null }
+  $msBuild = "$msBuild\MsBuild.exe"
+  
+  $vs = new-object -typeName PsObject
+  $vs | add-member -memberType NoteProperty -name Path -value $vsPath
+  $vs | add-member -memberType NoteProperty -name Major -value $vsMajor
+  $vs | add-member -memberType NoteProperty -name Minor -value $vsMinor
+  $vs | add-member -memberType NoteProperty -name MsBuild -value $msBuild
+  return $vs
+}

build/Modules/Umbraco.Build/Set-UmbracoContinuousVersion.ps1

@@ -0,0 +1,30 @@
+#
+# Set-UmbracoContinuousVersion
+# Sets the Umbraco version for continuous integration
+#
+#   -Version <version>
+#   where <version> is a Semver valid version
+#   eg 1.2.3, 1.2.3-alpha, 1.2.3-alpha+456
+#
+#   -BuildNumber <buildNumber>
+#   where <buildNumber> is a string coming from the build server
+#   eg 34, 126, 1
+#
+function Set-UmbracoContinuousVersion
+{
+  param (
+    [Parameter(Mandatory=$true)]
+    [string]
+    $version,
+    [Parameter(Mandatory=$true)]
+    [string]
+    $buildNumber
+  )
+  
+  Write-Host "Version is currently set to $version"
+
+  $umbracoVersion = "$($version.Trim())-alpha$($buildNumber)"
+  Write-Host "Setting Umbraco Version to $umbracoVersion"
+
+  Set-UmbracoVersion $umbracoVersion
+}

build/Modules/Umbraco.Build/Set-UmbracoVersion.ps1

@@ -0,0 +1,117 @@
+#
+# Set-UmbracoVersion
+# Sets the Umbraco version
+#
+#   -Version <version>
+#   where <version> is a Semver valid version
+#   eg 1.2.3, 1.2.3-alpha, 1.2.3-alpha+456
+#
+function Set-UmbracoVersion
+{
+  param (
+    [Parameter(Mandatory=$true)]
+    [string]
+    $version
+  )
+  
+  $uenv = Get-UmbracoBuildEnv
+  
+  try
+  {
+    [Reflection.Assembly]::LoadFile($uenv.Semver) > $null
+  }
+  catch
+  {
+    Write-Error "Failed to load $uenv.Semver"
+    break
+  }
+  
+  # validate input
+  $ok = [Regex]::Match($version, "^[0-9]+\.[0-9]+\.[0-9]+(\-[a-z0-9]+)?(\+[0-9]+)?$")
+  if (-not $ok.Success)
+  {
+    Write-Error "Invalid version $version"
+    break
+  }
+
+  # parse input
+  try
+  {
+    $semver = [SemVer.SemVersion]::Parse($version)
+  }
+  catch
+  {
+    Write-Error "Invalid version $version"
+    break
+  }
+  
+  #
+  $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch
+  
+  # edit files and set the proper versions and dates
+  Write-Host "Update UmbracoVersion.cs"
+  Replace-FileText "$($uenv.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs" `
+    "(\d+)\.(\d+)\.(\d+)(.(\d+))?" `
+    "$release" 
+  Replace-FileText "$($uenv.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs" `
+    "CurrentComment { get { return `"(.+)`"" `
+    "CurrentComment { get { return `"$($semver.PreRelease)`""
+  Write-Host "Update SolutionInfo.cs"
+  Replace-FileText "$($uenv.SolutionRoot)\src\SolutionInfo.cs" `
+    "AssemblyFileVersion\(`"(.+)?`"\)" `
+    "AssemblyFileVersion(`"$release`")"
+  Replace-FileText "$($uenv.SolutionRoot)\src\SolutionInfo.cs" `
+    "AssemblyInformationalVersion\(`"(.+)?`"\)" `
+    "AssemblyInformationalVersion(`"$semver`")"
+  $year = [System.DateTime]::Now.ToString("yyyy")
+  Replace-FileText "$($uenv.SolutionRoot)\src\SolutionInfo.cs" `
+    "AssemblyCopyright\(`"Copyright © Umbraco (\d{4})`"\)" `
+    "AssemblyCopyright(`"Copyright © Umbraco $year`")"
+   
+  # edit csproj and set IIS Express port number
+  # this is a raw copy of ReplaceIISExpressPortNumber.exe
+  # it probably can be achieved in a much nicer way - l8tr
+  $source = @"
+  using System;
+  using System.IO;
+  using System.Xml;
+  using System.Globalization;
+
+  namespace Umbraco
+  {
+    public static class PortUpdater
+    {
+      public static void Update(string path, string release)
+      {
+        XmlDocument xmlDocument = new XmlDocument();
+        string fullPath = Path.GetFullPath(path);
+        xmlDocument.Load(fullPath);
+        int result = 1;
+        int.TryParse(release.Replace(`".`", `"`"), out result);
+        while (result < 1024)
+          result *= 10;
+        XmlNode xmlNode1 = xmlDocument.GetElementsByTagName(`"IISUrl`").Item(0);
+        if (xmlNode1 != null)
+          xmlNode1.InnerText = `"http://localhost:`" + (object) result;
+        XmlNode xmlNode2 = xmlDocument.GetElementsByTagName(`"DevelopmentServerPort`").Item(0);
+        if (xmlNode2 != null)
+          xmlNode2.InnerText = result.ToString((IFormatProvider) CultureInfo.InvariantCulture);
+        xmlDocument.Save(fullPath);
+      }
+    }
+  }
+"@
+
+  $assem = (
+    "System.Xml",
+    "System.IO",
+    "System.Globalization"
+  )
+
+  Write-Host "Update Umbraco.Web.UI.csproj"
+  add-type -referencedAssemblies $assem -typeDefinition $source -language CSharp
+  $csproj = "$($uenv.SolutionRoot)\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
+  [Umbraco.PortUpdater]::Update($csproj, $release)
+
+  return $semver
+}

build/Modules/Umbraco.Build/Umbraco.Build.psm1

@@ -0,0 +1,615 @@
+
+# Umbraco.Build.psm1
+#
+# $env:PSModulePath = "$pwd\build\Modules\;$env:PSModulePath"
+# Import-Module Umbraco.Build -Force -DisableNameChecking
+#
+# PowerShell Modules:
+# https://msdn.microsoft.com/en-us/library/dd878324%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
+#
+# PowerShell Module Manifest:
+# https://msdn.microsoft.com/en-us/library/dd878337%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
+#
+# See also
+# http://www.powershellmagazine.com/2014/08/15/pstip-taking-control-of-verbose-and-debug-output-part-5/
+
+
+. "$PSScriptRoot\Utilities.ps1"
+. "$PSScriptRoot\Get-VisualStudio.ps1"
+
+. "$PSScriptRoot\Get-UmbracoBuildEnv.ps1"
+. "$PSScriptRoot\Set-UmbracoVersion.ps1"
+. "$PSScriptRoot\Set-UmbracoContinuousVersion.ps1"
+. "$PSScriptRoot\Get-UmbracoVersion.ps1"
+. "$PSScriptRoot\Verify-NuGet.ps1"
+
+. "$PSScriptRoot\Build-UmbracoDocs.ps1"
+
+#
+# Prepares the build
+#
+function Prepare-Build
+{
+  param (
+    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
+    
+    [Alias("k")]
+    [switch]
+    $keep = $false
+  )
+
+  Write-Host ">> Prepare Build"
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+
+  # clear
+  Write-Host "Clear folders and files"
+
+  Remove-Directory "$src\Umbraco.Web.UI.Client\bower_components"
+
+  if (-not $keep)
+  {
+	Remove-Directory "$tmp"
+	Remove-Directory "$out"
+  }
+
+  if (-not (Test-Path "$tmp")) 
+  {
+    mkdir "$tmp" > $null
+  }
+  if (-not (Test-Path "$out")) 
+  {
+    mkdir "$out" > $null
+  }
+    
+  # ensure proper web.config
+  $webUi = "$src\Umbraco.Web.UI"
+  Store-WebConfig $webUi
+  Write-Host "Create clean web.config"
+  Copy-File "$webUi\web.Template.config" "$webUi\web.config"
+}
+
+function Clear-EnvVar($var)
+{
+  $value = [Environment]::GetEnvironmentVariable($var)
+  if (test-path "env:$var") { rm "env:$var" }
+  return $value
+}
+
+function Set-EnvVar($var, $value)
+{
+  if ($value)
+  {
+    [Environment]::SetEnvironmentVariable($var, $value)
+  }
+  else
+  {
+    if (test-path "env:$var") { rm "env:$var" }
+  }
+}
+
+function Sandbox-Node
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+  
+  $global:node_path = $env:path
+  $nodePath = $uenv.NodePath
+  $gitExe = (get-command git).Source  
+  $gitPath = [System.IO.Path]::GetDirectoryName($gitExe)
+  $env:path = "$nodePath;$gitPath"
+  
+  $global:node_nodepath = Clear-EnvVar "NODEPATH"
+  $global:node_npmcache = Clear-EnvVar "NPM_CONFIG_CACHE"
+  $global:node_npmprefix = Clear-EnvVar "NPM_CONFIG_PREFIX"
+}
+
+function Restore-Node
+{
+  $env:path = $node_path
+  
+  Set-EnvVar "NODEPATH" $node_nodepath
+  Set-EnvVar "NPM_CONFIG_CACHE" $node_npmcache
+  Set-EnvVar "NPM_CONFIG_PREFIX" $node_npmprefix
+}
+
+#
+# Builds the Belle UI project
+#
+function Compile-Belle
+{
+  param (
+    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
+    $version # an Umbraco version object (see Get-UmbracoVersion)
+  )
+
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $src = "$($uenv.SolutionRoot)\src"
+  
+  Write-Host ">> Compile Belle"
+  Write-Host "Logging to $tmp\belle.log"
+  
+  # get a temp clean node env (will restore)
+  Sandbox-Node $uenv
+  
+  push-location "$($uenv.SolutionRoot)\src\Umbraco.Web.UI.Client"
+  write "node version is:" > $tmp\belle.log
+  &node -v >> $tmp\belle.log 2>&1
+  write "npm version is:" >> $tmp\belle.log 2>&1
+  &npm -v >> $tmp\belle.log 2>&1
+  write "cleaning npm cache" >> $tmp\belle.log 2>&1
+  &npm cache clean >> $tmp\belle.log 2>&1
+  write "installing bower" >> $tmp\belle.log 2>&1
+  &npm install -g bower >> $tmp\belle.log 2>&1
+  write "installing gulp" >> $tmp\belle.log 2>&1
+  &npm install -g gulp >> $tmp\belle.log 2>&1
+  write "installing gulp-cli" >> $tmp\belle.log 2>&1
+  &npm install -g gulp-cli --quiet >> $tmp\belle.log 2>&1
+  write "executing npm install" >> $tmp\belle.log 2>&1
+  &npm install >> $tmp\belle.log 2>&1
+  write "executing gulp build for version $version" >> $tmp\belle.log 2>&1
+  &gulp build --buildversion=$version.Release >> $tmp\belle.log 2>&1
+  pop-location
+  
+  # fixme - should we filter the log to find errors?
+  #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
+
+  # restore
+  Restore-Node
+  
+  # setting node_modules folder to hidden
+  # used to prevent VS13 from crashing on it while loading the websites project
+  # also makes sure aspnet compiler does not try to handle rogue files and chokes
+  # in VSO with Microsoft.VisualC.CppCodeProvider -related errors
+  # use get-item -force 'cos it might be hidden already
+  write "Set hidden attribute on node_modules"
+  $dir = get-item -force "$src\Umbraco.Web.UI.Client\node_modules"
+  $dir.Attributes = $dir.Attributes -bor ([System.IO.FileAttributes]::Hidden)
+}
+
+#
+# Compiles Umbraco
+#
+function Compile-Umbraco
+{
+  param (
+    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
+    [string] $buildConfiguration = "Release"
+  )
+
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+  
+  if ($uenv.VisualStudio -eq $null)
+  {
+    Write-Error "Build environment does not provide VisualStudio."
+    break
+  }
+  
+  $toolsVersion = "4.0"
+  if ($uenv.VisualStudio.Major -eq 15)
+  {
+    $toolsVersion = "15.0"
+  }
+    
+  Write-Host ">> Compile Umbraco"
+  Write-Host "Logging to $tmp\msbuild.umbraco.log"
+
+  # beware of the weird double \\ at the end of paths
+  # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
+  &$uenv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
+    /p:WarningLevel=0 `
+    /p:Configuration=$buildConfiguration `
+    /p:Platform=AnyCPU `
+    /p:UseWPP_CopyWebApplication=True `
+    /p:PipelineDependsOnBuild=False `
+    /p:OutDir=$tmp\bin\\ `
+    /p:WebProjectOutputDir=$tmp\WebApp\\ `
+    /p:Verbosity=minimal `
+    /t:Clean`;Rebuild `
+    /tv:$toolsVersion `
+    /p:UmbracoBuild=True `
+    > $tmp\msbuild.umbraco.log
+    
+  # /p:UmbracoBuild tells the csproj that we are building from PS
+}
+
+#
+# Prepare Tests
+#
+function Prepare-Tests
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  
+  Write-Host ">> Prepare Tests"
+
+  # fixme - idea is to avoid rebuilding everything for tests
+  # but because of our weird assembly versioning (with .* stuff)
+  # everything gets rebuilt all the time...
+  #Copy-Files "$tmp\bin" "." "$tmp\tests"
+  
+  # data
+  Write-Host "Copy data files"
+  if (-Not (Test-Path -Path "$tmp\tests\Packaging" ) )
+  {
+    Write-Host "Create packaging directory"
+    mkdir "$tmp\tests\Packaging" > $null
+  }
+  Copy-Files "$src\Umbraco.Tests\Packaging\Packages" "*" "$tmp\tests\Packaging\Packages"
+  
+  # required for package install tests  
+  if (-Not (Test-Path -Path "$tmp\tests\bin" ) )
+  {
+    Write-Host "Create bin directory"
+    mkdir "$tmp\tests\bin" > $null
+  }
+}
+
+#
+# Compiles Tests
+#
+function Compile-Tests
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$tmp\tests"
+
+  $buildConfiguration = "Release"
+  
+  if ($uenv.VisualStudio -eq $null)
+  {
+    Write-Error "Build environment does not provide VisualStudio."
+    break
+  }
+  
+  $toolsVersion = "4.0"
+  if ($uenv.VisualStudio.Major -eq 15)
+  {
+    $toolsVersion = "15.0"
+  }
+    
+  Write-Host ">> Compile Tests"
+  Write-Host "Logging to $tmp\msbuild.tests.log"
+
+  # beware of the weird double \\ at the end of paths
+  # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
+  &$uenv.VisualStudio.MsBuild "$src\Umbraco.Tests\Umbraco.Tests.csproj" `
+    /p:WarningLevel=0 `
+    /p:Configuration=$buildConfiguration `
+    /p:Platform=AnyCPU `
+    /p:UseWPP_CopyWebApplication=True `
+    /p:PipelineDependsOnBuild=False `
+    /p:OutDir=$out\\ `
+    /p:Verbosity=minimal `
+    /t:Build `
+    /tv:$toolsVersion `
+    /p:UmbracoBuild=True `
+    /p:NugetPackages=$src\packages `
+    > $tmp\msbuild.tests.log
+    
+  # /p:UmbracoBuild tells the csproj that we are building from PS
+}
+
+#
+# Cleans things up and prepare files after compilation
+#
+function Prepare-Packages
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+
+  Write-Host ">> Prepare Packages" 
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+
+  $buildConfiguration = "Release"
+
+  # restore web.config
+  Restore-WebConfig "$src\Umbraco.Web.UI"
+
+  # cleanup build
+  Write-Host "Clean build"
+  Remove-File "$tmp\bin\*.dll.config"
+  Remove-File "$tmp\WebApp\bin\*.dll.config"
+
+  # cleanup presentation
+  Write-Host "Cleanup presentation"
+  Remove-Directory "$tmp\WebApp\umbraco.presentation"
+
+  # create directories
+  Write-Host "Create directories"
+  mkdir "$tmp\Configs" > $null
+  mkdir "$tmp\Configs\Lang" > $null
+  mkdir "$tmp\WebApp\App_Data" > $null
+  #mkdir "$tmp\WebApp\Media" > $null
+  #mkdir "$tmp\WebApp\Views" > $null
+
+  # copy various files
+  Write-Host "Copy xml documentation"
+  cp -force "$tmp\bin\*.xml" "$tmp\WebApp\bin"
+
+  Write-Host "Copy transformed configs and langs"
+  # note: exclude imageprocessor/*.config as imageprocessor pkg installs them
+  Copy-Files "$tmp\WebApp\config" "*.config" "$tmp\Configs" `
+    { -not $_.RelativeName.StartsWith("imageprocessor") }
+  Copy-Files "$tmp\WebApp\config" "*.js" "$tmp\Configs"
+  Copy-Files "$tmp\WebApp\config\lang" "*.xml" "$tmp\Configs\Lang"
+  Copy-File "$tmp\WebApp\web.config" "$tmp\Configs\web.config.transform"
+
+  Write-Host "Copy transformed web.config"
+  Copy-File "$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed" "$tmp\WebApp\web.config"
+
+  # offset the modified timestamps on all umbraco dlls, as WebResources
+  # break if date is in the future, which, due to timezone offsets can happen.
+  Write-Host "Offset dlls timestamps"
+  ls -r "$tmp\*.dll" | foreach {
+    $_.CreationTime = $_.CreationTime.AddHours(-11)
+    $_.LastWriteTime = $_.LastWriteTime.AddHours(-11)
+  }
+
+  # copy libs
+  Write-Host "Copy SqlCE libraries"
+  Copy-Files "$src\packages\SqlServerCE.4.0.0.1" "*.*" "$tmp\bin" `
+    { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") }
+  Copy-Files "$src\packages\SqlServerCE.4.0.0.1" "*.*" "$tmp\WebApp\bin" `
+    { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") }
+          
+  # copy Belle
+  Write-Host "Copy Belle"
+  Copy-Files "$src\Umbraco.Web.UI\umbraco\assets" "*" "$tmp\WebApp\umbraco\assets"
+  Copy-Files "$src\Umbraco.Web.UI\umbraco\js" "*" "$tmp\WebApp\umbraco\js"
+  Copy-Files "$src\Umbraco.Web.UI\umbraco\lib" "*" "$tmp\WebApp\umbraco\lib"
+  Copy-Files "$src\Umbraco.Web.UI\umbraco\views" "*" "$tmp\WebApp\umbraco\views"
+
+}
+
+#
+# Creates the Zip packages
+#
+function Package-Zip
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+
+  Write-Host ">> Create Zip packages" 
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+
+  Write-Host "Zip all binaries"  
+  &$uenv.Zip a -r "$out\UmbracoCms.AllBinaries.$($version.Semver).zip" `
+    "$tmp\bin\*" `
+    "-x!dotless.Core.*" `
+    > $null
+   
+  Write-Host "Zip cms"  
+  &$uenv.Zip a -r "$out\UmbracoCms.$($version.Semver).zip" `
+    "$tmp\WebApp\*" `
+    "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb"`
+    > $null
+}
+
+#
+# Prepares NuGet
+#
+function Prepare-NuGet
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+
+  Write-Host ">> Prepare NuGet" 
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+
+  # add Web.config transform files to the NuGet package
+  Write-Host "Add web.config transforms to NuGet package"
+  mv "$tmp\WebApp\Views\Web.config" "$tmp\WebApp\Views\Web.config.transform"
+  
+  # fixme - that one does not exist in .bat build either?
+  #mv "$tmp\WebApp\Xslt\Web.config" "$tmp\WebApp\Xslt\Web.config.transform"
+}
+
+#
+# Restores NuGet
+#
+function Restore-NuGet
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+
+  Write-Host ">> Restore NuGet"
+  Write-Host "Logging to $tmp\nuget.restore.log" 
+  
+  &$uenv.NuGet restore "$src\Umbraco.sln" -configfile "$src\NuGet.config" > "$tmp\nuget.restore.log"
+}
+
+#
+# Copies the Azure Gallery script to output
+#
+function Prepare-AzureGallery
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+  $psScript = "$($uenv.SolutionRoot)\build\azuregalleryrelease.ps1"
+  
+  Write-Host ">> Copy azuregalleryrelease.ps1 to output folder"
+  Copy-Item $psScript $out
+}
+
+#
+# Creates the NuGet packages
+#
+function Package-NuGet
+{
+  param (
+    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
+    $version # an Umbraco version object (see Get-UmbracoVersion)
+  )
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+  $nuspecs = "$($uenv.SolutionRoot)\build\NuSpecs"
+  
+  Write-Host ">> Create NuGet packages"
+
+  # see https://docs.microsoft.com/en-us/nuget/schema/nuspec
+  # note - warnings about SqlCE native libs being outside of 'lib' folder,
+  # nothing much we can do about it as it's intentional yet there does not
+  # seem to be a way to disable the warning
+  
+  &$uenv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
+    -Properties BuildTmp="$tmp" `
+    -Version $version.Semver.ToString() `
+    -Symbols -Verbosity quiet -outputDirectory $out
+
+  &$uenv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
+    -Properties BuildTmp="$tmp" `
+    -Version $version.Semver.ToString() `
+    -Verbosity quiet -outputDirectory $out
+}
+
+#
+# Builds Umbraco
+#
+function Build-Umbraco
+{
+  [CmdletBinding()]
+  param (
+    [string]
+    $target = "all",
+    [string]
+    $buildConfiguration = "Release"
+  )
+  
+  $target = $target.ToLowerInvariant()
+  Write-Host ">> Build-Umbraco <$target> <$buildConfiguration>"
+
+  Write-Host "Get Build Environment"
+  $uenv = Get-UmbracoBuildEnv
+  
+  Write-Host "Get Version"
+  $version = Get-UmbracoVersion
+  Write-Host "Version $($version.Semver)"
+
+  if ($target -eq "pre-build")
+  {
+    Prepare-Build $uenv
+    #Compile-Belle $uenv $version
+
+    # set environment variables
+    $env:UMBRACO_VERSION=$version.Semver.ToString()
+    $env:UMBRACO_RELEASE=$version.Release
+    $env:UMBRACO_COMMENT=$version.Comment
+    $env:UMBRACO_BUILD=$version.Build
+
+    # set environment variable for VSO
+    # https://github.com/Microsoft/vsts-tasks/issues/375
+    # https://github.com/Microsoft/vsts-tasks/blob/master/docs/authoring/commands.md
+    Write-Host ("##vso[task.setvariable variable=UMBRACO_VERSION;]$($version.Semver.ToString())")
+    Write-Host ("##vso[task.setvariable variable=UMBRACO_RELEASE;]$($version.Release)")
+    Write-Host ("##vso[task.setvariable variable=UMBRACO_COMMENT;]$($version.Comment)")
+    Write-Host ("##vso[task.setvariable variable=UMBRACO_BUILD;]$($version.Build)")
+    
+    Write-Host ("##vso[task.setvariable variable=UMBRACO_TMP;]$($uenv.SolutionRoot)\build.tmp")
+  }
+  elseif ($target -eq "pre-tests")
+  {
+    Prepare-Tests $uenv
+  }
+  elseif ($target -eq "compile-tests")
+  {
+    Compile-Tests $uenv
+  }
+  elseif ($target -eq "compile-umbraco")
+  {
+    Compile-Umbraco $uenv $buildConfiguration
+  }
+  elseif ($target -eq "pre-packages")
+  {
+    Prepare-Packages $uenv
+  }
+  elseif ($target -eq "pre-nuget")
+  {
+    Prepare-NuGet $uenv
+  }
+  elseif ($target -eq "restore-nuget")
+  {
+    Restore-NuGet $uenv
+  }
+  elseif ($target -eq "pkg-zip")
+  {
+    Package-Zip $uenv
+  }
+  elseif ($target -eq "compile-belle")
+  {
+    Compile-Belle $uenv $version
+  }
+  elseif ($target -eq "prepare-azuregallery")
+  {
+    Prepare-AzureGallery $uenv
+  }
+  elseif ($target -eq "all")
+  {
+    Prepare-Build $uenv
+    Restore-NuGet $uenv
+    Compile-Belle $uenv $version
+    Compile-Umbraco $uenv $buildConfiguration
+    Prepare-Tests $uenv
+    Compile-Tests $uenv
+    # not running tests...
+    Prepare-Packages $uenv
+    Package-Zip $uenv
+    Verify-NuGet $uenv
+    Prepare-NuGet $uenv
+    Package-NuGet $uenv $version
+	Prepare-AzureGallery $uenv
+  }
+  else
+  {
+    Write-Error "Unsupported target `"$target`"."
+  }
+}
+
+#
+# export functions
+#
+Export-ModuleMember -function Get-UmbracoBuildEnv
+Export-ModuleMember -function Set-UmbracoVersion
+Export-ModuleMember -function Set-UmbracoContinuousVersion
+Export-ModuleMember -function Get-UmbracoVersion
+Export-ModuleMember -function Build-Umbraco
+Export-ModuleMember -function Build-UmbracoDocs
+Export-ModuleMember -function Verify-NuGet
+
+#eof

build/Modules/Umbraco.Build/Utilities.ps1

@@ -0,0 +1,95 @@
+# returns the full path if $file is relative to $pwd
+function Get-FullPath($file)
+{
+  $path = [System.IO.Path]::Combine($pwd, $file)
+  $path = [System.IO.Path]::GetFullPath($path)
+  return $path
+}
+
+# removes a directory, doesn't complain if it does not exist
+function Remove-Directory($dir)
+{
+  remove-item $dir -force -recurse -errorAction SilentlyContinue > $null
+}
+
+# removes a file, doesn't complain if it does not exist
+function Remove-File($file)
+{
+  remove-item $file -force -errorAction SilentlyContinue > $null
+}
+
+# copies a file, creates target dir if needed
+function Copy-File($source, $target)
+{
+  $ignore = new-item -itemType file -path $target -force
+  cp -force $source $target
+}
+
+# copies files to a directory
+function Copy-Files($source, $select, $target, $filter)
+{
+  $files = ls -r "$source\$select"
+  $files | foreach {
+    $relative = $_.FullName.SubString($source.Length+1)
+    $_ | add-member -memberType NoteProperty -name RelativeName -value $relative
+  }
+  if ($filter -ne $null) {
+    $files = $files | where $filter 
+  }
+  $files |
+    foreach {
+      if ($_.PsIsContainer) {
+        $ignore = new-item -itemType directory -path "$target\$($_.RelativeName)" -force
+      }
+      else {
+        Copy-File $_.FullName "$target\$($_.RelativeName)"
+      }
+    }
+}
+
+# regex-replaces content in a file
+function Replace-FileText($filename, $source, $replacement)
+{
+  $filepath = Get-FullPath $filename
+  $text = [System.IO.File]::ReadAllText($filepath)
+  $text = [System.Text.RegularExpressions.Regex]::Replace($text, $source, $replacement)
+  $utf8bom = New-Object System.Text.UTF8Encoding $true
+  [System.IO.File]::WriteAllText($filepath, $text, $utf8bom)
+}
+
+# store web.config
+function Store-WebConfig($webUi)
+{
+  if (test-path "$webUi\web.config")
+  {
+    if (test-path "$webUi\web.config.temp-build")
+    {
+      Write-Host "Found existing web.config.temp-build"
+      $i = 0
+      while (test-path "$webUi\web.config.temp-build.$i")
+      {
+        $i = $i + 1
+      }
+      Write-Host "Save existing web.config as web.config.temp-build.$i"
+      Write-Host "(WARN: the original web.config.temp-build will be restored during post-build)"
+      mv "$webUi\web.config" "$webUi\web.config.temp-build.$i"
+    }
+    else
+    {
+      Write-Host "Save existing web.config as web.config.temp-build"
+      Write-Host "(will be restored during post-build)"
+      mv "$webUi\web.config" "$webUi\web.config.temp-build"
+    }
+  }
+}
+
+# restore web.config
+function Restore-WebConfig($webUi)
+{
+  if (test-path "$webUi\web.config.temp-build")
+  {
+    Write-Host "Restoring existing web.config"
+    Remove-File "$webUi\web.config"
+    mv "$webUi\web.config.temp-build" "$webUi\web.config"
+  }
+}

build/Modules/Umbraco.Build/Verify-NuGet.ps1

@@ -0,0 +1,444 @@
+#
+# Verify-NuGet
+#
+
+function Format-Dependency
+{
+  param ( $d )
+  
+  $m = $d.Id + " "
+  if ($d.MinInclude) { $m = $m + "[" }
+  else { $m = $m + "(" }
+  $m = $m + $d.MinVersion
+  if ($d.MaxVersion -ne $d.MinVersion) { $m = $m + "," + $d.MaxVersion }
+  if ($d.MaxInclude) { $m = $m + "]" }
+  else { $m = $m + ")" }
+
+  return $m
+}
+
+function Write-NuSpec
+{
+  param ( $name, $deps )
+
+  Write-Host ""
+  Write-Host "$name NuSpec dependencies:"
+  
+  foreach ($d in $deps)
+  {
+    $m = Format-Dependency $d
+    Write-Host " $m"
+  }
+}
+
+function Write-Package
+{
+  param ( $name, $pkgs )
+  
+  Write-Host ""
+  Write-Host "$name packages:"
+  
+  foreach ($p in $pkgs)
+  {
+    Write-Host " $($p.Id) $($p.Version)"
+  }
+}
+
+function Verify-NuGet
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+  
+  if ($uenv -eq $null)
+  {
+    $uenv = Get-UmbracoBuildEnv
+  }
+
+  $source = @"
+  
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.IO;
+    using System.Xml;
+    using System.Xml.Serialization;
+    using Semver;
+  
+    namespace Umbraco.Build
+    {
+      public class NuGet
+      {       
+        public static Dependency[] GetNuSpecDependencies(string filename)
+        {
+          NuSpec nuspec;
+          var serializer = new XmlSerializer(typeof(NuSpec));
+          using (var reader = new StreamReader(filename))
+          {
+            nuspec = (NuSpec) serializer.Deserialize(reader);
+          }
+          var nudeps = nuspec.Metadata.Dependencies;
+          var deps = new List<Dependency>();
+          foreach (var nudep in nudeps)
+          {
+            var dep = new Dependency();
+            dep.Id = nudep.Id;
+            
+            var parts = nudep.Version.Split(',');
+            if (parts.Length == 1)
+            {
+              dep.MinInclude = parts[0].StartsWith("[");
+              dep.MaxInclude = parts[0].EndsWith("]");
+              
+              SemVersion version;
+              if (!SemVersion.TryParse(parts[0].Substring(1, parts[0].Length-2).Trim(), out version)) continue;
+              dep.MinVersion = dep.MaxVersion = version; //parts[0].Substring(1, parts[0].Length-2).Trim();
+            }
+            else
+            {
+              SemVersion version;
+              if (!SemVersion.TryParse(parts[0].Substring(1).Trim(), out version)) continue;
+              dep.MinVersion = version; //parts[0].Substring(1).Trim();
+              if (!SemVersion.TryParse(parts[1].Substring(0, parts[1].Length-1).Trim(), out version)) continue;
+              dep.MaxVersion = version; //parts[1].Substring(0, parts[1].Length-1).Trim();
+              dep.MinInclude = parts[0].StartsWith("[");
+              dep.MaxInclude = parts[1].EndsWith("]");
+            }
+            
+            deps.Add(dep);
+          }
+          return deps.ToArray();
+        }
+
+        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(/*this*/ IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
+        {
+          HashSet<TKey> knownKeys = new HashSet<TKey>();
+          foreach (TSource element in source)
+          {
+            if (knownKeys.Add(keySelector(element)))
+            {
+              yield return element;
+            }
+          }
+        }
+        
+        public static Package[] GetProjectsPackages(string src, string[] projects)
+        {
+          var l = new List<Package>();
+          foreach (var project in projects)
+          {
+            var path = Path.Combine(src, project);
+            var packageConfig = Path.Combine(path, "packages.config");
+            if (File.Exists(packageConfig))
+              ReadPackagesConfig(packageConfig, l);
+            var csprojs = Directory.GetFiles(path, "*.csproj");
+            foreach (var csproj in csprojs)
+            {
+              ReadCsProj(csproj, l);
+            }
+          }
+          IEnumerable<Package> p = l.OrderBy(x => x.Id);
+          p = DistinctBy(p, x => x.Id + ":::" + x.Version);
+          return p.ToArray();
+        }
+        
+        public static object[] GetPackageErrors(Package[] pkgs)
+        {
+          return pkgs
+            .GroupBy(x => x.Id)
+            .Where(x => x.Count() > 1)
+            .ToArray();
+        }
+        
+        public static object[] GetNuSpecErrors(Package[] pkgs, Dependency[] deps)
+        {
+          var d = pkgs.ToDictionary(x => x.Id, x => x.Version);
+          return deps
+            .Select(x => 
+            {
+              SemVersion v;
+              if (!d.TryGetValue(x.Id, out v)) return null;
+              
+              var ok = true;
+              
+              /*
+              if (x.MinInclude)
+              {
+                if (v < x.MinVersion) ok = false;
+              }
+              else
+              {
+                if (v <= x.MinVersion) ok = false;
+              }
+
+              if (x.MaxInclude)
+              {
+                if (v > x.MaxVersion) ok = false;
+              }
+              else
+              {
+                if (v >= x.MaxVersion) ok = false;
+              }
+              */
+              
+              if (!x.MinInclude || v != x.MinVersion) ok = false;
+              
+              return ok ? null : new { Dependency = x, Version = v };
+            })
+            .Where(x => x != null)
+            .ToArray();
+        }
+        
+        /*
+        public static Package[] GetProjectPackages(string path)
+        {
+          var l = new List<Package>();
+          var packageConfig = Path.Combine(path, "packages.config");
+          if (File.Exists(packageConfig))
+            ReadPackagesConfig(packageConfig, l);
+          var csprojs = Directory.GetFiles(path, "*.csproj");
+          foreach (var csproj in csprojs)
+          {
+            ReadCsProj(csproj, l);
+          }
+          return l.ToArray();
+        }
+        */
+        
+        public static string GetDirectoryName(string filename)
+        {
+          return Path.GetFileName(Path.GetDirectoryName(filename));
+        }
+        
+        public static void ReadPackagesConfig(string filename, List<Package> packages)
+        {
+          //Console.WriteLine("read " + filename);
+
+          PackagesConfigPackages pkgs;
+          var serializer = new XmlSerializer(typeof(PackagesConfigPackages));
+          using (var reader = new StreamReader(filename))
+          {
+            pkgs = (PackagesConfigPackages) serializer.Deserialize(reader);
+          }
+          foreach (var p in pkgs.Packages)
+          {
+            SemVersion version;
+            if (!SemVersion.TryParse(p.Version, out version)) continue;
+            packages.Add(new Package { Id = p.Id, Version = version, Project = GetDirectoryName(filename) });
+          }
+        }
+        
+        public static void ReadCsProj(string filename, List<Package> packages)
+        {
+          //Console.WriteLine("read " + filename);
+          
+          // if xmlns then it's not a VS2017 with PackageReference
+          var text = File.ReadAllLines(filename);
+          var line = text.FirstOrDefault(x => x.Contains("<Project"));
+          if (line == null) return;
+          if (line.Contains("xmlns")) return;         
+
+          CsProjProject proj;
+          var serializer = new XmlSerializer(typeof(CsProjProject));
+          using (var reader = new StreamReader(filename))
+          {
+            proj = (CsProjProject) serializer.Deserialize(reader);
+          }
+          foreach (var p in proj.ItemGroups.Where(x => x.Packages != null).SelectMany(x => x.Packages))
+          {
+            var sversion = p.VersionE ?? p.VersionA;
+            SemVersion version;
+            if (!SemVersion.TryParse(sversion, out version)) continue;
+            packages.Add(new Package { Id = p.Id, Version = version, Project = GetDirectoryName(filename) });
+          }
+        }
+        
+        public class Dependency
+        {
+          public string Id { get; set; }
+          public SemVersion MinVersion { get; set; }
+          public SemVersion MaxVersion { get; set; }
+          public bool MinInclude { get; set; }
+          public bool MaxInclude { get; set; }
+        }
+        
+        public class Package
+        {
+          public string Id { get; set; }
+          public SemVersion Version { get; set; }
+          public string Project { get; set; }
+        }
+
+        [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd")]
+        [XmlRoot(Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd", IsNullable = false, ElementName = "package")]
+        public class NuSpec
+        {
+          [XmlElement("metadata")]
+          public NuSpecMetadata Metadata { get; set; }
+        }
+
+        [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd", TypeName = "metadata")]
+        public class NuSpecMetadata
+        {
+          [XmlArray("dependencies")]
+          [XmlArrayItem("dependency", IsNullable = false)]
+          public NuSpecDependency[] Dependencies { get; set; }
+        }
+
+        [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd", TypeName = "dependencies")]
+        public class NuSpecDependency
+        {
+          [XmlAttribute(AttributeName = "id")]
+          public string Id { get; set; }
+
+          [XmlAttribute(AttributeName = "version")]
+          public string Version { get; set; }
+        }
+        
+        [XmlType(AnonymousType = true)]
+        [XmlRoot(Namespace = "", IsNullable = false, ElementName = "packages")]
+        public class PackagesConfigPackages
+        {
+            [XmlElement("package")]
+            public PackagesConfigPackage[] Packages { get; set; }
+        }
+
+        [XmlType(AnonymousType = true, TypeName = "package")]
+        public class PackagesConfigPackage
+        {
+            [XmlAttribute(AttributeName = "id")]
+            public string Id { get; set; }
+
+            [XmlAttribute(AttributeName = "version")]
+            public string Version { get; set; }
+        }
+        
+        [XmlType(AnonymousType = true)]
+        [XmlRoot(Namespace = "", IsNullable = false, ElementName = "Project")]
+        public class CsProjProject
+        {
+            [XmlElement("ItemGroup")]
+            public CsProjItemGroup[] ItemGroups { get; set; }
+        }
+        
+        [XmlType(AnonymousType = true, TypeName = "ItemGroup")]
+        public class CsProjItemGroup
+        {
+            [XmlElement("PackageReference")]
+            public CsProjPackageReference[] Packages { get; set; }
+        }
+        
+        [XmlType(AnonymousType = true, TypeName = "PackageReference")]
+        public class CsProjPackageReference
+        {
+            [XmlAttribute(AttributeName = "Include")]
+            public string Id { get; set; }
+
+            [XmlAttribute(AttributeName = "Version")]
+            public string VersionA { get; set; }
+            
+            [XmlElement("Version")]
+            public string VersionE { get; set;}
+        }
+      }
+    }
+    
+"@
+
+  Write-Host ">> Verify NuGet consistency"
+
+  $assem = (
+    "System.Xml",
+    "System.Core", # "System.Collections.Generic"
+    "System.Linq",
+    "System.Xml.Serialization",
+    "System.IO",
+    "System.Globalization",
+    $uenv.Semver
+  )
+  
+  try
+  {
+    # as long as the code hasn't changed it's fine to re-add, but if the code
+    # has changed this will throw - better warn the dev that we have an issue
+    add-type -referencedAssemblies $assem -typeDefinition $source -language CSharp
+  }
+  catch
+  {
+    if ($_.FullyQualifiedErrorId.StartsWith("TYPE_ALREADY_EXISTS,"))
+      { Write-Error "Failed to add type, did you change the code?" }
+    else
+      { Write-Error $_ }
+  }
+  if (-not $?) { break }
+  
+  $nuspecs = (
+    "UmbracoCms",
+    "UmbracoCms.Core"
+  )
+  
+  $projects = (
+    "Umbraco.Core",
+    "Umbraco.Web",
+    "Umbraco.Web.UI",
+    "UmbracoExamine"#,
+    #"Umbraco.Tests",
+    #"Umbraco.Tests.Benchmarks"
+  )
+   
+  $src = "$($uenv.SolutionRoot)\src"
+  $pkgs = [Umbraco.Build.NuGet]::GetProjectsPackages($src, $projects)
+  if (-not $?) { break }
+  #Write-Package "All" $pkgs
+  
+  $errs = [Umbraco.Build.NuGet]::GetPackageErrors($pkgs)
+  if (-not $?) { break }
+  
+  if ($errs.Length -gt 0)
+  {
+    Write-Host ""
+  }
+  foreach ($err in $errs)
+  {
+    Write-Host $err.Key
+    foreach ($e in $err)
+    {
+      Write-Host " $($e.Version) required by $($e.Project)"
+    }
+  }
+  if ($errs.Length -gt 0)
+  {
+    Write-Error "Found non-consolidated package dependencies"
+    break
+  }
+  
+  $nuerr = $false
+  $nupath = "$($uenv.SolutionRoot)\build\NuSpecs"
+  foreach ($nuspec in $nuspecs)
+  {  
+    $deps = [Umbraco.Build.NuGet]::GetNuSpecDependencies("$nupath\$nuspec.nuspec")
+    if (-not $?) { break }
+    #Write-NuSpec $nuspec $deps
+    
+    $errs = [Umbraco.Build.NuGet]::GetNuSpecErrors($pkgs, $deps)
+    if (-not $?) { break }
+    
+    if ($errs.Length -gt 0)
+    {
+      Write-Host ""
+      Write-Host "$nuspec requires:"
+      $nuerr = $true
+    }
+    foreach ($err in $errs)
+    {
+      $m = Format-Dependency $err.Dependency
+      Write-Host " $m but projects require $($err.Version)"
+    }
+  }
+  
+  if ($nuerr)
+  {
+    Write-Error "Found inconsistent NuGet dependencies"
+    break
+  }
+}

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,60 +1,107 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms.Core</id>
-        <version>8.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>https://umbraco.com/dist/nuget/logo-small.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>
-
-            <group targetFramework="net472">
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="LightInject" version="[5.4.0,5.999999)" />
-                <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
-                <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
-                <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
-                <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
-                <dependency id="Semver" version="[2.0.4,2.999999)" />
-                <dependency id="Serilog" version="[2.8.0,2.999999)" />
-                <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
-                <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
-                <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
-                <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
-                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
-                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
-                <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
-                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-                <dependency id="NPoco" version="[3.9.4,3.999999)" />
-            </group>
-            
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
-
-        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
-
-        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
-    </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="3.4.4">
+    <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.1.0, 4.0.0)" />
+      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.1.0, 4.0.0)" />
+      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.1.0, 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="MySql.Data" version="[6.9.9, 7.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.7, 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.89, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
+      <dependency id="semver" version="[1.1.2, 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)" />
+      <dependency id="System.ValueTuple" version="[4.4.0, 5.0.0)" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$BuildTmp$\WebApp\bin\businesslogic.dll" target="lib\net45\businesslogic.dll" />
+    <file src="$BuildTmp$\WebApp\bin\businesslogic.xml" target="lib\net45\businesslogic.xml" />
+    <file src="$BuildTmp$\WebApp\bin\cms.dll" target="lib\net45\cms.dll" />
+    <file src="$BuildTmp$\WebApp\bin\cms.xml" target="lib\net45\cms.xml" />
+    <file src="$BuildTmp$\WebApp\bin\controls.dll" target="lib\net45\controls.dll" />
+    <file src="$BuildTmp$\WebApp\bin\controls.xml" target="lib\net45\controls.xml" />
+    <file src="$BuildTmp$\WebApp\bin\interfaces.dll" target="lib\net45\interfaces.dll" />
+    <file src="$BuildTmp$\WebApp\bin\interfaces.xml" target="lib\net45\interfaces.xml" />
+    <file src="$BuildTmp$\WebApp\bin\log4net.dll" target="lib\net45\log4net.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\Microsoft.ApplicationBlocks.Data.dll" />
+    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net45\SQLCE4Umbraco.dll" />
+    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net45\SQLCE4Umbraco.xml" />
+    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net45\System.Data.SqlServerCe.dll" />
+    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net45\System.Data.SqlServerCe.Entity.dll" />
+    <file src="$BuildTmp$\WebApp\bin\TidyNet.dll" target="lib\net45\TidyNet.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net45\Umbraco.Core.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net45\Umbraco.Core.xml" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.dll" target="lib\net45\umbraco.DataLayer.dll" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.xml" target="lib\net45\umbraco.DataLayer.xml" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.dll" target="lib\net45\umbraco.dll" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.xml" target="lib\net45\umbraco.xml" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.dll" target="lib\net45\umbraco.editorControls.dll" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.xml" target="lib\net45\umbraco.editorControls.xml" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net45\umbraco.MacroEngines.dll" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net45\umbraco.MacroEngines.xml" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.dll" target="lib\net45\umbraco.providers.dll" />
+    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.xml" target="lib\net45\umbraco.providers.xml" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net45\Umbraco.Web.UI.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net45\Umbraco.Web.UI.xml" />
+    <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.dll" target="lib\net45\UmbracoExamine.dll" />
+    <file src="$BuildTmp$\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="$BuildTmp$\bin\SQLCE4Umbraco.pdb" target="lib" />
+    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
+    <file src="$BuildTmp$\bin\businesslogic.pdb" target="lib" />
+    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
+    <file src="$BuildTmp$\bin\cms.pdb" target="lib" />
+    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
+    <file src="$BuildTmp$\bin\controls.pdb" target="lib" />
+    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
+    <file src="$BuildTmp$\bin\interfaces.pdb" target="lib" />
+    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
+    <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
+    <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+    <file src="$BuildTmp$\bin\umbraco.DataLayer.pdb" target="lib" />
+    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
+    <file src="$BuildTmp$\bin\umbraco.editorControls.pdb" target="lib" />
+    <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
+    <file src="$BuildTmp$\bin\umbraco.MacroEngines.pdb" target="lib" />
+    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
+    <file src="$BuildTmp$\bin\umbraco.providers.pdb" target="lib" />
+    <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
+    <file src="$BuildTmp$\bin\umbraco.pdb" target="lib" />
+    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
+    <file src="$BuildTmp$\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="$BuildTmp$\bin\UmbracoExamine.pdb" target="lib" />
+    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
+  </files>
+</package>

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms.Web</id>
-        <version>8.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>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the web 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>
-
-            <group targetFramework="net472">
-
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
-                <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
-                <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.0,1.999999)" />
-                <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-                <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
-                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
-                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
-                <dependency id="Markdown" version="[2.2.1,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
-                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-
-            </group>
-            
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
-
-        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\Umbraco.Web.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\Umbraco.Examine.xml" />
-
-        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib" />
-        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib" />
-    </files>
-</package>

build/NuSpecs/UmbracoCms.nuspec

@@ -1,69 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms</id>
-        <version>8.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>https://umbraco.com/dist/nuget/logo-small.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>
-
-            <group targetFramework="net472">
-
-                <dependency id="UmbracoCms.Web" version="[$version$]" />
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.4]" />
-                <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
-                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
-                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
-                <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />
-
-            </group>
-
-
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- files -->
-        <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
-        <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
-        <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
-        <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-        <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
-
-        <!-- these files are copied by install.ps1 -->
-        <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
-
-        <!-- tools -->
-        <!-- beware! install.ps1 not supported by PackageReference -->
-        <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" />
-
-        <!-- config transforms -->
-        <!-- beware! config transforms not supported by PackageReference -->
-        <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
-        <file src="tools\serilog.config.install.xdt" target="Content\config\serilog.config.install.xdt" />
-        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.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" /> <!-- FIXME: Content\ !! and then... transform?! -->
-
-        <!-- UmbracoCms props and targets -->
-        <file src="build\**" target="build" />
-    </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="3.4.4">
+    <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.10, 4.0.0)" />
+      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
+	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
+      <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.0, 3.0.0)" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
+    <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
+    <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
+    <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
+    <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
+    <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
+    <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+    <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
+    <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+    <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
+    <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
+    <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
+    <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\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>

build/NuSpecs/build/UmbracoCms.targets

@@ -47,6 +47,9 @@
       <CustomFilesToInclude Include=".\umbraco\**\*">
         <Dir>umbraco</Dir>
       </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\umbraco_client\**\*">
+        <Dir>umbraco_client</Dir>
+      </CustomFilesToInclude>
       <CustomFilesToInclude Include=".\Global.asax">
         <Dir>.</Dir>
       </CustomFilesToInclude>

build/NuSpecs/tools/Dashboard.config.install.xdt

@@ -0,0 +1,95 @@
+<?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>

build/NuSpecs/tools/Readme.txt

@@ -1,27 +1,26 @@
-
-                       888                                         
-                       888                                         
-888  888 88888b.d88b.  88888b.  888d888  8888b.   .d8888b  .d88b.  
-888  888 888 "888 "88b 888 "88b 888P"       "88b d88P"    d88""88b 
-888  888 888  888  888 888  888 888     .d888888 888      888  888 
-Y88b 888 888  888  888 888 d88P 888     888  888 Y88b.    Y88..88P 
- "Y88888 888  888  888 88888P"  888     "Y888888  "Y8888P  "Y88P"  
-
-------------------------------------------------------------------
-
-Don't forget to build!
-
-
-When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config
-file (and config files in the config folder).
-
-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, config\splashes and global.asax.
-
-Please read the release notes on our.umbraco.com:
-https://our.umbraco.com/download/releases
-
-- Umbraco
+
+  _    _ __  __ ____  _____           _____ ____  
+ | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
+ | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
+ | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
+ | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
+  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
+                                                   
+----------------------------------------------------
+
+Don't forget to build!
+
+
+When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
+file (and config files in the config folder). 
+
+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.com:
+https://our.umbraco.com/download/releases
+
+- Umbraco

build/NuSpecs/tools/ReadmeUpgrade.txt

@@ -1,30 +1,39 @@
 
-  _    _ __  __ ____  _____           _____ ____
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \
+  _    _ __  __ ____  _____           _____ ____  
+ | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
  | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
  | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
  | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/
-
+  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
+                                                   
 ----------------------------------------------------
 
+*** IMPORTANT NOTICE FOR UPGRADES FROM VERSIONS BELOW 7.7.0 ***
+
+Be sure to read the version specific upgrade information before proceeding:
+https://our.umbraco.com/documentation/Getting-Started/Setup/Upgrading/version-specific#version-7-7-0
+
+Depending on the version you are upgrading from, you may 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 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
+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
+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, config\splashes and global.asax.
+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.com:
 http://our.umbraco.com/contribute/releases
 
-- Umbraco
+- Umbraco

build/NuSpecs/tools/Web.config.install.xdt

@@ -1,195 +1,420 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <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="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </sectionGroup>
-  </configSections>
+    <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)" />
 
-  <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>
+        <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" />
+            <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </sectionGroup>
+    </configSections>
 
-  <umbracoConfiguration xdt:Transform="InsertIfMissing">
-    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
-    <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-  </umbracoConfiguration>
+    <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" />
+        <add key="umbracoDefaultUILanguage" value="en-US" xdt:Locator="Match(key)" xdt:Transform="SetAttributes(value)" />
+    </appSettings>
 
-  <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)" />
-    </DbProviderFactories>
-  </system.data>
-  <clientDependency xdt:Transform="RemoveAttributes(version)" />
+    <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" />
+        <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    </umbracoConfiguration>
 
-  <system.web xdt:Transform="InsertIfMissing" />
-  <system.web>
-    <siteMap xdt:Transform="Remove" />
-    <httpRuntime xdt:Transform="InsertIfMissing" />
-    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <FileSystemProviders xdt:Transform="Remove" />
+    <BaseRestExtensions xdt:Transform="Remove" />
 
-    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
-    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
-    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
-    <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
-    <compilation xdt:Transform="InsertIfMissing" />
+    <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>
 
-    <xhtmlConformance xdt:Transform="Remove" />
+    <clientDependency xdt:Transform="RemoveAttributes(version)" />
 
-    <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>
+    <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)" />
 
-    <httpHandlers xdt:Transform="InsertIfMissing" />
-    <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
-    </httpHandlers>
-  </system.web>
+        <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>
 
-  <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" />
+        <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>
 
-      <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>
+        <xhtmlConformance xdt:Transform="Remove" />
 
-    <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>
+        <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>
 
-    <handlers>
-      <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </handlers>
+        <httpHandlers xdt:Transform="InsertIfMissing" />
+        <httpHandlers>
+            <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
+        </httpHandlers>
+    </system.web>
 
-    <security xdt:Transform="InsertIfMissing">
-      <requestFiltering xdt:Transform="InsertIfMissing">
-        <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
-      </requestFiltering>
-    </security>
+    <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" />
 
-  </system.webServer>
+            <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>
 
-  <runtime xdt:Transform="InsertIfMissing" />
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
-  </runtime>
+        <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>
 
-  <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" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-    </assemblyBinding>
-  </runtime>
+        <handlers>
+            <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        </handlers>
 
- <runtime>
+        <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" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
+        </assemblyBinding>
+    </runtime>
+
+    <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+                <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="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+                <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="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+                <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-12.0.0.0" newVersion="12.0.0.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+                <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.7.0" newVersion="5.2.7.0" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
             </dependentAssembly>
             <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+                <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.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+                <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.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.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>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
 
-  <system.web.webPages.razor xdt:Transform="Remove" />
+    <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="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>
+    <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>

build/NuSpecs/tools/applications.config.install.xdt

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <applications xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <add alias="content" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="media" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="settings" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="developer" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="users" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="member" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="forms" name="Forms" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing" />
-  <add alias="translation" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon,sortOrder)" />
-</applications>
+  <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>

build/NuSpecs/tools/install.core.ps1

@@ -0,0 +1,105 @@
+param($installPath, $toolsPath, $package, $project)
+
+Write-Host "installPath:" "${installPath}"
+Write-Host "toolsPath:" "${toolsPath}"
+
+Write-Host " "
+
+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}"		
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	Write-Host "copyLogsPath:" "${copyLogsPath}"			
+	$umbracoBinFolder = Join-Path $projectPath "bin"
+	Write-Host "umbracoBinFolder:" "${umbracoBinFolder}"		
+
+	# 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
+	
+	if(Test-Path $umbracoBinFolder) {
+		$umbracoBinBackupPath = Join-Path $backupPath "bin"
+		
+		New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
+		
+		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
+		
+		# Delete files Umbraco ships with
+		if(Test-Path $umbracoBinFolder\businesslogic.dll) { Remove-Item $umbracoBinFolder\businesslogic.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\cms.dll) { Remove-Item $umbracoBinFolder\cms.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\controls.dll) { Remove-Item $umbracoBinFolder\controls.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\interfaces.dll) { Remove-Item $umbracoBinFolder\interfaces.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\log4net.dll) { Remove-Item $umbracoBinFolder\log4net.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\SQLCE4Umbraco.dll) { Remove-Item $umbracoBinFolder\SQLCE4Umbraco.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\TidyNet.dll) { Remove-Item $umbracoBinFolder\TidyNet.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\umbraco.dll) { Remove-Item $umbracoBinFolder\umbraco.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Core.dll) { Remove-Item $umbracoBinFolder\Umbraco.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\umbraco.DataLayer.dll) { Remove-Item $umbracoBinFolder\umbraco.DataLayer.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\umbraco.editorControls.dll) { Remove-Item $umbracoBinFolder\umbraco.editorControls.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\umbraco.MacroEngines.dll) { Remove-Item $umbracoBinFolder\umbraco.MacroEngines.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.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 }
+		
+		# Delete files Umbraco depends upon
+		$amd64Folder = Join-Path $umbracoBinFolder "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 }
+		if(Test-Path $umbracoBinFolder\AutoMapper.dll) { Remove-Item $umbracoBinFolder\AutoMapper.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\AutoMapper.Net4.dll) { Remove-Item $umbracoBinFolder\AutoMapper.Net4.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.Mvc.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\CookComputing.XmlRpcV2.dll) { Remove-Item $umbracoBinFolder\CookComputing.XmlRpcV2.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Examine.dll) { Remove-Item $umbracoBinFolder\Examine.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\HtmlAgilityPack.dll) { Remove-Item $umbracoBinFolder\HtmlAgilityPack.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ICSharpCode.SharpZipLib.dll) { Remove-Item $umbracoBinFolder\ICSharpCode.SharpZipLib.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.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 }
+		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.Razor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Deployment.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Deployment.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }		
+	}
+}

build/NuSpecs/tools/install.ps1

@@ -1,90 +1,162 @@
-param($installPath, $toolsPath, $package, $project)
-
-Write-Host "installPath:" "${installPath}"
-Write-Host "toolsPath:" "${toolsPath}"
-
-Write-Host " "
-
-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}"
-	$webConfigSource = Join-Path $projectPath "Web.config"
-	Write-Host "webConfigSource:" "${webConfigSource}"
-	$configFolder = Join-Path $projectPath "Config"
-	Write-Host "configFolder:" "${configFolder}"
-
-	# 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"		
-	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.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 "Umbraco.Core.ConfigurationStatus") 
-				{
-					# 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
-	} else {
-		# This part only runs for upgrades
-	
-		$upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*"
-		$upgradeView = Join-Path $umbracoFolder "Views\install\"
-		Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}"
-		Copy-Item $upgradeViewSource $upgradeView -Force
-		
-		Try 
-		{
-			# Disable tours for upgrades, presumably Umbraco experience is already available
-			$umbracoSettingsConfigPath = Join-Path $configFolder "umbracoSettings.config"
-			$content = (Get-Content $umbracoSettingsConfigPath).Replace('<tours enable="true">','<tours enable="false">')
-			# Saves with UTF-8 encoding without BOM which makes sure Umbraco can still read it
-			# Reference: https://stackoverflow.com/a/32951824/5018
-			[IO.File]::WriteAllLines($umbracoSettingsConfigPath, $content)
-		} 
-		Catch 
-		{
-			# Not a big problem if this fails, let it go
-		}
-	}
-	
-	# Open appropriate readme
-	if($copyWebconfig -eq $true)  
-	{
-		$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
-	} 
-	else 
-	{	
-		$DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt')
-	}
-}
+param($installPath, $toolsPath, $package, $project)
+
+Write-Host "installPath:" "${installPath}"
+Write-Host "toolsPath:" "${toolsPath}"
+
+Write-Host " "
+
+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}"
+	$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
+	Copy-Item $webConfigSource $backupPath -Force
+	
+	# Backup config files folder	
+	if(Test-Path $configFolder) {
+		$umbracoBackupPath = Join-Path $backupPath "Config"
+		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
+		
+		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
+	}
+	
+	# Copy 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
+		
+		$sqlCex86Source = Join-Path $installPath "UmbracoFiles\bin\x86\*"
+		$sqlCex86Destination = Join-Path $projectPath "bin\x86\"
+		Copy-Item $sqlCex86source $sqlCex86Destination -Force
+
+		$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 {
+		# This part only runs for upgrades
+	
+		$upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*"
+		$upgradeView = Join-Path $umbracoFolder "Views\install\"
+		Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}"
+		Copy-Item $upgradeViewSource $upgradeView -Force
+		
+		Try 
+		{
+			# Disable tours for upgrades, presumably Umbraco experience is already available
+			$umbracoSettingsConfigPath = Join-Path $configFolder "umbracoSettings.config"
+			$content = (Get-Content $umbracoSettingsConfigPath).Replace('<tours enable="true">','<tours enable="false">')
+			# Saves with UTF-8 encoding without BOM which makes sure Umbraco can still read it
+			# Reference: https://stackoverflow.com/a/32951824/5018
+			[IO.File]::WriteAllLines($umbracoSettingsConfigPath, $content)
+		} 
+		Catch 
+		{
+			# Not a big problem if this fails, let it go
+		}
+		
+		Try 
+		{
+			$uiXmlConfigPath = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+			$uiXmlFile = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+
+			$uiXml = New-Object System.Xml.XmlDocument
+			$uiXml.PreserveWhitespace = $true
+
+			$uiXml.Load($uiXmlFile)
+			$createExists = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks/create")
+
+			if($createExists.Count -eq 0) 
+			{    
+				$macrosTasksNode = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks")
+
+				#Creating: <create assembly="umbraco" type="macroTasks" />
+				$createNode = $uiXml.CreateElement("create")
+				$createNode.SetAttribute("assembly", "umbraco")
+				$createNode.SetAttribute("type", "macroTasks")
+				$macrosTasksNode.AppendChild($createNode)
+				$uiXml.Save($uiXmlFile)
+			}
+		} 
+		Catch { }
+	}
+	
+	$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')
+	}
+}

build/NuSpecs/tools/log4net.config.install.xdt

@@ -0,0 +1,20 @@
+<?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>
+

build/NuSpecs/tools/serilog.config.install.xdt

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">>
-    <appSettings>
-
-        <add key="serilog:using:File" value="Umbraco.Core" xdt:Transform="SetAttributes(value)" xdt:Locator="Match(key)"/>
-        <add key="serilog:write-to:File.shared" xdt:Transform="Remove" xdt:Locator="Match(key)"/>
-
-    </appSettings>
-</configuration>

build/NuSpecs/tools/trees.config.install.xdt

@@ -0,0 +1,146 @@
+<?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.Web.Trees.ScriptTreeController, 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.Web.Trees.DictionaryTreeController, 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 initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, umbraco"
+       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 initialize="true" sortOrder="5" alias="xslt" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.XsltTreeController, umbraco"
+       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 initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, umbraco" 
+      xdt:Locator="Match(application,alias)"
+      xdt:Transform="SetAttributes()" />
+
+  <add application="users" alias="userTypes"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add application="users" alias="userPermissions" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+
+  <!--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>

build/azuregalleryrelease.ps1

@@ -0,0 +1,59 @@
+Param(
+ [string]$GitHubPersonalAccessToken,
+ [string]$Directory
+)
+$workingDirectory = $Directory
+CD $workingDirectory
+
+# Clone repo
+$fullGitUrl = "https://$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+git clone $fullGitUrl 2>&1 | % { $_.ToString() } 
+
+# Remove everything so that unzipping the release later will update everything
+# Don't remove the readme file nor the git directory
+Write-Host "Cleaning up git directory before adding new version"
+Remove-Item -Recurse $workingDirectory\$env:GIT_REPOSITORYNAME\* -Exclude README.md,.git
+
+# Find release zip
+$zipsDir = "$workingDirectory\$env:BUILD_DEFINITIONNAME\zips"
+$pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
+Write-Host "Searching for Umbraco release files in $workingDirectory\$zipsDir for a file with pattern $pattern"
+$file = (Get-ChildItem $zipsDir | Where-Object { $_.Name -match "$pattern" })
+
+if($file)
+{
+    # Get release name
+    $version = [regex]::Match($file.Name, $pattern).captures.groups[1].value
+    $releaseName = "Umbraco $version"
+    Write-Host "Found $releaseName"
+    
+    # Unzip into repository to update release
+    Add-Type -AssemblyName System.IO.Compression.FileSystem
+    Write-Host "Unzipping $($file.FullName) to $workingDirectory\$env:GIT_REPOSITORYNAME"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$workingDirectory\$env:GIT_REPOSITORYNAME")
+    
+    # Telling git who we are
+    git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
+    git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
+    
+    # Commit
+    CD $env:GIT_REPOSITORYNAME
+    Write-Host "Committing Umbraco $version Release from Build Output"
+
+    git add . 2>&1 | % { $_.ToString() } 
+    git commit -m " Release $releaseName from Build Output" 2>&1 | % { $_.ToString() } 
+
+    # Tag the release
+    git tag -a "v$version" -m "v$version"
+
+    # Push release to master
+    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$GitHubPersonalAccessToken@$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+    git push $fullGitAuthUrl 2>&1 | % { $_.ToString() } 
+
+    #Push tag to master
+    git push $fullGitAuthUrl --tags 2>&1 | % { $_.ToString() }
+}
+else
+{
+    Write-Error "Umbraco release file not found, searched in $workingDirectory\$zipsDir for a file with pattern $pattern - cancelling"
+}

build/build-bootstrap.ps1

@@ -1,92 +0,0 @@
-
-  # this script should be dot-sourced into the build.ps1 scripts
-  # right after the parameters declaration
-  # ie
-  # . "$PSScriptRoot\build-bootstrap.ps1"
-
-  # THIS FILE IS DISTRIBUTED AS PART OF UMBRACO.BUILD
-  # DO NOT MODIFY IT - ALWAYS USED THE COMMON VERSION
-
-  # ################################################################
-  # BOOTSTRAP
-  # ################################################################
-
-  # reset errors
-  $error.Clear()
-
-  # ensure we have temp folder for downloads
-  $scriptRoot = "$PSScriptRoot"
-  $scriptTemp = "$scriptRoot\temp"
-  if (-not (test-path $scriptTemp)) { mkdir $scriptTemp > $null }
-
-  # get NuGet
-  $cache = 4
-  $nuget = "$scriptTemp\nuget.exe"
-  if (-not $local)
-  {
-    $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-    if ((test-path $nuget) -and ((ls $nuget).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
-    {
-      Remove-Item $nuget -force -errorAction SilentlyContinue > $null
-    }
-    if (-not (test-path $nuget))
-    {
-      Write-Host "Download NuGet..."
-      Invoke-WebRequest $source -OutFile $nuget
-      if (-not $?) { throw "Failed to download NuGet." }
-    }
-  }
-  elseif (-not (test-path $nuget))
-  {
-    throw "Failed to locate NuGet.exe."
-  }
-
-  # NuGet notes
-  # As soon as we use -ConfigFile, NuGet uses that file, and only that file, and does not
-  # merge configuration from system level. See comments in NuGet.Client solution, class
-  # NuGet.Configuration.Settings, method LoadDefaultSettings.
-  # For NuGet to merge configurations, it needs to "find" the file in the current directory,
-  # or above. Which means we cannot really use -ConfigFile but instead have to have Umbraco's
-  # NuGet.config file at root, and always run NuGet.exe while at root or in a directory below
-  # root.
-
-  $solutionRoot = "$scriptRoot\.."
-  $testPwd = [System.IO.Path]::GetFullPath($pwd.Path) + "\"
-  $testRoot = [System.IO.Path]::GetFullPath($solutionRoot) + "\"
-  if (-not $testPwd.ToLower().StartsWith($testRoot.ToLower()))
-  {
-      throw "Cannot run outside of the solution's root."
-  }
-
-  # get the build system
-  if (-not $local)
-  {
-    $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease"
-    &$nuget install Umbraco.Build @params
-    if (-not $?) { throw "Failed to download Umbraco.Build." }
-  }
-
-  # ensure we have the build system
-  $ubuildPath = ls "$scriptTemp\Umbraco.Build.*" | sort -property CreationTime -descending | select -first 1
-  if (-not $ubuildPath)
-  {
-    throw "Failed to locate the build system."
-  }
-
-  # boot the build system
-  # this creates $global:ubuild
-  return &"$ubuildPath\ps\Boot.ps1"
-
-  # at that point the build.ps1 script must boot the build system
-  # eg
-  # $ubuild.Boot($ubuildPath.FullName, [System.IO.Path]::GetFullPath("$scriptRoot\.."),
-  #   @{ Local = $local; With7Zip = $false; WithNode = $false },
-  #   @{ continue = $continue })
-  # if (-not $?) { throw "Failed to boot the build system." }
-  #
-  # and it's good practice to report
-  # eg
-  # Write-Host "Umbraco.Whatever Build"
-  # Write-Host "Umbraco.Build v$($ubuild.BuildVersion)"
-
-  # eof

build/build-docs.ps1

@@ -1,44 +0,0 @@
-$uenv=build/build.ps1 -get
-
-$src = "$($uenv.SolutionRoot)\src"
-$tmp = $uenv.BuildTemp
-$out = $uenv.BuildOutput
-$DocFxJson = "$src\ApiDocs\docfx.json"
-$DocFxSiteOutput = "$tmp\_site\*.*"
-
-################ Do the UI docs
-$uenv.CompileBelle()
-
-"Moving to Umbraco.Web.UI.Client folder"
-cd .\src\Umbraco.Web.UI.Client
-
-"Generating the docs and waiting before executing the next commands"
-& gulp docs | Out-Null
-
-# change baseUrl
-$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-$IndexPath = "./docs/api/index.html"
-(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
-
-
-################ Do the c# docs
-
-# Build the solution in debug mode
-$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
-#$uenv.CompileUmbraco()
-
-#restore nuget packages
-$uenv.RestoreNuGet()
-
-# run DocFx
-$DocFx = $uenv.BuildEnv.DocFx
-
-Write-Host "$DocFxJson"
-& $DocFx metadata $DocFxJson
-& $DocFx build $DocFxJson
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput

build/build.ps1

@@ -1,543 +1,67 @@
-
-  param (
-    # get, don't execute
+param (
     [Parameter(Mandatory=$false)]
-    [Alias("g")]
-    [switch] $get = $false,
+    [string]
+    $version,
 
-    # run local, don't download, assume everything is ready
     [Parameter(Mandatory=$false)]
-    [Alias("l")]
-    [Alias("loc")]
-    [switch] $local = $false,
+    [Alias("mo")]
+    [switch]
+    $moduleOnly = $false
+)
 
-	# enable docfx
-    [Parameter(Mandatory=$false)]
-    [Alias("doc")]
-    [switch] $docfx = $false,
-	
-    # keep the build directories, don't clear them
-    [Parameter(Mandatory=$false)]
-    [Alias("c")]
-    [Alias("cont")]
-    [switch] $continue = $false,
+# the script can run either from the solution root,
+# or from the ./build directory - anything else fails
+if ([System.IO.Path]::GetFileName($pwd) -eq "build")
+{
+  $mpath = [System.IO.Path]::GetDirectoryName($pwd) + "\build\Modules\"
+}
+else
+{
+  $mpath = "$pwd\build\Modules\"
+}
 
-    # execute a command
-    [Parameter(Mandatory=$false, ValueFromRemainingArguments=$true)]
-    [String[]]
-    $command
-  )
+# look for the module and throw if not found
+if (-not [System.IO.Directory]::Exists($mpath + "Umbraco.Build"))
+{
+  Write-Error "Could not locate Umbraco build Powershell module."
+  break
+}
 
-  # ################################################################
-  # BOOTSTRAP
-  # ################################################################
+# add the module path (if not already there)
+if (-not $env:PSModulePath.Contains($mpath))
+{
+  $env:PSModulePath = "$mpath;$env:PSModulePath"
+}
 
-  # create and boot the buildsystem
-  $ubuild = &"$PSScriptRoot\build-bootstrap.ps1"
-  if (-not $?) { return }
-  $ubuild.Boot($PSScriptRoot,
-    @{ Local = $local; WithDocFx = $docfx },
-    @{ Continue = $continue })
-  if ($ubuild.OnError()) { return }
+# force-import (or re-import) the module
+Write-Host "Import Umbraco build Powershell module"
+Import-Module Umbraco.Build -Force -DisableNameChecking
 
-  Write-Host "Umbraco Cms Build"
-  Write-Host "Umbraco.Build v$($ubuild.BuildVersion)"
-
-  # ################################################################
-  # TASKS
-  # ################################################################
-
-  $ubuild.DefineMethod("SetMoreUmbracoVersion",
+# module only?
+if ($moduleOnly)
+{
+  if (-not [string]::IsNullOrWhiteSpace($version))
   {
-    param ( $semver )
-
-    $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch
-
-    Write-Host "Update IIS Express port in csproj"
-    $updater = New-Object "Umbraco.Build.ExpressPortUpdater"
-    $csproj = "$($this.SolutionRoot)\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
-    $updater.Update($csproj, $release)
-  })
-
-  $ubuild.DefineMethod("SandboxNode",
-  {
-    $global:node_path = $env:path
-    $nodePath = $this.BuildEnv.NodePath
-    $gitExe = (Get-Command git).Source
-    if (-not $gitExe) { $gitExe = (Get-Command git).Path }
-    $gitPath = [System.IO.Path]::GetDirectoryName($gitExe)
-    $env:path = "$nodePath;$gitPath"
-
-    $global:node_nodepath = $this.ClearEnvVar("NODEPATH")
-    $global:node_npmcache = $this.ClearEnvVar("NPM_CONFIG_CACHE")
-    $global:node_npmprefix = $this.ClearEnvVar("NPM_CONFIG_PREFIX")
-
-    # https://github.com/gruntjs/grunt-contrib-connect/issues/235
-    $this.SetEnvVar("NODE_NO_HTTP2", "1")
-  })
-
-  $ubuild.DefineMethod("RestoreNode",
-  {
-    $env:path = $node_path
-
-    $this.SetEnvVar("NODEPATH", $node_nodepath)
-    $this.SetEnvVar("NPM_CONFIG_CACHE", $node_npmcache)
-    $this.SetEnvVar("NPM_CONFIG_PREFIX", $node_npmprefix)
-
-    $ignore = $this.ClearEnvVar("NODE_NO_HTTP2")
-  })
-
-  $ubuild.DefineMethod("CompileBelle",
-  {
-    $src = "$($this.SolutionRoot)\src"
-    $log = "$($this.BuildTemp)\belle.log"
-
-    Write-Host "Compile Belle"
-    Write-Host "Logging to $log"
-
-    # get a temp clean node env (will restore)
-    $this.SandboxNode()
-
-    # stupid PS is going to gather all "warnings" in $error
-    # so we have to take care of it else they'll bubble and kill the build
-    if ($error.Count -gt 0) { return }
-
-    try {
-        Push-Location "$($this.SolutionRoot)\src\Umbraco.Web.UI.Client"
-        Write-Output "" > $log
-
-        Write-Output "### node version is:" > $log
-        node -v >> $log 2>&1
-        if (-not $?) { throw "Failed to report node version." }
-
-        Write-Output "### npm version is:" >> $log 2>&1
-        npm -v >> $log 2>&1
-        if (-not $?) { throw "Failed to report npm version." }
-
-        Write-Output "### clean npm cache" >> $log 2>&1
-        npm cache clean --force >> $log 2>&1
-        $error.Clear() # that one can fail 'cos security bug - ignore
-
-        Write-Output "### npm install" >> $log 2>&1
-        npm install >> $log 2>&1
-        Write-Output ">> $? $($error.Count)" >> $log 2>&1
-        # Don't really care about the messages from npm install making us think there are errors
-        $error.Clear()
-
-        Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
-        npx gulp build --buildversion=$this.Version.Release >> $log 2>&1
-        if (-not $?) { throw "Failed to build" } # that one is expected to work
-    } finally {
-        Pop-Location
-
-        # FIXME: should we filter the log to find errors?
-        #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
-
-        # restore
-        $this.RestoreNode()
-    }
-
-    # setting node_modules folder to hidden
-    # used to prevent VS13 from crashing on it while loading the websites project
-    # also makes sure aspnet compiler does not try to handle rogue files and chokes
-    # in VSO with Microsoft.VisualC.CppCodeProvider -related errors
-    # use get-item -force 'cos it might be hidden already
-    Write-Host "Set hidden attribute on node_modules"
-    $dir = Get-Item -force "$src\Umbraco.Web.UI.Client\node_modules"
-    $dir.Attributes = $dir.Attributes -bor ([System.IO.FileAttributes]::Hidden)
-  })
-
-  $ubuild.DefineMethod("CompileUmbraco",
-  {
-    $buildConfiguration = "Release"
-
-    $src = "$($this.SolutionRoot)\src"
-    $log = "$($this.BuildTemp)\msbuild.umbraco.log"
-
-    if ($this.BuildEnv.VisualStudio -eq $null)
-    {
-      throw "Build environment does not provide VisualStudio."
-    }
-
-    Write-Host "Compile Umbraco"
-    Write-Host "Logging to $log"
-
-    # beware of the weird double \\ at the end of paths
-    # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
-    &$this.BuildEnv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
-      /p:WarningLevel=0 `
-      /p:Configuration=$buildConfiguration `
-      /p:Platform=AnyCPU `
-      /p:UseWPP_CopyWebApplication=True `
-      /p:PipelineDependsOnBuild=False `
-      /p:OutDir="$($this.BuildTemp)\bin\\" `
-      /p:WebProjectOutputDir="$($this.BuildTemp)\WebApp\\" `
-      /p:Verbosity=minimal `
-      /t:Clean`;Rebuild `
-      /tv:"$($this.BuildEnv.VisualStudio.ToolsVersion)" `
-      /p:UmbracoBuild=True `
-      > $log
-
-    if (-not $?) { throw "Failed to compile Umbraco.Web.UI." }
-
-    # /p:UmbracoBuild tells the csproj that we are building from PS, not VS
-  })
-
-  $ubuild.DefineMethod("PrepareTests",
-  {
-    Write-Host "Prepare Tests"
-
-    # FIXME: - idea is to avoid rebuilding everything for tests
-    # but because of our weird assembly versioning (with .* stuff)
-    # everything gets rebuilt all the time...
-    #Copy-Files "$tmp\bin" "." "$tmp\tests"
-
-    # data
-    Write-Host "Copy data files"
-    if (-not (Test-Path -Path "$($this.BuildTemp)\tests\Packaging" ))
-    {
-      Write-Host "Create packaging directory"
-      mkdir "$($this.BuildTemp)\tests\Packaging" > $null
-    }
-    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Tests\Packaging\Packages", "*", "$($this.BuildTemp)\tests\Packaging\Packages")
-
-    # required for package install tests
-    if (-not (Test-Path -Path "$($this.BuildTemp)\tests\bin" ))
-    {
-      Write-Host "Create bin directory"
-      mkdir "$($this.BuildTemp)\tests\bin" > $null
-    }
-  })
-
-  $ubuild.DefineMethod("CompileTests",
-  {
-    $buildConfiguration = "Release"
-    $log = "$($this.BuildTemp)\msbuild.tests.log"
-
-    if ($this.BuildEnv.VisualStudio -eq $null)
-    {
-      throw "Build environment does not provide VisualStudio."
-    }
-
-    Write-Host "Compile Tests"
-    Write-Host "Logging to $log"
-
-    # beware of the weird double \\ at the end of paths
-    # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
-    &$this.BuildEnv.VisualStudio.MsBuild "$($this.SolutionRoot)\src\Umbraco.Tests\Umbraco.Tests.csproj" `
-      /p:WarningLevel=0 `
-      /p:Configuration=$buildConfiguration `
-      /p:Platform=AnyCPU `
-      /p:UseWPP_CopyWebApplication=True `
-      /p:PipelineDependsOnBuild=False `
-      /p:OutDir="$($this.BuildTemp)\tests\\" `
-      /p:Verbosity=minimal `
-      /t:Build `
-      /tv:"$($this.BuildEnv.VisualStudio.ToolsVersion)" `
-      /p:UmbracoBuild=True `
-      > $log
-
-    if (-not $?) { throw "Failed to compile tests." }
-
-    # /p:UmbracoBuild tells the csproj that we are building from PS
-  })
-
-  $ubuild.DefineMethod("PreparePackages",
-  {
-    Write-Host "Prepare Packages"
-
-    $src = "$($this.SolutionRoot)\src"
-    $tmp = "$($this.BuildTemp)"
-    $out = "$($this.BuildOutput)"
-
-    $buildConfiguration = "Release"
-
-    # restore web.config
-    $this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")
-
-    # cleanup build
-    Write-Host "Clean build"
-    $this.RemoveFile("$tmp\bin\*.dll.config")
-    $this.RemoveFile("$tmp\WebApp\bin\*.dll.config")
-
-    # cleanup presentation
-    Write-Host "Cleanup presentation"
-    $this.RemoveDirectory("$tmp\WebApp\umbraco.presentation")
-
-    # create directories
-    Write-Host "Create directories"
-    mkdir "$tmp\Configs" > $null
-    mkdir "$tmp\Configs\Lang" > $null
-    mkdir "$tmp\WebApp\App_Data" > $null
-    #mkdir "$tmp\WebApp\Media" > $null
-    #mkdir "$tmp\WebApp\Views" > $null
-
-    # copy various files
-    Write-Host "Copy xml documentation"
-    Copy-Item -force "$tmp\bin\*.xml" "$tmp\WebApp\bin"
-
-    Write-Host "Copy transformed configs and langs"
-    # note: exclude imageprocessor/*.config as imageprocessor pkg installs them
-    $this.CopyFiles("$tmp\WebApp\config", "*.config", "$tmp\Configs", `
-      { -not $_.RelativeName.StartsWith("imageprocessor") })
-    $this.CopyFiles("$tmp\WebApp\config", "*.js", "$tmp\Configs")
-    $this.CopyFiles("$tmp\WebApp\config\lang", "*.xml", "$tmp\Configs\Lang")
-    $this.CopyFile("$tmp\WebApp\web.config", "$tmp\Configs\web.config.transform")
-
-    Write-Host "Copy transformed web.config"
-    $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")
-
-    # offset the modified timestamps on all umbraco dlls, as WebResources
-    # break if date is in the future, which, due to timezone offsets can happen.
-    Write-Host "Offset dlls timestamps"
-    Get-ChildItem -r "$tmp\*.dll" | ForEach-Object {
-      $_.CreationTime = $_.CreationTime.AddHours(-11)
-      $_.LastWriteTime = $_.LastWriteTime.AddHours(-11)
-    }
-
-    # copy libs
-    Write-Host "Copy SqlCE libraries"
-    $nugetPackages = $env:NUGET_PACKAGES
-    if (-not $nugetPackages)
-    {
-      $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
-    }
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
-
-    # copy Belle
-    Write-Host "Copy Belle"
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\assets", "*", "$tmp\WebApp\umbraco\assets")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\js", "*", "$tmp\WebApp\umbraco\js")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\lib", "*", "$tmp\WebApp\umbraco\lib")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\views", "*", "$tmp\WebApp\umbraco\views")
-  })
-
-  $ubuild.DefineMethod("PackageZip",
-  {
-    Write-Host "Create Zip packages"
-
-    $src = "$($this.SolutionRoot)\src"
-    $tmp = $this.BuildTemp
-    $out = $this.BuildOutput
-
-    Write-Host "Zip all binaries"
-    &$this.BuildEnv.Zip a -r "$out\UmbracoCms.AllBinaries.$($this.Version.Semver).zip" `
-      "$tmp\bin\*" `
-      "-x!dotless.Core.*" `
-      > $null
-    if (-not $?) { throw "Failed to zip UmbracoCms.AllBinaries." }
-
-    Write-Host "Zip cms"
-    &$this.BuildEnv.Zip a -r "$out\UmbracoCms.$($this.Version.Semver).zip" `
-      "$tmp\WebApp\*" `
-      "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb" `
-      > $null
-    if (-not $?) { throw "Failed to zip UmbracoCms." }
-  })
-
-  $ubuild.DefineMethod("PrepareBuild",
-  {
-    $this.TempStoreFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config")
-    Write-Host "Create clean web.config"
-    $this.CopyFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.Template.config", "$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config")
-
-    Write-host "Set environment"
-    $env:UMBRACO_VERSION=$this.Version.Semver.ToString()
-    $env:UMBRACO_RELEASE=$this.Version.Release
-    $env:UMBRACO_COMMENT=$this.Version.Comment
-    $env:UMBRACO_BUILD=$this.Version.Build
-
-    if ($args -and $args[0] -eq "vso")
-    {
-      Write-host "Set VSO environment"
-      # set environment variable for VSO
-      # https://github.com/Microsoft/vsts-tasks/issues/375
-      # https://github.com/Microsoft/vsts-tasks/blob/master/docs/authoring/commands.md
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_VERSION;]$($this.Version.Semver.ToString())")
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_RELEASE;]$($this.Version.Release)")
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_COMMENT;]$($this.Version.Comment)")
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_BUILD;]$($this.Version.Build)")
-
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_TMP;]$($this.SolutionRoot)\build.tmp")
-    }
-  })
-
-  $ubuild.DefineMethod("PrepareNuGet",
-  {
-    Write-Host "Prepare NuGet"
-
-    # add Web.config transform files to the NuGet package
-    Write-Host "Add web.config transforms to NuGet package"
-    mv "$($this.BuildTemp)\WebApp\Views\Web.config" "$($this.BuildTemp)\WebApp\Views\Web.config.transform"
-
-  })
-
-  $ubuild.DefineMethod("RestoreNuGet",
-  {
-    Write-Host "Restore NuGet"
-    Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
-    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log"
-    if (-not $?) { throw "Failed to restore NuGet packages." }
-  })
-
-  $ubuild.DefineMethod("PackageNuGet",
-  {
-    $nuspecs = "$($this.SolutionRoot)\build\NuSpecs"
-
-    Write-Host "Create NuGet packages"
-
-    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
-        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Symbols -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Core." }
-
-    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Web.nuspec" `
-        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Symbols -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }
-
-    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
-        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }
-
-    # run hook
-    if ($this.HasMethod("PostPackageNuGet"))
-    {
-      Write-Host "Run PostPackageNuGet hook"
-      $this.PostPackageNuGet();
-      if (-not $?) { throw "Failed to run hook." }
-    }
-  })
-
-  $ubuild.DefineMethod("VerifyNuGet",
-  {
-    $this.VerifyNuGetConsistency(
-      ("UmbracoCms", "UmbracoCms.Core", "UmbracoCms.Web"),
-      ("Umbraco.Core", "Umbraco.Web", "Umbraco.Web.UI", "Umbraco.Examine"))
-    if ($this.OnError()) { return }
-  })
-
-  $ubuild.DefineMethod("PrepareAzureGallery",
-  {
-    Write-Host "Prepare Azure Gallery"
-    $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
-  })
-  
-  $ubuild.DefineMethod("PrepareCSharpDocs",
-  {
-    Write-Host "Prepare C# Documentation"
-	
-    $src = "$($this.SolutionRoot)\src"
-      $tmp = $this.BuildTemp
-      $out = $this.BuildOutput
-    $DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
-    $DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
-	
-
-	#restore nuget packages
-	$this.RestoreNuGet()
-    # run DocFx
-    $DocFx = $this.BuildEnv.DocFx
-    
-    & $DocFx metadata $DocFxJson
-    & $DocFx build $DocFxJson
-
-    # zip it
-    & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
-  })
-  
-  $ubuild.DefineMethod("PrepareAngularDocs",
-  {
-    Write-Host "Prepare Angular Documentation"
-	
-    $src = "$($this.SolutionRoot)\src"
-      $out = $this.BuildOutput
-    
-    $this.CompileBelle()
-
-    "Moving to Umbraco.Web.UI.Client folder"
-    cd .\src\Umbraco.Web.UI.Client
-
-    "Generating the docs and waiting before executing the next commands"
-    & gulp docs | Out-Null
-
-    # change baseUrl
-    $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-    $IndexPath = "./docs/api/index.html"
-    (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
-
-    # zip it
-    & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
-  })
-
-  $ubuild.DefineMethod("Build",
-  {
-    $error.Clear()
-
-    $this.PrepareBuild()
-    if ($this.OnError()) { return }
-    $this.RestoreNuGet()
-    if ($this.OnError()) { return }
-    $this.CompileBelle()
-    if ($this.OnError()) { return }
-    $this.CompileUmbraco()
-    if ($this.OnError()) { return }
-    $this.PrepareTests()
-    if ($this.OnError()) { return }
-    $this.CompileTests()
-    if ($this.OnError()) { return }
-    # not running tests
-    $this.PreparePackages()
-    if ($this.OnError()) { return }
-    $this.PackageZip()
-    if ($this.OnError()) { return }
-    $this.VerifyNuGet()
-    if ($this.OnError()) { return }
-    $this.PrepareNuGet()
-    if ($this.OnError()) { return }
-    $this.PackageNuGet()
-    if ($this.OnError()) { return }
-    $this.PrepareAzureGallery()
-    if ($this.OnError()) { return }
-    $this.PostPackageHook()
-    if ($this.OnError()) { return }
-
-    Write-Host "Done"
-  })
-
-  $ubuild.DefineMethod("PostPackageHook",
-  {
-    # run hook
-    if ($this.HasMethod("PostPackage"))
-    {
-      Write-Host "Run PostPackage hook"
-      $this.PostPackage();
-      if (-not $?) { throw "Failed to run hook." }
-    }
-  })
-
-  # ################################################################
-  # RUN
-  # ################################################################
-
-  # configure
-  $ubuild.ReleaseBranches = @( "master" )
-
-  # run
-  if (-not $get)
-  {
-    if ($command.Length -eq 0)
-    {
-      $command = @( "Build" )
-    }
-    $ubuild.RunMethod($command);
-    if ($ubuild.OnError()) { return }
+    Write-Host "(module only: ignoring version parameter)"
   }
-  if ($get) { return $ubuild }
+  else
+  {
+    Write-Host "(module only)"
+  }
+  break
+}
+
+# get build environment
+Write-Host "Setup Umbraco build Environment"
+$uenv = Get-UmbracoBuildEnv
+
+# set the version if any
+if (-not [string]::IsNullOrWhiteSpace($version))
+{
+  Write-Host "Set Umbraco version to $version"
+  Set-UmbracoVersion $version
+}
+
+# full umbraco build
+Write-Host "Build Umbraco"
+Build-Umbraco

build/setversion.ps1

@@ -0,0 +1,18 @@
+# Usage: powershell .\setversion.ps1 7.6.8
+# Or: powershell .\setversion 7.6.8-beta001
+
+param (
+    [Parameter(Mandatory=$true)]
+    [string]
+    $version
+)
+
+# report
+Write-Host "Setting Umbraco version to $version"
+
+# import Umbraco Build PowerShell module - $pwd is ./build
+$env:PSModulePath = "$pwd\Modules\;$env:PSModulePath"
+Import-Module Umbraco.Build -Force -DisableNameChecking
+
+# run commands
+$version = Set-UmbracoVersion -Version $version

src/ApiDocs/docfx.json

@@ -1,61 +0,0 @@
-{
-  "metadata": [
-    {
-      "src": [
-        { 
-          "src": "../",
-          "files": [
-            "Umbraco.Core/Umbraco.Core.csproj",
-            "Umbraco.Web/Umbraco.Web.csproj"
-          ],
-          "exclude": [
-            "**/obj/**",
-            "**/bin/**"
-          ]
-        }
-      ],
-      "dest": "api",
-      "filter": "docfx.filter.yml"
-    }
-  ],
-  "build": {
-    "content": [
-      {
-        "files": [
-          "api/**.yml",
-          "api/index.md"
-        ]
-      },
-      {
-        "files": [
-          "articles/**.md",
-          "articles/**/toc.yml",
-          "toc.yml",
-          "*.md"
-        ],
-        "exclude": [
-          "obj/**"
-        ]
-      }
-    ],
-    "overwrite": [
-      {
-        "files": [
-          "**.md"
-        ],
-        "exclude": [
-          "obj/**"
-        ]
-      }
-    ],
-    "globalMetadata": {
-      "_appTitle": "Umbraco c# Api docs",
-      "_enableSearch": true,
-      "_disableContribution": false
-    },
-    "dest": "../../build.tmp/_site",
-    "template": [
-      "default", "umbracotemplate"
-    ]
-  }
-}

src/NuGet.Config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="umbracocore" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
+  </packageSources>
+</configuration>

src/SQLCE4Umbraco/Properties/AssemblyInfo.cs

@@ -0,0 +1,21 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SqlCE4Umbraco")]
+[assembly: AssemblyDescription("Umbraco specific Sql Ce Provider")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyProduct("Umbraco CMS")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("04436b0a-1dc6-4ee1-9d96-4c04f1a9f429")]
+
+[assembly: InternalsVisibleTo("Umbraco.Tests")]

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5BA5425F-27A7-4677-865E-82246498AA2E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SQLCE4Umbraco</RootNamespace>
+    <AssemblyName>SQLCE4Umbraco</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\SQLCE4Umbraco.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <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>
+    <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>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SqlCeApplicationBlock.cs" />
+    <Compile Include="SqlCeContextGuardian.cs" />
+    <Compile Include="SqlCEDataReader.cs" />
+    <Compile Include="SqlCEHelper.cs" />
+    <Compile Include="SqlCEInstaller.cs" />
+    <Compile Include="SqlCEParameter.cs" />
+    <Compile Include="SqlCeProviderException.cs" />
+    <Compile Include="SqlCETableUtility.cs" />
+    <Compile Include="SqlCEUtility.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
+      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
+      <Name>umbraco.datalayer</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj.DotSettings

@@ -0,0 +1,2 @@
+<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>

src/SQLCE4Umbraco/SqlCEDataReader.cs

@@ -0,0 +1,44 @@
+/************************************************************************************
+ * 
+ *  Umbraco Data Layer
+ *  MIT Licensed work
+ *  ©2008 Ruben Verborgh
+ * 
+ ***********************************************************************************/
+
+using System.Data.SqlServerCe;
+using umbraco.DataLayer;
+
+namespace SqlCE4Umbraco
+{
+    /// <summary>
+    /// Class that adapts a SqlDataReader.SqlDataReader to a RecordsReaderAdapter.
+    /// </summary>
+    public class SqlCeDataReaderHelper : RecordsReaderAdapter<SqlCeDataReader>
+    {
+        #region Public Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SqlServerDataReader"/> class.
+        /// </summary>
+        /// <param name="dataReader">The data reader.</param>
+        public SqlCeDataReaderHelper(System.Data.SqlServerCe.SqlCeDataReader dataReader) : base(dataReader) { }
+                                                       
+        #endregion
+
+        #region RecordsReaderAdapter Members
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has records.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance has records; otherwise, <c>false</c>.
+        /// </value>
+        public override bool HasRecords
+        {
+            get { return DataReader.HasRows; }
+        }
+
+        #endregion
+    }
+}

src/SQLCE4Umbraco/SqlCEHelper.cs

@@ -0,0 +1,253 @@
+/************************************************************************************
+ * 
+ *  Umbraco Data Layer
+ *  MIT Licensed work
+ *  ©2008 Ruben Verborgh
+ * 
+ ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlServerCe;
+using System.Linq;
+using System.Xml;
+using System.Diagnostics;
+using umbraco.DataLayer;
+using umbraco.DataLayer.SqlHelpers.SqlServer;
+
+namespace SqlCE4Umbraco
+{
+    /// <summary>
+    /// Sql Helper for an SQL Server database.
+    /// </summary>
+    public class SqlCEHelper : SqlHelper<SqlCeParameter>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SqlCEHelper"/> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        public SqlCEHelper(string connectionString) : base(connectionString)
+        {
+            m_Utility = new SqlCEUtility(this);
+        }
+
+        /// <summary>
+        /// Checks if the actual database exists, if it doesn't then it will create it
+        /// </summary>
+        internal void CreateEmptyDatabase()
+        {
+            var localConnection = new SqlCeConnection(ConnectionString);
+            if (!System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
+            {
+                using (var sqlCeEngine = new SqlCeEngine(ConnectionString))
+                {
+                    sqlCeEngine.CreateDatabase();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Most likely only will be used for unit tests but will remove all tables from the database
+        /// </summary>
+        internal void ClearDatabase()
+        {
+            // drop constraints before tables to avoid exceptions
+            // looping on try/catching exceptions was not really nice
+
+            // http://stackoverflow.com/questions/536350/drop-all-the-tables-stored-procedures-triggers-constriants-and-all-the-depend
+
+            var localConnection = new SqlCeConnection(ConnectionString);
+            if (System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
+            {
+                List<string> tables;
+
+                // drop foreign keys
+                // SQL may need "where constraint_catalog=DB_NAME() and ..."
+                tables = new List<string>();
+                using (var reader = ExecuteReader("select table_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' order by table_name"))
+                {
+                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
+                }
+
+                foreach (var table in tables)
+                {
+                    var constraints = new List<string>();
+                    using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' and table_name = '" + table + "' order by constraint_name"))
+                    {
+                        while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
+                    }
+                    foreach (var constraint in constraints)
+                    {
+                        // SQL may need "[dbo].[table]"
+                        ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
+                    }
+                }
+
+                // drop primary keys
+                // SQL may need "where constraint_catalog=DB_NAME() and ..."
+                tables = new List<string>();
+                using (var reader = ExecuteReader("select table_name from information_schema.table_constraints where constraint_type = 'PRIMARY KEY' order by table_name"))
+                {
+                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
+                }
+
+                foreach (var table in tables)
+                {
+                    var constraints = new List<string>();
+                    using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'PRIMARY KEY' and table_name = '" + table + "' order by constraint_name"))
+                    {
+                        while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
+                    }
+                    foreach (var constraint in constraints)
+                    {
+                        // SQL may need "[dbo].[table]"
+                        ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
+                    }
+                }
+
+                // drop tables
+                tables = new List<string>();
+                using (var reader = ExecuteReader("select table_name from information_schema.tables where table_type <> 'VIEW' order by table_name"))
+                {
+                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
+                }
+
+                foreach (var table in tables)
+                {
+                    ExecuteNonQuery("drop table [" + table + "]");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Drops all foreign keys on a table.
+        /// </summary>
+        /// <param name="table">The name of the table.</param>
+        /// <remarks>To be used in unit tests.</remarks>
+        internal void DropForeignKeys(string table)
+        {
+            var constraints = new List<string>();
+            using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' and table_name = '" + table + "' order by constraint_name"))
+            {
+                while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
+            }
+            foreach (var constraint in constraints)
+            {
+                // SQL may need "[dbo].[table]"
+                ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
+            }
+        }
+
+        /// <summary>
+        /// Replaces the data directory with a local path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>A local path with the resolved 'DataDirectory' mapping.</returns>
+        private string ReplaceDataDirectory(string path)
+        {
+            if (!string.IsNullOrWhiteSpace(path) && path.Contains("|DataDirectory|"))
+            {
+                var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory") as string;
+                if (!string.IsNullOrEmpty(dataDirectory))
+                {
+                    path = path.Contains(@"|\") 
+                        ? path.Replace("|DataDirectory|", dataDirectory) 
+                        : path.Replace("|DataDirectory|", dataDirectory + System.IO.Path.DirectorySeparatorChar);
+                }
+            }
+
+            return path;
+        }
+
+        /// <summary>
+        /// Creates a new parameter for use with this specific implementation of ISqlHelper.
+        /// </summary>
+        /// <param name="parameterName">Name of the parameter.</param>
+        /// <param name="value">Value of the parameter.</param>
+        /// <returns>A new parameter of the correct type.</returns>
+        /// <remarks>Abstract factory pattern</remarks>
+        public override IParameter CreateParameter(string parameterName, object value)
+        {
+            return new SqlCEParameter(parameterName, value);
+        }
+
+        /// <summary>
+        /// Executes a command that returns a single value.
+        /// </summary>
+        /// <param name="commandText">The command text.</param>
+        /// <param name="parameters">The parameters.</param>
+        /// <returns>The return value of the command.</returns>
+        protected override object ExecuteScalar(string commandText, SqlCeParameter[] parameters)
+        {
+#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);
+            }
+        }
+
+        /// <summary>
+        /// Executes a command and returns the number of rows affected.
+        /// </summary>
+        /// <param name="commandText">The command text.</param>
+        /// <param name="parameters">The parameters.</param>
+        /// <returns>
+        /// The number of rows affected by the command.
+        /// </returns>
+        protected override int ExecuteNonQuery(string commandText, SqlCeParameter[] parameters)
+        {
+#if DEBUG && DebugDataLayer
+                // Log Query Execution
+                Trace.TraceInformation(GetType().Name + " SQL ExecuteNonQuery: " + commandText);
+#endif
+
+            using (var cc = UseCurrentConnection)
+            {
+                return SqlCeApplicationBlock.ExecuteNonQuery(
+                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
+                    CommandType.Text, commandText, parameters);
+            }
+        }
+
+        /// <summary>
+        /// Executes a command and returns a records reader containing the results.
+        /// </summary>
+        /// <param name="commandText">The command text.</param>
+        /// <param name="parameters">The parameters.</param>
+        /// <returns>
+        /// A data reader containing the results of the command.
+        /// </returns>
+        protected override IRecordsReader ExecuteReader(string commandText, SqlCeParameter[] parameters)
+        {
+#if DEBUG && DebugDataLayer
+                // Log Query Execution
+                Trace.TraceInformation(GetType().Name + " SQL ExecuteReader: " + commandText);
+#endif
+
+            using (var cc = UseCurrentConnection)
+            {
+                return new SqlCeDataReaderHelper(SqlCeApplicationBlock.ExecuteReader(
+                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
+                    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));
+        }
+    }
+}

src/SQLCE4Umbraco/SqlCEInstaller.cs

@@ -0,0 +1,141 @@
+/************************************************************************************
+ * 
+ *  Umbraco Data Layer
+ *  MIT Licensed work
+ *  ©2008 Ruben Verborgh
+ * 
+ ***********************************************************************************/
+
+using System;
+using System.Resources;
+using SQLCE4Umbraco;
+using umbraco.DataLayer.Utility.Installer;
+using System.Diagnostics;
+
+namespace SqlCE4Umbraco
+{
+    /// <summary>
+    /// Database installer for an SQL Server data source.
+    /// </summary>
+    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
+    public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
+    {
+        #region Private Constants
+
+        /// <summary>The latest database version this installer supports.</summary>
+        private const DatabaseVersion LatestVersionSupported = DatabaseVersion.Version4_8;
+
+        /// <summary>The specifications to determine the database version.</summary>
+        private static readonly VersionSpecs[] m_VersionSpecs = new VersionSpecs[] {
+                    new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8),
+                    new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1),
+                    new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
+                    new VersionSpecs("SELECT description FROM cmsContentType",DatabaseVersion.Version3),
+                    new VersionSpecs("SELECT id FROM sysobjects",DatabaseVersion.None) };
+
+        #endregion
+
+        #region Public Properties
+
+        /// <summary>
+        /// This ensures that the database exists, then runs the base method
+        /// </summary>
+        public override bool CanConnect
+        {
+            get
+            {
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.CreateEmptyDatabase();
+                return base.CanConnect;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the installer can upgrade the data source.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if the installer can upgrade the data source; otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>Empty data sources can't be upgraded, just installed.</remarks>
+        public override bool CanUpgrade
+        {
+            get
+            {
+                return CurrentVersion == DatabaseVersion.Version4_1;
+            }
+        }
+
+        #endregion
+
+        #region Protected Properties
+
+        /// <summary>
+        /// Gets the version specification for evaluation by DetermineCurrentVersion.
+        /// Only first matching specification is taken into account.
+        /// </summary>
+        /// <value>The version specifications.</value>
+        protected override VersionSpecs[] VersionSpecs
+        {
+            get { return m_VersionSpecs; }
+        }
+
+        #endregion
+
+        #region Public Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SqlCEInstaller"/> class.
+        /// </summary>
+        /// <param name="sqlHelper">The SQL helper.</param>
+        public SqlCEInstaller(SqlCEHelper sqlHelper) : base(sqlHelper, LatestVersionSupported)
+        { }
+
+        #endregion
+
+        #region DefaultInstaller Members       
+
+        /// <summary>
+        /// Returns the sql to do a full install
+        /// </summary>
+        protected override string FullInstallSql
+        {
+            get { return string.Empty; }
+        }
+
+
+        /// <summary>
+        /// Returns the sql to do an upgrade
+        /// </summary>
+        protected override string UpgradeSql
+        {
+            get { return string.Empty; }
+        }
+
+        // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
+        // in a CE db
+        protected override DatabaseVersion DetermineCurrentVersion()
+        {
+            DatabaseVersion version = base.DetermineCurrentVersion();
+            if (version != DatabaseVersion.Unavailable)
+            {
+                return version;
+            }
+
+            // verify connection
+            try
+            {
+                using (var sqlHelper = SqlHelper)
+                    if (SqlCeApplicationBlock.VerifyConnection(sqlHelper.ConnectionString))
+                        return DatabaseVersion.None;
+            }
+            catch (Exception e)
+            {
+                Trace.WriteLine(e.ToString());
+            }
+
+            return DatabaseVersion.Unavailable;
+        }
+
+        #endregion
+    }
+}

src/SQLCE4Umbraco/SqlCEParameter.cs

@@ -0,0 +1,34 @@
+/************************************************************************************
+ * 
+ *  Umbraco Data Layer
+ *  MIT Licensed work
+ *  ©2008 Ruben Verborgh
+ * 
+ ***********************************************************************************/
+
+using System;
+using System.Data.SqlServerCe;
+using System.Data.SqlTypes;
+using umbraco.DataLayer;
+
+namespace SqlCE4Umbraco
+{
+    /// <summary>
+    /// Parameter class for the SqlCEHelper.
+    /// </summary>
+    public class SqlCEParameter : SqlParameterAdapter<SqlCeParameter>
+    {
+        #region Public Constructors
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SqlCEParameter"/> class.
+        /// </summary>
+        /// <param name="parameterName">Name of the parameter.</param>
+        /// <param name="value">Value of the parameter.</param>
+        public SqlCEParameter(string parameterName, object value)
+            : base(new SqlCeParameter(parameterName, value))
+        { }
+
+        #endregion
+    }
+}

src/SQLCE4Umbraco/SqlCETableUtility.cs

@@ -0,0 +1,250 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using umbraco.DataLayer.Utility.Table;
+using umbraco.DataLayer;
+using umbraco;
+
+namespace SqlCE4Umbraco
+{
+    /// <summary>
+    /// SQL Server implementation of <see cref="DefaultTableUtility&lt;S&gt;"/>.
+    /// </summary>
+    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
+    public class SqlCETableUtility : DefaultTableUtility<SqlCEHelper>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SqlCETableUtility"/> class.
+        /// </summary>
+        /// <param name="sqlHelper">The SQL helper.</param>
+        public SqlCETableUtility(SqlCEHelper sqlHelper)
+            : base(sqlHelper)
+        { }
+
+        #region DefaultTableUtility<SqlCEHelper> members
+
+        /// <summary>
+        /// Gets the table with the specified name.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>The table, or <c>null</c> if no table with that name exists.</returns>
+        public override ITable GetTable(string name)
+        {
+            if (name == null)
+                throw new ArgumentNullException("name");
+
+            ITable table = null;
+
+            // get name in correct casing
+            using (var sqlHelper = SqlHelper)
+                name = sqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
+                                                          sqlHelper.CreateParameter("name", name));
+            if (name != null)
+            {
+                table = new DefaultTable(name);
+
+                using (var sqlHelper = SqlHelper)
+                using (IRecordsReader reader = sqlHelper.ExecuteReader(
+                        @"SELECT c.name AS Name, st.name AS DataType, c.max_length, c.is_nullable, c.is_identity
+                          FROM sys.tables AS t
+                            JOIN sys.columns AS c ON t.object_id = c.object_id
+                            JOIN sys.schemas AS s ON s.schema_id = t.schema_id
+                            JOIN sys.types AS ty ON ty.user_type_id = c.user_type_id
+                            JOIN sys.types st ON ty.system_type_id = st.user_type_id
+                          WHERE t.name = @name
+                          ORDER BY c.column_id", sqlHelper.CreateParameter("name", name)))
+                {
+                    while (reader.Read())
+                    {
+                        table.AddField(table.CreateField(reader.GetString("Name"), GetType(reader)));
+                    }
+                }
+            }
+
+            return table;
+        }
+
+        /// <summary>
+        /// Saves or updates the table.
+        /// </summary>
+        /// <param name="table">The table to be saved.</param>
+        public override void SaveTable(ITable table)
+        {
+            if (table == null)
+                throw new ArgumentNullException("table");
+
+            ITable oldTable = GetTable(table.Name);
+
+            // create the table if it didn't exist, update fields otherwise
+            if (oldTable == null)
+            {
+                CreateTable(table);
+            }
+            else
+            {
+                foreach (IField field in table)
+                {
+                    // create the field if it did't exist in the old table
+                    if (oldTable.FindField(field.Name)==null)
+                    {
+                        CreateColumn(table, field);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Protected Helper Methods
+
+        /// <summary>
+        /// Creates the table in the data source.
+        /// </summary>
+        /// <param name="table">The table.</param>
+        protected virtual void CreateTable(ITable table)
+        {
+            Debug.Assert(table != null);
+
+            // create enumerator and check for first field
+            IEnumerator<IField> fieldEnumerator = table.GetEnumerator();
+            bool hasNext = fieldEnumerator.MoveNext();
+            if(!hasNext)
+                throw new ArgumentException("The table must contain at least one field.");
+
+            // create query
+            StringBuilder createTableQuery = new StringBuilder();
+            using (var sqlHelper = SqlHelper)
+                createTableQuery.AppendFormat("CREATE TABLE [{0}] (", sqlHelper.EscapeString(table.Name));
+
+            // add fields
+            while (hasNext)
+            {
+                // add field name and type
+                IField field = fieldEnumerator.Current;
+                createTableQuery.Append('[').Append(field.Name).Append(']');
+                createTableQuery.Append(' ').Append(GetDatabaseType(field));
+
+                // append comma if a following field exists
+                hasNext = fieldEnumerator.MoveNext();
+                if (hasNext)
+                {
+                    createTableQuery.Append(',');
+                }
+            }
+
+            // close CREATE TABLE x (...) bracket
+            createTableQuery.Append(')');
+
+            // execute query
+            try
+            {
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.ExecuteNonQuery(createTableQuery.ToString());
+            }
+            catch (Exception executeException)
+            {
+                throw new UmbracoException(String.Format("Could not create table '{0}'.", table), executeException);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new column in the table.
+        /// </summary>
+        /// <param name="table">The table.</param>
+        /// <param name="field">The field used to create the column.</param>
+        protected virtual void CreateColumn(ITable table, IField field)
+        {
+            Debug.Assert(table != null && field != null);
+
+            StringBuilder addColumnQuery = new StringBuilder();
+            using (var sqlHelper = SqlHelper)
+                addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
+                                        sqlHelper.EscapeString(table.Name),
+                                        sqlHelper.EscapeString(field.Name),
+                                        sqlHelper.EscapeString(GetDatabaseType(field)));
+            try
+            {
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
+            }
+            catch (Exception executeException)
+            {
+                throw new UmbracoException(String.Format("Could not create column '{0}' in table '{1}'.",
+                                                         field, table.Name), executeException);
+            }
+        }
+
+        /// <summary>
+        /// Gets the .Net type corresponding to the specified database data type.
+        /// </summary>
+        /// <param name="dataTypeReader">The data type reader.</param>
+        /// <returns>The .Net type</returns>
+        protected virtual Type GetType(IRecordsReader dataTypeReader)
+        {
+            string typeName = dataTypeReader.GetString("DataType");
+
+            switch (typeName)
+            {
+                case "bit":                 return typeof(bool);
+                case "tinyint":             return typeof(byte);
+                case "datetime":            return typeof(DateTime);
+                // TODO: return different decimal type according to field precision
+                case "decimal":             return typeof(decimal);
+                case "uniqueidentifier":    return typeof(Guid);
+                case "smallint":            return typeof(Int16);
+                case "int":                 return typeof(Int32);
+                case "bigint":              return typeof(Int64);
+                case "nvarchar":            return typeof(string);
+                default:
+                    throw new ArgumentException(String.Format("Cannot convert database type '{0}' to a .Net type.",
+                                                              typeName));
+            }
+        }
+
+        /// <summary>
+        /// Gets the database type corresponding to the field, complete with field properties.
+        /// </summary>
+        /// <param name="field">The field.</param>
+        /// <returns>The database type.</returns>
+        protected virtual string GetDatabaseType(IField field)
+        {
+            StringBuilder fieldBuilder = new StringBuilder();
+
+            fieldBuilder.Append(GetDatabaseTypeName(field));
+            fieldBuilder.Append(field.HasProperty(FieldProperties.Identity) ? " IDENTITY(1,1)" : String.Empty);
+            fieldBuilder.Append(field.HasProperty(FieldProperties.NotNull) ? " NOT NULL" : " NULL");
+
+            return fieldBuilder.ToString();
+        }
+
+        /// <summary>
+        /// Gets the name of the database type, without field properties.
+        /// </summary>
+        /// <param name="field">The field.</param>
+        /// <returns></returns>
+        protected virtual string GetDatabaseTypeName(IField field)
+        {
+            switch (field.DataType.FullName)
+            {
+                case "System.Boolean":  return "bit";
+                case "System.Byte":     return "tinyint";
+                case "System.DateTime": return "datetime";
+                case "System.Decimal":  return "decimal(28)";
+                case "System.Double":   return "decimal(15)";
+                case "System.Single":   return "decimal(7)";
+                case "System.Guid":     return "uniqueidentifier";
+                case "System.Int16":    return "smallint";
+                case "System.Int32":    return "int";
+                case "System.Int64":    return "bigint";;
+                case "System.String":
+                    string type = "nvarchar";
+                    return field.Size == 0 ? type : String.Format("{0}({1})", type, field.Size);
+                default:
+                    throw new ArgumentException(String.Format("Cannot convert '{0}' to a database type.", field));
+            }
+        }
+
+        #endregion
+    }
+}

src/SQLCE4Umbraco/SqlCEUtility.cs

@@ -0,0 +1,56 @@
+/************************************************************************************
+ * 
+ *  Umbraco Data Layer
+ *  MIT Licensed work
+ *  ©2008 Ruben Verborgh
+ * 
+ ***********************************************************************************/
+
+using System;
+using umbraco.DataLayer.SqlHelpers.SqlServer;
+using umbraco.DataLayer.Utility;
+using umbraco.DataLayer.Utility.Installer;
+using umbraco.DataLayer.Utility.Table;
+
+namespace SqlCE4Umbraco
+{
+    /// <summary>
+    /// Utility for an SQL Server data source.
+    /// </summary>
+    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
+    public class SqlCEUtility : DefaultUtility<SqlCEHelper>
+    {
+        #region Public Constructors
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SqlServerUtility"/> class.
+        /// </summary>
+        /// <param name="sqlHelper">The SQL helper.</param>
+        public SqlCEUtility(SqlCEHelper sqlHelper) : base(sqlHelper)
+        { }
+
+        #endregion
+
+        #region DefaultUtility Members
+
+        /// <summary>
+        /// Creates an installer.
+        /// </summary>
+        /// <returns>The SQL Server installer.</returns>
+        public override IInstallerUtility CreateInstaller()
+        {
+            return new SqlCEInstaller(SqlHelper);
+        }
+
+        /// <summary>
+        /// Creates a table utility.
+        /// </summary>
+        /// <returns>The table utility</returns>
+        public override ITableUtility CreateTableUtility()
+        {
+            return new SqlCETableUtility(SqlHelper);
+        }
+
+        #endregion
+    }
+}

src/SQLCE4Umbraco/SqlCeApplicationBlock.cs

@@ -0,0 +1,270 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlServerCe;
+using System.Data;
+using System.Diagnostics;
+using SQLCE4Umbraco;
+
+namespace SqlCE4Umbraco
+{
+    public class SqlCeApplicationBlock
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="connectionString"></param>
+        /// <param name="commandType"></param>
+        /// <param name="commandText"></param>
+        /// <param name="commandParameters"></param>
+        /// <returns></returns>
+        public static object ExecuteScalar(
+            string connectionString,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters
+            )
+        {
+            try
+            {
+                using (var conn = SqlCeContextGuardian.Open(connectionString))
+                {
+                    return ExecuteScalarTry(conn, null, commandText, commandParameters);
+                }
+            }
+            catch (Exception ee)
+            {
+                throw new SqlCeProviderException("Error running Scalar: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee);
+            }
+        }
+
+        public static object ExecuteScalar(
+            SqlCeConnection conn, SqlCeTransaction trx,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters)
+        {
+            try
+            {
+                return ExecuteScalarTry(conn, trx, commandText, commandParameters);
+            }
+            catch (Exception ee)
+            {
+                throw new SqlCeProviderException("Error running Scalar: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee);
+            }
+        }
+
+        public static object ExecuteScalar(
+            SqlCeConnection conn,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters)
+        {
+            return ExecuteScalar(conn, null, commandType, commandText, commandParameters);
+        }
+
+        private static object ExecuteScalarTry(
+            SqlCeConnection conn, SqlCeTransaction trx,
+            string commandText,
+            params SqlCeParameter[] commandParameters)
+        {
+            object retVal;
+            using (var cmd = trx == null ? new SqlCeCommand(commandText, conn) : new SqlCeCommand(commandText, conn, trx))
+            {
+                AttachParameters(cmd, commandParameters);
+                Debug.WriteLine("---------------------------------SCALAR-------------------------------------");
+                Debug.WriteLine(commandText);
+                Debug.WriteLine("----------------------------------------------------------------------------");
+                retVal = cmd.ExecuteScalar();
+            }
+            return retVal;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="connectionString"></param>
+        /// <param name="commandType"></param>
+        /// <param name="commandText"></param>
+        /// <param name="commandParameters"></param>
+        public static int ExecuteNonQuery(
+            string connectionString,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters
+            )
+        {
+            try
+            {
+                using (var conn = SqlCeContextGuardian.Open(connectionString))
+                {
+                    return ExecuteNonQueryTry(conn, null, commandText, commandParameters);
+                }
+            }
+            catch (Exception ee)
+            {
+                throw new SqlCeProviderException("Error running NonQuery: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
+            }
+        }
+
+        public static int ExecuteNonQuery(
+            SqlCeConnection conn,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters
+        )
+        {
+            return ExecuteNonQuery(conn, null, commandType, commandText, commandParameters);
+        }
+
+        public static int ExecuteNonQuery(
+            SqlCeConnection conn, SqlCeTransaction trx,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters
+            )
+        {
+            try
+            {
+                return ExecuteNonQueryTry(conn, trx, commandText, commandParameters);
+            }
+            catch (Exception ee)
+            {
+                throw new SqlCeProviderException("Error running NonQuery: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
+            }
+        }
+
+        private static int ExecuteNonQueryTry(
+            SqlCeConnection conn, SqlCeTransaction trx,
+            string commandText,
+            params SqlCeParameter[] commandParameters)
+        {
+            // this is for multiple queries in the installer
+            if (commandText.Trim().StartsWith("!!!"))
+            {
+                commandText = commandText.Trim().Trim('!');
+                var commands = commandText.Split('|');
+                var currentCmd = string.Empty;
+
+                foreach (var command in commands)
+                {
+                    try
+                    {
+                        currentCmd = command;
+                        if (string.IsNullOrWhiteSpace(command)) continue;
+                        var c = trx == null ? new SqlCeCommand(command, conn) : new SqlCeCommand(command, conn, trx);
+                        c.ExecuteNonQuery();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.WriteLine("*******************************************************************");
+                        Debug.WriteLine(currentCmd);
+                        Debug.WriteLine(e);
+                        Debug.WriteLine("*******************************************************************");
+                    }
+                }
+                return 1;
+            }
+
+            Debug.WriteLine("----------------------------------------------------------------------------");
+            Debug.WriteLine(commandText);
+            Debug.WriteLine("----------------------------------------------------------------------------");
+            var cmd = new SqlCeCommand(commandText, conn);
+            AttachParameters(cmd, commandParameters);
+            var rowsAffected = cmd.ExecuteNonQuery();
+            return rowsAffected;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="connectionString"></param>
+        /// <param name="commandType"></param>
+        /// <param name="commandText"></param>
+        /// <param name="commandParameters"></param>
+        /// <returns></returns>
+        public static SqlCeDataReader ExecuteReader(
+            string connectionString,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters
+            )
+        {
+            try
+            {
+                var conn = SqlCeContextGuardian.Open(connectionString);
+                return ExecuteReaderTry(conn, null, commandText, commandParameters);
+            }
+            catch (Exception ee)
+            {
+                throw new SqlCeProviderException("Error running Reader: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
+            }
+        }
+
+        public static SqlCeDataReader ExecuteReader(
+            SqlCeConnection conn,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters
+        )
+        {
+            return ExecuteReader(conn, commandType, commandText, commandParameters);
+        }
+
+        public static SqlCeDataReader ExecuteReader(
+            SqlCeConnection conn, SqlCeTransaction trx,
+            CommandType commandType,
+            string commandText,
+            params SqlCeParameter[] commandParameters
+            )
+        {
+            try
+            {
+                return ExecuteReaderTry(conn, trx, commandText, commandParameters);
+            }
+            catch (Exception ee)
+            {
+                throw new SqlCeProviderException("Error running Reader: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
+            }
+        }
+
+        private static SqlCeDataReader ExecuteReaderTry(
+            SqlCeConnection conn, SqlCeTransaction trx,
+            string commandText,
+            params SqlCeParameter[] commandParameters)
+        {
+            Debug.WriteLine("---------------------------------READER-------------------------------------");
+            Debug.WriteLine(commandText);
+            Debug.WriteLine("----------------------------------------------------------------------------");
+
+            try
+            {
+                var cmd = trx == null ? new SqlCeCommand(commandText, conn) : new SqlCeCommand(commandText, conn, trx);
+                AttachParameters(cmd, commandParameters);
+                return cmd.ExecuteReader();
+            }
+            catch
+            {
+                conn.Close();
+                throw;
+            }
+        }
+
+        public static bool VerifyConnection(string connectionString)
+        {
+            using (var conn = SqlCeContextGuardian.Open(connectionString))
+            {
+                return conn.State == ConnectionState.Open;
+            }
+        }
+
+        private static void AttachParameters(SqlCeCommand command, IEnumerable<SqlCeParameter> commandParameters)
+        {
+            foreach (var parameter in commandParameters)
+            {
+                if ((parameter.Direction == ParameterDirection.InputOutput) && (parameter.Value == null))
+                    parameter.Value = DBNull.Value;
+                command.Parameters.Add(parameter);
+            }
+        }
+    }
+}

src/SQLCE4Umbraco/SqlCeContextGuardian.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlServerCe;
+using System.Linq;
+using System.Text;
+
+namespace SQLCE4Umbraco
+{
+    public static class SqlCeContextGuardian
+    {
+        private static SqlCeConnection _constantOpenConnection;
+        private static readonly object Lock = new object();
+
+        // Awesome SQL CE 4 speed improvement by Erik Ejskov Jensen - SQL CE 4 MVP
+        // It's not an issue with SQL CE 4 that we never close the connection
+        public static SqlCeConnection Open(string connectionString)
+        {
+            var connectionStringBuilder = new DbConnectionStringBuilder();
+            try
+            {
+                connectionStringBuilder.ConnectionString = connectionString;
+            }
+            catch (Exception ex)
+            {
+                throw new ArgumentException("Bad connection string.", "connectionString", ex);
+            }
+            connectionStringBuilder.Remove("datalayer");
+
+            // SQL CE 4 performs better when there's always a connection open in the background
+            EnsureOpenBackgroundConnection(connectionStringBuilder.ConnectionString);
+
+            SqlCeConnection conn = new SqlCeConnection(connectionStringBuilder.ConnectionString);
+            conn.Open();
+
+            return conn;
+
+        }
+
+		/// <summary>
+		/// Sometimes we need to ensure this is closed especially in unit tests
+		/// </summary>
+		internal static void CloseBackgroundConnection()
+		{
+			if (_constantOpenConnection != null)
+				_constantOpenConnection.Close();
+		}
+
+        private static void EnsureOpenBackgroundConnection(string connectionString)
+        {
+            lock (Lock)
+            {
+                if (_constantOpenConnection == null)
+                {
+                    _constantOpenConnection = new SqlCeConnection(connectionString);
+                    _constantOpenConnection.Open();
+                }
+                else if (_constantOpenConnection.State != ConnectionState.Open)
+                    _constantOpenConnection.Open();
+            }
+        }
+    }
+}

src/SQLCE4Umbraco/SqlCeProviderException.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace SqlCE4Umbraco
+{
+    public class SqlCeProviderException : Exception
+    {
+        public SqlCeProviderException() : base()
+        {
+
+        }
+
+        public SqlCeProviderException(string message) : base(message)
+        {
+
+        }
+    }
+}

src/SQLCE4Umbraco/app.config

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <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>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

src/SQLCE4Umbraco/packages.config

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

src/SolutionInfo.cs

@@ -1,22 +1,15 @@
-using System.Reflection;
-using System.Resources;
-
-[assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// versions
-// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin
-
-// note: do NOT change anything here manually, use the build scripts
-
-// this is the ONLY ONE the CLR cares about for compatibility
-// should change ONLY when "hard" breaking compatibility (manual change)
-[assembly: AssemblyVersion("8.0.0")]
-
-// these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.0")]
-[assembly: AssemblyInformationalVersion("8.1.0")]
+using System.Reflection;
+using System.Resources;
+
+[assembly: AssemblyCompany("Umbraco")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: NeutralResourcesLanguageAttribute("en-US")]
+
+
+[assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyFileVersion("7.13.0")]
+[assembly: AssemblyInformationalVersion("7.13.0")]

src/Umbraco.Abstractions/AssemblyExtensions.cs

@@ -1,70 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-
-namespace Umbraco.Core
-{
-    public static class AssemblyExtensions
-    {
-        /// <summary>
-        /// Returns the file used to load the assembly
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static FileInfo GetAssemblyFile(this Assembly assembly)
-        {
-            var codeBase = assembly.CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            return new FileInfo(path);
-        }
-
-        /// <summary>
-        /// Returns true if the assembly is the App_Code assembly
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static bool IsAppCodeAssembly(this Assembly assembly)
-        {
-            if (assembly.FullName.StartsWith("App_Code"))
-            {
-                try
-                {
-                    Assembly.Load("App_Code");
-                    return true;
-                }
-                catch (FileNotFoundException)
-                {
-                    //this will occur if it cannot load the assembly
-                    return false;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Returns true if the assembly is the compiled global asax.
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static bool IsGlobalAsaxAssembly(this Assembly assembly)
-        {
-            //only way I can figure out how to test is by the name
-            return assembly.FullName.StartsWith("App_global.asax");
-        }
-
-        /// <summary>
-        ///  Returns the file used to load the assembly
-        /// </summary>
-        /// <param name="assemblyName"></param>
-        /// <returns></returns>
-        public static FileInfo GetAssemblyFile(this AssemblyName assemblyName)
-        {
-            var codeBase = assemblyName.CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            return new FileInfo(path);
-        }
-
-    }
-}

src/Umbraco.Abstractions/Attempt.cs

@@ -1,126 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides ways to create attempts.
-    /// </summary>
-    public static class Attempt
-    {
-        // note:
-        // cannot rely on overloads only to differentiate between with/without status
-        // in some cases it will always be ambiguous, so be explicit w/ 'WithStatus' methods
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult> Succeed<TResult>(TResult result)
-        {
-            return Attempt<TResult>.Succeed(result);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result and a status.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult, TStatus> SucceedWithStatus<TResult, TStatus>(TStatus status, TResult result)
-        {
-            return Attempt<TResult, TStatus>.Succeed(status, result);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail<TResult>()
-        {
-            return Attempt<TResult>.Fail();
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail<TResult>(TResult result)
-        {
-            return Attempt<TResult>.Fail(result);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and a status.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result)
-        {
-            return Attempt<TResult, TStatus>.Fail(status, result);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail<TResult>(TResult result, Exception exception)
-        {
-            return Attempt<TResult>.Fail(result, exception);
-        }
-
-
-        /// <summary>
-        /// Creates a failed attempt with a result, an exception and a status.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result, Exception exception)
-        {
-            return Attempt<TResult, TStatus>.Fail(status, result, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult> If<TResult>(bool condition, TResult result)
-        {
-            return Attempt<TResult>.If(condition, result);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="succStatus">The status of the successful attempt.</param>
-        /// <param name="failStatus">The status of the failed attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult, TStatus> IfWithStatus<TResult, TStatus>(bool condition, TStatus succStatus, TStatus failStatus, TResult result)
-        {
-            return Attempt<TResult, TStatus>.If(condition, succStatus, failStatus, result);
-        }
-    }
-}

src/Umbraco.Abstractions/AttemptOfTResult.cs

@@ -1,133 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents the result of an operation attempt.
-    /// </summary>
-    /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-    [Serializable]
-    public struct Attempt<TResult>
-    {
-        // private - use Succeed() or Fail() methods to create attempts
-        private Attempt(bool success, TResult result, Exception exception)
-        {
-            Success = success;
-            Result = result;
-            Exception = exception;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Attempt{TResult}"/> was successful.
-        /// </summary>
-        public bool Success { get; }
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        public Exception Exception { get; }
-
-        /// <summary>
-        /// Gets the attempt result.
-        /// </summary>
-        public TResult Result { get; }
-
-        /// <summary>
-        /// Gets the attempt result, if successful, else a default value.
-        /// </summary>
-        public TResult ResultOr(TResult value) => Success ? Result : value;
-
-        // optimize, use a singleton failed attempt
-        private static readonly Attempt<TResult> Failed = new Attempt<TResult>(false, default(TResult), null);
-
-        /// <summary>
-        /// Creates a successful attempt.
-        /// </summary>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult> Succeed()
-        {
-            return new Attempt<TResult>(true, default(TResult), null);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult> Succeed(TResult result)
-        {
-            return new Attempt<TResult>(true, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail()
-        {
-            return Failed;
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail(Exception exception)
-        {
-            return new Attempt<TResult>(false, default(TResult), exception);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail(TResult result)
-        {
-            return new Attempt<TResult>(false, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail(TResult result, Exception exception)
-        {
-            return new Attempt<TResult>(false, result, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult> If(bool condition)
-        {
-            return condition ? new Attempt<TResult>(true, default(TResult), null) : Failed;
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult> If(bool condition, TResult result)
-        {
-            return new Attempt<TResult>(condition, result, null);
-        }
-
-        /// <summary>
-        /// Implicitly operator to check if the attempt was successful without having to access the 'success' property
-        /// </summary>
-        /// <param name="a"></param>
-        /// <returns></returns>
-        public static implicit operator bool(Attempt<TResult> a)
-        {
-            return a.Success;
-        }
-    }
-}

src/Umbraco.Abstractions/AttemptOfTResultTStatus.cs

@@ -1,142 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents the result of an operation attempt.
-    /// </summary>
-    /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-    /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-    [Serializable]
-    public struct Attempt<TResult, TStatus>
-    {
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Attempt{TResult,TStatus}"/> was successful.
-        /// </summary>
-        public bool Success { get; }
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        public Exception Exception { get; }
-
-        /// <summary>
-        /// Gets the attempt result.
-        /// </summary>
-        public TResult Result { get; }
-
-        /// <summary>
-        /// Gets the attempt status.
-        /// </summary>
-        public TStatus Status { get; }
-
-        // private - use Succeed() or Fail() methods to create attempts
-        private Attempt(bool success, TResult result, TStatus status, Exception exception)
-        {
-            Success = success;
-            Result = result;
-            Status = status;
-            Exception = exception;
-        }
-
-        /// <summary>
-        /// Creates a successful attempt.
-        /// </summary>
-        /// <param name="status">The status of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult, TStatus> Succeed(TStatus status)
-        {
-            return new Attempt<TResult, TStatus>(true, default(TResult), status, null);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult, TStatus> Succeed(TStatus status, TResult result)
-        {
-            return new Attempt<TResult, TStatus>(true, result, status, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <param name="status">The status of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> Fail(TStatus status)
-        {
-            return new Attempt<TResult, TStatus>(false, default(TResult), status, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with an exception.
-        /// </summary>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> Fail(TStatus status, Exception exception)
-        {
-            return new Attempt<TResult, TStatus>(false, default(TResult), status, exception);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> Fail(TStatus status, TResult result)
-        {
-            return new Attempt<TResult, TStatus>(false, result, status, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> Fail(TStatus status, TResult result, Exception exception)
-        {
-            return new Attempt<TResult, TStatus>(false, result, status, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="succStatus">The status of the successful attempt.</param>
-        /// <param name="failStatus">The status of the failed attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult, TStatus> If(bool condition, TStatus succStatus, TStatus failStatus)
-        {
-            return new Attempt<TResult, TStatus>(condition, default(TResult), condition ? succStatus : failStatus, null);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="succStatus">The status of the successful attempt.</param>
-        /// <param name="failStatus">The status of the failed attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult, TStatus> If(bool condition, TStatus succStatus, TStatus failStatus, TResult result)
-        {
-            return new Attempt<TResult, TStatus>(condition, result, condition ? succStatus : failStatus, null);
-        }
-
-        /// <summary>
-        /// Implicitly operator to check if the attempt was successful without having to access the 'success' property
-        /// </summary>
-        /// <param name="a"></param>
-        /// <returns></returns>
-        public static implicit operator bool(Attempt<TResult, TStatus> a)
-        {
-            return a.Success;
-        }
-    }
-}

src/Umbraco.Abstractions/Cache/CacheKeys.cs

@@ -1,15 +0,0 @@
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Constants storing cache keys used in caching
-    /// </summary>
-    public static class CacheKeys
-    {
-        public const string ApplicationsCacheKey = "ApplicationCache"; // used by SectionService
-
-        // TODO: this one can probably be removed
-        public const string TemplateFrontEndCacheKey = "template";
-
-        public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
-    }
-}

src/Umbraco.Abstractions/Cache/IAppCache.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Defines an application cache.
-    /// </summary>
-    public interface IAppCache
-    {
-        /// <summary>
-        /// Gets an item identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <returns>The item, or null if the item was not found.</returns>
-        object Get(string key);
-
-        /// <summary>
-        /// Gets or creates an item identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <param name="factory">A factory function that can create the item.</param>
-        /// <returns>The item.</returns>
-        object Get(string key, Func<object> factory);
-
-        /// <summary>
-        /// Gets items with a key starting with the specified value.
-        /// </summary>
-        /// <param name="keyStartsWith">The StartsWith value to use in the search.</param>
-        /// <returns>Items matching the search.</returns>
-        IEnumerable<object> SearchByKey(string keyStartsWith);
-
-        /// <summary>
-        /// Gets items with a key matching a regular expression.
-        /// </summary>
-        /// <param name="regex">The regular expression.</param>
-        /// <returns>Items matching the search.</returns>
-        IEnumerable<object> SearchByRegex(string regex);
-
-        /// <summary>
-        /// Removes all items from the cache.
-        /// </summary>
-        void Clear();
-
-        /// <summary>
-        /// Removes an item identified by its key from the cache.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        void Clear(string key);
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </summary>
-        /// <param name="typeName">The name of the type to remove.</param>
-        /// <remarks>
-        /// <para>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</para>
-        /// <para>Performs a case-sensitive search.</para>
-        /// </remarks>
-        void ClearOfType(string typeName);
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </summary>
-        /// <typeparam name="T">The type of the items to remove.</typeparam>
-        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</remarks>
-        void ClearOfType<T>();
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </summary>
-        /// <typeparam name="T">The type of the items to remove.</typeparam>
-        /// <param name="predicate">The predicate to satisfy.</param>
-        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</remarks>
-        void ClearOfType<T>(Func<string, T, bool> predicate);
-
-        /// <summary>
-        /// Clears items with a key starting with the specified value.
-        /// </summary>
-        /// <param name="keyStartsWith">The StartsWith value to use in the search.</param>
-        void ClearByKey(string keyStartsWith);
-
-        /// <summary>
-        /// Clears items with a key matching a regular expression.
-        /// </summary>
-        /// <param name="regex">The regular expression.</param>
-        void ClearByRegex(string regex);
-    }
-}

src/Umbraco.Abstractions/Cache/ICacheRefresher.cs

@@ -1,33 +0,0 @@
-using System;
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// The IcacheRefresher Interface is used for load balancing.
-    ///
-    /// </summary>
-    public interface ICacheRefresher : IDiscoverable
-    {
-        Guid RefresherUniqueId { get; }
-        string Name { get; }
-        void RefreshAll();
-        void Refresh(int id);
-        void Remove(int id);
-        void Refresh(Guid id);
-    }
-
-    /// <summary>
-    /// Strongly type cache refresher that is able to refresh cache of real instances of objects as well as IDs
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <remarks>
-    /// This is much better for performance when we're not running in a load balanced environment so we can refresh the cache
-    /// against a already resolved object instead of looking the object back up by id.
-    /// </remarks>
-    public interface ICacheRefresher<T> : ICacheRefresher
-    {
-        void Refresh(T instance);
-        void Remove(T instance);
-    }
-}

src/Umbraco.Abstractions/Cache/IJsonCacheRefresher.cs

@@ -1,14 +0,0 @@
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
-    /// </summary>
-    public interface IJsonCacheRefresher : ICacheRefresher
-    {
-        /// <summary>
-        /// Refreshes, clears, etc... any cache based on the information provided in the json
-        /// </summary>
-        /// <param name="json"></param>
-        void Refresh(string json);
-    }
-}

src/Umbraco.Abstractions/Cache/IPayloadCacheRefresher.cs

@@ -1,14 +0,0 @@
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A cache refresher that supports refreshing cache based on a custom payload
-    /// </summary>
-    public interface IPayloadCacheRefresher<TPayload> : IJsonCacheRefresher
-    {
-        /// <summary>
-        /// Refreshes, clears, etc... any cache based on the information provided in the payload
-        /// </summary>
-        /// <param name="payloads"></param>
-        void Refresh(TPayload[] payloads);
-    }
-}

src/Umbraco.Abstractions/Collections/CompositeIntStringKey.cs

@@ -1,43 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Collections
-{
-    /// <summary>
-    /// Represents a composite key of (int, string) for fast dictionaries.
-    /// </summary>
-    /// <remarks>
-    /// <para>The integer part of the key must be greater than, or equal to, zero.</para>
-    /// <para>The string part of the key is case-insensitive.</para>
-    /// <para>Null is a valid value for both parts.</para>
-    /// </remarks>
-    public struct CompositeIntStringKey : IEquatable<CompositeIntStringKey>
-    {
-        private readonly int _key1;
-        private readonly string _key2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompositeIntStringKey"/> struct.
-        /// </summary>
-        public CompositeIntStringKey(int? key1, string key2)
-        {
-            if (key1 < 0) throw new ArgumentOutOfRangeException(nameof(key1));
-            _key1 = key1 ?? -1;
-            _key2 = key2?.ToLowerInvariant() ?? "NULL";
-        }
-
-        public bool Equals(CompositeIntStringKey other)
-            => _key2 == other._key2 && _key1 == other._key1;
-
-        public override bool Equals(object obj)
-            => obj is CompositeIntStringKey other && _key2 == other._key2 && _key1 == other._key1;
-
-        public override int GetHashCode()
-            => _key2.GetHashCode() * 31 + _key1;
-
-        public static bool operator ==(CompositeIntStringKey key1, CompositeIntStringKey key2)
-            => key1._key2 == key2._key2 && key1._key1 == key2._key1;
-
-        public static bool operator !=(CompositeIntStringKey key1, CompositeIntStringKey key2)
-            => key1._key2 != key2._key2 || key1._key1 != key2._key1;
-    }
-}

src/Umbraco.Abstractions/Collections/CompositeNStringNStringKey.cs

@@ -1,41 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Collections
-{
-    /// <summary>
-    /// Represents a composite key of (string, string) for fast dictionaries.
-    /// </summary>
-    /// <remarks>
-    /// <para>The string parts of the key are case-insensitive.</para>
-    /// <para>Null is a valid value for both parts.</para>
-    /// </remarks>
-    public struct CompositeNStringNStringKey : IEquatable<CompositeNStringNStringKey>
-    {
-        private readonly string _key1;
-        private readonly string _key2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompositeNStringNStringKey"/> struct.
-        /// </summary>
-        public CompositeNStringNStringKey(string key1, string key2)
-        {
-            _key1 = key1?.ToLowerInvariant() ?? "NULL";
-            _key2 = key2?.ToLowerInvariant() ?? "NULL";
-        }
-
-        public bool Equals(CompositeNStringNStringKey other)
-            => _key2 == other._key2 && _key1 == other._key1;
-
-        public override bool Equals(object obj)
-            => obj is CompositeNStringNStringKey other && _key2 == other._key2 && _key1 == other._key1;
-
-        public override int GetHashCode()
-            => _key2.GetHashCode() * 31 + _key1.GetHashCode();
-
-        public static bool operator ==(CompositeNStringNStringKey key1, CompositeNStringNStringKey key2)
-            => key1._key2 == key2._key2 && key1._key1 == key2._key1;
-
-        public static bool operator !=(CompositeNStringNStringKey key1, CompositeNStringNStringKey key2)
-            => key1._key2 != key2._key2 || key1._key1 != key2._key1;
-    }
-}

src/Umbraco.Abstractions/Collections/CompositeStringStringKey.cs

@@ -1,41 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Collections
-{
-    /// <summary>
-    /// Represents a composite key of (string, string) for fast dictionaries.
-    /// </summary>
-    /// <remarks>
-    /// <para>The string parts of the key are case-insensitive.</para>
-    /// <para>Null is NOT a valid value for neither parts.</para>
-    /// </remarks>
-    public struct CompositeStringStringKey : IEquatable<CompositeStringStringKey>
-    {
-        private readonly string _key1;
-        private readonly string _key2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompositeStringStringKey"/> struct.
-        /// </summary>
-        public CompositeStringStringKey(string key1, string key2)
-        {
-            _key1 = key1?.ToLowerInvariant() ?? throw new ArgumentNullException(nameof(key1));
-            _key2 = key2?.ToLowerInvariant() ?? throw new ArgumentNullException(nameof(key2));
-        }
-
-        public bool Equals(CompositeStringStringKey other)
-            => _key2 == other._key2 && _key1 == other._key1;
-
-        public override bool Equals(object obj)
-            => obj is CompositeStringStringKey other && _key2 == other._key2 && _key1 == other._key1;
-
-        public override int GetHashCode()
-            => _key2.GetHashCode() * 31 + _key1.GetHashCode();
-
-        public static bool operator ==(CompositeStringStringKey key1, CompositeStringStringKey key2)
-            => key1._key2 == key2._key2 && key1._key1 == key2._key1;
-
-        public static bool operator !=(CompositeStringStringKey key1, CompositeStringStringKey key2)
-            => key1._key2 != key2._key2 || key1._key1 != key2._key1;
-    }
-}

src/Umbraco.Abstractions/Collections/ObservableDictionary.cs

@@ -1,249 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace Umbraco.Core.Collections
-{
-    /// <summary>
-    /// An ObservableDictionary
-    /// </summary>
-    /// <remarks>
-    /// Assumes that the key will not change and is unique for each element in the collection.
-    /// Collection is not thread-safe, so calls should be made single-threaded.
-    /// </remarks>
-    /// <typeparam name="TValue">The type of elements contained in the BindableCollection</typeparam>
-    /// <typeparam name="TKey">The type of the indexing key</typeparam>
-    public class ObservableDictionary<TKey, TValue> : ObservableCollection<TValue>, IReadOnlyDictionary<TKey, TValue>, IDictionary<TKey, TValue>
-    {
-        protected Dictionary<TKey, int> Indecies { get; }
-        protected Func<TValue, TKey> KeySelector { get; }
-
-        /// <summary>
-        /// Create new ObservableDictionary
-        /// </summary>
-        /// <param name="keySelector">Selector function to create key from value</param>
-        /// <param name="equalityComparer">The equality comparer to use when comparing keys, or null to use the default comparer.</param>
-        public ObservableDictionary(Func<TValue, TKey> keySelector, IEqualityComparer<TKey> equalityComparer = null)
-        {
-            KeySelector = keySelector ?? throw new ArgumentException("keySelector");
-            Indecies = new Dictionary<TKey, int>(equalityComparer);
-        }
-
-        #region Protected Methods
-
-        protected override void InsertItem(int index, TValue item)
-        {
-            var key = KeySelector(item);
-            if (Indecies.ContainsKey(key))
-                throw new DuplicateKeyException(key.ToString());
-
-            if (index != Count)
-            {
-                foreach (var k in Indecies.Keys.Where(k => Indecies[k] >= index).ToList())
-                {
-                    Indecies[k]++;
-                }
-            }
-
-            base.InsertItem(index, item);
-            Indecies[key] = index;
-        }
-
-        protected override void ClearItems()
-        {
-            base.ClearItems();
-            Indecies.Clear();
-        }
-
-        protected override void RemoveItem(int index)
-        {
-            var item = this[index];
-            var key = KeySelector(item);
-
-            base.RemoveItem(index);
-
-            Indecies.Remove(key);
-
-            foreach (var k in Indecies.Keys.Where(k => Indecies[k] > index).ToList())
-            {
-                Indecies[k]--;
-            }
-        }
-
-        #endregion
-
-        public bool ContainsKey(TKey key)
-        {
-            return Indecies.ContainsKey(key);
-        }
-
-        /// <summary>
-        /// Gets or sets the element with the specified key.  If setting a new value, new value must have same key.
-        /// </summary>
-        /// <param name="key">Key of element to replace</param>
-        /// <returns></returns>
-        public TValue this[TKey key]
-        {
-
-            get => this[Indecies[key]];
-            set
-            {
-                //confirm key matches
-                if (!KeySelector(value).Equals(key))
-                    throw new InvalidOperationException("Key of new value does not match");
-
-                if (!Indecies.ContainsKey(key))
-                {
-                    Add(value);
-                }
-                else
-                {
-                    this[Indecies[key]] = value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Replaces element at given key with new value.  New value must have same key.
-        /// </summary>
-        /// <param name="key">Key of element to replace</param>
-        /// <param name="value">New value</param>
-        ///
-        /// <exception cref="InvalidOperationException"></exception>
-        /// <returns>False if key not found</returns>
-        public bool Replace(TKey key, TValue value)
-        {
-            if (!Indecies.ContainsKey(key)) return false;
-
-            //confirm key matches
-            if (!KeySelector(value).Equals(key))
-                throw new InvalidOperationException("Key of new value does not match");
-
-            this[Indecies[key]] = value;
-            return true;
-
-        }
-
-        public void ReplaceAll(IEnumerable<TValue> values)
-        {
-            if (values == null) throw new ArgumentNullException(nameof(values));
-
-            Clear();
-
-            foreach (var value in values)
-            {
-                Add(value);
-            }
-        }
-
-        public bool Remove(TKey key)
-        {
-            if (!Indecies.ContainsKey(key)) return false;
-
-            RemoveAt(Indecies[key]);
-            return true;
-
-        }
-
-        /// <summary>
-        /// Allows us to change the key of an item
-        /// </summary>
-        /// <param name="currentKey"></param>
-        /// <param name="newKey"></param>
-        public void ChangeKey(TKey currentKey, TKey newKey)
-        {
-            if (!Indecies.ContainsKey(currentKey))
-            {
-                throw new InvalidOperationException("No item with the key " + currentKey + "was found in the collection");
-            }
-
-            if (ContainsKey(newKey))
-            {
-                throw new DuplicateKeyException(newKey.ToString());
-            }
-
-            var currentIndex = Indecies[currentKey];
-
-            Indecies.Remove(currentKey);
-            Indecies.Add(newKey, currentIndex);
-        }
-
-        #region IDictionary and IReadOnlyDictionary implementation
-
-        public bool TryGetValue(TKey key, out TValue val)
-        {
-            if (Indecies.TryGetValue(key, out var index))
-            {
-                val = this[index];
-                return true;
-            }
-            val = default;
-            return false;
-        }
-
-        /// <summary>
-        /// Returns all keys
-        /// </summary>
-        public IEnumerable<TKey> Keys => Indecies.Keys;
-
-        /// <summary>
-        /// Returns all values
-        /// </summary>
-        public IEnumerable<TValue> Values => base.Items;
-
-        ICollection<TKey> IDictionary<TKey, TValue>.Keys => Indecies.Keys;
-
-        //this will never be used
-        ICollection<TValue> IDictionary<TKey, TValue>.Values => Values.ToList();
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => false;
-
-        IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
-        {
-            foreach (var i in Values)
-            {
-                var key = KeySelector(i);
-                yield return new KeyValuePair<TKey, TValue>(key, i);
-            }
-        }
-
-        void IDictionary<TKey, TValue>.Add(TKey key, TValue value)
-        {
-            Add(value);
-        }
-
-        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)
-        {
-            Add(item.Value);
-        }
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item)
-        {
-            return ContainsKey(item.Key);
-        }
-
-        void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
-        {
-            throw new NotImplementedException();
-        }
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item)
-        {
-            return Remove(item.Key);
-        }
-
-        #endregion
-
-        internal class DuplicateKeyException : Exception
-        {
-            public DuplicateKeyException(string key)
-                : base("Attempted to insert duplicate key \"" + key + "\" in collection.")
-            {
-                Key = key;
-            }
-
-            public string Key { get; }
-        }
-    }
-}

src/Umbraco.Abstractions/Collections/TopoGraph.cs

@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Collections
-{
-    public class TopoGraph
-    {
-        internal const string CycleDependencyError = "Cyclic dependency.";
-        internal const string MissingDependencyError = "Missing dependency.";
-
-        public class Node<TKey, TItem>
-        {
-            public Node(TKey key, TItem item, IEnumerable<TKey> dependencies)
-            {
-                Key = key;
-                Item = item;
-                Dependencies = dependencies;
-            }
-
-            public TKey Key { get; }
-            public TItem Item { get; }
-            public IEnumerable<TKey> Dependencies { get; }
-        }
-
-        public static Node<TKey, TItem> CreateNode<TKey, TItem>(TKey key, TItem item, IEnumerable<TKey> dependencies)
-            => new Node<TKey, TItem>(key, item, dependencies);
-    }
-
-    /// <summary>
-    /// Represents a generic DAG that can be topologically sorted.
-    /// </summary>
-    /// <typeparam name="TKey">The type of the keys.</typeparam>
-    /// <typeparam name="TItem">The type of the items.</typeparam>
-    public class TopoGraph<TKey, TItem> : TopoGraph
-    {
-        private readonly Func<TItem, TKey> _getKey;
-        private readonly Func<TItem, IEnumerable<TKey>> _getDependencies;
-        private readonly Dictionary<TKey, TItem> _items = new Dictionary<TKey, TItem>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TopoGraph{TKey, TItem}"/> class.
-        /// </summary>
-        /// <param name="getKey">A method that returns the key of an item.</param>
-        /// <param name="getDependencies">A method that returns the dependency keys of an item.</param>
-        public TopoGraph(Func<TItem, TKey> getKey, Func<TItem, IEnumerable<TKey>> getDependencies)
-        {
-            _getKey = getKey;
-            _getDependencies = getDependencies;
-        }
-
-        /// <summary>
-        /// Adds an item to the graph.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        public void AddItem(TItem item)
-        {
-            var key = _getKey(item);
-            _items[key] = item;
-        }
-
-        /// <summary>
-        /// Adds items to the graph.
-        /// </summary>
-        /// <param name="items">The items.</param>
-        public void AddItems(IEnumerable<TItem> items)
-        {
-            foreach (var item in items)
-                AddItem(item);
-        }
-
-        /// <summary>
-        /// Gets the sorted items.
-        /// </summary>
-        /// <param name="throwOnCycle">A value indicating whether to throw on cycles, or just ignore the branch.</param>
-        /// <param name="throwOnMissing">A value indicating whether to throw on missing dependency, or just ignore the dependency.</param>
-        /// <param name="reverse">A value indicating whether to reverse the order.</param>
-        /// <returns>The (topologically) sorted items.</returns>
-        public IEnumerable<TItem> GetSortedItems(bool throwOnCycle = true, bool throwOnMissing = true, bool reverse = false)
-        {
-            var sorted = new TItem[_items.Count];
-            var visited = new HashSet<TItem>();
-            var index = reverse ? _items.Count - 1 : 0;
-            var incr = reverse ? -1 : +1;
-
-            foreach (var item in _items.Values)
-                Visit(item, visited, sorted, ref index, incr, throwOnCycle, throwOnMissing);
-
-            return sorted;
-        }
-
-        private static bool Contains(TItem[] items, TItem item, int start, int count)
-        {
-            return Array.IndexOf(items, item, start, count) >= 0;
-        }
-
-        private void Visit(TItem item, ISet<TItem> visited, TItem[] sorted, ref int index, int incr, bool throwOnCycle, bool throwOnMissing)
-        {
-            if (visited.Contains(item))
-            {
-                // visited but not sorted yet = cycle
-                var start = incr > 0 ? 0 : index;
-                var count = incr > 0 ? index : sorted.Length - index;
-                if (throwOnCycle && Contains(sorted, item, start, count) == false)
-                    throw new Exception(CycleDependencyError);
-                return;
-            }
-
-            visited.Add(item);
-
-            var keys = _getDependencies(item);
-            var dependencies = keys == null ? null : FindDependencies(keys, throwOnMissing);
-
-            if (dependencies != null)
-                foreach (var dep in dependencies)
-                    Visit(dep, visited, sorted, ref index, incr, throwOnCycle, throwOnMissing);
-
-            sorted[index] = item;
-            index += incr;
-        }
-
-        private IEnumerable<TItem> FindDependencies(IEnumerable<TKey> keys, bool throwOnMissing)
-        {
-            foreach (var key in keys)
-            {
-                TItem value;
-                if (_items.TryGetValue(key, out value))
-                    yield return value;
-                else if (throwOnMissing)
-                    throw new Exception(MissingDependencyError);
-            }
-        }
-    }
-}

src/Umbraco.Abstractions/Composing/BuilderCollectionBase.cs

@@ -1,43 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Provides a base class for builder collections.
-    /// </summary>
-    /// <typeparam name="TItem">The type of the items.</typeparam>
-    public abstract class BuilderCollectionBase<TItem> : IBuilderCollection<TItem>
-    {
-        private readonly TItem[] _items;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BuilderCollectionBase{TItem}"/> with items.
-        /// </summary>
-        /// <param name="items">The items.</param>
-        protected BuilderCollectionBase(IEnumerable<TItem> items)
-        {
-            _items = items.ToArray();
-        }
-
-        /// <inheritdoc />
-        public int Count => _items.Length;
-
-        /// <summary>
-        /// Gets an enumerator.
-        /// </summary>
-        public IEnumerator<TItem> GetEnumerator()
-        {
-            return ((IEnumerable<TItem>) _items).GetEnumerator();
-        }
-
-        /// <summary>
-        /// Gets an enumerator.
-        /// </summary>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}

src/Umbraco.Abstractions/Composing/DisableAttribute.cs

@@ -1,37 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Indicates that a composer should be disabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>If a type is specified, disables the composer of that type, else disables the composer marked with the attribute.</para>
-    /// <para>This attribute is *not* inherited.</para>
-    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-    public class DisableAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisableAttribute"/> class.
-        /// </summary>
-        public DisableAttribute()
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisableAttribute"/> class.
-        /// </summary>
-        public DisableAttribute(Type disabledType)
-        {
-            DisabledType = disabledType;
-        }
-
-        /// <summary>
-        /// Gets the disabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type DisabledType { get; }
-    }
-}

src/Umbraco.Abstractions/Composing/DisableComposerAttribute.cs

@@ -1,28 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Indicates that a composer should be disabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class DisableComposerAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisableComposerAttribute"/> class.
-        /// </summary>
-        public DisableComposerAttribute(Type disabledType)
-        {
-            DisabledType = disabledType;
-        }
-
-        /// <summary>
-        /// Gets the disabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type DisabledType { get; }
-    }
-}

src/Umbraco.Abstractions/Composing/EnableAttribute.cs

@@ -1,37 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Indicates that a composer should be enabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>If a type is specified, enables the composer of that type, else enables the composer marked with the attribute.</para>
-    /// <para>This attribute is *not* inherited.</para>
-    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-    public class EnableAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableAttribute"/> class.
-        /// </summary>
-        public EnableAttribute()
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableAttribute"/> class.
-        /// </summary>
-        public EnableAttribute(Type enabledType)
-        {
-            EnabledType = enabledType;
-        }
-
-        /// <summary>
-        /// Gets the enabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type EnabledType { get; }
-    }
-}

src/Umbraco.Abstractions/Composing/EnableComposerAttribute.cs

@@ -1,31 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Indicates that a composer should be enabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>If a type is specified, enables the composer of that type, else enables the composer marked with the attribute.</para>
-    /// <para>This attribute is *not* inherited.</para>
-    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class EnableComposerAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableComposerAttribute"/> class.
-        /// </summary>
-        public EnableComposerAttribute(Type enabledType)
-        {
-            EnabledType = enabledType;
-        }
-
-        /// <summary>
-        /// Gets the enabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type EnabledType { get; }
-    }
-}

src/Umbraco.Abstractions/Composing/HideFromTypeFinderAttribute.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Notifies the TypeFinder that it should ignore the class marked with this attribute.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class)]
-    public sealed class HideFromTypeFinderAttribute : Attribute
-    { }
-}

src/Umbraco.Abstractions/Composing/IBuilderCollection.cs

@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Represents a builder collection, ie an immutable enumeration of items.
-    /// </summary>
-    /// <typeparam name="TItem">The type of the items.</typeparam>
-    public interface IBuilderCollection<out TItem> : IEnumerable<TItem>
-    {
-        /// <summary>
-        /// Gets the number of items in the collection.
-        /// </summary>
-        int Count { get; }
-    }
-}

src/Umbraco.Abstractions/Composing/ICollectionBuilder.cs

@@ -1,30 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Represents a collection builder.
-    /// </summary>
-    public interface ICollectionBuilder
-    {
-        /// <summary>
-        /// Registers the builder so it can build the collection, by
-        /// registering the collection and the types.
-        /// </summary>
-        void RegisterWith(IRegister register);
-    }
-
-    /// <summary>
-    /// Represents a collection builder.
-    /// </summary>
-    /// <typeparam name="TCollection">The type of the collection.</typeparam>
-    /// <typeparam name="TItem">The type of the items.</typeparam>
-    public interface ICollectionBuilder<out TCollection, TItem> : ICollectionBuilder
-        where TCollection : IBuilderCollection<TItem>
-    {
-        /// <summary>
-        /// Creates a collection.
-        /// </summary>
-        /// <returns>A collection.</returns>
-        /// <remarks>Creates a new collection each time it is invoked.</remarks>
-        TCollection CreateCollection(IFactory factory);
-    }
-}

src/Umbraco.Abstractions/Composing/IComponent.cs

@@ -1,25 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Represents a component.
-    /// </summary>
-    /// <remarks>
-    /// <para>Components are created by DI and therefore must have a public constructor.</para>
-    /// <para>All components are terminated in reverse order when Umbraco terminates, and
-    /// disposable components are disposed.</para>
-    /// <para>The Dispose method may be invoked more than once, and components
-    /// should ensure they support this.</para>
-    /// </remarks>
-    public interface IComponent
-    {
-        /// <summary>
-        /// Initializes the component.
-        /// </summary>
-        void Initialize();
-
-        /// <summary>
-        /// Terminates the component.
-        /// </summary>
-        void Terminate();
-    }
-}

src/Umbraco.Abstractions/Composing/IDiscoverable.cs

@@ -1,5 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    public interface IDiscoverable
-    { }
-}

src/Umbraco.Abstractions/Composing/IFactory.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Defines a service factory for Umbraco.
-    /// </summary>
-    public interface IFactory
-    {
-        /// <summary>
-        /// Gets the concrete factory.
-        /// </summary>
-        object Concrete { get; }
-
-        /// <summary>
-        /// Gets an instance of a service.
-        /// </summary>
-        /// <param name="type">The type of the service.</param>
-        /// <returns>An instance of the specified type.</returns>
-        /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
-        object GetInstance(Type type);
-
-        /// <summary>
-        /// Gets a targeted instance of a service.
-        /// </summary>
-        /// <typeparam name="TService">The type of the service.</typeparam>
-        /// <typeparam name="TTarget">The type of the target.</typeparam>
-        /// <returns>The instance of the specified type for the specified target.</returns>
-        /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
-        TService GetInstanceFor<TService, TTarget>();
-
-        /// <summary>
-        /// Tries to get an instance of a service.
-        /// </summary>
-        /// <param name="type">The type of the service.</param>
-        /// <returns>An instance of the specified type, or null.</returns>
-        /// <remarks>Returns null if the container does not know how to get an instance
-        /// of the specified type. Throws an exception if the container does know how
-        /// to get an instance of the specified type, but failed to do so.</remarks>
-        object TryGetInstance(Type type);
-
-        /// <summary>
-        /// Gets all instances of a service.
-        /// </summary>
-        /// <param name="serviceType">The type of the service.</param>
-        IEnumerable<object> GetAllInstances(Type serviceType);
-
-        /// <summary>
-        /// Gets all instances of a service.
-        /// </summary>
-        /// <typeparam name="TService">The type of the service.</typeparam>
-        IEnumerable<TService> GetAllInstances<TService>()
-            where TService : class;
-
-        /// <summary>
-        /// Releases an instance.
-        /// </summary>
-        /// <param name="instance">The instance.</param>
-        /// <remarks>
-        /// See https://stackoverflow.com/questions/14072208 and http://kozmic.net/2010/08/27/must-i-release-everything-when-using-windsor/,
-        /// you only need to release instances you specifically resolved, and even then, if done right, that might never be needed. For
-        /// instance, LightInject does not require this and does not support it - should work with scopes.
-        /// </remarks>
-        void Release(object instance);
-
-        /// <summary>
-        /// Begins a scope.
-        /// </summary>
-        /// <remarks>
-        /// <para>When the scope is disposed, scoped instances that have been created during the scope are disposed.</para>
-        /// <para>Scopes can be nested. Each instance is disposed individually.</para>
-        /// </remarks>
-        IDisposable BeginScope();
-
-        /// <summary>
-        /// Enables per-request scope.
-        /// </summary>
-        /// <remarks>
-        /// <para>Ties scopes to web requests.</para>
-        /// </remarks>
-        void EnablePerWebRequestScope();
-    }
-}

src/Umbraco.Abstractions/Composing/IRegister.cs

@@ -1,106 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Defines a service register for Umbraco.
-    /// </summary>
-    public interface IRegister
-    {
-        /// <summary>
-        /// Gets the concrete container.
-        /// </summary>
-        object Concrete { get; }
-
-        /// <summary>
-        /// Registers a service as its own implementation.
-        /// </summary>
-        void Register(Type serviceType, Lifetime lifetime = Lifetime.Transient);
-
-        /// <summary>
-        /// Registers a service with an implementation type.
-        /// </summary>
-        void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient);
-
-        /// <summary>
-        /// Registers a service with an implementation factory.
-        /// </summary>
-        void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service with an implementing instance.
-        /// </summary>
-        void Register(Type serviceType, object instance);
-
-        /// <summary>
-        /// Registers a service for a target, as its own implementation.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementation type.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementation factory.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementing instance.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(TService instance)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a base type for auto-registration.
-        /// </summary>
-        /// <remarks>
-        /// <para>Auto-registration means that anytime the container is asked to create an instance
-        /// of a type deriving from <paramref name="serviceBaseType"/>, it will first register that
-        /// type automatically.</para>
-        /// <para>This can be used for instance for views or controllers. Then, one just needs to
-        /// register a common base class or interface, and the container knows how to create instances.</para>
-        /// </remarks>
-        void RegisterAuto(Type serviceBaseType);
-
-        #region Control
-
-        /// <summary>
-        /// Configures the container for web support.
-        /// </summary>
-        /// <remarks>
-        /// <para>Enables support for MVC, WebAPI, but *not* per-request scope. This is used early in the boot
-        /// process, where anything "scoped" should not be linked to a web request.</para>
-        /// </remarks>
-        void ConfigureForWeb();
-
-        /// <summary>
-        /// Creates the factory.
-        /// </summary>
-        IFactory CreateFactory();
-
-        #endregion
-    }
-}

src/Umbraco.Abstractions/Composing/Lifetime.cs

@@ -1,49 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Specifies the lifetime of a registered instance.
-    /// </summary>
-    public enum Lifetime
-    {
-        /// <summary>
-        /// Always get a new instance.
-        /// </summary>
-        /// <remarks>Corresponds to Transient in LightInject, Castle Windsor
-        /// or MS.DI, PerDependency in Autofac.</remarks>
-        Transient,
-
-        /// <summary>
-        /// One unique instance per request.
-        /// </summary>
-        // TODO: review lifetimes for LightInject vs other containers
-        // currently, corresponds to 'Request' in LightInject which is 'Transient + disposed by Scope'
-        // but NOT (in LightInject) a per-web-request lifetime, more a TransientScoped
-        //
-        // we use it for controllers, httpContextBase and umbracoContext
-        // - so that they are automatically disposed at the end of the scope (ie request)
-        // - not sure they should not be simply 'scoped'?
-        //
-        // Castle has an extra PerWebRequest something, and others use scope
-        // what about Request before first request ie during application startup?
-        // see http://blog.ploeh.dk/2009/11/17/UsingCastleWindsor'sPerWebRequestlifestylewithASP.NETMVConIIS7/
-        // Castle ends up requiring a special scope manager too
-        // see https://groups.google.com/forum/#!topic/castle-project-users/1E2W9LVIYR4
-        //
-        // but maybe also - why are we requiring scoped services at startup?
-        Request,
-
-        /// <summary>
-        /// One unique instance per container scope.
-        /// </summary>
-        /// <remarks>Corresponds to Scope in LightInject, Scoped in MS.DI
-        /// or Castle Windsor, PerLifetimeScope in Autofac.</remarks>
-        Scope,
-
-        /// <summary>
-        /// One unique instance per container.
-        /// </summary>
-        /// <remarks>Corresponds to Singleton in LightInject, Castle Windsor
-        /// or MS.DI and to SingleInstance in Autofac.</remarks>
-        Singleton
-    }
-}

src/Umbraco.Abstractions/Composing/RuntimeLevelAttribute.cs

@@ -1,21 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Marks a composer to indicate a minimum and/or maximum runtime level for which the composer would compose.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class /*, AllowMultiple = false, Inherited = true*/)]
-    public class RuntimeLevelAttribute : Attribute
-    {
-        /// <summary>
-        /// Gets or sets the minimum runtime level for which the composer would compose.
-        /// </summary>
-        public RuntimeLevel MinLevel { get; set; } = RuntimeLevel.Install;
-
-        /// <summary>
-        /// Gets or sets the maximum runtime level for which the composer would compose.
-        /// </summary>
-        public RuntimeLevel MaxLevel { get; set; } = RuntimeLevel.Run;
-    }
-}