Bump version to 8.0.2

Fix recycle bin moves
(cherry picked from commit 173df80e3d) # Conflicts: # src/Umbraco.Core/Services/Implement/MediaService.cs
2019-04-26 15:15:17 +02:00 · 2019-04-26 15:03:09 +02:00 · 2019-04-25 13:43:03 +02:00 · 2019-04-23 14:08:19 +02:00 · 2019-04-23 13:51:29 +02:00 · 2019-04-17 15:23:35 +10:00
1095 changed files with 14011 additions and 18549 deletions
@@ -1,176 +1,14 @@
-# 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.
-
- 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:
+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:

    build/build.ps1
    
-You might run into [Powershell quirks](#powershell-quirks).
-
-### Build Infrastructure
-
-The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
-
-    $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

@@ -207,6 +45,120 @@ The best solution is to unblock the Zip file before un-zipping: right-click the

    PS> Get-ChildItem -Recurse *.* | Unblock-File

-### Git Quirks
+## Git Quirks

-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 Infrastructure
+
+The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
+
+    $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.
+
+### 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.
+
+/eof
@@ -0,0 +1,34 @@
+Umbraco Cms Clear
+--
+----
+
+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.
+
+## Fast
+
+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 medias and views around, but in most cases, it will be enough.
+
+## More
+
+To perform a more complete clear, you will want to also delete the content of the media, views, masterpages, scripts... directories.
+
+## Full
+
+The following command will force remove all untracked files and directories, be they ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
+
+    git clean -xdf .
+    
+## Docs
+
+See
+* git [clean](<https://git-scm.com/docs/git-clean>)
+* git [reset](<https://git-scm.com/docs/git-reset>)
@@ -1,187 +1,97 @@
-# 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/.github/V8_GETTING_STARTED.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 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.
+
+## 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-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `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)
+- [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
+
+## 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!
@@ -0,0 +1,162 @@
+# 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](https://github.com/umbraco/Umbraco-CMS/issues/new/choose), 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](https://issues.umbraco.org/issues?q=&project=U4&tagValue=upforgrabs&release=&issueType=&search=search) or on the [new issue tracker](https://github.com/umbraco/Umbraco-CMS/issues?q=is%3Aopen+is%3Aissue+label%3Acommunity%2Fup-for-grabs).
+
+### 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 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
+
+In order to build the Umbraco source code locally, first make sure you have the following installed.
+
+  * Visual Studio 2017 v15.3+
+  * Node v10+ (Installed via `build.bat` script. If you already have it installed, make sure you're running at least v10)
+  * npm v6.4.1+ (Installed via `build.bat` script. If you already have it installed, make sure you're running at least v6.4.1)
+
+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))
@@ -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 to 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.  
@@ -2,20 +2,11 @@

 - [ ] 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! -->
+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.
+<!-- 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.
-->


 <!-- Thanks for contributing to Umbraco CMS! -->
@@ -1,40 +1,62 @@
-# [Umbraco CMS](https://umbraco.com) &middot; [![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).
-
+_You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
+[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
+
+_Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS) to go to the v7 branch._
+
+_Ready to try out Version 8? [See the quick start guide](V8_GETTING_STARTED.md)._
+
+When is Umbraco 8 coming?
+=========================
+When it's ready. We're done with the major parts of the architecture work and are focusing on three separate tracks to prepare Umbraco 8 for release:
+1) Editor Track (_currently in progress_). Without editors, there's no market for Umbraco. So we want to make sure that Umbraco 8 is full of love for editors.
+2) Partner Track. Without anyone implementing Umbraco, there's nothing for editors to update. So we want to make sure that Umbraco 8 is a joy to implement
+3) Contributor Track. Without our fabulous ecosystem of both individual Umbracians and 3rd party ISVs, Umbraco wouldn't be as rich a platform as it is today. We want to make sure that it's easy, straight forward and as backwards-compatible as possible to create packages for Umbraco
+
+Once a track is done, we start releasing previews where we ask people to test the features we believe are ready. While the testing is going on and we gather feedback, we move on to the next track. This doesn't mean that there hasn't already been work done in the area, but that a track focuses on finalizing, polishing and preparing the features for release.
+
+Umbraco CMS
+===========
+The friendliest, most flexible and fastest growing ASP.NET CMS, and 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 - and 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, right out of the box.
+
+Umbraco is not only loved by developers, but is a content editor's 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 scalable. 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 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.
+
+## 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.
+
+## 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](CONTRIBUTING_DETAILED.md#reporting-bugs).
+
+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).
@@ -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.
@@ -0,0 +1,37 @@
+## A quick start guide for getting up and runnning with Umbraco v8
+
+### What you need:
+
+* [Visual Studio 2017 Community (Free)](https://www.visualstudio.com/vs/community/), or Professional, Enterprise, etc... _(**Minimum of Version 15.7** or higher, this is important, you WILL get issues with lesser versions)_
+* .NET Framework 4.7.2 installed, get it here: https://www.microsoft.com/net/download/thank-you/net472?survey=false
+* .NET Framework 4.7.2 developer pack, get it here: https://www.microsoft.com/net/download/thank-you/net472-developer-pack _(be sure this is the ENU file which will be named `NDP472-DevPack-ENU.exe`)_
+* Clone the Umbraco repository using the `temp8` branch. If your git client doesn't support specifying the branch as you clone then use the command `git clone --single-branch -b temp8 <your fork url>`. _(If you clone the repo using the default v7 branch and then checkout the `temp8` branch you **might** get problems)_
+
+### Start the solution
+
+* Open the `/src/umbraco.sln` Visual Studio solution
+* Start the solution (easiest way is to use `ctrl + F5`)
+* When the solution is first built this may take some time since it will restore all nuget and npm packages, build the .net solution and also build the angular solution
+* When the website starts you'll see the Umbraco installer and just follow the prompts
+* You're all set!
+
+### Want to run from a zip instead?
+
+If you just want to try out a few things, you can run the site from a zip file which you can download from here https://github.com/umbraco/Umbraco-CMS/releases/tag/temp8-cg18. 
+
+We recommend running the site with the Visual Studio since you'll be able to remain up to date with the latest source code changes.
+
+### Making code changes
+
+* _[The process for making code changes in v8 is the same as v7](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md)_
+* Any .NET changes you make you just need to compile
+* Any Angular/JS changes you make you will need to make sure you are running the Gulp build. Easiest way to do this is from within Visual Studio in the `Task Runner Explorer`. You can find this window by pressing `ctrl + q` and typing in `Task Runner Explorer`. In this window you'll see all Gulp tasks, double click on the `dev` task, this will compile the angular solution and start a file watcher, then any html/js changes you make are automatically built.  
+* When making js changes, you should have the chrome developer tools open to ensure that cache is disabled
+* If you are only making C# changes and are not touching the UI code at all, you can significantly speed up the VS build by adding an empty file specifically called `~/src/preserve.belle`. The UI (Belle) build will then be skipped during a Rebuild.
+
+### What to work on?
+
+We are keeping track of [known issues and limitations here](http://issues.umbraco.org/issue/U4-11279). These line items will eventually be turned into actual tasks to be worked on. Feel free to help us keep this list updated if you find issues and even help fix some of these items. If there is a particular item you'd like to help fix please mention this on the task and we'll create a sub task for the item to continue discussion there.
+
+There's [a list of tasks for v8 that haven't been completed](https://github.com/umbraco/Umbraco-CMS/labels/release%2F8.0.0). If you are interested in helping out with any of these please mention this on the task. This list will be constantly updated as we begin to document and design some of the other tasks that still need to get done.
+
@@ -161,4 +161,3 @@ build/temp/

 # eof
 /src/Umbraco.Web.UI.Client/TESTS-*.xml
-/src/ApiDocs/api/*
@@ -22,6 +22,7 @@
                  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="AutoMapper" version="[8.0.0,8.999999)" />
                <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)" />
@@ -39,8 +40,6 @@
                <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>
@@ -56,5 +55,6 @@

        <!-- symbols -->
        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
+        <file src="$BuildTmp$\..\src\Umbraco.Core\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
    </files>
 </package>
@@ -59,6 +59,8 @@

        <!-- symbols -->
        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib" />
+        <file src="$BuildTmp$\..\src\Umbraco.Web\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib" />
+        <file src="$BuildTmp$\..\src\Umbraco.Examine\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Examine" />
    </files>
 </package>
@@ -58,7 +58,6 @@
        <!-- 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?! -->
@@ -1,13 +1,12 @@

-                       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!

@@ -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>
@@ -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
@@ -11,21 +11,11 @@
    [Alias("loc")]
    [switch] $local = $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,
-
-    # execute a command
-    [Parameter(Mandatory=$false, ValueFromRemainingArguments=$true)]
-    [String[]]
-    $command
+    [switch] $continue = $false
  )

  # ################################################################
@@ -36,7 +26,7 @@
  $ubuild = &"$PSScriptRoot\build-bootstrap.ps1"
  if (-not $?) { return }
  $ubuild.Boot($PSScriptRoot,
-    @{ Local = $local; WithDocFx = $docfx },
+    @{ Local = $local; },
    @{ Continue = $continue })
  if ($ubuild.OnError()) { return }

@@ -392,13 +382,13 @@
    &$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"
+        -Symbols -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"
+        -Symbols -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" `
@@ -429,53 +419,6 @@
    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",
  {
@@ -508,7 +451,6 @@
    if ($this.OnError()) { return }
    $this.PostPackageHook()
    if ($this.OnError()) { return }
-
    Write-Host "Done"
  })

@@ -533,11 +475,7 @@
  # run
  if (-not $get)
  {
-    if ($command.Length -eq 0)
-    {
-      $command = @( "Build" )
-    }
-    $ubuild.RunMethod($command);
+    $ubuild.Build()
    if ($ubuild.OnError()) { return }
  }
  if ($get) { return $ubuild }
@@ -2,20 +2,21 @@
  "metadata": [
    {
      "src": [
-        { 
-          "src": "../",
+        {
          "files": [
            "Umbraco.Core/Umbraco.Core.csproj",
            "Umbraco.Web/Umbraco.Web.csproj"
          ],
          "exclude": [
            "**/obj/**",
-            "**/bin/**"
-          ]
+            "**/bin/**",
+            "_site/**"
+          ],
+          "cwd": "../src"
        }
      ],
-      "dest": "api",
-      "filter": "docfx.filter.yml"
+      "dest": "../apidocs/api",
+      "filter": "../apidocs/docfx.filter.yml"
    }
  ],
  "build": {
@@ -34,7 +35,19 @@
          "*.md"
        ],
        "exclude": [
-          "obj/**"
+          "obj/**",
+          "_site/**"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "images/**"
+        ],
+        "exclude": [
+          "obj/**",
+          "_site/**"
        ]
      }
    ],
@@ -44,7 +57,8 @@
          "**.md"
        ],
        "exclude": [
-          "obj/**"
+          "obj/**",
+          "_site/**"
        ]
      }
    ],
@@ -53,9 +67,9 @@
      "_enableSearch": true,
      "_disableContribution": false
    },
-    "dest": "../../build.tmp/_site",
+    "dest": "_site",
    "template": [
      "default", "umbracotemplate"
    ]
  }
-}
+}
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]

 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.1.0")]
-[assembly: AssemblyInformationalVersion("8.1.0")]
+[assembly: AssemblyFileVersion("8.0.2")]
+[assembly: AssemblyInformationalVersion("8.0.2")]
@@ -1,10 +0,0 @@
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Represents an Umbraco configuration section which can be used to pass to UmbracoConfiguration.For{T}
-    /// </summary>
-    public interface IUmbracoConfigurationSection
-    {
-
-    }
-}
@@ -1,4 +0,0 @@
-namespace Umbraco.Core.Events
-{
-    public class DatabaseCreationEventArgs : System.ComponentModel.CancelEventArgs{}
-}
@@ -1,761 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Xml;
-using Umbraco.Core.Collections;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides object extension methods.
-    /// </summary>
-    public static class ObjectExtensions
-    {
-        
-        private static readonly ConcurrentDictionary<Type, Type> NullableGenericCache = new ConcurrentDictionary<Type, Type>();
-        private static readonly ConcurrentDictionary<CompositeTypeTypeKey, TypeConverter> InputTypeConverterCache = new ConcurrentDictionary<CompositeTypeTypeKey, TypeConverter>();
-        private static readonly ConcurrentDictionary<CompositeTypeTypeKey, TypeConverter> DestinationTypeConverterCache = new ConcurrentDictionary<CompositeTypeTypeKey, TypeConverter>();
-        private static readonly ConcurrentDictionary<CompositeTypeTypeKey, bool> AssignableTypeCache = new ConcurrentDictionary<CompositeTypeTypeKey, bool>();
-        private static readonly ConcurrentDictionary<Type, bool> BoolConvertCache = new ConcurrentDictionary<Type, bool>();
-
-        private static readonly char[] NumberDecimalSeparatorsToNormalize = { '.', ',' };
-        private static readonly CustomBooleanTypeConverter CustomBooleanTypeConverter = new CustomBooleanTypeConverter();
-
-        //private static readonly ConcurrentDictionary<Type, Func<object>> ObjectFactoryCache = new ConcurrentDictionary<Type, Func<object>>();
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="input"></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public static IEnumerable<T> AsEnumerableOfOne<T>(this T input)
-        {
-            return Enumerable.Repeat(input, 1);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="input"></param>
-        public static void DisposeIfDisposable(this object input)
-        {
-            if (input is IDisposable disposable)
-                disposable.Dispose();
-        }
-
-        /// <summary>
-        /// Provides a shortcut way of safely casting an input when you cannot guarantee the <typeparamref name="T"/> is
-        /// an instance type (i.e., when the C# AS keyword is not applicable).
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="input">The input.</param>
-        /// <returns></returns>
-        public static T SafeCast<T>(this object input)
-        {
-            if (ReferenceEquals(null, input) || ReferenceEquals(default(T), input)) return default;
-            if (input is T variable) return variable;
-            return default;
-        }
-
-        /// <summary>
-        /// Attempts to convert the input object to the output type.
-        /// </summary>
-        /// <remarks>This code is an optimized version of the original Umbraco method</remarks>
-        /// <typeparam name="T">The type to convert to</typeparam>
-        /// <param name="input">The input.</param>
-        /// <returns>The <see cref="Attempt{T}"/></returns>
-        public static Attempt<T> TryConvertTo<T>(this object input)
-        {
-            var result = TryConvertTo(input, typeof(T));
-
-            if (result.Success)
-                return Attempt<T>.Succeed((T)result.Result);
-
-            // just try to cast
-            try
-            {
-                return Attempt<T>.Succeed((T)input);
-            }
-            catch (Exception e)
-            {
-                return Attempt<T>.Fail(e);
-            }
-        }
-
-        /// <summary>
-        /// Attempts to convert the input object to the output type.
-        /// </summary>
-        /// <remarks>This code is an optimized version of the original Umbraco method</remarks>
-        /// <param name="input">The input.</param>
-        /// <param name="target">The type to convert to</param>
-        /// <returns>The <see cref="Attempt{Object}"/></returns>
-        public static Attempt<object> TryConvertTo(this object input, Type target)
-        {
-            if (target == null)
-            {
-                return Attempt<object>.Fail();
-            }
-
-            try
-            {
-                if (input == null)
-                {
-                    // Nullable is ok
-                    if (target.IsGenericType && GetCachedGenericNullableType(target) != null)
-                    {
-                        return Attempt<object>.Succeed(null);
-                    }
-
-                    // Reference types are ok
-                    return Attempt<object>.If(target.IsValueType == false, null);
-                }
-
-                var inputType = input.GetType();
-
-                // Easy
-                if (target == typeof(object) || inputType == target)
-                {
-                    return Attempt.Succeed(input);
-                }
-
-                // Check for string so that overloaders of ToString() can take advantage of the conversion.
-                if (target == typeof(string))
-                {
-                    return Attempt<object>.Succeed(input.ToString());
-                }
-
-                // If we've got a nullable of something, we try to convert directly to that thing.
-                // We cache the destination type and underlying nullable types
-                // Any other generic types need to fall through
-                if (target.IsGenericType)
-                {
-                    var underlying = GetCachedGenericNullableType(target);
-                    if (underlying != null)
-                    {
-                        // Special case for empty strings for bools/dates which should return null if an empty string.
-                        if (input is string inputString)
-                        {
-                            // TODO: Why the check against only bool/date when a string is null/empty? In what scenario can we convert to another type when the string is null or empty other than just being null?
-                            if (string.IsNullOrEmpty(inputString) && (underlying == typeof(DateTime) || underlying == typeof(bool)))
-                            {
-                                return Attempt<object>.Succeed(null);
-                            }
-                        }
-
-                        // Recursively call into this method with the inner (not-nullable) type and handle the outcome
-                        var inner = input.TryConvertTo(underlying);
-
-                        // And if successful, fall on through to rewrap in a nullable; if failed, pass on the exception
-                        if (inner.Success)
-                        {
-                            input = inner.Result; // Now fall on through...
-                        }
-                        else
-                        {
-                            return Attempt<object>.Fail(inner.Exception);
-                        }
-                    }
-                }
-                else
-                {
-                    // target is not a generic type
-
-                    if (input is string inputString)
-                    {
-                        // Try convert from string, returns an Attempt if the string could be
-                        // processed (either succeeded or failed), else null if we need to try
-                        // other methods
-                        var result = TryConvertToFromString(inputString, target);
-                        if (result.HasValue)
-                        {
-                            return result.Value;
-                        }
-                    }
-
-                    // TODO: Do a check for destination type being IEnumerable<T> and source type implementing IEnumerable<T> with
-                    // the same 'T', then we'd have to find the extension method for the type AsEnumerable() and execute it.
-                    if (GetCachedCanAssign(input, inputType, target))
-                    {
-                        return Attempt.Succeed(Convert.ChangeType(input, target));
-                    }
-                }
-
-                if (target == typeof(bool))
-                {
-                    if (GetCachedCanConvertToBoolean(inputType))
-                    {
-                        return Attempt.Succeed(CustomBooleanTypeConverter.ConvertFrom(input));
-                    }
-                }
-
-                var inputConverter = GetCachedSourceTypeConverter(inputType, target);
-                if (inputConverter != null)
-                {
-                    return Attempt.Succeed(inputConverter.ConvertTo(input, target));
-                }
-
-                var outputConverter = GetCachedTargetTypeConverter(inputType, target);
-                if (outputConverter != null)
-                {
-                    return Attempt.Succeed(outputConverter.ConvertFrom(input));
-                }
-
-                if (target.IsGenericType && GetCachedGenericNullableType(target) != null)
-                {
-                    // cannot Convert.ChangeType as that does not work with nullable
-                    // input has already been converted to the underlying type - just
-                    // return input, there's an implicit conversion from T to T? anyways
-                    return Attempt.Succeed(input);
-                }
-
-                // Re-check convertibles since we altered the input through recursion
-                if (input is IConvertible convertible2)
-                {
-                    return Attempt.Succeed(Convert.ChangeType(convertible2, target));
-                }
-            }
-            catch (Exception e)
-            {
-                return Attempt<object>.Fail(e);
-            }
-
-            return Attempt<object>.Fail();
-        }
-
-        /// <summary>
-        /// Attempts to convert the input string to the output type.
-        /// </summary>
-        /// <remarks>This code is an optimized version of the original Umbraco method</remarks>
-        /// <param name="input">The input.</param>
-        /// <param name="target">The type to convert to</param>
-        /// <returns>The <see cref="Nullable{Attempt}"/></returns>
-        private static Attempt<object>? TryConvertToFromString(this string input, Type target)
-        {
-            // Easy
-            if (target == typeof(string))
-            {
-                return Attempt<object>.Succeed(input);
-            }
-
-            // Null, empty, whitespaces
-            if (string.IsNullOrWhiteSpace(input))
-            {
-                if (target == typeof(bool))
-                {
-                    // null/empty = bool false
-                    return Attempt<object>.Succeed(false);
-                }
-
-                if (target == typeof(DateTime))
-                {
-                    // null/empty = min DateTime value
-                    return Attempt<object>.Succeed(DateTime.MinValue);
-                }
-
-                // Cannot decide here,
-                // Any of the types below will fail parsing and will return a failed attempt
-                // but anything else will not be processed and will return null
-                // so even though the string is null/empty we have to proceed.
-            }
-
-            // Look for type conversions in the expected order of frequency of use.
-            //
-            // By using a mixture of ordered if statements and switches we can optimize both for
-            // fast conditional checking for most frequently used types and the branching
-            // that does not depend on previous values available to switch statements.
-            if (target.IsPrimitive)
-            {
-                if (target == typeof(int))
-                {
-                    if (int.TryParse(input, out var value))
-                    {
-                        return Attempt<object>.Succeed(value);
-                    }
-
-                    // Because decimal 100.01m will happily convert to integer 100, it
-                    // makes sense that string "100.01" *also* converts to integer 100.
-                    var input2 = NormalizeNumberDecimalSeparator(input);
-                    return Attempt<object>.If(decimal.TryParse(input2, out var value2), Convert.ToInt32(value2));
-                }
-
-                if (target == typeof(long))
-                {
-                    if (long.TryParse(input, out var value))
-                    {
-                        return Attempt<object>.Succeed(value);
-                    }
-
-                    // Same as int
-                    var input2 = NormalizeNumberDecimalSeparator(input);
-                    return Attempt<object>.If(decimal.TryParse(input2, out var value2), Convert.ToInt64(value2));
-                }
-
-                // TODO: Should we do the decimal trick for short, byte, unsigned?
-
-                if (target == typeof(bool))
-                {
-                    if (bool.TryParse(input, out var value))
-                    {
-                        return Attempt<object>.Succeed(value);
-                    }
-
-                    // Don't declare failure so the CustomBooleanTypeConverter can try
-                    return null;
-                }
-
-                // Calling this method directly is faster than any attempt to cache it.
-                switch (Type.GetTypeCode(target))
-                {
-                    case TypeCode.Int16:
-                        return Attempt<object>.If(short.TryParse(input, out var value), value);
-
-                    case TypeCode.Double:
-                        var input2 = NormalizeNumberDecimalSeparator(input);
-                        return Attempt<object>.If(double.TryParse(input2, out var valueD), valueD);
-
-                    case TypeCode.Single:
-                        var input3 = NormalizeNumberDecimalSeparator(input);
-                        return Attempt<object>.If(float.TryParse(input3, out var valueF), valueF);
-
-                    case TypeCode.Char:
-                        return Attempt<object>.If(char.TryParse(input, out var valueC), valueC);
-
-                    case TypeCode.Byte:
-                        return Attempt<object>.If(byte.TryParse(input, out var valueB), valueB);
-
-                    case TypeCode.SByte:
-                        return Attempt<object>.If(sbyte.TryParse(input, out var valueSb), valueSb);
-
-                    case TypeCode.UInt32:
-                        return Attempt<object>.If(uint.TryParse(input, out var valueU), valueU);
-
-                    case TypeCode.UInt16:
-                        return Attempt<object>.If(ushort.TryParse(input, out var valueUs), valueUs);
-
-                    case TypeCode.UInt64:
-                        return Attempt<object>.If(ulong.TryParse(input, out var valueUl), valueUl);
-                }
-            }
-            else if (target == typeof(Guid))
-            {
-                return Attempt<object>.If(Guid.TryParse(input, out var value), value);
-            }
-            else if (target == typeof(DateTime))
-            {
-                if (DateTime.TryParse(input, out var value))
-                {
-                    switch (value.Kind)
-                    {
-                        case DateTimeKind.Unspecified:
-                        case DateTimeKind.Utc:
-                            return Attempt<object>.Succeed(value);
-
-                        case DateTimeKind.Local:
-                            return Attempt<object>.Succeed(value.ToUniversalTime());
-
-                        default:
-                            throw new ArgumentOutOfRangeException();
-                    }
-                }
-
-                return Attempt<object>.Fail();
-            }
-            else if (target == typeof(DateTimeOffset))
-            {
-                return Attempt<object>.If(DateTimeOffset.TryParse(input, out var value), value);
-            }
-            else if (target == typeof(TimeSpan))
-            {
-                return Attempt<object>.If(TimeSpan.TryParse(input, out var value), value);
-            }
-            else if (target == typeof(decimal))
-            {
-                var input2 = NormalizeNumberDecimalSeparator(input);
-                return Attempt<object>.If(decimal.TryParse(input2, out var value), value);
-            }
-            else if (input != null && target == typeof(Version))
-            {
-                return Attempt<object>.If(Version.TryParse(input, out var value), value);
-            }
-
-            // E_NOTIMPL IPAddress, BigInteger
-			return null; // we can't decide...
-        }
-        internal static void CheckThrowObjectDisposed(this IDisposable disposable, bool isDisposed, string objectname)
-        {
-            // TODO: Localize this exception
-            if (isDisposed)
-                throw new ObjectDisposedException(objectname);
-        }
-
-        //public enum PropertyNamesCaseType
-        //{
-        //    CamelCase,
-        //    CaseInsensitive
-        //}
-
-        ///// <summary>
-        ///// Convert an object to a JSON string with camelCase formatting
-        ///// </summary>
-        ///// <param name="obj"></param>
-        ///// <returns></returns>
-        //public static string ToJsonString(this object obj)
-        //{
-        //    return obj.ToJsonString(PropertyNamesCaseType.CamelCase);
-        //}
-
-        ///// <summary>
-        ///// Convert an object to a JSON string with the specified formatting
-        ///// </summary>
-        ///// <param name="obj">The obj.</param>
-        ///// <param name="propertyNamesCaseType">Type of the property names case.</param>
-        ///// <returns></returns>
-        //public static string ToJsonString(this object obj, PropertyNamesCaseType propertyNamesCaseType)
-        //{
-        //    var type = obj.GetType();
-        //    var dateTimeStyle = "yyyy-MM-dd HH:mm:ss";
-
-        //    if (type.IsPrimitive || typeof(string).IsAssignableFrom(type))
-        //    {
-        //        return obj.ToString();
-        //    }
-
-        //    if (typeof(DateTime).IsAssignableFrom(type) || typeof(DateTimeOffset).IsAssignableFrom(type))
-        //    {
-        //        return Convert.ToDateTime(obj).ToString(dateTimeStyle);
-        //    }
-
-        //    var serializer = new JsonSerializer();
-
-        //    switch (propertyNamesCaseType)
-        //    {
-        //        case PropertyNamesCaseType.CamelCase:
-        //            serializer.ContractResolver = new CamelCasePropertyNamesContractResolver();
-        //            break;
-        //    }
-
-        //    var dateTimeConverter = new IsoDateTimeConverter
-        //        {
-        //            DateTimeStyles = System.Globalization.DateTimeStyles.None,
-        //            DateTimeFormat = dateTimeStyle
-        //        };
-
-        //    if (typeof(IDictionary).IsAssignableFrom(type))
-        //    {
-        //        return JObject.FromObject(obj, serializer).ToString(Formatting.None, dateTimeConverter);
-        //    }
-
-        //    if (type.IsArray || (typeof(IEnumerable).IsAssignableFrom(type)))
-        //    {
-        //        return JArray.FromObject(obj, serializer).ToString(Formatting.None, dateTimeConverter);
-        //    }
-
-        //    return JObject.FromObject(obj, serializer).ToString(Formatting.None, dateTimeConverter);
-        //}
-
-        /// <summary>
-        /// Converts an object into a dictionary
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="TProperty"></typeparam>
-        /// <typeparam name="TVal"> </typeparam>
-        /// <param name="o"></param>
-        /// <param name="ignoreProperties"></param>
-        /// <returns></returns>
-        public static IDictionary<string, TVal> ToDictionary<T, TProperty, TVal>(this T o, params Expression<Func<T, TProperty>>[] ignoreProperties)
-        {
-            return o.ToDictionary<TVal>(ignoreProperties.Select(e => o.GetPropertyInfo(e)).Select(propInfo => propInfo.Name).ToArray());
-        }
-
-        /// <summary>
-        /// Turns object into dictionary
-        /// </summary>
-        /// <param name="o"></param>
-        /// <param name="ignoreProperties">Properties to ignore</param>
-        /// <returns></returns>
-        public static IDictionary<string, TVal> ToDictionary<TVal>(this object o, params string[] ignoreProperties)
-        {
-            if (o != null)
-            {
-                var props = TypeDescriptor.GetProperties(o);
-                var d = new Dictionary<string, TVal>();
-                foreach (var prop in props.Cast<PropertyDescriptor>().Where(x => ignoreProperties.Contains(x.Name) == false))
-                {
-                    var val = prop.GetValue(o);
-                    if (val != null)
-                    {
-                        d.Add(prop.Name, (TVal)val);
-                    }
-                }
-                return d;
-            }
-            return new Dictionary<string, TVal>();
-        }
-
-        
-
-        internal static string ToDebugString(this object obj, int levels = 0)
-        {
-            if (obj == null) return "{null}";
-            try
-            {
-                if (obj is string)
-                {
-                    return "\"{0}\"".InvariantFormat(obj);
-                }
-                if (obj is int || obj is short || obj is long || obj is float || obj is double || obj is bool || obj is int? || obj is short? || obj is long? || obj is float? || obj is double? || obj is bool?)
-                {
-                    return "{0}".InvariantFormat(obj);
-                }
-                if (obj is Enum)
-                {
-                    return "[{0}]".InvariantFormat(obj);
-                }
-                if (obj is IEnumerable)
-                {
-                    var enumerable = (obj as IEnumerable);
-
-                    var items = (from object enumItem in enumerable let value = GetEnumPropertyDebugString(enumItem, levels) where value != null select value).Take(10).ToList();
-
-                    return items.Any()
-                            ? "{{ {0} }}".InvariantFormat(string.Join(", ", items))
-                            : null;
-                }
-
-                var props = obj.GetType().GetProperties();
-                if ((props.Length == 2) && props[0].Name == "Key" && props[1].Name == "Value" && levels > -2)
-                {
-                    try
-                    {
-                        var key = props[0].GetValue(obj, null) as string;
-                        var value = props[1].GetValue(obj, null).ToDebugString(levels - 1);
-                        return "{0}={1}".InvariantFormat(key, value);
-                    }
-                    catch (Exception)
-                    {
-                        return "[KeyValuePropertyException]";
-                    }
-                }
-                if (levels > -1)
-                {
-                    var items =
-                        (from propertyInfo in props
-                         let value = GetPropertyDebugString(propertyInfo, obj, levels)
-                         where value != null
-                         select "{0}={1}".InvariantFormat(propertyInfo.Name, value)).ToArray();
-
-                    return items.Any()
-                            ? "[{0}]:{{ {1} }}".InvariantFormat(obj.GetType().Name, String.Join(", ", items))
-                            : null;
-                }
-            }
-            catch (Exception ex)
-            {
-                return "[Exception:{0}]".InvariantFormat(ex.Message);
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Attempts to serialize the value to an XmlString using ToXmlString
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        internal static Attempt<string> TryConvertToXmlString(this object value, Type type)
-        {
-            try
-            {
-                var output = value.ToXmlString(type);
-                return Attempt.Succeed(output);
-            }
-            catch (NotSupportedException ex)
-            {
-                return Attempt<string>.Fail(ex);
-            }
-        }
-
-        /// <summary>
-        /// Returns an XmlSerialized safe string representation for the value
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="type">The Type can only be a primitive type or Guid and byte[] otherwise an exception is thrown</param>
-        /// <returns></returns>
-        public static string ToXmlString(this object value, Type type)
-        {
-            if (value == null) return string.Empty;
-            if (type == typeof(string)) return (value.ToString().IsNullOrWhiteSpace() ? "" : value.ToString());
-            if (type == typeof(bool)) return XmlConvert.ToString((bool)value);
-            if (type == typeof(byte)) return XmlConvert.ToString((byte)value);
-            if (type == typeof(char)) return XmlConvert.ToString((char)value);
-            if (type == typeof(DateTime)) return XmlConvert.ToString((DateTime)value, XmlDateTimeSerializationMode.Unspecified);
-            if (type == typeof(DateTimeOffset)) return XmlConvert.ToString((DateTimeOffset)value);
-            if (type == typeof(decimal)) return XmlConvert.ToString((decimal)value);
-            if (type == typeof(double)) return XmlConvert.ToString((double)value);
-            if (type == typeof(float)) return XmlConvert.ToString((float)value);
-            if (type == typeof(Guid)) return XmlConvert.ToString((Guid)value);
-            if (type == typeof(int)) return XmlConvert.ToString((int)value);
-            if (type == typeof(long)) return XmlConvert.ToString((long)value);
-            if (type == typeof(sbyte)) return XmlConvert.ToString((sbyte)value);
-            if (type == typeof(short)) return XmlConvert.ToString((short)value);
-            if (type == typeof(TimeSpan)) return XmlConvert.ToString((TimeSpan)value);
-            if (type == typeof(bool)) return XmlConvert.ToString((bool)value);
-            if (type == typeof(uint)) return XmlConvert.ToString((uint)value);
-            if (type == typeof(ulong)) return XmlConvert.ToString((ulong)value);
-            if (type == typeof(ushort)) return XmlConvert.ToString((ushort)value);
-
-            throw new NotSupportedException("Cannot convert type " + type.FullName + " to a string using ToXmlString as it is not supported by XmlConvert");
-        }
-
-        /// <summary>
-        /// Returns an XmlSerialized safe string representation for the value and type
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static string ToXmlString<T>(this object value)
-        {
-            return value.ToXmlString(typeof (T));
-        }
-
-        private static string GetEnumPropertyDebugString(object enumItem, int levels)
-        {
-            try
-            {
-                return enumItem.ToDebugString(levels - 1);
-            }
-            catch (Exception)
-            {
-                return "[GetEnumPartException]";
-            }
-        }
-
-        private static string GetPropertyDebugString(PropertyInfo propertyInfo, object obj, int levels)
-        {
-            try
-            {
-                return propertyInfo.GetValue(obj, null).ToDebugString(levels - 1);
-            }
-            catch (Exception)
-            {
-                return "[GetPropertyValueException]";
-            }
-        }
-
-        public static Guid AsGuid(this object value)
-        {
-            return value is Guid guid ? guid : Guid.Empty;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static string NormalizeNumberDecimalSeparator(string s)
-        {
-            var normalized = System.Threading.Thread.CurrentThread.CurrentCulture.NumberFormat.NumberDecimalSeparator[0];
-            return s.ReplaceMany(NumberDecimalSeparatorsToNormalize, normalized);
-        }
-
-        // gets a converter for source, that can convert to target, or null if none exists
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static TypeConverter GetCachedSourceTypeConverter(Type source, Type target)
-        {
-            var key = new CompositeTypeTypeKey(source, target);
-
-            if (InputTypeConverterCache.TryGetValue(key, out var typeConverter))
-            {
-                return typeConverter;
-            }
-
-            var converter = TypeDescriptor.GetConverter(source);
-            if (converter.CanConvertTo(target))
-            {
-                return InputTypeConverterCache[key] = converter;
-            }
-
-            return InputTypeConverterCache[key] = null;
-        }
-
-        // gets a converter for target, that can convert from source, or null if none exists
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static TypeConverter GetCachedTargetTypeConverter(Type source, Type target)
-        {
-            var key = new CompositeTypeTypeKey(source, target);
-
-            if (DestinationTypeConverterCache.TryGetValue(key, out var typeConverter))
-            {
-                return typeConverter;
-            }
-            
-            var converter = TypeDescriptor.GetConverter(target);
-            if (converter.CanConvertFrom(source))
-            {
-                return DestinationTypeConverterCache[key] = converter;
-            }
-
-            return DestinationTypeConverterCache[key] = null;
-        }
-
-        // gets the underlying type of a nullable type, or null if the type is not nullable
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Type GetCachedGenericNullableType(Type type)
-        {
-            if (NullableGenericCache.TryGetValue(type, out var underlyingType))
-            {
-                return underlyingType;
-            }
-
-            if (type.GetGenericTypeDefinition() == typeof(Nullable<>))
-            {
-                Type underlying = Nullable.GetUnderlyingType(type);
-                return NullableGenericCache[type] = underlying;
-            }
-
-            return NullableGenericCache[type] = null;
-        }
-
-        // gets an IConvertible from source to target type, or null if none exists
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool GetCachedCanAssign(object input, Type source, Type target)
-        {
-            var key = new CompositeTypeTypeKey(source, target);
-            if (AssignableTypeCache.TryGetValue(key, out var canConvert))
-            {
-                return canConvert;
-            }
-
-            // "object is" is faster than "Type.IsAssignableFrom.
-            // We can use it to very quickly determine whether true/false
-            if (input is IConvertible && target.IsAssignableFrom(source))
-            {
-                return AssignableTypeCache[key] = true;
-            }
-
-            return AssignableTypeCache[key] = false;
-        }
-
-        // determines whether a type can be converted to boolean
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool GetCachedCanConvertToBoolean(Type type)
-        {
-            if (BoolConvertCache.TryGetValue(type, out var result))
-            {
-                return result;
-            }
-
-            if (CustomBooleanTypeConverter.CanConvertFrom(type))
-            {
-                return BoolConvertCache[type] = true;
-            }
-
-            return BoolConvertCache[type] = false;
-        }
-
-        
-    }
-}
@@ -1,45 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Persistence
-{
-    /// <summary>
-    /// Provides a mean to express aliases in SELECT Sql statements.
-    /// </summary>
-    /// <remarks>
-    /// <para>First register with <c>using static Umbraco.Core.Persistence.NPocoSqlExtensions.Aliaser</c>,
-    /// then use eg <c>Sql{Foo}(x => Alias(x.Id, "id"))</c>.</para>
-    /// </remarks>
-    public static class SqlExtensionsStatics
-    {
-        /// <summary>
-        /// Aliases a field.
-        /// </summary>
-        /// <param name="field">The field to alias.</param>
-        /// <param name="alias">The alias.</param>
-        public static object Alias(object field, string alias) => field;
-
-        /// <summary>
-        /// Produces Sql text.
-        /// </summary>
-        /// <param name="field">The name of the field.</param>
-        /// <param name="expr">A function producing Sql text.</param>
-        public static T SqlText<T>(string field, Func<string, string> expr) => default;
-
-        /// <summary>
-        /// Produces Sql text.
-        /// </summary>
-        /// <param name="field1">The name of the first field.</param>
-        /// <param name="field2">The name of the second field.</param>
-        /// <param name="expr">A function producing Sql text.</param>
-        public static T SqlText<T>(string field1, string field2, Func<string, string, string> expr) => default;
-
-        /// <summary>
-        /// Produces Sql text.
-        /// </summary>
-        /// <param name="field1">The name of the first field.</param>
-        /// <param name="field2">The name of the second field.</param>
-        /// <param name="field3">The name of the third field.</param>
-        /// <param name="expr">A function producing Sql text.</param>
-        public static T SqlText<T>(string field1, string field2, string field3, Func<string, string, string, string> expr) => default;
-    }
-}
@@ -1,558 +0,0 @@
-using System;
-#if !NETSTANDARD
-using System.Globalization;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-#endif
-using System.Text.RegularExpressions;
-
-/*
-Copyright (c) 2013 Max Hauser 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-namespace Semver
-{
-    /// <summary>
-    /// A semantic version implementation.
-    /// Conforms to v2.0.0 of http://semver.org/
-    /// </summary>
-#if NETSTANDARD
-    public sealed class SemVersion : IComparable<SemVersion>, IComparable
-#else
-    [Serializable]
-    public sealed class SemVersion : IComparable<SemVersion>, IComparable, ISerializable
-#endif
-    {
-        static Regex parseEx =
-            new Regex(@"^(?<major>\d+)" +
-                @"(\.(?<minor>\d+))?" +
-                @"(\.(?<patch>\d+))?" +
-                @"(\-(?<pre>[0-9A-Za-z\-\.]+))?" +
-                @"(\+(?<build>[0-9A-Za-z\-\.]+))?$",
-#if NETSTANDARD
-                RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture);
-#else
-                RegexOptions.CultureInvariant | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-#endif
-
-#if !NETSTANDARD
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SemVersion" /> class.
-        /// </summary>
-        /// <param name="info"></param>
-        /// <param name="context"></param>
-        /// <exception cref="ArgumentNullException"></exception>
-        private SemVersion(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null) throw new ArgumentNullException("info");
-            var semVersion = Parse(info.GetString("SemVersion"));
-            Major = semVersion.Major;
-            Minor = semVersion.Minor;
-            Patch = semVersion.Patch;
-            Prerelease = semVersion.Prerelease;
-            Build = semVersion.Build;
-        }
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SemVersion" /> class.
-        /// </summary>
-        /// <param name="major">The major version.</param>
-        /// <param name="minor">The minor version.</param>
-        /// <param name="patch">The patch version.</param>
-        /// <param name="prerelease">The prerelease version (eg. "alpha").</param>
-        /// <param name="build">The build eg ("nightly.232").</param>
-        public SemVersion(int major, int minor = 0, int patch = 0, string prerelease = "", string build = "")
-        {
-            this.Major = major;
-            this.Minor = minor;
-            this.Patch = patch;
-
-            this.Prerelease = prerelease ?? "";
-            this.Build = build ?? "";
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SemVersion"/> class.
-        /// </summary>
-        /// <param name="version">The <see cref="System.Version"/> that is used to initialize 
-        /// the Major, Minor, Patch and Build properties.</param>
-        public SemVersion(Version version)
-        {
-            if (version == null)
-                throw new ArgumentNullException("version");
-
-            this.Major = version.Major;
-            this.Minor = version.Minor;
-
-            if (version.Revision >= 0)
-            {
-                this.Patch = version.Revision;
-            }
-
-            this.Prerelease = String.Empty;
-
-            if (version.Build > 0)
-            {
-                this.Build = version.Build.ToString();
-            }
-            else
-            {
-                this.Build = String.Empty;
-            }
-        }
-
-        /// <summary>
-        /// Parses the specified string to a semantic version.
-        /// </summary>
-        /// <param name="version">The version string.</param>
-        /// <param name="strict">If set to <c>true</c> minor and patch version are required, else they default to 0.</param>
-        /// <returns>The SemVersion object.</returns>
-        /// <exception cref="System.InvalidOperationException">When a invalid version string is passed.</exception>
-        public static SemVersion Parse(string version, bool strict = false)
-        {
-            var match = parseEx.Match(version);
-            if (!match.Success)
-                throw new ArgumentException("Invalid version.", "version");
-
-#if NETSTANDARD
-            var major = int.Parse(match.Groups["major"].Value);
-#else
-            var major = int.Parse(match.Groups["major"].Value, CultureInfo.InvariantCulture);
-#endif
-
-            var minorMatch = match.Groups["minor"];
-            int minor = 0;
-            if (minorMatch.Success)
-            {
-#if NETSTANDARD
-                minor = int.Parse(minorMatch.Value);
-#else
-                minor = int.Parse(minorMatch.Value, CultureInfo.InvariantCulture);
-#endif
-            }
-            else if (strict)
-            {
-                throw new InvalidOperationException("Invalid version (no minor version given in strict mode)");
-            }
-
-            var patchMatch = match.Groups["patch"];
-            int patch = 0;
-            if (patchMatch.Success)
-            {
-#if NETSTANDARD
-                patch = int.Parse(patchMatch.Value);
-#else
-                patch = int.Parse(patchMatch.Value, CultureInfo.InvariantCulture);
-#endif
-            }
-            else if (strict)
-            {
-                throw new InvalidOperationException("Invalid version (no patch version given in strict mode)");
-            }
-
-            var prerelease = match.Groups["pre"].Value;
-            var build = match.Groups["build"].Value;
-
-            return new SemVersion(major, minor, patch, prerelease, build);
-        }
-
-        /// <summary>
-        /// Parses the specified string to a semantic version.
-        /// </summary>
-        /// <param name="version">The version string.</param>
-        /// <param name="semver">When the method returns, contains a SemVersion instance equivalent 
-        /// to the version string passed in, if the version string was valid, or <c>null</c> if the 
-        /// version string was not valid.</param>
-        /// <param name="strict">If set to <c>true</c> minor and patch version are required, else they default to 0.</param>
-        /// <returns><c>False</c> when a invalid version string is passed, otherwise <c>true</c>.</returns>
-        public static bool TryParse(string version, out SemVersion semver, bool strict = false)
-        {
-            try
-            {
-                semver = Parse(version, strict);
-                return true;
-            }
-            catch (Exception)
-            {
-                semver = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Tests the specified versions for equality.
-        /// </summary>
-        /// <param name="versionA">The first version.</param>
-        /// <param name="versionB">The second version.</param>
-        /// <returns>If versionA is equal to versionB <c>true</c>, else <c>false</c>.</returns>
-        public static bool Equals(SemVersion versionA, SemVersion versionB)
-        {
-            if (ReferenceEquals(versionA, null))
-                return ReferenceEquals(versionB, null);
-            return versionA.Equals(versionB);
-        }
-
-        /// <summary>
-        /// Compares the specified versions.
-        /// </summary>
-        /// <param name="versionA">The version to compare to.</param>
-        /// <param name="versionB">The version to compare against.</param>
-        /// <returns>If versionA &lt; versionB <c>&lt; 0</c>, if versionA &gt; versionB <c>&gt; 0</c>,
-        /// if versionA is equal to versionB <c>0</c>.</returns>
-        public static int Compare(SemVersion versionA, SemVersion versionB)
-        {
-            if (ReferenceEquals(versionA, null))
-                return ReferenceEquals(versionB, null) ? 0 : -1;
-            return versionA.CompareTo(versionB);
-        }
-
-        /// <summary>
-        /// Make a copy of the current instance with optional altered fields. 
-        /// </summary>
-        /// <param name="major">The major version.</param>
-        /// <param name="minor">The minor version.</param>
-        /// <param name="patch">The patch version.</param>
-        /// <param name="prerelease">The prerelease text.</param>
-        /// <param name="build">The build text.</param>
-        /// <returns>The new version object.</returns>
-        public SemVersion Change(int? major = null, int? minor = null, int? patch = null,
-            string prerelease = null, string build = null)
-        {
-            return new SemVersion(
-                major ?? this.Major,
-                minor ?? this.Minor,
-                patch ?? this.Patch,
-                prerelease ?? this.Prerelease,
-                build ?? this.Build);
-        }
-
-        /// <summary>
-        /// Gets the major version.
-        /// </summary>
-        /// <value>
-        /// The major version.
-        /// </value>
-        public int Major { get; private set; }
-
-        /// <summary>
-        /// Gets the minor version.
-        /// </summary>
-        /// <value>
-        /// The minor version.
-        /// </value>
-        public int Minor { get; private set; }
-
-        /// <summary>
-        /// Gets the patch version.
-        /// </summary>
-        /// <value>
-        /// The patch version.
-        /// </value>
-        public int Patch { get; private set; }
-
-        /// <summary>
-        /// Gets the pre-release version.
-        /// </summary>
-        /// <value>
-        /// The pre-release version.
-        /// </value>
-        public string Prerelease { get; private set; }
-
-        /// <summary>
-        /// Gets the build version.
-        /// </summary>
-        /// <value>
-        /// The build version.
-        /// </value>
-        public string Build { get; private set; }
-
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents this instance.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="System.String" /> that represents this instance.
-        /// </returns>
-        public override string ToString()
-        {
-            var version = "" + Major + "." + Minor + "." + Patch;
-            if (!String.IsNullOrEmpty(Prerelease))
-                version += "-" + Prerelease;
-            if (!String.IsNullOrEmpty(Build))
-                version += "+" + Build;
-            return version;
-        }
-
-        /// <summary>
-        /// Compares the current instance with another object of the same type and returns an integer that indicates 
-        /// whether the current instance precedes, follows, or occurs in the same position in the sort order as the 
-        /// other object.
-        /// </summary>
-        /// <param name="obj">An object to compare with this instance.</param>
-        /// <returns>
-        /// A value that indicates the relative order of the objects being compared. 
-        /// The return value has these meanings: Value Meaning Less than zero 
-        ///  This instance precedes <paramref name="obj" /> in the sort order. 
-        ///  Zero This instance occurs in the same position in the sort order as <paramref name="obj" />. i
-        ///  Greater than zero This instance follows <paramref name="obj" /> in the sort order.
-        /// </returns>
-        public int CompareTo(object obj)
-        {
-            return CompareTo((SemVersion)obj);
-        }
-
-        /// <summary>
-        /// Compares the current instance with another object of the same type and returns an integer that indicates 
-        /// whether the current instance precedes, follows, or occurs in the same position in the sort order as the 
-        /// other object.
-        /// </summary>
-        /// <param name="other">An object to compare with this instance.</param>
-        /// <returns>
-        /// A value that indicates the relative order of the objects being compared. 
-        /// The return value has these meanings: Value Meaning Less than zero 
-        ///  This instance precedes <paramref name="other" /> in the sort order. 
-        ///  Zero This instance occurs in the same position in the sort order as <paramref name="other" />. i
-        ///  Greater than zero This instance follows <paramref name="other" /> in the sort order.
-        /// </returns>
-        public int CompareTo(SemVersion other)
-        {
-            if (ReferenceEquals(other, null))
-                return 1;
-
-            var r = this.CompareByPrecedence(other);
-            if (r != 0)
-                return r;
-
-            r = CompareComponent(this.Build, other.Build);
-            return r;
-        }
-
-        /// <summary>
-        /// Compares to semantic versions by precedence. This does the same as a Equals, but ignores the build information.
-        /// </summary>
-        /// <param name="other">The semantic version.</param>
-        /// <returns><c>true</c> if the version precedence matches.</returns>
-        public bool PrecedenceMatches(SemVersion other)
-        {
-            return CompareByPrecedence(other) == 0;
-        }
-
-        /// <summary>
-        /// Compares to semantic versions by precedence. This does the same as a Equals, but ignores the build information.
-        /// </summary>
-        /// <param name="other">The semantic version.</param>
-        /// <returns>
-        /// A value that indicates the relative order of the objects being compared. 
-        /// The return value has these meanings: Value Meaning Less than zero 
-        ///  This instance precedes <paramref name="other" /> in the version precedence.
-        ///  Zero This instance has the same precedence as <paramref name="other" />. i
-        ///  Greater than zero This instance has creater precedence as <paramref name="other" />.
-        /// </returns>
-        public int CompareByPrecedence(SemVersion other)
-        {
-            if (ReferenceEquals(other, null))
-                return 1;
-
-            var r = this.Major.CompareTo(other.Major);
-            if (r != 0) return r;
-
-            r = this.Minor.CompareTo(other.Minor);
-            if (r != 0) return r;
-
-            r = this.Patch.CompareTo(other.Patch);
-            if (r != 0) return r;
-
-            r = CompareComponent(this.Prerelease, other.Prerelease, true);
-            return r;
-        }
-
-        static int CompareComponent(string a, string b, bool lower = false)
-        {
-            var aEmpty = String.IsNullOrEmpty(a);
-            var bEmpty = String.IsNullOrEmpty(b);
-            if (aEmpty && bEmpty)
-                return 0;
-
-            if (aEmpty)
-                return lower ? 1 : -1;
-            if (bEmpty)
-                return lower ? -1 : 1;
-
-            var aComps = a.Split('.');
-            var bComps = b.Split('.');
-
-            var minLen = Math.Min(aComps.Length, bComps.Length);
-            for (int i = 0; i < minLen; i++)
-            {
-                var ac = aComps[i];
-                var bc = bComps[i];
-                int anum, bnum;
-                var isanum = Int32.TryParse(ac, out anum);
-                var isbnum = Int32.TryParse(bc, out bnum);
-                int r;
-                if (isanum && isbnum)
-                {
-                    r = anum.CompareTo(bnum);
-                    if (r != 0) return anum.CompareTo(bnum);
-                }
-                else
-                {
-                    if (isanum)
-                        return -1;
-                    if (isbnum)
-                        return 1;
-                    r = String.CompareOrdinal(ac, bc);
-                    if (r != 0)
-                        return r;
-                }
-            }
-
-            return aComps.Length.CompareTo(bComps.Length);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object" /> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(obj, null))
-                return false;
-
-            if (ReferenceEquals(this, obj))
-                return true;
-
-            var other = (SemVersion)obj;
-
-            return this.Major == other.Major &&
-                this.Minor == other.Minor &&
-                this.Patch == other.Patch &&
-                string.Equals(this.Prerelease, other.Prerelease, StringComparison.Ordinal) &&
-                string.Equals(this.Build, other.Build, StringComparison.Ordinal);
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
-        /// </returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int result = this.Major.GetHashCode();
-                result = result * 31 + this.Minor.GetHashCode();
-                result = result * 31 + this.Patch.GetHashCode();
-                result = result * 31 + this.Prerelease.GetHashCode();
-                result = result * 31 + this.Build.GetHashCode();
-                return result;
-            }
-        }
-
-#if !NETSTANDARD
-        [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
-        public void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null) throw new ArgumentNullException("info");
-            info.AddValue("SemVersion", ToString());
-        }
-#endif
-
-        /// <summary>
-        /// Implicit conversion from string to SemVersion.
-        /// </summary>
-        /// <param name="version">The semantic version.</param>
-        /// <returns>The SemVersion object.</returns>
-        public static implicit operator SemVersion(string version)
-        {
-            return SemVersion.Parse(version);
-        }
-
-        /// <summary>
-        /// The override of the equals operator. 
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The right value.</param>
-        /// <returns>If left is equal to right <c>true</c>, else <c>false</c>.</returns>
-        public static bool operator ==(SemVersion left, SemVersion right)
-        {
-            return SemVersion.Equals(left, right);
-        }
-
-        /// <summary>
-        /// The override of the un-equal operator. 
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The right value.</param>
-        /// <returns>If left is not equal to right <c>true</c>, else <c>false</c>.</returns>
-        public static bool operator !=(SemVersion left, SemVersion right)
-        {
-            return !SemVersion.Equals(left, right);
-        }
-
-        /// <summary>
-        /// The override of the greater operator. 
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The right value.</param>
-        /// <returns>If left is greater than right <c>true</c>, else <c>false</c>.</returns>
-        public static bool operator >(SemVersion left, SemVersion right)
-        {
-            return SemVersion.Compare(left, right) > 0;
-        }
-
-        /// <summary>
-        /// The override of the greater than or equal operator. 
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The right value.</param>
-        /// <returns>If left is greater than or equal to right <c>true</c>, else <c>false</c>.</returns>
-        public static bool operator >=(SemVersion left, SemVersion right)
-        {
-            return left == right || left > right;
-        }
-
-        /// <summary>
-        /// The override of the less operator. 
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The right value.</param>
-        /// <returns>If left is less than right <c>true</c>, else <c>false</c>.</returns>
-        public static bool operator <(SemVersion left, SemVersion right)
-        {
-            return SemVersion.Compare(left, right) < 0;
-        }
-
-        /// <summary>
-        /// The override of the less than or equal operator. 
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The right value.</param>
-        /// <returns>If left is less than or equal to right <c>true</c>, else <c>false</c>.</returns>
-        public static bool operator <=(SemVersion left, SemVersion right)
-        {
-            return left == right || left < right;
-        }
-    }
-}
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>7.3</LangVersion>
-        <RootNamespace>Umbraco.Core</RootNamespace>
-    </PropertyGroup>
-
-</Project>
@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;

 namespace Umbraco.Core
 {
-    public static class AssemblyExtensions
+    internal static class AssemblyExtensions
    {
        /// <summary>
        /// Returns the file used to load the assembly
@@ -21,7 +21,7 @@ namespace Umbraco.Core
    // been closed, the Semaphore system object is destroyed - so in any case
    // an iisreset should clean up everything
    //
-    public class AsyncLock
+    internal class AsyncLock
    {
        private readonly SemaphoreSlim _semaphore;
        private readonly Semaphore _semaphore2;
@@ -0,0 +1,40 @@
+using System;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Web;
+using Umbraco.Core;
+
+[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")]
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Manages any assembly binding redirects that cannot be done via config (i.e. unsigned --> signed assemblies)
+    /// </summary>
+    public sealed class BindingRedirects
+    {
+        public static void Initialize()
+        {
+            // this only gets called when an assembly can't be resolved
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+        }
+        
+        /// <summary>
+        /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            //AutoMapper:
+            // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
+            // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
+            if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
+                return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
+
+            return null;
+
+        }
+    }
+}
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Cache
    /// 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
+    interface ICacheRefresher<T> : ICacheRefresher
    {
        void Refresh(T instance);
        void Remove(T instance);
@@ -3,7 +3,7 @@
    /// <summary>
    /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
    /// </summary>
-    public interface IJsonCacheRefresher : ICacheRefresher
+    interface IJsonCacheRefresher : ICacheRefresher
    {
        /// <summary>
        /// Refreshes, clears, etc... any cache based on the information provided in the json
@@ -3,7 +3,7 @@
    /// <summary>
    /// A cache refresher that supports refreshing cache based on a custom payload
    /// </summary>
-    public interface IPayloadCacheRefresher<TPayload> : IJsonCacheRefresher
+    interface IPayloadCacheRefresher<TPayload> : IJsonCacheRefresher
    {
        /// <summary>
        /// Refreshes, clears, etc... any cache based on the information provided in the payload
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Cache
 {
@@ -12,6 +13,11 @@ namespace Umbraco.Core.Cache

        public static NoCacheRepositoryCachePolicy<TEntity, TId> Instance { get; } = new NoCacheRepositoryCachePolicy<TEntity, TId>();

+        public IRepositoryCachePolicy<TEntity, TId> Scoped(IAppPolicyCache runtimeCache, IScope scope)
+        {
+            throw new NotImplementedException();
+        }
+
        public TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
        {
            return performGet(id);
@@ -6,7 +6,7 @@ namespace Umbraco.Core.CodeAnnotations
    /// Attribute to add a Friendly Name string with an UmbracoObjectType enum value
    /// </summary>
    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
-    public class FriendlyNameAttribute : Attribute
+    internal class FriendlyNameAttribute : Attribute
    {
        /// <summary>
        /// friendly name value
@@ -6,7 +6,7 @@ namespace Umbraco.Core.CodeAnnotations
    /// Attribute to associate a GUID string and Type with an UmbracoObjectType Enum value
    /// </summary>
    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
-    public class UmbracoObjectTypeAttribute : Attribute
+    internal class UmbracoObjectTypeAttribute : Attribute
    {
        public UmbracoObjectTypeAttribute(string objectId)
        {
@@ -3,7 +3,7 @@
 namespace Umbraco.Core.CodeAnnotations
 {
    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
-    public class UmbracoUdiTypeAttribute : Attribute
+    internal class UmbracoUdiTypeAttribute : Attribute
    {
        public string UdiType { get; private set; }

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Collections
    /// <summary>
    /// Represents a composite key of (Type, Type) for fast dictionaries.
    /// </summary>
-    public struct CompositeTypeTypeKey : IEquatable<CompositeTypeTypeKey>
+    internal struct CompositeTypeTypeKey : IEquatable<CompositeTypeTypeKey>
    {
        /// <summary>
        /// Initializes a new instance of the <see cref="CompositeTypeTypeKey"/> struct.
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Collections
    /// A List that can be deep cloned with deep cloned elements and can reset the collection's items dirty flags
    /// </summary>
    /// <typeparam name="T"></typeparam>
-    public class DeepCloneableList<T> : List<T>, IDeepCloneable, IRememberBeingDirty
+    internal class DeepCloneableList<T> : List<T>, IDeepCloneable, IRememberBeingDirty
    {
        private readonly ListCloneBehavior _listCloneBehavior;

@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Collections
 {
-    public enum ListCloneBehavior
+    internal enum ListCloneBehavior
    {
        /// <summary>
        /// When set, DeepClone will clone the items one time and the result list behavior will be None
@@ -7,7 +7,7 @@ namespace Umbraco.Core.Collections
    /// and is customizable to keep the newest or oldest equatable item
    /// </summary>
    /// <typeparam name="T"></typeparam>
-    public class OrderedHashSet<T> : KeyedCollection<T, T>
+    internal class OrderedHashSet<T> : KeyedCollection<T, T>
    {
        private readonly bool _keepOldest;

@@ -8,7 +8,7 @@ namespace Umbraco.Core.Collections
    /// </summary>
    /// <remarks>Types in the list are, or derive from, or implement, the base type.</remarks>
    /// <typeparam name="TBase">The base type.</typeparam>
-    public class TypeList<TBase>
+    internal class TypeList<TBase>
    {
        private readonly List<Type> _list = new List<Type>();

@@ -30,4 +30,4 @@ namespace Umbraco.Core.Collections
            return _list.Contains(type);
        }
    }
-}
+}
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Compose

        private static void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
        {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContentString)))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContent.ToInvariantString())))
            {
                var relationService = Current.Services.RelationService;
                const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Compose

        private static void MediaService_Moved(IMediaService sender, MoveEventArgs<IMedia> e)
        {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMediaString)))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMedia.ToInvariantString())))
            {
                var relationService = Current.Services.RelationService;
                const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
@@ -133,11 +133,7 @@ namespace Umbraco.Core.Composing

            Configs.RegisterWith(_register);

-            IFactory factory = null;
-            // ReSharper disable once AccessToModifiedClosure -- on purpose
-            _register.Register(_ => factory, Lifetime.Singleton);
-            factory = _register.CreateFactory();
-            return factory;
+            return _register.CreateFactory();
        }

        /// <summary>
@@ -1,4 +1,4 @@
-using Umbraco.Core.Mapping;
+using AutoMapper;
 using Umbraco.Core.Models.Identity;

 namespace Umbraco.Core.Composing.CompositionExtensions
@@ -8,9 +8,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
    {
        public static Composition ComposeCoreMappingProfiles(this Composition composition)
        {
-            composition.RegisterUnique<UmbracoMapper>();
-            composition.WithCollectionBuilder<MapDefinitionCollectionBuilder>()
-                .Add<IdentityMapDefinition>();
+            composition.Register<Profile, IdentityMapperProfile>();
            return composition;
        }
    }
@@ -46,7 +46,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
            composition.RegisterUnique<IPartialViewRepository, PartialViewRepository>();
            composition.RegisterUnique<IScriptRepository, ScriptRepository>();
            composition.RegisterUnique<IStylesheetRepository, StylesheetRepository>();
-            composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();

            return composition;
        }
@@ -98,6 +98,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                : appPlugins.GetDirectories()
                    .SelectMany(x => x.GetDirectories("Lang"))
                    .SelectMany(x => x.GetFiles("*.xml", SearchOption.TopDirectoryOnly))
+                    .Where(x => Path.GetFileNameWithoutExtension(x.FullName).Length == 5)
                    .Select(x => new LocalizedTextServiceSupplementaryFileSource(x, false));

            //user defined langs that overwrite the default, these should not be used by plugin creators
@@ -105,6 +106,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                ? Enumerable.Empty<LocalizedTextServiceSupplementaryFileSource>()
                : configLangFolder
                    .GetFiles("*.user.xml", SearchOption.TopDirectoryOnly)
+                    .Where(x => Path.GetFileNameWithoutExtension(x.FullName).Length == 10)
                    .Select(x => new LocalizedTextServiceSupplementaryFileSource(x, true));

            return new LocalizedTextServiceFileSources(
@@ -4,7 +4,6 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
@@ -104,9 +103,6 @@ namespace Umbraco.Core.Composing

        #region Getters

-        public static UmbracoMapper Mapper
-            => _factory.GetInstance<UmbracoMapper>();
-
        public static IShortStringHelper ShortStringHelper
            => _shortStringHelper ?? (_shortStringHelper = _factory?.TryGetInstance<IShortStringHelper>()
                                  ?? new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(Configs.Settings())));
@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Implements an un-ordered collection builder.
-    /// </summary>
-    /// <typeparam name="TBuilder">The type of the builder.</typeparam>
-    /// <typeparam name="TCollection">The type of the collection.</typeparam>
-    /// <typeparam name="TItem">The type of the items.</typeparam>
-    /// <remarks>
-    /// <para>A set collection builder is the most basic collection builder,
-    /// where items are not ordered.</para>
-    /// </remarks>
-    public abstract class SetCollectionBuilderBase<TBuilder, TCollection, TItem> : CollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TBuilder : SetCollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : class, IBuilderCollection<TItem>
-    {
-        protected abstract TBuilder This { get; }
-
-        /// <summary>
-        /// Clears all types in the collection.
-        /// </summary>
-        /// <returns>The builder.</returns>
-        public TBuilder Clear()
-        {
-            Configure(types => types.Clear());
-            return This;
-        }
-
-        /// <summary>
-        /// Adds a type to the collection.
-        /// </summary>
-        /// <typeparam name="T">The type to append.</typeparam>
-        /// <returns>The builder.</returns>
-        public TBuilder Add<T>()
-            where T : TItem
-        {
-            Configure(types =>
-            {
-                var type = typeof(T);
-                if (types.Contains(type)) types.Remove(type);
-                types.Add(type);
-            });
-            return This;
-        }
-
-        /// <summary>
-        /// Adds a type to the collection.
-        /// </summary>
-        /// <param name="type">The type to append.</param>
-        /// <returns>The builder.</returns>
-        public TBuilder Add(Type type)
-        {
-            Configure(types =>
-            {
-                EnsureType(type, "register");
-                if (types.Contains(type)) types.Remove(type);
-                types.Add(type);
-            });
-            return This;
-        }
-
-        /// <summary>
-        ///  Adds types to the collections.
-        /// </summary>
-        /// <param name="types">The types to append.</param>
-        /// <returns>The builder.</returns>
-        public TBuilder Add(IEnumerable<Type> types)
-        {
-            Configure(list =>
-            {
-                foreach (var type in types)
-                {
-                    // would be detected by CollectionBuilderBase when registering, anyways, but let's fail fast
-                    EnsureType(type, "register");
-                    if (list.Contains(type)) list.Remove(type);
-                    list.Add(type);
-                }
-            });
-            return This;
-        }
-
-        /// <summary>
-        /// Removes a type from the collection.
-        /// </summary>
-        /// <typeparam name="T">The type to remove.</typeparam>
-        /// <returns>The builder.</returns>
-        public TBuilder Remove<T>()
-            where T : TItem
-        {
-            Configure(types =>
-            {
-                var type = typeof(T);
-                if (types.Contains(type)) types.Remove(type);
-            });
-            return This;
-        }
-
-        /// <summary>
-        /// Removes a type from the collection.
-        /// </summary>
-        /// <param name="type">The type to remove.</param>
-        /// <returns>The builder.</returns>
-        public TBuilder Remove(Type type)
-        {
-            Configure(types =>
-            {
-                EnsureType(type, "remove");
-                if (types.Contains(type)) types.Remove(type);
-            });
-            return This;
-        }
-
-        /// <summary>
-        /// Replaces a type in the collection.
-        /// </summary>
-        /// <typeparam name="TReplaced">The type to replace.</typeparam>
-        /// <typeparam name="T">The type to insert.</typeparam>
-        /// <returns>The builder.</returns>
-        /// <remarks>Throws if the type to replace does not already belong to the collection.</remarks>
-        public TBuilder Replace<TReplaced, T>()
-            where TReplaced : TItem
-            where T : TItem
-        {
-            Configure(types =>
-            {
-                var typeReplaced = typeof(TReplaced);
-                var type = typeof(T);
-                if (typeReplaced == type) return;
-
-                var index = types.IndexOf(typeReplaced);
-                if (index < 0) throw new InvalidOperationException();
-
-                if (types.Contains(type)) types.Remove(type);
-                index = types.IndexOf(typeReplaced); // in case removing type changed index
-                types.Insert(index, type);
-                types.Remove(typeReplaced);
-            });
-            return This;
-        }
-
-        /// <summary>
-        /// Replaces a type in the collection.
-        /// </summary>
-        /// <param name="typeReplaced">The type to replace.</param>
-        /// <param name="type">The type to insert.</param>
-        /// <returns>The builder.</returns>
-        /// <remarks>Throws if the type to replace does not already belong to the collection.</remarks>
-        public TBuilder Replace(Type typeReplaced, Type type)
-        {
-            Configure(types =>
-            {
-                EnsureType(typeReplaced, "find");
-                EnsureType(type, "register");
-
-                if (typeReplaced == type) return;
-
-                var index = types.IndexOf(typeReplaced);
-                if (index < 0) throw new InvalidOperationException();
-
-                if (types.Contains(type)) types.Remove(type);
-                index = types.IndexOf(typeReplaced); // in case removing type changed index
-                types.Insert(index, type);
-                types.Remove(typeReplaced);
-            });
-            return This;
-        }
-    }
-}
@@ -6,50 +6,30 @@ namespace Umbraco.Core.Composing
    /// <summary>
    /// Provides a base class for collections of types.
    /// </summary>
-    public abstract class TypeCollectionBuilderBase<TBuilder, TCollection, TConstraint> : ICollectionBuilder<TCollection, Type>
-        where TBuilder : TypeCollectionBuilderBase<TBuilder, TCollection, TConstraint>
+    public abstract class TypeCollectionBuilderBase<TCollection, TConstraint> : ICollectionBuilder<TCollection, Type>
        where TCollection : class, IBuilderCollection<Type>
    {
        private readonly HashSet<Type> _types = new HashSet<Type>();

-        protected abstract TBuilder This { get; }
-
-        private static Type Validate(Type type, string action)
+        private Type Validate(Type type, string action)
        {
            if (!typeof(TConstraint).IsAssignableFrom(type))
                throw new InvalidOperationException($"Cannot {action} type {type.FullName} as it does not inherit from/implement {typeof(TConstraint).FullName}.");
            return type;
        }

-        public TBuilder Add(Type type)
-        {
-            _types.Add(Validate(type, "add"));
-            return This;
-        }
+        public void Add(Type type) => _types.Add(Validate(type, "add"));

-        public TBuilder Add<T>()
-        {
-            Add(typeof(T));
-            return This;
-        }
+        public void Add<T>() => Add(typeof(T));

-        public TBuilder Add(IEnumerable<Type> types)
+        public void Add(IEnumerable<Type> types)
        {
            foreach (var type in types) Add(type);
-            return This;
        }

-        public TBuilder Remove(Type type)
-        {
-            _types.Remove(Validate(type, "remove"));
-            return This;
-        }
+        public void Remove(Type type) => _types.Remove(Validate(type, "remove"));

-        public TBuilder Remove<T>()
-        {
-            Remove(typeof(T));
-            return This;
-        }
+        public void Remove<T>() => Remove(typeof(T));

        public TCollection CreateCollection(IFactory factory)
        {
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Composing
    /// A utility class for type checking, this provides internal caching so that calls to these methods will be faster
    /// than doing a manual type check in c#
    /// </summary>
-    public static class TypeHelper
+    internal static class TypeHelper
    {
        private static readonly ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]> GetPropertiesCache
            = new ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]>();
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Composing
        /// Based on a type we'll check if it is IEnumerable{T} (or similar) and if so we'll return a List{T}, this will also deal with array types and return List{T} for those too.
        /// If it cannot be done, null is returned.
        /// </summary>
-        public static IList CreateGenericEnumerableFromObject(object obj)
+        internal static IList CreateGenericEnumerableFromObject(object obj)
        {
            var type = obj.GetType();

@@ -323,7 +323,7 @@ namespace Umbraco.Core.Composing
            return MatchType(implementation, contract, new Dictionary<string, Type>());
        }

-        public static bool MatchType(Type implementation, Type contract, IDictionary<string, Type> bindings, bool variance = true)
+        internal static bool MatchType(Type implementation, Type contract, IDictionary<string, Type> bindings, bool variance = true)
        {
            if (contract.IsGenericType)
            {
@@ -63,7 +63,7 @@ namespace Umbraco.Core.Configuration

            public void Dispose()
            {
-                _stringEnumerator.DisposeIfDisposable();
+                ObjectExtensions.DisposeIfDisposable(_stringEnumerator);
            }
        }
    }
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Net.Configuration;
 using System.Web;
 using System.Web.Configuration;
-using System.Web.Hosting;
 using System.Xml.Linq;
 using Umbraco.Core.IO;

@@ -18,15 +17,16 @@ namespace Umbraco.Core.Configuration
    /// </summary>
    public class GlobalSettings : IGlobalSettings
    {
-        private string _localTempPath;

-        // TODO these should not be static
+        #region Private static fields
+
+        
        private static string _reservedPaths;
        private static string _reservedUrls;
-
        //ensure the built on (non-changeable) reserved paths are there at all times
        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
        internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
+        #endregion

        /// <summary>
        /// Used in unit testing to reset all config items that were set with property setters (i.e. did not come from config)
@@ -131,7 +131,7 @@ namespace Umbraco.Core.Configuration
                    : "~/App_Data/umbraco.config";
            }
        }
-
+        
        /// <summary>
        /// Gets the path to umbraco's root directory (/umbraco by default).
        /// </summary>
@@ -163,7 +163,7 @@ namespace Umbraco.Core.Configuration
                SaveSetting(Constants.AppSettings.ConfigurationStatus, value);
            }
        }
-
+        
        /// <summary>
        /// Saves a setting into the configuration file.
        /// </summary>
@@ -206,7 +206,7 @@ namespace Umbraco.Core.Configuration
                ConfigurationManager.RefreshSection("appSettings");
            }
        }
-
+              
        /// <summary>
        /// Gets a value indicating whether umbraco is running in [debug mode].
        /// </summary>
@@ -250,7 +250,7 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
-
+        
        /// <summary>
        /// Returns the number of days that should take place between version checks.
        /// </summary>
@@ -269,7 +269,7 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
-
+        
        /// <inheritdoc />
        public LocalTempStorage LocalTempStorageLocation
        {
@@ -288,43 +288,25 @@ namespace Umbraco.Core.Configuration
        {
            get
            {
-                if (_localTempPath != null)
-                    return _localTempPath;
-
                switch (LocalTempStorageLocation)
                {
                    case LocalTempStorage.AspNetTemp:
-                        return _localTempPath = System.IO.Path.Combine(HttpRuntime.CodegenDir, "UmbracoData");
-
+                        return System.IO.Path.Combine(HttpRuntime.CodegenDir, "UmbracoData");
                    case LocalTempStorage.EnvironmentTemp:
-
-                        // environment temp is unique, we need a folder per site
-
-                        // use a hash
-                        // combine site name and application id
-                        //  site name is a Guid on Cloud
-                        //  application id is eg /LM/W3SVC/123456/ROOT
-                        // the combination is unique on one server
-                        // and, if a site moves from worker A to B and then back to A...
-                        //  hopefully it gets a new Guid or new application id?
-
-                        var siteName = HostingEnvironment.SiteName;
-                        var applicationId = HostingEnvironment.ApplicationID; // ie HttpRuntime.AppDomainAppId
-
-                        var hashString = siteName + "::" + applicationId;
-                        var hash = hashString.GenerateHash();
-                        var siteTemp = System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", hash);
-
-                        return _localTempPath = siteTemp;
-
+                        // include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path - assuming we cannot have SHA1 collisions on AppDomainAppId
+                        var appDomainHash = HttpRuntime.AppDomainAppId.GenerateHash();
+                        return System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", appDomainHash);
                    //case LocalTempStorage.Default:
                    //case LocalTempStorage.Unknown:
                    default:
-                        return _localTempPath = IOHelper.MapPath("~/App_Data/TEMP");
+                        return IOHelper.MapPath("~/App_Data/TEMP");
                }
            }
        }

+
        /// <summary>
        /// Gets the default UI language.
        /// </summary>
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Newtonsoft.Json.Linq;

 namespace Umbraco.Core.Configuration.Grid
 {
@@ -2,6 +2,14 @@

 namespace Umbraco.Core.Configuration
 {
+    /// <summary>
+    /// Represents an Umbraco configuration section which can be used to pass to UmbracoConfiguration.For{T}
+    /// </summary>
+    public interface IUmbracoConfigurationSection
+    {
+
+    }
+
    /// <summary>
    /// Represents an Umbraco section within the configuration file.
    /// </summary>
@@ -93,6 +93,7 @@ namespace Umbraco.Core
            /// </summary>
            public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer";

+            
            /// <summary>
            /// Debug specific web.config AppSetting keys for Umbraco
            /// </summary>
@@ -145,11 +145,11 @@

            public const string PartialViewMacros = "partialViewMacros";

-            public const string LogViewer = "logViewer";
+			public const string LogViewer = "logViewer";

            public static class Groups
            {
-                public const string Settings = "settingsGroup";
+				public const string Settings = "settingsGroup";

                public const string Templating = "templatingGroup";

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastiaan Janssen	5a07e34fb4	Bump version to 8.0.2	2019-04-26 15:15:17 +02:00
Stephan	1b5d614f5a	Fix recycle bin moves (cherry picked from commit `173df80e3d`) # Conflicts: # src/Umbraco.Core/Services/Implement/MediaService.cs	2019-04-26 15:03:09 +02:00
Sebastiaan Janssen	abb08260eb	v8: Imagepicker prevalue and grid setting/styles as infinite editor (#4971 ) (cherry picked from commit `f82dff597b`) # Conflicts: # src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js	2019-04-25 13:43:03 +02:00
Stephan	57c567c570	Fix paging error in NuCache (cherry picked from commit `5d0010a993`)	2019-04-23 14:08:19 +02:00
Stephan	424f4601ae	Merge commit 'a2a247b413' into v8/8.0	2019-04-23 13:51:29 +02:00
Shannon	6f17129364	Make DropDownFlexibleConfiguration class public to allow configuration to be set when creating a new data type	2019-04-17 15:23:35 +10:00