Testing the arrows for expanding and collapsing a tree

fixes: 156: Update nested content css/markup so it doesn't collide with the old package

CODE_OF_CONDUCT.md

@@ -1,80 +0,0 @@
-# Code of Conduct
-
-## 1. Purpose
-
-A primary goal of Umbraco CMS is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
-
-This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
-
-We invite all those who participate in Umbraco CMS to help us create safe and positive experiences for everyone.
-
-## 2. Open Source Citizenship
-
-A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
-
-Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
-
-If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
-
-## 3. Expected Behavior
-
-The following behaviors are expected and requested of all community members:
-
-*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-*   Exercise consideration and respect in your speech and actions.
-*   Attempt collaboration before conflict.
-*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
-*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
-
-## 4. Unacceptable Behavior
-
-The following behaviors are considered harassment and are unacceptable within our community:
-
-*   Violence, threats of violence or violent language directed against another person.
-*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
-*   Posting or displaying sexually explicit or violent material.
-*   Posting or threatening to post other people’s personally identifying information ("doxing").
-*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
-*   Inappropriate photography or recording.
-*   Inappropriate physical contact. You should have someone’s consent before touching them.
-*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
-*   Deliberate intimidation, stalking or following (online or in person).
-*   Advocating for, or encouraging, any of the above behavior.
-*   Sustained disruption of community events, including talks and presentations.
-
-## 5. Consequences of Unacceptable Behavior
-
-Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
-
-Anyone asked to stop unacceptable behavior is expected to comply immediately.
-
-If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
-
-## 6. Reporting Guidelines
-
-If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. Please contact Sebastiaan Janssen - [sj@umbraco.dk](mailto:sj@umbraco.dk).
-
-Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
-
-## 7. Addressing Grievances
-
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Umbraco with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
-
-## 8. Scope
-
-We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
-
-This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
-
-## 9. Contact info
-
-Sebastiaan Janssen - [sj@umbraco.dk](mailto:sj@umbraco.dk)
-
-## 10. License and attribution
-
-This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
-
-Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
-
-Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

apidocs/toc.yml

@@ -1,5 +1,5 @@
 
 - name: Umbraco.Core Documentation
-  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Core.html
+  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Core.html
 - name: Umbraco.Web Documentation
-  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Web.html
+  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Web.html

build/InstallGit.cmd

@@ -1,63 +0,0 @@
-@ECHO OFF
-SETLOCAL
-REM SETLOCAL is on, so changes to the path not persist to the actual user's path
-
-git.exe --version
-IF %ERRORLEVEL%==9009 GOTO :trydefaultpath
-REM OK, DONE
-GOTO :EOF
-
-:trydefaultpath
-PATH=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
-git.exe --version
-IF %ERRORLEVEL%==9009 GOTO :showerror
-REM OK, DONE
-GOTO :EOF
-
-:showerror
-ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd nor in C:\Program Files\Git\cmd
-SET /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
-IF %install%==y (
-	:: Create a temporary batch file to execute either after elevating to admin or as-is when the user is already admin
-	ECHO @ECHO OFF > "%temp%\ChocoInstallGit.cmd"
-	ECHO SETLOCAL >> "%temp%\ChocoInstallGit.cmd"
-	ECHO ECHO Installing Chocolatey first >> "%temp%\ChocoInstallGit.cmd"
-	ECHO @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" >> "%temp%\ChocoInstallGit.cmd"
-	ECHO SET PATH=%%PATH%%;%%ALLUSERSPROFILE%%\chocolatey\bin >> "%temp%\ChocoInstallGit.cmd"
-	ECHO choco install git -y >> "%temp%\ChocoInstallGit.cmd"
-	
-	GOTO :installgit
-) ELSE (
-	GOTO :cantcontinue
-)
-
-:cantcontinue
-ECHO Can't complete the build without Git being in the path. Please add it to be able to continue.
-GOTO :EOF
-
-:installgit
-pushd %~dp0
-    :: Running prompt elevated
-
-:: --> Check for permissions
->nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
-
-:: --> If error flag set, we do not have admin.
-IF '%errorlevel%' NEQ '0' (
-    GOTO UACPrompt
-) ELSE ( GOTO gotAdmin )
-
-:UACPrompt
-    ECHO You're not currently running this with admin privileges, we'll now try to execute the install of Git through Chocolatey after elevating to admin privileges
-    ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
-    ECHO UAC.ShellExecute "%temp%\ChocoInstallGit.cmd", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
-	
-    "%temp%\getadmin.vbs"
-    EXIT /B
-	
-:gotAdmin
-    IF EXIST "%temp%\getadmin.vbs" ( DEL "%temp%\getadmin.vbs" )
-    pushd "%CD%"
-    CD /D "%~dp0"
-	
-    CALL "%temp%\ChocoInstallGit.cmd"

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

@@ -42,7 +42,7 @@ function Build-UmbracoDocs
   #get-content .\build.tmp\belle-docs.log | %{ if ($_ -match "build") { write $_}}
   
   # change baseUrl
-  $baseUrl = "https://our.umbraco.org/apidocs/ui/"
+  $baseUrl = "https://our.umbraco.com/apidocs/ui/"
   $indexPath = "$src/Umbraco.Web.UI.Client/docs/api/index.html"
   (Get-Content $indexPath).Replace("origin + location.href.substr(origin.length).replace(rUrl, indexFile)", "'$baseUrl'") `
     | Set-Content $indexPath

build/NuSpecs/tools/Readme.txt

@@ -20,7 +20,7 @@ Publish this won't affect you.
 The following items will now be automatically included when creating a deploy package or publishing to the file 
 system: umbraco, umbraco_client, config\splashes and global.asax.
 
-Please read the release notes on our.umbraco.org:
-http://our.umbraco.org/contribute/releases
+Please read the release notes on our.umbraco.com:
+http://our.umbraco.com/contribute/releases
 
 - Umbraco

build/NuSpecs/tools/ReadmeUpgrade.txt

@@ -11,7 +11,7 @@
 *** IMPORTANT NOTICE FOR UPGRADES FROM VERSIONS BELOW 7.7.0 ***
 
 Be sure to read the version specific upgrade information before proceeding:
-https://our.umbraco.org/documentation/Getting-Started/Setup/Upgrading/version-specific#version-7-7-0
+https://our.umbraco.com/documentation/Getting-Started/Setup/Upgrading/version-specific#version-7-7-0
 
 Depending on the version you are upgrading from, you may need to make some changes to your web.config
 and you will need to be aware of the breaking changes listed there to see if these affect your installation.
@@ -33,7 +33,7 @@ Publish this won't affect you.
 The following items will now be automatically included when creating a deploy package or publishing to the file 
 system: umbraco, umbraco_client, config\splashes and global.asax.
 
-Please read the release notes on our.umbraco.org:
-http://our.umbraco.org/contribute/releases
+Please read the release notes on our.umbraco.com:
+http://our.umbraco.com/contribute/releases
 
 - Umbraco

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

@@ -1,42 +1,32 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(name)" 
-		xdt:Transform="SetAttributes(type)">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(name)" 
-		xdt:Transform="SetAttributes(type)" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(name)" 
-		xdt:Transform="SetAttributes(type)" />
-    </sectionGroup>
-  </configSections>
-  
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-		xdt:Locator="Match(factoryType)" 
-		xdt:Transform="SetAttributes(factoryType)" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-		<add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />        
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  
-  <system.web>
-      <pages
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-			xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)" 
-			xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
-      <controls>
-        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" 
-			xdt:Locator="Match(namespace)" 
-			xdt:Transform="SetAttributes(assembly)" />
-      </controls>
-    </pages>
-  </system.web>
-  
-</configuration>
+    <configSections>
+        <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)">
+            <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
+            <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
+        </sectionGroup>
+    </configSections>
+
+    <system.web.webPages.razor>
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
+        <pages pageBaseType="System.Web.Mvc.WebViewPage">
+            <namespaces>
+                <add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />
+            </namespaces>
+        </pages>
+    </system.web.webPages.razor>
+
+    <system.web>
+        <pages
+          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)"
+        xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
+            <controls>
+                <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
+            </controls>
+        </pages>
+    </system.web>
+
+</configuration>

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

@@ -1,419 +1,420 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
+    <configSections xdt:Transform="InsertIfMissing" />
+    <configSections>
+        <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
 
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
-      <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </sectionGroup>
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
-      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </sectionGroup>
-  </configSections>
+        <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
+            <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        </sectionGroup>
+        <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
+            <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </sectionGroup>
+    </configSections>
 
-  <appSettings xdt:Transform="InsertIfMissing" />
-  <appSettings>
-    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="umbracoDefaultUILanguage" value="en-US" xdt:Locator="Match(key)" xdt:Transform="SetAttributes(value)" />
-  </appSettings>
+    <appSettings xdt:Transform="InsertIfMissing" />
+    <appSettings>
+        <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+        <add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+        <add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+        <add key="umbracoDefaultUILanguage" value="en-US" xdt:Locator="Match(key)" xdt:Transform="SetAttributes(value)" />
+    </appSettings>
 
-  <umbracoConfiguration xdt:Transform="InsertIfMissing">
-    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-  </umbracoConfiguration>
+    <umbracoConfiguration xdt:Transform="InsertIfMissing">
+        <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    </umbracoConfiguration>
 
-  <FileSystemProviders xdt:Transform="Remove" />
-  <BaseRestExtensions xdt:Transform="Remove" />
+    <FileSystemProviders xdt:Transform="Remove" />
+    <BaseRestExtensions xdt:Transform="Remove" />
 
-  <system.data xdt:Transform="InsertIfMissing">
-    <DbProviderFactories xdt:Transform="InsertIfMissing">
-      <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
-      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
-    </DbProviderFactories>
-  </system.data>
-  <clientDependency xdt:Transform="RemoveAttributes(version)" />
+    <system.data xdt:Transform="InsertIfMissing">
+        <DbProviderFactories xdt:Transform="InsertIfMissing">
+            <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+            <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
+            <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+            <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
+            <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+            <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
+        </DbProviderFactories>
+    </system.data>
 
-  <system.web xdt:Transform="InsertIfMissing" />
-  <system.web>
-    <siteMap xdt:Transform="Remove" />
-    <siteMap xdt:Transform="InsertIfMissing">
-      <providers xdt:Transform="InsertIfMissing">
-        <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
-      </providers>
-    </siteMap>
-    <httpRuntime xdt:Transform="InsertIfMissing" />
-    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <clientDependency xdt:Transform="RemoveAttributes(version)" />
 
-    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
-    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
-    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
-    <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
-    <compilation xdt:Transform="InsertIfMissing" />
-    <compilation>
-      <assemblies xdt:Transform="InsertIfMissing" />
-      <assemblies>
-        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel.Annotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel.EventBasedAsync, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Contracts, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Debug, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Tools, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Dynamic.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Globalization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Expressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Queryable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.NetworkInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.Requests, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ObjectModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit.ILGeneration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit.Lightweight, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Duplex, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.Encoding.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.RegularExpressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-      </assemblies>
-    </compilation>
+    <system.web xdt:Transform="InsertIfMissing" />
+    <system.web>
+        <siteMap xdt:Transform="Remove" />
+        <siteMap xdt:Transform="InsertIfMissing">
+            <providers xdt:Transform="InsertIfMissing">
+                <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
+            </providers>
+        </siteMap>
+        <httpRuntime xdt:Transform="InsertIfMissing" />
+        <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
+        <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
 
-    <compilation>
-      <assemblies>
-        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-      </assemblies>
-    </compilation>
-    <compilation>
-      <assemblies>
-        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-      </assemblies>
-    </compilation>
+        <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
+        <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
+        <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
+        <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
+        <compilation xdt:Transform="InsertIfMissing" />
+        <compilation>
+            <assemblies xdt:Transform="InsertIfMissing" />
+            <assemblies>
+                <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ComponentModel.Annotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ComponentModel.EventBasedAsync, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Contracts, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Debug, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Tools, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Dynamic.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Globalization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq.Expressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq.Queryable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Net.NetworkInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Net.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Net.Requests, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ObjectModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Emit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Emit.ILGeneration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Emit.Lightweight, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Serialization.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Serialization.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Duplex, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Text.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Text.Encoding.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Text.RegularExpressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+            </assemblies>
+        </compilation>
 
-    <xhtmlConformance xdt:Transform="Remove" />
+        <compilation>
+            <assemblies>
+                <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+            </assemblies>
+        </compilation>
+        <compilation>
+            <assemblies>
+                <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+            </assemblies>
+        </compilation>
 
-    <httpModules xdt:Transform="InsertIfMissing" />
-    <httpModules>
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </httpModules>
+        <xhtmlConformance xdt:Transform="Remove" />
 
-    <httpHandlers xdt:Transform="InsertIfMissing" />
-    <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
-    </httpHandlers>
-  </system.web>
+        <httpModules xdt:Transform="InsertIfMissing" />
+        <httpModules>
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </httpModules>
 
-  <system.webServer xdt:Transform="InsertIfMissing" />
-  <system.webServer>
-    <modules xdt:Transform="InsertIfMissing" />
-    <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
-      <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <!-- Inserts it as the first element. Also see http://stackoverflow.com/a/19041487/5018 -->
-      <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Insert" />
+        <httpHandlers xdt:Transform="InsertIfMissing" />
+        <httpHandlers>
+            <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
+        </httpHandlers>
+    </system.web>
 
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <!-- Note, we're removing the one that starts with a space here, don't correct it -->
-      <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </modules>
+    <system.webServer xdt:Transform="InsertIfMissing" />
+    <system.webServer>
+        <modules xdt:Transform="InsertIfMissing" />
+        <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
+            <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <!-- Inserts it as the first element. Also see http://stackoverflow.com/a/19041487/5018 -->
+            <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Insert" />
 
-    <staticContent xdt:Transform="InsertIfMissing" />
-    <staticContent>
-      <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-    </staticContent>
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <!-- Note, we're removing the one that starts with a space here, don't correct it -->
+            <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </modules>
 
-    <handlers>
-      <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </handlers>
+        <staticContent xdt:Transform="InsertIfMissing" />
+        <staticContent>
+            <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+        </staticContent>
 
-    <security xdt:Transform="InsertIfMissing">
-      <requestFiltering xdt:Transform="InsertIfMissing">
-        <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
-      </requestFiltering>
-    </security>
+        <handlers>
+            <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        </handlers>
 
-  </system.webServer>
+        <security xdt:Transform="InsertIfMissing">
+            <requestFiltering xdt:Transform="InsertIfMissing">
+                <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
+            </requestFiltering>
+        </security>
 
-  <runtime xdt:Transform="InsertIfMissing" />
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
-  </runtime>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
-    </assemblyBinding>
-  </runtime>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
-      </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-
-  <system.web.webPages.razor xdt:Transform="Remove" />
-
-  <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="umbraco" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
     </system.webServer>
-  </location>
 
-  <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="App_Plugins" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
+    <runtime xdt:Transform="InsertIfMissing" />
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
+    </runtime>
 
-</configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
+        </assemblyBinding>
+    </runtime>
+
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+
+    <system.web.webPages.razor xdt:Transform="Remove" />
+
+    <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="umbraco" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing">
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
+
+    <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="App_Plugins" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing">
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
+
+</configuration>

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

@@ -46,7 +46,7 @@
   <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" 
+  <add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   <add alias="dictionary" application="settings"

build/RevertToCleanInstall.bat

@@ -1,127 +0,0 @@
-@ECHO OFF
-
-:choice
-set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal?
-if /I "%c%" EQU "C" goto :prompt
-if /I "%c%" EQU "Y" goto :auto
-if /I "%c%" EQU "N" goto :exit
-goto :choice
-
-
-:prompt
-
-echo Current folder: %CD%
-
-echo Removing sqlce database
-del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf
-
-echo Resetting installedPackages.config
-echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
-
-echo Removing plugin cache files
-del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
-
-echo Removing cache files and examine index
-del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
-
-echo Removing log files
-del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
-
-echo Removing packages
-del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
-
-echo Removing previews
-del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
-
-echo Removing app code files (typically added by starterkits)
-del ..\src\Umbraco.Web.UI\App_Code\*.*
-
-echo Removing xslt files
-del ..\src\Umbraco.Web.UI\xslt\*.*
-
-echo Removing user control files
-del ..\src\Umbraco.Web.UI\UserControls\*.*
-
-echo Removing masterpage files
-del ..\src\Umbraco.Web.UI\masterpages\*.*
-
-echo Removing razor files
-del ..\src\Umbraco.Web.UI\macroScripts\*.*
-
-echo Removing media files
-del ..\src\Umbraco.Web.UI\media\*.*
-
-echo Removing script files
-del ..\src\Umbraco.Web.UI\scripts\*.*
-
-echo Removing css files
-del ..\src\Umbraco.Web.UI\css\*.*
-
-echo "Umbraco install reverted to clean install"
-pause 
-exit
-
-
-
-:auto
-
-echo Current folder: %CD%
-
-echo Removing sqlce database
-del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf
-
-echo Resetting installedPackages.config
-echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
-
-echo Removing plugin cache files
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
-
-echo Removing cache files and examine index
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
-
-echo Removing log files
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
-
-echo Removing packages
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
-
-echo Removing previews
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
-
-echo Removing app code files (typically added by starterkits)
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
-
-echo Removing xslt files
-FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
-
-echo Removing masterpage files
-FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
-
-echo Removing user control files
-FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
-
-echo Removing view files
-ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
-ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
-
-echo Removing razor files
-FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
-
-echo Removing media files
-FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
-
-echo Removing script files
-FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
-
-echo Removing css files
-FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
-
-echo "Umbraco install reverted to clean install"
-pause 
-exit
-
-
-
-:exit
-exit

build/RevertToEmptyInstall.bat

@@ -1,163 +0,0 @@
-@ECHO OFF
-
-:choice
-set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal?
-if /I "%c%" EQU "C" goto :prompt
-if /I "%c%" EQU "Y" goto :auto
-if /I "%c%" EQU "N" goto :exit
-goto :choice
-
-
-:prompt
-
-echo Current folder: %CD%
-
-echo Regenerating SQL CE database
-SET buildfolder=%CD%
-CD ..\tools\RegenerateUmbracoSQLCEDatabase\
-RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
-CD %buildfolder%
-
-echo Removing bin files
-del ..\src\Umbraco.Web.UI\bin\*.*
-
-echo Building solution
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
-
-echo Resetting installedPackages.config
-echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
-
-echo Removing plugin cache files
-del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
-
-echo Removing cache files and examine index
-del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
-
-echo Removing log files
-del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
-
-echo Removing packages
-del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
-
-echo Removing previews
-del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
-
-echo Removing app code files (typically added by starterkits)
-del ..\src\Umbraco.Web.UI\App_Code\*.*
-
-echo Removing xslt files
-del ..\src\Umbraco.Web.UI\xslt\*.*
-
-echo Removing user control files
-del ..\src\Umbraco.Web.UI\UserControls\*.*
-
-echo Removing masterpage files
-del ..\src\Umbraco.Web.UI\masterpages\*.*
-
-echo Removing razor files
-del ..\src\Umbraco.Web.UI\macroScripts\*.*
-
-echo Removing media files
-del ..\src\Umbraco.Web.UI\media\*.*
-
-echo Removing script files
-del ..\src\Umbraco.Web.UI\scripts\*.*
-
-echo Removing css files
-del ..\src\Umbraco.Web.UI\css\*.*
-
-echo "Umbraco install reverted to clean install"
-pause 
-exit
-
-
-
-:auto
-
-echo Current folder: %CD%
-
-echo Regenerating SQL CE database
-SET buildfolder=%CD%
-CD ..\tools\RegenerateUmbracoSQLCEDatabase\
-RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
-CD %buildfolder%
-
-echo Removing bin files
- FOR %%A IN (..\src\Umbraco.Web.UI\bin\*.*) DO DEL %%A
-
-echo Building solution
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
-
-echo Resetting installedPackages.config
-echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
-
-echo Removing plugin cache files
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
-
-echo Removing cache files and examine index
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
-
-echo Removing log files
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
-
-echo Removing packages
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
-
-echo Removing previews
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
-
-echo Removing app code files (typically added by starterkits)
-FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
-
-echo Removing xslt files
-FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
-
-echo Removing masterpage files
-FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
-
-echo Removing user control files
-FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
-
-echo Removing view files
-ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
-ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
-
-echo Removing razor files
-FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
-
-echo Removing media files
-FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
-
-echo Removing script files
-FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
-
-echo Removing css files
-FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
-
-echo Removing Courier files
-del ..\src\Umbraco.Web.UI\config\courier.config
-del ..\src\Umbraco.Web.UI\umbraco\images\tray\courier.jpg
-rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\courier\" /S /Q
-
-echo Removing Contour files
-del ..\src\Umbraco.Web.UI\umbraco\images\tray\contour.png
-FOR %%A IN (..\src\Umbraco.Web.UI\umbraco\images\umbraco\icon_*.*) DO DEL %%A
-rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\umbracoContour\" /S /Q
-del ..\src\Umbraco.Web.UI\umbraco\xslt\templates\UmbracoContour*.* /S /Q
-rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
-
-echo Start with a clean web.config
-copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
-
-echo Start with a clean web.config
-copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
-
-echo "Umbraco install reverted to clean install"
-pause 
-exit
-
-
-
-:exit
-exit

docs/CODE_OF_CONDUCT.md

@@ -0,0 +1,32 @@
+# Code Of Conduct
+ 
+Our informal code of conduct concentrates on the values we, as Umbraco HQ, have set for ourselves and for our community. We expect you to be a friend. 
+Instead of listing out all the exact "do's" and "don't's" we want to challenge you to think about our values and apply them:
+
+If there's a need to talk to Umbraco HQ about anything, please make sure to send a mail to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+
+## Be a Friend
+
+We welcome and thank you for registering at Our Umbraco. Find below the values that govern Umbraco and which you accept by using Our Umbraco.
+
+## Trust
+
+Assume positive intent and try to understand before being understood.
+
+## Respect
+
+Treat others as you would like to be treated.
+
+This also goes for treating the HQ with respect. For example: don’t promote products on [our.umbraco.org](https://our.umbraco.org) that directly compete with our commercial offerings which enables us to work for a sustainable Umbraco.
+
+## Open
+
+Be honest and straightforward. Tell it as it is. Share thoughts and knowledge and engage in collaboration.
+
+## Hungry
+
+Don't rest on your laurels and never accept the status quo. Contribute and give back to fellow Umbracians.
+
+## Friendly
+
+Don’t judge upon mistakes made but rather upon the speed and quality with which mistakes are corrected. Friendly posts and contributions generate smiles and builds long lasting relationships.

docs/CONTRIBUTING.md

@@ -0,0 +1,99 @@
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/docs/CONTRIBUTING.md) to go to the v8 branch_
+# Contributing to Umbraco CMS
+
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍
+
+The following is a set of guidelines for contributing to Umbraco CMS.
+
+These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
+
+## Contributing code changes
+
+This document gives you a quick overview on how to get started, we will link to in-depth documentation throughout if you need some more background info.
+
+
+## Guidelines for contributions we welcome
+
+Not all changes are wanted so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valueable time.
+
+We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md), make sure to talk to us before making large changes.
+
+Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
+
+## How do I begin?
+
+Great question! The short version goes like this:
+
+  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
+
+  ![Fork the repository](img/forkrepository.png)
+
+  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
+  
+  ![Clone the fork](img/clonefork.png)
+
+  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
+  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
+  * **Commit** - done? Yay! 🎉 It is recommended to create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-U4-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `U4-12345`
+  * **Push** - great, now you can push the changes up to your fork on GitHub
+  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
+
+  ![Create a pull request](img/createpullrequest.png)
+
+### Further reading
+
+At this point you might want to [read on about contributing in depth](CONTRIBUTING_DETAILED.md). 
+
+### Reviews
+
+You've sent us your first contribution, congratulations! Now what?
+
+The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request you to make some additional changes.
+
+We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
+
+- Your PR will get a reply within 48 hours
+- An in-depth reply will be added within at most 2 weeks
+- The PR will be either merged or rejected within at most 4 weeks
+- Sometimes it is difficult to meet these timelines and we'll talk to you
+
+## Styleguides
+
+To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
+
+That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
+
+## The PR team
+
+The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
+
+- [Anders Bjerner](https://github.com/abjerner)
+- [Dave Woestenborghs](https://github.com/dawoe)
+- [Emma Burstow](https://github.com/emmaburstow)
+- [Kyle Weems](https://github.com/cssquirrel)
+- [Poornima Nayar](https://github.com/poornimanayar)
+
+These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay. 
+
+## Questions?
+
+You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:
+
+- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
+- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.org/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
+- We're also [active in the Gitter chatroom](https://gitter.im/umbraco/Umbraco-CMS)
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+
+
+## Contributing to Umbraco, in depth
+
+There are other ways to contribute, and there's a few more things that you might be wondering about. We will answer the [most common questions and ways to contribute in our detailed documentation](CONTRIBUTING_DETAILED.md).
+
+## Credits
+
+This contribution guide borrows heavily from the excellent work on [the Atom contribution guide](https://github.com/atom/atom/blob/master/CONTRIBUTING.md). A big [#h5yr](http://h5yr.com/) to them!

docs/CONTRIBUTING_DETAILED.md

@@ -1,17 +1,11 @@
-# Contributing to Umbraco CMS
+# Contributing in detail
 
-👍🎉 First off, thanks for taking the time to contribute! 🎉👍
+There's more than one way to contribute to Umbraco, there's some more suggestions below.
 
-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 💖. 
+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
 
-[Code of Conduct](#code-of-conduct)
-
 [How Can I Contribute?](#how-can-i-contribute)
   * [Reporting Bugs](#reporting-bugs)
   * [Suggesting Enhancements](#suggesting-enhancements)
@@ -26,16 +20,6 @@ Remember, we're a friendly bunch and are happy with whatever contribution you mi
   * [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 do I even begin?](#how-do-i-even-begin)
-
-[Problems?](#problems)
-
-[Credits](#credits)
-
-## 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).
-
 ## How Can I Contribute?
 
 ### Reporting Bugs
@@ -52,7 +36,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r
   * **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 question 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:
+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.
@@ -74,7 +58,7 @@ Include details about your configuration and environment:
 
 ### Suggesting Enhancements
 
-This section guides you through submitting an enhancement suggestion for Atom, 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 🔎.
+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.
 
@@ -100,6 +84,10 @@ The most successful pull requests usually look a like this:
 
 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.
@@ -135,7 +123,7 @@ To find the general areas of something you're looking to fix or improve, have a
 
 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?](tools/contributing/defaultbranch.png)
+![What branch do you want me to target?](img/defaultbranch.png)
 
 ### Building Umbraco from source code
 
@@ -143,7 +131,7 @@ The easiest way to get started is to run `build.bat` which will build both the b
 
 Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 ([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](tools/contributing/gulpbuild.png)
+![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.
 
@@ -168,40 +156,4 @@ 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))
-
-## How do I even 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](tools/contributing/forkrepository.png)
-
-  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
-  
-  ![Clone the fork](tools/contributing/clonefork.png)
-
-  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](#building-umbraco-from-source-code)
-  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will happily give feedback
-  * **Commit** - done? Yay! 🎉 It is recommended to create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-U4-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `U4-12345`
-  * **Push** - great, now you can push the changes up to your fork on GitHub
-  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
-
-  ![Create a pull request](tools/contributing/createpullrequest.png)
-
-The Umbraco development 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.
-
-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!
-
-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 at this and we'll be nice about it, thanking you for spending your valueable time.
-
-Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you send us a PR, your PR will not be closed as unwanted.
-
-## Problems?
-
-Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.org/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely!
-
-## 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!
+(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))

docs/CONTRIBUTION_GUIDELINES.md

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

docs/README.md

@@ -1,47 +1,49 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
-
-Umbraco CMS
-===========
-The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
-
-[![ScreenShot](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](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
-
-## Umbraco - The Friendly CMS
-
-For the first time on the Microsoft platform, there is a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. 
-
-Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
-
-Used by more than 443,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 220,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
-
-To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
-
-## Why Open Source?
-As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
-
-## Trying out Umbraco CMS
-
-[Umbraco Cloud](https://umbraco.com) is the easiest and fastest way to use Umbraco yet with full support for all your custom .NET code and intergrations. You're up and running in less than a minute and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14 day trial, no credit card needed.
-
-If you want to DIY you can [download Umbraco](https://our.umbraco.org/download) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host yourself and handling deployments and upgrades is all down to you.
-
-## Community
-
-Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.org). Our Umbraco feature forums for questions and answers, documentation, downloadable plugins for Umbraco and a rich collection of community resources.
-
-## Contribute to Umbraco
-
-Umbraco is contribution focused and community driven. If you want to contribute back to Umbraco please check out our [guide to contributing](CONTRIBUTING.md).
-
-## Found a bug?
-
-Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
-
-To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).
+[![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
+
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/tree/temp8) to go to the v8 branch_
+
+Umbraco CMS
+===========
+The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
+
+[![ScreenShot](img/vimeo.png)](https://vimeo.com/172382998/)
+
+## Umbraco CMS
+Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
+
+## Watch an introduction video
+
+[![ScreenShot](https://shop.umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
+
+## Umbraco - The Friendly CMS
+
+For the first time on the Microsoft platform, there is a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box.
+
+Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
+
+Used by more than 443,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 220,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay.
+
+To view more examples, please visit [https://umbraco.com/case-studies-testimonials/](https://umbraco.com/case-studies-testimonials/)
+
+## Why Open Source?
+As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
+
+## Trying out Umbraco CMS
+
+[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet with full support for all your custom .NET code and intergrations. You're up and running in less than a minute and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14 day trial, no credit card needed.
+
+If you want to DIY you can [download Umbraco](https://our.umbraco.com/download) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host yourself and handling deployments and upgrades is all down to you.
+
+## Community
+
+Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com). Our Umbraco feature forums for questions and answers, documentation, downloadable plugins for Umbraco and a rich collection of community resources.
+
+## Contribute to Umbraco
+
+Umbraco is contribution focused and community driven. If you want to contribute back to Umbraco please check out our [guide to contributing](CONTRIBUTING.md).
+
+## Found a bug?
+
+Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/docs/CONTRIBUTING.md).
+
+To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).

docs/REVIEW_PROCESS.md

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

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.11.0")]
-[assembly: AssemblyInformationalVersion("7.11.0")]
+[assembly: AssemblyFileVersion("7.12.1")]
+[assembly: AssemblyInformationalVersion("7.12.1")]

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -32,10 +32,9 @@ namespace Umbraco.Core.Configuration
 
         #region Private static fields
 
-        private static Version _version;
         private static readonly object Locker = new object();
         //make this volatile so that we can ensure thread safety with a double check lock
-    	private static volatile string _reservedUrlsCache;
+        private static volatile string _reservedUrlsCache;
         private static string _reservedPathsCache;
         private static HashSet<string> _reservedList = new HashSet<string>();
         private static string _reservedPaths;
@@ -190,7 +189,7 @@ namespace Umbraco.Core.Configuration
         /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
         /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
         /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
-		/// 
+        /// 
         /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
         /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
         /// </remarks>
@@ -205,7 +204,7 @@ namespace Umbraco.Core.Configuration
                 var path = Path;
                 if (path.StartsWith(SystemDirectories.Root)) // beware of TrimStart, see U4-2518
                     path = path.Substring(SystemDirectories.Root.Length);
-			    return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+                return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
             }
         }
 
@@ -312,7 +311,7 @@ namespace Umbraco.Core.Configuration
                 SetMembershipProvidersLegacyEncoding(UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider, value);
             }
         }
-		
+        
         /// <summary>
         /// Saves a setting into the configuration file.
         /// </summary>
@@ -503,7 +502,7 @@ namespace Umbraco.Core.Configuration
         }
 
         /// <summary>
-        /// Returns a string value to determine if umbraco should skip version-checking.
+        /// Returns the number of days that should take place between version checks.
         /// </summary>
         /// <value>The version check period in days (0 = never).</value>
         public static int VersionCheckPeriod

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -112,7 +112,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get
             {
-                return GetOptionalTextElement("PreviewBadge", @"<a id=""umbracoPreviewBadge"" style=""position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>");                
+                return GetOptionalTextElement("PreviewBadge", @"<a id=""umbracoPreviewBadge"" style=""z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>");                
             }
         }
 
@@ -360,4 +360,4 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         }
         
     }
-}
+}

src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     [Obsolete("This is no longer used and will be removed in future versions")]
     internal class HelpElement : ConfigurationElement, IHelpSection
     {
-        [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")]
+        [ConfigurationProperty("defaultUrl", DefaultValue = "https://our.umbraco.com/wiki/umbraco-help/{0}/{1}")]
         public string DefaultUrl
         {
             get { return (string) base["defaultUrl"]; }

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.11.0");
+        private static readonly Version Version = new Version("7.12.1");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/Constants-Applications.cs

@@ -92,7 +92,7 @@
 			/// alias for the dictionary tree.
 			/// </summary>
 			public const string Dictionary = "dictionary";
-
+            
             public const string Stylesheets = "stylesheets";
 
             /// <summary>
@@ -135,4 +135,4 @@
     }
 
    
-}
+}

src/Umbraco.Core/Constants-Conventions.cs

@@ -341,6 +341,16 @@ namespace Umbraco.Core
                 /// ContentType alias for default relation type "Relate Parent Document On Delete".
                 /// </summary>
                 public const string RelateParentDocumentOnDeleteAlias = "relateParentDocumentOnDelete";
+
+                /// <summary>
+                /// ContentType name for default relation type "Relate Parent Media Folder On Delete".
+                /// </summary>
+                public const string RelateParentMediaFolderOnDeleteName = "Relate Parent Media Folder On Delete";
+
+                /// <summary>
+                /// ContentType alias for default relation type "Relate Parent Media Folder On Delete".
+                /// </summary>
+                public const string RelateParentMediaFolderOnDeleteAlias = "relateParentMediaFolderOnDelete";
             }
 		}
 	}

src/Umbraco.Core/Constants-PackageRepository.cs

@@ -7,7 +7,7 @@
         /// </summary>
         public static class PackageRepository
         {
-            public const string RestApiBaseUrl = "https://our.umbraco.org/webapi/packages/v1";
+            public const string RestApiBaseUrl = "https://our.umbraco.com/webapi/packages/v1";
             public const string DefaultRepositoryName = "Umbraco package Repository";
             public const string DefaultRepositoryId = "65194810-1f85-11dd-bd0b-0800200c9a66";
         }

src/Umbraco.Core/DatabaseContext.cs

@@ -279,16 +279,34 @@ namespace Umbraco.Core
         {
             get
             {
-                string dbtype = Database.Connection == null ? ProviderName : Database.Connection.GetType().Name;
+                if (Database.Connection == null)
+                {
+                    string dbtype = ProviderName;
 
-                if (dbtype.StartsWith("MySql")) return DatabaseProviders.MySql;
-                if (dbtype.StartsWith("SqlCe") || dbtype.Contains("SqlServerCe")) return DatabaseProviders.SqlServerCE;
-                if (dbtype.StartsWith("Npgsql")) return DatabaseProviders.PostgreSQL;
-                if (dbtype.StartsWith("Oracle") || dbtype.Contains("OracleClient")) return DatabaseProviders.Oracle;
-                if (dbtype.StartsWith("SQLite")) return DatabaseProviders.SQLite;
-                if (dbtype.Contains("Azure")) return DatabaseProviders.SqlAzure;
+                    if (dbtype.StartsWith("MySql")) return DatabaseProviders.MySql;
+                    if (dbtype.StartsWith("SqlCe") || dbtype.Contains("SqlServerCe")) return DatabaseProviders.SqlServerCE;
+                    if (dbtype.StartsWith("Npgsql")) return DatabaseProviders.PostgreSQL;
+                    if (dbtype.StartsWith("Oracle") || dbtype.Contains("OracleClient")) return DatabaseProviders.Oracle;
+                    if (dbtype.StartsWith("SQLite")) return DatabaseProviders.SQLite;
+                    if (dbtype.Contains("Azure")) return DatabaseProviders.SqlAzure;
 
-                return DatabaseProviders.SqlServer;
+                    return DatabaseProviders.SqlServer;
+                }
+                else
+                {
+                    Database.DBType dbType = Database.DatabaseType;
+                    
+                    switch (dbType)
+                    {
+                        case Persistence.Database.DBType.SqlServer: return DatabaseProviders.SqlServer;
+                        case Persistence.Database.DBType.SqlServerCE: return DatabaseProviders.SqlServerCE;
+                        case Persistence.Database.DBType.MySql: return DatabaseProviders.MySql;
+                        case Persistence.Database.DBType.PostgreSQL: return DatabaseProviders.PostgreSQL;
+                        case Persistence.Database.DBType.Oracle: return DatabaseProviders.Oracle;
+                        case Persistence.Database.DBType.SQLite: return DatabaseProviders.SQLite;
+                        default: return (ProviderName.Contains("Azure"))? DatabaseProviders.SqlAzure : DatabaseProviders.SqlServer;
+                    } 
+                }
             }
         }
 

src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs

@@ -3,10 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
-using System.Linq;
+using umbraco.interfaces;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Macros
 {

src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs

@@ -120,13 +120,22 @@ namespace Umbraco.Core.Models.Identity
             set { _tracker.SetPropertyValueAndDetectChanges(value, ref _userName, Ps.Value.UserNameSelector); }
         }
 
+        /// <summary>
+        /// LastPasswordChangeDateUtc so we can track changes to it
+        /// </summary>
+        public override DateTime? LastPasswordChangeDateUtc
+        {
+            get { return _lastPasswordChangeDateUtc; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _lastPasswordChangeDateUtc, Ps.Value.LastPasswordChangeDateUtcSelector); }
+        }
+
         /// <summary>
         /// Override LastLoginDateUtc so we can track changes to it
         /// </summary>
         public override DateTime? LastLoginDateUtc
         {
             get { return _lastLoginDateUtc; }
-            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _lastLoginDateUtc, Ps.Value.LastLoginDateUtcSelector); }            
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _lastLoginDateUtc, Ps.Value.LastLoginDateUtcSelector); }
         }
 
         /// <summary>
@@ -392,6 +401,7 @@ namespace Umbraco.Core.Models.Identity
             public readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Email);
             public readonly PropertyInfo UserNameSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.UserName);
             public readonly PropertyInfo LastLoginDateUtcSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, DateTime?>(x => x.LastLoginDateUtc);
+            public readonly PropertyInfo LastPasswordChangeDateUtcSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, DateTime?>(x => x.LastPasswordChangeDateUtc);
             public readonly PropertyInfo EmailConfirmedSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, bool>(x => x.EmailConfirmed);
             public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Name);
             public readonly PropertyInfo AccessFailedCountSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, int>(x => x.AccessFailedCount);
@@ -419,6 +429,7 @@ namespace Umbraco.Core.Models.Identity
         private int _id;
         private bool _hasIdentity = false;
         private DateTime? _lastLoginDateUtc;
+        private DateTime? _lastPasswordChangeDateUtc;
         private bool _emailConfirmed;
         private string _name;
         private int _accessFailedCount;
@@ -449,4 +460,4 @@ namespace Umbraco.Core.Models.Identity
 
 
     }
-}
+}

src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs

@@ -19,6 +19,7 @@ namespace Umbraco.Core.Models.Identity
                 })
                 .ConstructUsing(user => new BackOfficeIdentityUser(user.Id, user.Groups))
                 .ForMember(user => user.LastLoginDateUtc, expression => expression.MapFrom(user => user.LastLoginDate.ToUniversalTime()))
+                .ForMember(user => user.LastPasswordChangeDateUtc, expression => expression.MapFrom(user => user.LastPasswordChangeDate.ToUniversalTime()))
                 .ForMember(user => user.Email, expression => expression.MapFrom(user => user.Email))
                 .ForMember(user => user.EmailConfirmed, expression => expression.MapFrom(user => user.EmailConfirmedDate.HasValue))
                 .ForMember(user => user.Id, expression => expression.MapFrom(user => user.Id))

src/Umbraco.Core/Models/Identity/IdentityUser.cs

@@ -83,6 +83,12 @@ namespace Umbraco.Core.Models.Identity
         /// </summary>
         public virtual DateTime? LockoutEndDateUtc { get; set; }
 
+        /// <summary>
+        /// DateTime in UTC when the password was last changed.
+        /// 
+        /// </summary>
+        public virtual DateTime? LastPasswordChangeDateUtc { get; set; }
+
         /// <summary>
         /// Is lockout enabled for this user
         /// 
@@ -127,4 +133,4 @@ namespace Umbraco.Core.Models.Identity
 
         
     }
-}
+}

src/Umbraco.Core/Models/Rdbms/ConsentDto.cs

@@ -39,6 +39,7 @@ namespace Umbraco.Core.Models.Rdbms
         public int State { get; set; }
 
         [Column("comment")]
+        [NullSetting(NullSetting = NullSettings.Null)]
         public string Comment { get; set; }
     }
 }

src/Umbraco.Core/Models/Rdbms/LanguageDto.cs

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("languageISOCode")]
         [Index(IndexTypes.UniqueNonClustered)]
         [NullSetting(NullSetting = NullSettings.Null)]
-        [Length(10)]
+        [Length(14)]
         public string IsoCode { get; set; }
 
         [Column("languageCultureName")]
@@ -23,4 +23,4 @@ namespace Umbraco.Core.Models.Rdbms
         [Length(100)]
         public string CultureName { get; set; }
     }
-}
+}

src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models.Rdbms
     [ExplicitColumns]
     internal class RelationTypeDto
     {
-        public const int NodeIdSeed = 3;
+        public const int NodeIdSeed = 4;
 
         [Column("id")]
         [PrimaryKeyColumn(IdentitySeed = NodeIdSeed)]

src/Umbraco.Core/Packaging/Models/PackageAction.cs

@@ -27,7 +27,7 @@ namespace Umbraco.Core.Packaging.Models
             set { _runAt = value; }
         }
 
-        public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions)
+        public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (https://our.umbraco.com/wiki/reference/packaging/package-actions)
         {
             get { return _undo ?? true; }
             set { _undo = value; }

src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs

@@ -31,6 +31,13 @@ namespace Umbraco.Core.Persistence
             return _syntaxProvider.DoesTableExist(_db, tableName);
         }
 
+        public bool TableExist<T>()
+        {
+            var poco = Database.PocoData.ForType(typeof(T));
+            var tableName = poco.TableInfo.TableName;
+            return TableExist(tableName);
+        }
+
         internal void UninstallDatabaseSchema()
         {
             var creation = new DatabaseSchemaCreation(_db, _logger, _syntaxProvider);
@@ -194,4 +201,4 @@ namespace Umbraco.Core.Persistence
             _db.Execute(sql);
         }
     }
-}
+}

src/Umbraco.Core/Persistence/LocalDb.cs

@@ -142,7 +142,7 @@ namespace Umbraco.Core.Persistence
         {
             EnsureAvailable();
             var instances = GetInstances();
-            return instances != null && instances.Contains(instanceName);
+            return instances != null && instances.Contains(instanceName, StringComparer.OrdinalIgnoreCase);
         }
 
         /// <summary>

src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs

@@ -122,7 +122,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = new Guid("0cc0eba1-9960-42c9-bf9b-60e150b429ae"), Text = "Textstring", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = new Guid("ca90c950-0aff-4e72-b976-a30b1ac57dad"), Text = "Richtext editor", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = new Guid("2e6d3631-066e-44b8-aec4-96f09099b2b5"), Text = "Numeric", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "True/false", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
+            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "Checkbox", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = new Guid("fbaf13a8-4036-41f2-93a3-974f678c312a"), Text = "Checkbox list", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -42, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-42", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = new Guid("5046194e-4237-453c-a547-15db3a07c4e1"), Text = "Date Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
@@ -146,11 +146,6 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1048, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1048", SortOrder = 2, UniqueId = new Guid("135D60E0-64D9-49ED-AB08-893C9BA44AE5"), Text = "Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1049, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1049", SortOrder = 2, UniqueId = new Guid("9DBBCBBB-2327-434A-B355-AF1B84E5010A"), Text = "Multiple Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
             _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Related Links", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-
-            //TODO: We're not creating these for 7.0
-            //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1039, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1039", SortOrder = 2, UniqueId = new Guid("06f349a9-c949-4b6a-8660-59c10451af42"), Text = "Ultimate Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1038, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1038", SortOrder = 2, UniqueId = new Guid("1251c96c-185c-4e9b-93f4-b48205573cbd"), Text = "Simple Editor", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });
-            //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1042, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1042", SortOrder = 2, UniqueId = new Guid("0a452bd5-83f9-4bc3-8403-1286e13fb77e"), Text = "Macro Container", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now });            
         }
 
         private void CreateUmbracoLockData()
@@ -190,18 +185,18 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
         private void CreateUmbracoUserGroup2AppData()
         {
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Content });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Developer });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Developer });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Media });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Members });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings });            
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Users });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
-            
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
+            
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Content });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Media });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Forms });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Forms });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 4, AppAlias = Constants.Applications.Translation });
         }
@@ -278,17 +273,13 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 28, DataTypeId = 1048, PropertyEditorAlias = Constants.PropertyEditors.MediaPicker2Alias, DbType = "Ntext" });
             _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 29, DataTypeId = 1049, PropertyEditorAlias = Constants.PropertyEditors.MediaPicker2Alias, DbType = "Ntext" });
             _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 30, DataTypeId = 1050, PropertyEditorAlias = Constants.PropertyEditors.RelatedLinks2Alias, DbType = "Ntext" });
-
-            //TODO: We're not creating these for 7.0
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 19, DataTypeId = 1038, PropertyEditorAlias = Constants.PropertyEditors.MarkdownEditorAlias, DbType = "Ntext" });            
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 20, DataTypeId = 1039, PropertyEditorAlias = Constants.PropertyEditors.UltimatePickerAlias, DbType = "Ntext" });
-            //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 23, DataTypeId = 1042, PropertyEditorAlias = Constants.PropertyEditors.MacroContainerAlias, DbType = "Ntext" });
         }
 
         private void CreateCmsDataTypePreValuesData()
         {
             _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 3, Alias = "", SortOrder = 0, DataTypeNodeId = -87, Value = ",code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,umbracoembed,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|" });
             _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 4, Alias = "group", SortOrder = 0, DataTypeNodeId = 1041, Value = "default" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = 5, Alias = "storageType", SortOrder = 0, DataTypeNodeId = 1041, Value = "Json" });
             
             //defaults for the member list
             _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -1, Alias = "pageSize", SortOrder = 1, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "10" });
@@ -319,6 +310,9 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             relationType = new RelationTypeDto { Id = 2, Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName };
             relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
             _database.Insert("umbracoRelationType", "id", false, relationType);
+            relationType = new RelationTypeDto { Id = 3, Alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Media), ParentObjectType = new Guid(Constants.ObjectTypes.Media), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName };
+            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
+            _database.Insert("umbracoRelationType", "id", false, relationType);
         }
 
         private void CreateCmsTaskTypeData()

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/AddRelationTypeForMediaFolderOnDelete.cs

@@ -0,0 +1,38 @@
+using System;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
+{
+    [Migration("7.12.0", 0, Constants.System.UmbracoMigrationName)]
+    public class AddRelationTypeForMediaFolderOnDelete : MigrationBase
+    {
+        public AddRelationTypeForMediaFolderOnDelete(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            var exists = Context.Database.FirstOrDefault<RelationTypeDto>("WHERE alias=@alias", new { alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias });
+            if (exists == null)
+            {
+                var uniqueId = (Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias + "____" + Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName).ToGuid();
+                Insert.IntoTable("umbracoRelationType").Row(new
+                {
+                    typeUniqueId = uniqueId,
+                    alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias,
+                    name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName,
+                    childObjectType = Constants.ObjectTypes.MediaType,
+                    parentObjectType = Constants.ObjectTypes.MediaType,
+                    dual = false
+                });
+            }
+        }
+
+        public override void Down()
+        { }
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/IncreaseLanguageIsoCodeColumnLength.cs

@@ -0,0 +1,48 @@
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
+{
+    [Migration("7.12.0", 2, Constants.System.UmbracoMigrationName)]
+    public class IncreaseLanguageIsoCodeColumnLength : MigrationBase
+    {
+        public IncreaseLanguageIsoCodeColumnLength(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
+
+            //Ensure the index exists before dropping it
+            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
+            {
+                Delete.Index("IX_umbracoLanguage_languageISOCode").OnTable("umbracoLanguage");
+            }
+            
+            Alter.Table("umbracoLanguage")
+                .AlterColumn("languageISOCode")
+                .AsString(14)
+                .Nullable();
+
+            Create.Index("IX_umbracoLanguage_languageISOCode")
+                .OnTable("umbracoLanguage")
+                .OnColumn("languageISOCode")
+                .Unique();
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/RenameTrueFalseField.cs

@@ -0,0 +1,25 @@
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
+{
+    [Migration("7.12.0", 0, Constants.System.UmbracoMigrationName)]
+    public class RenameTrueFalseField : MigrationBase
+    {
+        public RenameTrueFalseField(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            //rename the existing true/false field
+            Update.Table("umbracoNode").Set(new { text = "Checkbox" }).Where(new { id = -49 });
+        }
+
+        public override void Down()
+        {
+            //set the field back to true/false
+            Update.Table("umbracoNode").Set(new { text = "True/false" }).Where(new { id = -49 });
+        }
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
+{
+    /// <summary>
+    /// Set the default storageType for the tags datatype to "CSV" to ensure backwards compatibilty since the default is going to be JSON in new versions
+    /// </summary>
+    
+    [Migration("7.12.0", 1, Constants.System.UmbracoMigrationName)]
+    public class SetDefaultTagsStorageType: MigrationBase
+    {
+        public SetDefaultTagsStorageType(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            if (Context?.Database == null) return;
+            
+            // We need to get all datatypes with an alias of "umbraco.tags" so we can loop over them and set the missing values if needed
+            var datatypes = Context.Database.Fetch<DataTypeDto>("SELECT * FROM cmsDataType");
+            var tagsDataTypes = datatypes.Where(x => string.Equals(x.PropertyEditorAlias, Constants.PropertyEditors.TagsAlias, StringComparison.InvariantCultureIgnoreCase));
+            var dataTypePreValues = Context.Database.Fetch<DataTypePreValueDto>("SELECT * FROM cmsDataTypePrevalues");
+
+            foreach (var datatype in tagsDataTypes)
+            {
+                // We need to check if the node has a "storageType" set
+                var result = dataTypePreValues.FirstOrDefault(x =>
+                    x.DataTypeNodeId == datatype.DataTypeId
+                    && string.Equals(x.Alias, "storageType", StringComparison.InvariantCultureIgnoreCase));
+
+                // if the "storageType" has not been set we do so by adding a new row in the table for the nodid and set it
+                if (result == null)
+                {
+                    Insert.IntoTable("CmsDataTypePrevalues").Row(new
+                    {
+                        datatypeNodeId = datatype.DataTypeId,
+                        value = "Csv",
+                        sortOrder = 2,
+                        alias = "storageType"
+                    });
+                }
+            }
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/UpdateUmbracoConsent.cs

@@ -0,0 +1,24 @@
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
+{
+    [Migration("7.12.0", 1, Constants.System.UmbracoMigrationName)]
+    public class UpdateUmbracoConsent : MigrationBase
+    {
+        public UpdateUmbracoConsent(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            Alter.Table("umbracoConsent").AlterColumn("comment").AsString().Nullable();
+        }
+
+        public override void Down()
+        {
+            // We can't remove this in case we already have null values saved in the column
+        }
+    }
+}

src/Umbraco.Core/Persistence/PetaPoco.cs

@@ -337,7 +337,7 @@ namespace Umbraco.Core.Persistence
 			        _transaction = _sharedConnection.BeginTransaction(isolationLevel);
 			    }
 
-			    catch (Exception e)
+			    catch (Exception)
 			    {
 			        throw;
 			    }
@@ -2494,9 +2494,9 @@ namespace Umbraco.Core.Persistence
 			// Now do rhs
 			if (_rhs != null)
 				_rhs.Build(sb, args, this);
-		}
+        }
 
-		public Sql Where(string sql, params object[] args)
+        public Sql Where(string sql, params object[] args)
 		{
 			return Append(new Sql("WHERE (" + sql + ")", args));
 		}
@@ -2509,9 +2509,14 @@ namespace Umbraco.Core.Persistence
 		public Sql Select(params object[] columns)
 		{
 			return Append(new Sql("SELECT " + String.Join(", ", (from x in columns select x.ToString()).ToArray())));
-		}
+        }
 
-		public Sql From(params object[] tables)
+        public Sql AndSelect(params object[] columns)
+        {
+            return Append(new Sql(", " + String.Join(", ", (from x in columns select x.ToString()).ToArray())));
+        }
+
+        public Sql From(params object[] tables)
 		{
 			return Append(new Sql("FROM " + String.Join(", ", (from x in tables select x.ToString()).ToArray())));
 		}

src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -15,6 +14,32 @@ namespace Umbraco.Core.Persistence
     /// </summary>
     public static class PetaPocoSqlExtensions
     {
+        /// <summary>
+        /// Defines the column to select in the generated SQL query
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="sql">Sql object</param>
+        /// <param name="sqlSyntax">Sql syntax</param>
+        /// <param name="fields">Columns to select</param>
+        /// <returns></returns>
+        public static Sql Select<T>(this Sql sql, ISqlSyntaxProvider sqlSyntax, params Expression<Func<T, object>>[] fields)
+        {
+            return sql.Select(GetFieldNames(sqlSyntax, fields));
+        }
+        
+        /// <summary>
+        /// Adds another set of field to select. This method must be used with "Select" when fecthing fields from different tables.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="sql">Sql object</param>
+        /// <param name="sqlSyntax">Sql syntax</param>
+        /// <param name="fields">Additional columns to select</param>
+        /// <returns></returns>
+        public static Sql AndSelect<T>(this Sql sql, ISqlSyntaxProvider sqlSyntax, params Expression<Func<T, object>>[] fields)
+        {
+            return sql.AndSelect(GetFieldNames(sqlSyntax, fields));
+        }
+
         [Obsolete("Use the overload specifying ISqlSyntaxProvider instead")]
         public static Sql From<T>(this Sql sql)
         {
@@ -55,6 +80,16 @@ namespace Umbraco.Core.Persistence
             return sqlSyntax.GetQuotedTableName(tableName) + "." + sqlSyntax.GetQuotedColumnName(fieldName);
         }
 
+        private static string[] GetFieldNames<T>(ISqlSyntaxProvider sqlSyntax, params Expression<Func<T, object>>[] fields)
+        {
+            if (fields.Length == 0)
+            {
+                return new[] { string.Format("{0}.*", sqlSyntax.GetQuotedTableName(typeof(T).GetTableName())) };
+            }
+
+            return fields.Select(field => GetFieldName(field, sqlSyntax)).ToArray();
+        }
+
         [Obsolete("Use the overload specifying ISqlSyntaxProvider instead")]
         public static Sql WhereIn<T>(this Sql sql, Expression<Func<T, object>> fieldSelector, IEnumerable values)
         {
@@ -240,4 +275,4 @@ namespace Umbraco.Core.Persistence
             return attr == null || string.IsNullOrWhiteSpace(attr.Name) ? column.Name : attr.Name;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs

@@ -96,7 +96,7 @@ namespace Umbraco.Core.Persistence.Repositories
             totalRecords = pagedResult.TotalItems;
 
             var pages = pagedResult.Items.Select(
-                dto => new AuditItem(dto.Id, dto.Comment, Enum<AuditType>.Parse(dto.Header), dto.UserId)).ToArray();
+                dto => new AuditItem(dto.Id, dto.Comment, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId)).ToArray();
 
             //Mapping the DateStamp
             for (int i = 0; i < pages.Length; i++)
@@ -198,4 +198,4 @@ namespace Umbraco.Core.Persistence.Repositories
             return filteredSql;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs

@@ -242,7 +242,7 @@ namespace Umbraco.Core.Persistence.Repositories
                .Where<NodeDto>(dto => dto.NodeObjectType == NodeObjectTypeId)
                .Where("umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + " in (@names)", new { names = roleNames });
             var existingRoles = Database.Fetch<NodeDto>(existingSql).Select(x => x.Text);
-            var missingRoles = roleNames.Except(existingRoles);
+            var missingRoles = roleNames.Except(existingRoles, StringComparer.CurrentCultureIgnoreCase);
             var missingGroups = missingRoles.Select(x => new MemberGroup {Name = x}).ToArray();
 
             if (UnitOfWork.Events.DispatchCancelable(SavingMemberGroup, this, new SaveEventArgs<IMemberGroup>(missingGroups)))
@@ -280,8 +280,8 @@ namespace Umbraco.Core.Persistence.Repositories
                 //exist in the roleNames list, then determine which ones are not currently assigned.
                 var mId = memberId;
                 var found = currentlyAssigned.Where(x => x.MemberId == mId).ToArray();
-                var assignedRoles = found.Where(x => roleNames.Contains(x.RoleName)).Select(x => x.RoleName);
-                var nonAssignedRoles = roleNames.Except(assignedRoles);
+                var assignedRoles = found.Where(x => roleNames.Contains(x.RoleName,StringComparer.CurrentCultureIgnoreCase)).Select(x => x.RoleName);
+                var nonAssignedRoles = roleNames.Except(assignedRoles, StringComparer.CurrentCultureIgnoreCase);
                 foreach (var toAssign in nonAssignedRoles)
                 {
                     var groupId = rolesForNames.First(x => x.Text == toAssign).NodeId;

src/Umbraco.Core/PluginManager.cs

@@ -343,7 +343,7 @@ namespace Umbraco.Core
             {
                 return ReadCache();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 try
                 {
@@ -519,7 +519,7 @@ namespace Umbraco.Core
                 {
                     return new FileStream(path, fileMode, fileAccess, fileShare);
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     if (--attempts == 0)
                         throw;

src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs

@@ -31,7 +31,7 @@ namespace Umbraco.Core.PropertyEditors
             Delimiter = ",";
             ReplaceTags = true;
             TagGroup = "default";
-            StorageType = TagCacheStorageType.Csv;
+            StorageType = TagCacheStorageType.Json;
         }
 
         /// <summary>
@@ -59,4 +59,4 @@ namespace Umbraco.Core.PropertyEditors
         /// </summary>
         public string TagGroup { get; set; }
     }
-}
+}

src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs

@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.PropertyEditors.ValueConverters
+{
+    [DefaultPropertyValueConverter]
+    public class FlexibleDropdownPropertyValueConverter : PropertyValueConverterBase, IPropertyValueConverterMeta
+    {
+        private static readonly ConcurrentDictionary<int, bool> Storages = new ConcurrentDictionary<int, bool>();
+        private readonly IDataTypeService _dataTypeService;
+
+        // TODO: Remove this ctor in v8 - the other one will be usable via IoC
+        public FlexibleDropdownPropertyValueConverter() : this(ApplicationContext.Current.Services.DataTypeService)
+        { }
+
+        public FlexibleDropdownPropertyValueConverter(IDataTypeService dataTypeService)
+        {
+            Mandate.ParameterNotNull(dataTypeService, "dataTypeService");
+            _dataTypeService = dataTypeService;
+        }
+
+        public override bool IsConverter(PublishedPropertyType propertyType)
+        {
+            return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.DropDownListFlexibleAlias);
+        }
+
+        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
+        {
+            return source != null
+                       ? source.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+                       : null;
+        }
+
+        public override object ConvertSourceToObject(PublishedPropertyType propertyType, object source, bool preview)
+        {
+            if (source == null)
+            {
+                return null;
+            }
+
+            var selectedValues = (string[]) source;
+            if (selectedValues.Any())
+            {
+                if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
+                {
+                    return selectedValues;
+                }
+
+                return selectedValues.First();
+            }
+
+            return source;
+        }
+
+        public Type GetPropertyValueType(PublishedPropertyType propertyType)
+        {
+            return IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias)
+                       ? typeof(IEnumerable<string>)
+                       : typeof(string);
+        }
+
+        public PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType,
+                                                        PropertyCacheValue cacheValue)
+        {
+            PropertyCacheLevel returnLevel;
+            switch (cacheValue)
+            {
+                case PropertyCacheValue.Object:
+                    returnLevel = PropertyCacheLevel.ContentCache;
+                    break;
+                case PropertyCacheValue.Source:
+                    returnLevel = PropertyCacheLevel.Content;
+                    break;
+                case PropertyCacheValue.XPath:
+                    returnLevel = PropertyCacheLevel.Content;
+                    break;
+                default:
+                    returnLevel = PropertyCacheLevel.None;
+                    break;
+            }
+
+            return returnLevel;
+        }
+
+        /// <summary>
+        /// Determines if the "enable multiple choice" prevalue has been ticked.
+        /// </summary>
+        /// <param name="dataTypeId">The ID of this particular datatype instance.</param>
+        /// <param name="propertyEditorAlias">The property editor alias.</param>
+        /// <returns><value>true</value> if the data type has been configured to return multiple values.
+        /// </returns>
+        private bool IsMultipleDataType(int dataTypeId, string propertyEditorAlias)
+        {
+            // GetPreValuesCollectionByDataTypeId is cached at repository level;
+            // still, the collection is deep-cloned so this is kinda expensive,
+            // better to cache here + trigger refresh in DataTypeCacheRefresher
+            return Storages.GetOrAdd(dataTypeId, id =>
+            {
+                var preVals = _dataTypeService.GetPreValuesCollectionByDataTypeId(id).PreValuesAsDictionary;
+
+                if (preVals.ContainsKey("multiple"))
+                {
+                    var preValue = preVals
+                                   .FirstOrDefault(x => string.Equals(x.Key, "multiple",
+                                                                      StringComparison.InvariantCultureIgnoreCase))
+                                   .Value;
+
+                    return preValue != null && preValue.Value.TryConvertTo<bool>().Result;
+                }
+
+                //in some odd cases, the pre-values in the db won't exist but their default pre-values contain this key so check there 
+                var propertyEditor = PropertyEditorResolver.Current.GetByAlias(propertyEditorAlias);
+                if (propertyEditor != null)
+                {
+                    var preValue = propertyEditor.DefaultPreValues
+                                                 .FirstOrDefault(x => string.Equals(x.Key, "multiple",
+                                                                                    StringComparison
+                                                                                        .InvariantCultureIgnoreCase))
+                                                 .Value;
+
+                    return preValue != null && preValue.TryConvertTo<bool>().Result;
+                }
+
+                return false;
+            });
+        }
+
+        internal static void ClearCaches()
+        {
+            Storages.Clear();
+        }
+    }
+}

src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs

@@ -40,12 +40,13 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 
                     //TODO: Change all singleton access to use ctor injection in v8!!!
                     //TODO: That would mean that property value converters would need to be request lifespan, hrm....
+                    bool isDebug = HttpContext.Current != null && HttpContext.Current.IsDebuggingEnabled;
                     var gridConfig = UmbracoConfig.For.GridConfig(
                         ApplicationContext.Current.ProfilingLogger.Logger,
                         ApplicationContext.Current.ApplicationCache.RuntimeCache,
                         new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins)),
                         new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Config)),
-                        HttpContext.Current.IsDebuggingEnabled);
+                        isDebug);
                     
                     var sections = GetArray(obj, "sections");
                     foreach (var section in sections.Cast<JObject>())
@@ -112,4 +113,4 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         }
 
     }
-}
+}

src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs

@@ -40,7 +40,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             // splitting by newline
             //
             //   RS: SD/Stephan Please consider post before deciding to remove 
-            //// https://our.umbraco.org/forum/contributing-to-umbraco-cms/76989-keep-the-xml-values-in-the-multipletextstringvalueconverter
+            //// https://our.umbraco.com/forum/contributing-to-umbraco-cms/76989-keep-the-xml-values-in-the-multipletextstringvalueconverter
             var values = new List<string>();
             var pos = sourceString.IndexOf("<value>", StringComparison.Ordinal);
             while (pos >= 0)

src/Umbraco.Core/Security/BackOfficeUserManager.cs

@@ -57,7 +57,7 @@ namespace Umbraco.Core.Security
         [Obsolete("Use the overload specifying all dependencies instead")]
         public static BackOfficeUserManager Create(
             IdentityFactoryOptions<BackOfficeUserManager> options,
-            IUserService userService,         
+            IUserService userService,
             IExternalLoginService externalLoginService,
             MembershipProviderBase membershipProvider)
         {
@@ -94,7 +94,7 @@ namespace Umbraco.Core.Security
             manager.InitUserManager(manager, membershipProvider, contentSectionConfig, options);
             return manager;
         }
-        
+
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("Use the overload specifying all dependencies instead")]
         public static BackOfficeUserManager Create(
@@ -129,7 +129,7 @@ namespace Umbraco.Core.Security
         [Obsolete("Use the overload specifying all dependencies instead")]
         protected void InitUserManager(
             BackOfficeUserManager manager,
-            MembershipProviderBase membershipProvider,         
+            MembershipProviderBase membershipProvider,
             IdentityFactoryOptions<BackOfficeUserManager> options)
         {
             InitUserManager(manager, membershipProvider, UmbracoConfig.For.UmbracoSettings().Content, options);
@@ -216,8 +216,8 @@ namespace Umbraco.Core.Security
         /// <param name="contentSectionConfig"></param>
         /// <returns></returns>
         protected void InitUserManager(
-            BackOfficeUserManager<T> manager, 
-            MembershipProviderBase membershipProvider, 
+            BackOfficeUserManager<T> manager,
+            MembershipProviderBase membershipProvider,
             IDataProtectionProvider dataProtectionProvider,
             IContentSection contentSectionConfig)
         {
@@ -233,7 +233,7 @@ namespace Umbraco.Core.Security
 
             //use a custom hasher based on our membership provider
             manager.PasswordHasher = GetDefaultPasswordHasher(membershipProvider);
-            
+
             if (dataProtectionProvider != null)
             {
                 manager.UserTokenProvider = new DataProtectorTokenProvider<T, int>(dataProtectionProvider.Create("ASP.NET Identity"));
@@ -373,7 +373,7 @@ namespace Umbraco.Core.Security
         }
 
         #region Overrides for password logic
-        
+
         /// <summary>
         /// Logic used to validate a username and password
         /// </summary>
@@ -484,6 +484,7 @@ namespace Umbraco.Core.Security
         /// </remarks>
         protected override async Task<IdentityResult> UpdatePassword(IUserPasswordStore<T, int> passwordStore, T user, string newPassword)
         {
+            user.LastPasswordChangeDateUtc = DateTime.UtcNow;
             var userAwarePasswordHasher = PasswordHasher as IUserAwarePasswordHasher<BackOfficeIdentityUser, int>;
             if (userAwarePasswordHasher == null)
                 return await base.UpdatePassword(passwordStore, user, newPassword);
@@ -496,7 +497,7 @@ namespace Umbraco.Core.Security
             await UpdateSecurityStampInternal(user);
             return IdentityResult.Success;
 
-            
+
         }
 
         /// <summary>
@@ -534,15 +535,22 @@ namespace Umbraco.Core.Security
 
         #endregion
 
-        public override Task<IdentityResult> SetLockoutEndDateAsync(int userId, DateTimeOffset lockoutEnd)
+        public override async Task<IdentityResult> SetLockoutEndDateAsync(int userId, DateTimeOffset lockoutEnd)
         {
-            var result = base.SetLockoutEndDateAsync(userId, lockoutEnd);
+            var result = await base.SetLockoutEndDateAsync(userId, lockoutEnd);
 
             // The way we unlock is by setting the lockoutEnd date to the current datetime
-            if (result.Result.Succeeded && lockoutEnd >= DateTimeOffset.UtcNow)
+            if (result.Succeeded && lockoutEnd >= DateTimeOffset.UtcNow)
+            {
                 RaiseAccountLockedEvent(userId);
+            }
             else
+            {
                 RaiseAccountUnlockedEvent(userId);
+                //Resets the login attempt fails back to 0 when unlock is clicked
+                await ResetAccessFailedCountAsync(userId);
+
+            }
 
             return result;
         }
@@ -564,16 +572,39 @@ namespace Umbraco.Core.Security
             RaiseResetAccessFailedCountEvent(userId);
             return await UpdateAsync(user);
         }
-        
 
-      
 
-        public override Task<IdentityResult> AccessFailedAsync(int userId)
+
+        /// <summary>
+        /// Overides the microsoft ASP.NET user managment method
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns>
+        /// returns a Async Task<IdentityResult>
+        /// </returns>
+        /// <remarks>
+        /// Doesnt set fail attempts back to 0
+        /// </remarks>
+        public override async Task<IdentityResult> AccessFailedAsync(int userId)
         {
-            var result = base.AccessFailedAsync(userId);
+            var lockoutStore = (IUserLockoutStore<BackOfficeIdentityUser, int>)Store;
+            var user = await FindByIdAsync(userId);
+            if (user == null)
+                throw new InvalidOperationException("No user found by user id " + userId);
+
+            var count = await lockoutStore.IncrementAccessFailedCountAsync(user);
+
+            if (count >= MaxFailedAccessAttemptsBeforeLockout)
+            {
+                await lockoutStore.SetLockoutEndDateAsync(user, DateTimeOffset.UtcNow.Add(DefaultAccountLockoutTimeSpan));
+                //NOTE: in normal aspnet identity this would do set the number of failed attempts back to 0
+                //here we are persisting the value for the back office
+            }
+
+            var result = await UpdateAsync(user);
 
             //Slightly confusing: this will return a Success if we successfully update the AccessFailed count
-            if (result.Result.Succeeded)
+            if (result.Succeeded)
                 RaiseLoginFailedEvent(userId);
 
             return result;

src/Umbraco.Core/Security/BackOfficeUserStore.cs

@@ -622,7 +622,7 @@ namespace Umbraco.Core.Security
         private bool UpdateMemberProperties(IUser user, BackOfficeIdentityUser identityUser)
         {
             var anythingChanged = false;
-            
+
             //don't assign anything if nothing has changed as this will trigger the track changes of the model
 
             if (identityUser.IsPropertyDirty("LastLoginDateUtc")
@@ -632,6 +632,13 @@ namespace Umbraco.Core.Security
                 anythingChanged = true;
                 user.LastLoginDate = identityUser.LastLoginDateUtc.Value.ToLocalTime();
             }
+            if (identityUser.IsPropertyDirty("LastPasswordChangeDateUtc")
+                || (user.LastPasswordChangeDate != default(DateTime) && identityUser.LastPasswordChangeDateUtc.HasValue == false)
+                || identityUser.LastPasswordChangeDateUtc.HasValue && user.LastPasswordChangeDate.ToUniversalTime() != identityUser.LastPasswordChangeDateUtc.Value)
+            {
+                anythingChanged = true;
+                user.LastPasswordChangeDate = identityUser.LastPasswordChangeDateUtc.Value.ToLocalTime();
+            }
             if (identityUser.IsPropertyDirty("EmailConfirmed")
                 || (user.EmailConfirmedDate.HasValue && user.EmailConfirmedDate.Value != default(DateTime) && identityUser.EmailConfirmed == false)
                 || ((user.EmailConfirmedDate.HasValue == false || user.EmailConfirmedDate.Value == default(DateTime)) && identityUser.EmailConfirmed))                
@@ -765,4 +772,4 @@ namespace Umbraco.Core.Security
             return Task.FromResult(false);
         }
     }
-}
+}

src/Umbraco.Core/Security/MachineKeyGenerator.cs

@@ -26,8 +26,6 @@ namespace Umbraco.Core.Security
     validation=""HMACSHA256"" decryption=""AES""
     />";
 
-            var Xxx = 3;
-
             return string.Format(c, GenerateAESDecryptionKey(), GenerateHMACSHA256ValidationKey());
         }
 
@@ -83,4 +81,4 @@ namespace Umbraco.Core.Security
             return sb.ToString();
         }
     }
-}
+}

src/Umbraco.Core/Services/ConsentService.cs

@@ -10,7 +10,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 namespace Umbraco.Core.Services
 {
     /// <summary>
-    /// Implements <see cref="IContentService"/>.
+    /// Implements <see cref="IConsentService"/>.
     /// </summary>
     internal class ConsentService : ScopeRepositoryService, IConsentService
     {

src/Umbraco.Core/Services/ContentService.cs

@@ -1872,7 +1872,7 @@ namespace Umbraco.Core.Services
                     }
                     copyEventArgs.CanCancel = false;
                     uow.Events.Dispatch(Copied, this, copyEventArgs);
-                    Audit(uow, AuditType.Copy, "Copy Content performed by user", content.WriterId, content.Id);
+                    Audit(uow, AuditType.Copy, "Copy Content performed by user", userId, content.Id);
                     uow.Commit();
                 }
 

src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs

@@ -109,6 +109,23 @@ namespace Umbraco.Core.Services
 
             return new ContentTypeAvailableCompositionsResults(ancestors, result);
         }
+        /// <summary>
+        /// Returns the list of content types the composition is used in
+        /// </summary>
+        /// <param name="allContentTypes"></param>
+        /// <param name="ctService"></param>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        internal static IEnumerable<IContentTypeComposition> GetWhereCompositionIsUsedInContentTypes(this IContentTypeService ctService,
+            IContentTypeComposition source,
+            IContentTypeComposition[] allContentTypes)
+        { 
+
+            var sourceId = source != null ? source.Id : 0;
+
+            // find which content types are using this composition
+            return allContentTypes.Where(x => x.ContentTypeComposition.Any(y => y.Id == sourceId)).ToArray();
+        }
 
         private static IContentTypeComposition[] GetAncestors(IContentTypeComposition ctype, IContentTypeComposition[] allContentTypes)
         {
@@ -162,4 +179,4 @@ namespace Umbraco.Core.Services
         }
 
     }
-}
+}

src/Umbraco.Core/Services/FileService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
@@ -291,6 +292,14 @@ namespace Umbraco.Core.Services
                 {"ContentTypeAlias", contentTypeAlias},
             };
 
+            // check that the template hasn't been created on disk before creating the content type
+            // if it exists, set the new template content to the existing file content
+            string content = GetViewContent(contentTypeAlias);
+            if (content != null)
+            {
+                template.Content = content;
+            }
+
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var saveEventArgs = new SaveEventArgs<ITemplate>(template, true, evtMsgs, additionalData);
@@ -312,17 +321,29 @@ namespace Umbraco.Core.Services
             return Attempt.Succeed(new OperationStatus<ITemplate, OperationStatusType>(template, OperationStatusType.Success, evtMsgs));
         }
 
+        /// <summary>
+        /// Create a new template, setting the content if a view exists in the filesystem
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="content"></param>
+        /// <param name="masterTemplate"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
         public ITemplate CreateTemplateWithIdentity(string name, string content, ITemplate masterTemplate = null, int userId = 0)
         {
+            // file might already be on disk, if so grab the content to avoid overwriting
             var template = new Template(name, name)
             {
-                Content = content
+                Content = GetViewContent(name) ?? content
             };
+
             if (masterTemplate != null)
             {
                 template.SetMasterTemplate(masterTemplate);
             }
+
             SaveTemplate(template, userId);
+
             return template;
         }
 
@@ -1076,6 +1097,33 @@ namespace Umbraco.Core.Services
             return GetPartialViewMacroSnippetContent(snippetName, PartialViewType.PartialViewMacro);
         }
 
+        private string GetViewContent(string filename)
+        {
+            if (filename.IsNullOrWhiteSpace())
+                throw new ArgumentNullException(nameof(filename));
+
+            if (filename.EndsWith(".cshtml") == false)
+            {
+                filename = $"{filename}.cshtml";
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateTemplateRepository(uow);
+                var stream = repository.GetFileContentStream(filename);
+
+                if (stream == null)
+                {
+                    return null;
+                }
+
+                using (var reader = new StreamReader(stream, Encoding.UTF8, true))
+                {
+                    return reader.ReadToEnd().Trim();
+                }
+            }
+        }
+
         private string GetPartialViewMacroSnippetContent(string snippetName, PartialViewType partialViewType)
         {
             if (snippetName.IsNullOrWhiteSpace())
@@ -1265,4 +1313,4 @@ namespace Umbraco.Core.Services
 
         #endregion
     }
-}
+}

src/Umbraco.Core/Services/IFileService.cs

@@ -428,4 +428,4 @@ namespace Umbraco.Core.Services
         /// <returns>The size of the partial view.</returns>
         long GetPartialViewFileSize(string filepath);
     }
-}
+}

src/Umbraco.Core/Services/IRelationService.cs

@@ -189,6 +189,15 @@ namespace Umbraco.Core.Services
             IEnumerable<IRelation> relations,
             bool loadBaseType = false);
 
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationType">The type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        IRelation Relate(int parentId, int childId, IRelationType relationType);
+
         /// <summary>
         /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
         /// </summary>
@@ -198,6 +207,15 @@ namespace Umbraco.Core.Services
         /// <returns>The created <see cref="Relation"/></returns>
         IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType);
 
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        IRelation Relate(int parentId, int childId, string relationTypeAlias);
+
         /// <summary>
         /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
         /// </summary>

src/Umbraco.Core/Services/RelationService.cs

@@ -394,6 +394,39 @@ namespace Umbraco.Core.Services
             }
         }
 
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationType">The type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        public IRelation Relate(int parentId, int childId, IRelationType relationType)
+        {
+            // Ensure that the RelationType has an indentity before using it to relate two entities
+            if (relationType.HasIdentity == false)
+                Save(relationType);
+
+            var relation = new Relation(parentId, childId, relationType);
+
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
+                {
+                    uow.Commit();
+                    return relation;
+                }
+
+                var repository = RepositoryFactory.CreateRelationRepository(uow);
+                repository.AddOrUpdate(relation);
+                uow.Commit();
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
+                return relation;
+            }
+        }
+
         /// <summary>
         /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
         /// </summary>
@@ -403,28 +436,23 @@ namespace Umbraco.Core.Services
         /// <returns>The created <see cref="Relation"/></returns>
         public IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType)
         {
-            //Ensure that the RelationType has an indentity before using it to relate two entities
-            if (relationType.HasIdentity == false)
-                Save(relationType);
+            return Relate(parent.Id, child.Id, relationType);
+        }
 
-            var relation = new Relation(parent.Id, child.Id, relationType);
+        /// <summary>
+        /// Relates two objects by their entity Ids.
+        /// </summary>
+        /// <param name="parentId">Id of the parent</param>
+        /// <param name="childId">Id of the child</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
+        /// <returns>The created <see cref="Relation"/></returns>
+        public IRelation Relate(int parentId, int childId, string relationTypeAlias)
+        {
+            var relationType = GetRelationTypeByAlias(relationTypeAlias);
+            if (relationType == null || string.IsNullOrEmpty(relationType.Alias))
+                throw new ArgumentNullException(string.Format("No RelationType with Alias '{0}' exists.", relationTypeAlias));
 
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
-                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
-                {
-                    uow.Commit();
-                    return relation;
-                }
-
-                repository.AddOrUpdate(relation);
-                uow.Commit();
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
-                return relation;
-            }
+            return Relate(parentId, childId, relationType);
         }
 
         /// <summary>
@@ -440,23 +468,7 @@ namespace Umbraco.Core.Services
             if (relationType == null || string.IsNullOrEmpty(relationType.Alias))
                 throw new ArgumentNullException(string.Format("No RelationType with Alias '{0}' exists.", relationTypeAlias));
 
-            var relation = new Relation(parent.Id, child.Id, relationType);
-
-            using (var uow = UowProvider.GetUnitOfWork())
-            {
-                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
-                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
-                {
-                    uow.Commit();
-                    return relation;
-                }
-                var repository = RepositoryFactory.CreateRelationRepository(uow);
-                repository.AddOrUpdate(relation);
-                uow.Commit();
-                saveEventArgs.CanCancel = false;
-                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
-                return relation;
-            }
+            return Relate(parent.Id, child.Id, relationType);
         }
 
         /// <summary>

src/Umbraco.Core/Services/UserService.cs

@@ -207,7 +207,7 @@ namespace Umbraco.Core.Services
                 {
                     return repository.GetByUsername(username, includeSecurityData: true);
                 }
-                catch (DbException ex)
+                catch (DbException)
                 {
                     //we need to handle this one specific case which is when we are upgrading to 7.7 since the user group
                     //tables don't exist yet. This is the 'easiest' way to deal with this without having to create special
@@ -786,7 +786,7 @@ namespace Umbraco.Core.Services
                     var result = repository.Get(id);
                     return result;
                 }
-                catch (DbException ex)
+                catch (DbException)
                 {
                     //we need to handle this one specific case which is when we are upgrading to 7.7 since the user group
                     //tables don't exist yet. This is the 'easiest' way to deal with this without having to create special

src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using Umbraco.Core.Auditing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -13,6 +12,9 @@ namespace Umbraco.Core.Strategies
         {
             ContentService.Moved += ContentService_Moved;
             ContentService.Trashed += ContentService_Trashed;
+
+            MediaService.Moved += MediaService_Moved;
+            MediaService.Trashed += MediaService_Trashed;
         }
 
         private void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
@@ -30,10 +32,26 @@ namespace Umbraco.Core.Strategies
             }
         }
 
+        private void MediaService_Moved(IMediaService sender, MoveEventArgs<IMedia> e)
+        {
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMedia.ToInvariantString())))
+            {
+                var relationService = ApplicationContext.Current.Services.RelationService;
+                var relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
+                var relations = relationService.GetByChildId(item.Entity.Id);
+
+                foreach (var relation in relations.Where(x => x.RelationType.Alias.InvariantEquals(relationTypeAlias)))
+                {
+                    relationService.Delete(relation);
+                }
+            }
+        }
+
         private void ContentService_Trashed(IContentService sender, MoveEventArgs<IContent> e)
         {
             var relationService = ApplicationContext.Current.Services.RelationService;
             var entityService = ApplicationContext.Current.Services.EntityService;
+            var textService = ApplicationContext.Current.Services.TextService;
             var relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
             var relationType = relationService.GetRelationTypeByAlias(relationTypeAlias);
 
@@ -64,7 +82,9 @@ namespace Umbraco.Core.Strategies
                     relationService.Save(relation);
 
                     ApplicationContext.Current.Services.AuditService.Add(AuditType.Delete,
-                        string.Format("Trashed content with Id: '{0}' related to original parent content with Id: '{1}'", item.Entity.Id, originalParentId),
+                        string.Format(textService.Localize(
+                                "recycleBin/contentTrashed"),
+                            item.Entity.Id, originalParentId),
                         item.Entity.WriterId,
                         item.Entity.Id);
                 }
@@ -72,5 +92,49 @@ namespace Umbraco.Core.Strategies
                 
             }
         }
+
+        private void MediaService_Trashed(IMediaService sender, MoveEventArgs<IMedia> e)
+        {
+            var relationService = ApplicationContext.Current.Services.RelationService;
+            var entityService = ApplicationContext.Current.Services.EntityService;
+            var textService = ApplicationContext.Current.Services.TextService;
+            var relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
+            var relationType = relationService.GetRelationTypeByAlias(relationTypeAlias);
+
+            // check that the relation-type exists, if not, then recreate it
+            if (relationType == null)
+            {
+                var documentObjectType = new Guid(Constants.ObjectTypes.Document);
+                var relationTypeName = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName;
+
+                relationType = new RelationType(documentObjectType, documentObjectType, relationTypeAlias, relationTypeName);
+                relationService.Save(relationType);
+            }
+
+            foreach (var item in e.MoveInfoCollection)
+            {
+                var originalPath = item.OriginalPath.ToDelimitedList();
+                var originalParentId = originalPath.Count > 2
+                    ? int.Parse(originalPath[originalPath.Count - 2])
+                    : Constants.System.Root;
+
+                //before we can create this relation, we need to ensure that the original parent still exists which
+                //may not be the case if the encompassing transaction also deleted it when this item was moved to the bin
+
+                if (entityService.Exists(originalParentId))
+                {
+                    // Add a relation for the item being deleted, so that we can know the original parent for if we need to restore later
+                    var relation = new Relation(originalParentId, item.Entity.Id, relationType);
+                    relationService.Save(relation);
+
+                    ApplicationContext.Current.Services.AuditService.Add(AuditType.Delete,
+                        string.Format(textService.Localize(
+                                "recycleBin/mediaTrashed"),
+                            item.Entity.Id, originalParentId),
+                        item.Entity.CreatorId,
+                        item.Entity.Id);
+                }
+            }
+        }
     }
 }

src/Umbraco.Core/StringExtensions.cs

@@ -8,14 +8,12 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
-using System.Xml;
-using Newtonsoft.Json;
-using Umbraco.Core.Configuration;
 using System.Web.Security;
-using Umbraco.Core.Strings;
+using Newtonsoft.Json;
 using Umbraco.Core.CodeAnnotations;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Strings;
 
 namespace Umbraco.Core
 {
@@ -121,8 +119,8 @@ namespace Umbraco.Core
                     //if the resolution was success, return it, otherwise just return the path, we've detected
                     // it's a path but maybe it's relative and resolution has failed, etc... in which case we're just
                     // returning what was given to us.
-                    return resolvedUrlResult.Success 
-                        ? resolvedUrlResult 
+                    return resolvedUrlResult.Success
+                        ? resolvedUrlResult
                         : Attempt.Succeed(input);
                 }
             }
@@ -144,7 +142,7 @@ namespace Umbraco.Core
         }
 
         internal static readonly Regex Whitespace = new Regex(@"\s+", RegexOptions.Compiled);
-        internal static readonly string[] JsonEmpties = new [] { "[]", "{}" };
+        internal static readonly string[] JsonEmpties = new[] { "[]", "{}" };
         internal static bool DetectIsEmptyJson(this string input)
         {
             return JsonEmpties.Contains(Whitespace.Replace(input, string.Empty));
@@ -166,7 +164,7 @@ namespace Umbraco.Core
                 var obj = JsonConvert.DeserializeObject(input);
                 return obj;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return input;
             }
@@ -472,13 +470,13 @@ namespace Umbraco.Core
             return ch.ToString(CultureInfo.InvariantCulture) == ch.ToString(CultureInfo.InvariantCulture).ToUpperInvariant();
         }
 
-        /// <summary>Is null or white space.</summary>
-        /// <param name="str">The str.</param>
-        /// <returns>The is null or white space.</returns>
-        public static bool IsNullOrWhiteSpace(this string str)
-        {
-            return (str == null) || (str.Trim().Length == 0);
-        }
+        /// <summary>Indicates whether a specified string is null, empty, or
+        /// consists only of white-space characters.</summary>
+        /// <param name="value">The value to check.</param>
+        /// <returns>Returns <see langword="true"/> if the value is null,
+        /// empty, or consists only of white-space characters, otherwise
+        /// returns <see langword="false"/>.</returns>
+        public static bool IsNullOrWhiteSpace(this string value) => string.IsNullOrWhiteSpace(value);
 
         public static string IfNullOrWhiteSpace(this string str, string defaultValue)
         {
@@ -624,7 +622,7 @@ namespace Umbraco.Core
                 byte[] decodedBytes = UrlTokenDecode(input);
                 return decodedBytes != null ? Encoding.UTF8.GetString(decodedBytes) : null;
             }
-            catch (FormatException ex)
+            catch (FormatException)
             {
                 return null;
             }
@@ -1436,14 +1434,25 @@ namespace Umbraco.Core
             return ReplaceMany(text, regexSpecialCharacters);
         }
 
+        /// <summary>
+        /// Checks whether a string "haystack" contains within it any of the strings in the "needles" collection and returns true if it does or false if it doesn't
+        /// </summary>
+        /// <param name="haystack">The string to check</param>
+        /// <param name="needles">The collection of strings to check are contained within the first string</param>
+        /// <param name="comparison">The type of comparision to perform - defaults to <see cref="StringComparison.CurrentCulture"/></param>
+        /// <returns>True if any of the needles are contained with haystack; otherwise returns false</returns>
+        /// Added fix to ensure the comparison is used - see http://issues.umbraco.org/issue/U4-11313
         public static bool ContainsAny(this string haystack, IEnumerable<string> needles, StringComparison comparison = StringComparison.CurrentCulture)
         {
-            if (haystack == null) throw new ArgumentNullException("haystack");
-            if (string.IsNullOrEmpty(haystack) == false || needles.Any())
+            if (haystack == null)
+                throw new ArgumentNullException("haystack");
+
+            if (string.IsNullOrEmpty(haystack) || needles == null || !needles.Any())
             {
-                return needles.Any(value => haystack.IndexOf(value) >= 0);
+                return false;
             }
-            return false;
+
+            return needles.Any(value => haystack.IndexOf(value, comparison) >= 0);
         }
 
         public static bool CsvContains(this string csv, string value)

src/Umbraco.Core/Strings/DefaultShortStringHelper.cs

@@ -26,7 +26,6 @@ namespace Umbraco.Core.Strings
         [Obsolete("Use the other ctor that specifies all dependencies")]
         public DefaultShortStringHelper()
         {
-            _umbracoSettings = _umbracoSettings;
             InitializeLegacyUrlReplaceCharacters();
         }
 

src/Umbraco.Core/Sync/ApplicationUrlHelper.cs

@@ -156,7 +156,7 @@ namespace Umbraco.Core.Sync
             // otherwise,
             //  if non-standard ports used,
             //  user may need to set umbracoApplicationUrl manually per 
-            //  http://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks
+            //  https://our.umbraco.com/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks
             var port = (request.IsSecureConnection == false && GlobalSettings.UseSSL == false)
                         || (request.IsSecureConnection && GlobalSettings.UseSSL)
                 ? ":" + request.ServerVariables["SERVER_PORT"]

src/Umbraco.MSBuild.Tasks.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.MSBuild.Tasks", "Umbraco.MSBuild.Tasks\Umbraco.MSBuild.Tasks.csproj", "{68AC9679-2439-4DA9-86BC-E36579594EFB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{68AC9679-2439-4DA9-86BC-E36579594EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68AC9679-2439-4DA9-86BC-E36579594EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68AC9679-2439-4DA9-86BC-E36579594EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68AC9679-2439-4DA9-86BC-E36579594EFB}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

src/Umbraco.MSBuild.Tasks/GetAssemblyFileVersion.cs

@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using System.Text.RegularExpressions;
-using Microsoft.Build.Framework;
-
-namespace Umbraco.MSBuild.Tasks
-{
-    public class GetAssemblyFileVersion : ITask
-    {
-        [Required]
-        public string strFilePathAssemblyInfo { get; set; }
-        
-        [Output]
-        public string strAssemblyFileVersion { get; set; }
-
-        public bool Execute()
-        {
-            StreamReader streamreaderAssemblyInfo = null;
-            Match matchVersion;
-            Group groupVersion;
-            string strLine;
-            strAssemblyFileVersion = String.Empty;
-            try
-            {
-                streamreaderAssemblyInfo = new StreamReader(strFilePathAssemblyInfo);
-                while ((strLine = streamreaderAssemblyInfo.ReadLine()) != null)
-                {
-                    matchVersion = Regex.Match(strLine, @"(?:AssemblyFileVersion\("")(?<ver>(\d*)\.(\d*)(\.(\d*)(\.(\d*))?)?)(?:""\))", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline | RegexOptions.ExplicitCapture);
-                    if (matchVersion.Success)
-                    {
-                        groupVersion = matchVersion.Groups["ver"];
-                        if ((groupVersion.Success) && (!String.IsNullOrEmpty(groupVersion.Value)))
-                        {
-                            strAssemblyFileVersion = groupVersion.Value;
-                            break;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                BuildMessageEventArgs args = new BuildMessageEventArgs(e.Message, string.Empty, "GetAssemblyFileVersion", MessageImportance.High);
-                BuildEngine.LogMessageEvent(args);
-            }
-            finally { if (streamreaderAssemblyInfo != null) streamreaderAssemblyInfo.Close(); }
-            return (true);
-        }
-
-        public IBuildEngine BuildEngine { get; set; }
-
-        public ITaskHost HostObject { get; set; }
-    }
-}

src/Umbraco.MSBuild.Tasks/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Umbraco.MSBuild.Tasks")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Umbraco.MSBuild.Tasks")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a4741c02-d938-4b29-a9b3-66ade85c95b5")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/Umbraco.MSBuild.Tasks/TimestampOffset.cs

@@ -1,45 +0,0 @@
-using System;
-using System.IO;
-using System.Xml;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using System.Text.RegularExpressions;
-
-namespace Umbraco.MSBuild.Tasks
-{
-    public class TimestampOffset : Task
-    {
-        [Required]
-        public int Offset { get; set; }
-
-        public ITaskItem[] Files { get; set; }
-
-        public override bool Execute()
-        {
-            try
-            {
-                if (Files != null && Files.Length > 0)
-                {
-                    foreach (var file in Files)
-                    {
-                        if (File.Exists(file.ItemSpec))
-                        {
-                            var creationDate = File.GetCreationTimeUtc(file.ItemSpec);
-                            var modifiedDate = File.GetLastWriteTimeUtc(file.ItemSpec);
-
-                            File.SetCreationTimeUtc(file.ItemSpec, creationDate.AddHours(Offset));
-                            File.SetLastWriteTimeUtc(file.ItemSpec, modifiedDate.AddHours(Offset));
-                        }
-                    }
-                }
-
-                return true;
-            }
-            catch(Exception e)
-            {
-                Log.LogErrorFromException(e);
-                return false;
-            }
-        }
-    }
-}

src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.Targets

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <UmbracoMSBuildTasksPath Condition="'$(UmbracoMSBuildTasksPath)' == ''">$(MSBuildProjectDirectory)\Lib\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
-    <UmbracoMSBuildTasksLib>$(UmbracoMSBuildTasksPath)\Umbraco.MSBuild.Tasks.dll</UmbracoMSBuildTasksLib>
-  </PropertyGroup>
-
-  <UsingTask AssemblyFile="$(UmbracoMSBuildTasksLib)" TaskName="Umbraco.MSBuild.Tasks.TimestampOffset" />
-  <UsingTask AssemblyFile="$(UmbracoMSBuildTasksLib)" TaskName="Umbraco.MSBuild.Tasks.GetAssemblyFileVersion" />
-  
-</Project>

src/Umbraco.MSBuild.Tasks/Umbraco.MSBuild.Tasks.csproj

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{68AC9679-2439-4DA9-86BC-E36579594EFB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Umbraco.MSBuild.Tasks</RootNamespace>
-    <AssemblyName>Umbraco.MSBuild.Tasks</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GetAssemblyFileVersion.cs" />
-    <Compile Include="TimestampOffset.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Umbraco.MSBuild.Tasks.Targets">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>robocopy "$(TargetDir) " "$(SolutionDir)..\lib\Umbraco\UmbracoMSBuildTasks " "*Umbraco.MSBuild.Tasks.dll" "*Umbraco.MSBuild.Tasks.targets" /NP /NJS
-if errorlevel 4 goto BuildEventFailed 
-if errorlevel 0 goto end 
-:BuildEventFailed echo FILECOPY for $(ProjectName) FAILED 
-exit 1 
-:end echo FILECOPY for $(ProjectName) COMPLETED OK 
-exit 0</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

src/Umbraco.Tests/App.config

@@ -55,7 +55,7 @@
 
     <appSettings>
         <add key="umbracoConfigurationStatus" value="6.0.0" />
-        <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
+        <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
         <add key="umbracoReservedPaths" value="~/install/" />
         <add key="umbracoPath" value="~/umbraco" />
         <add key="umbracoHideTopLevelNodeFromPath" value="true" />

src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using Umbraco.Core;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.CodeFirst
@@ -32,7 +31,7 @@ namespace Umbraco.Tests.CodeFirst
                     value = DateTime.Parse(property.Value.ToString());
                 else if (propertyInfo.PropertyType == typeof(Boolean))
                 {
-                    if (String.IsNullOrEmpty(property.Value.ToString()) || property.Value == "0")
+                    if (String.IsNullOrEmpty(property.Value.ToString()) || (string)property.Value == "0")
                     {
                         value = false;
                     }
@@ -48,4 +47,4 @@ namespace Umbraco.Tests.CodeFirst
             return mapped;
         }
     }
-}
+}

src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs

@@ -156,7 +156,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void PreviewBadge()
         {
-            Assert.IsTrue(SettingsSection.Content.PreviewBadge == @"<a id=""umbracoPreviewBadge"" style=""position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>");
+            Assert.IsTrue(SettingsSection.Content.PreviewBadge == @"<a id=""umbracoPreviewBadge"" style=""z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>");
         }
         [Test]
         public void UmbracoLibraryCacheDuration()

src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config

@@ -83,7 +83,7 @@
 
     <ForceSafeAliases>true</ForceSafeAliases>
 
-    <PreviewBadge><![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="{0}/endPreview.aspx?redir={2}"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>
+    <PreviewBadge><![CDATA[<a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="{0}/endPreview.aspx?redir={2}"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>
 
     <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
     <!-- In seconds. 0 will disable cache -->

src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config

@@ -3,27 +3,27 @@
 
   <!-- 
     umbracoSettings.config configuration documentation can be found here: 
-    http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/
+    https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/
     Many of the optional settings are not explicitly listed here 
     but can be found in the online documentation, each section has a 
     corresponding URL link below.
     -->
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Content -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Content -->
   <content>
 
-    <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Imaging -->
+    <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Imaging -->
     <imaging/>
     
-    <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Scripteditor -->
+    <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Scripteditor -->
     <scripteditor/>    
     
-    <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Errors -->
+    <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Errors -->
     <errors>
       <error404>1</error404>
     </errors>
 
-    <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Notifications -->
+    <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Notifications -->
     <notifications>
       <!-- the email that should be used as from mail when umbraco sends a notification -->
       <email>robot@umbraco.dk</email>
@@ -31,42 +31,42 @@
     
   </content>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Security 
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Security 
   <security/> -->
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#RequestHandler 
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#RequestHandler 
   <requestHandler/> -->
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Templates -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Templates -->
   <templates>
     <defaultRenderingEngine>Mvc</defaultRenderingEngine>
   </templates>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Developer -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Developer -->
   <developer/>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Scripting -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Scripting -->
   <scripting/>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#viewstateMoverModule -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#viewstateMoverModule -->
   <viewstateMoverModule/>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Logging -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Logging -->
   <logging/>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#ScheduledTasks -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#ScheduledTasks -->
   <scheduledTasks/>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#DistributedCallsLoadbalancing -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#DistributedCallsLoadbalancing -->
   <distributedCall/>
   
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Providers -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Providers -->
   <providers/>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Help -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Help -->
   <help/>
 
-  <!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#WebRouting -->
+  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#WebRouting -->
   <web.routing/>
   
 </defaultSettings>

src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs

@@ -419,7 +419,6 @@ namespace Umbraco.Tests.CoreXml
         {
             var source = new TestSource5();
             var nav = new NavigableNavigator(source);
-            TestContent content;
 
             Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
             Assert.IsTrue(nav.MoveToFirstChild());
@@ -1162,4 +1161,4 @@ namespace Umbraco.Tests.CoreXml
     }
 
     #endregion
-}
+}

src/Umbraco.Tests/DelegateExtensionsTests.cs

@@ -26,7 +26,6 @@ namespace Umbraco.Tests
         [Test]
         public void Quits_On_Success_Count()
         {
-            var maxTries = 5;
             var totalTries = 0;
             DelegateExtensions.RetryUntilSuccessOrMaxAttempts((currentTry) =>
             {
@@ -43,4 +42,4 @@ namespace Umbraco.Tests
 
 
     }
-}
+}

src/Umbraco.Tests/Dependencies/NuGet.cs

@@ -104,8 +104,7 @@ namespace Umbraco.Tests.Dependencies
             var packageConfigFiles = new List<FileInfo>();
             var packageDirectories =
                 sourceDirectory.GetDirectories().Where(x =>
-                            x.Name.StartsWith("Umbraco.Tests") == false &&
-                            x.Name.StartsWith("Umbraco.MSBuild.Tasks") == false).ToArray();
+                            x.Name.StartsWith("Umbraco.Tests") == false).ToArray();
 
             foreach (var directory in packageDirectories)
             {

src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs

@@ -1,67 +1,62 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 
 namespace Umbraco.Tests.FrontEnd
 {
     [TestFixture]
     public class UmbracoHelperTests
+        : BaseUmbracoApplicationTest
     {
-       
-        [Test]
-        public void Truncate_Simple()
-        {
-            var text = "Hello world, this is some text <a href='blah'>with a link</a>";
+        private const string SampleWithAnchorElement = "Hello world, this is some text <a href='blah'>with a link</a>";
+        private const string SampleWithBoldAndAnchorElements = "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
 
+        [Test]
+        public static void Truncate_Simple()
+        {
             var helper = new UmbracoHelper();
 
-            var result = helper.Truncate(text, 25).ToString();
-
-            Assert.AreEqual("Hello world, this is some&hellip;", result);
-        }
-
-        /// <summary>
-        /// If a truncated string ends with a space, we should trim the space before appending the ellipsis.
-        /// </summary>
-        [Test]
-        public void Truncate_Simple_With_Trimming()
-        {
-            var text = "Hello world, this is some text <a href='blah'>with a link</a>";
-
-            var helper = new UmbracoHelper();
-
-            var result = helper.Truncate(text, 26).ToString();
+            var result = helper.Truncate(SampleWithAnchorElement, 25).ToString();
 
             Assert.AreEqual("Hello world, this is some&hellip;", result);
         }
 
         [Test]
-        public void Truncate_Inside_Word()
+        public static void When_Truncating_A_String_Ends_With_A_Space_We_Should_Trim_The_Space_Before_Appending_The_Ellipsis()
         {
-            var text = "Hello world, this is some text <a href='blah'>with a link</a>";
-
             var helper = new UmbracoHelper();
 
-            var result = helper.Truncate(text, 24).ToString();
+            var result = helper.Truncate(SampleWithAnchorElement, 26).ToString();
+
+            Assert.AreEqual("Hello world, this is some&hellip;", result);
+        }
+
+        [Test]
+        public static void Truncate_Inside_Word()
+        {
+            var helper = new UmbracoHelper();
+
+            var result = helper.Truncate(SampleWithAnchorElement, 24).ToString();
 
             Assert.AreEqual("Hello world, this is som&hellip;", result);
         }
 
         [Test]
-        public void Truncate_With_Tag()
+        public static void Truncate_With_Tag()
         {
-            var text = "Hello world, this is some text <a href='blah'>with a link</a>";
-
             var helper = new UmbracoHelper();
 
-            var result = helper.Truncate(text, 35).ToString();
+            var result = helper.Truncate(SampleWithAnchorElement, 35).ToString();
 
             Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
         }
 
         [Test]
-        public void Create_Encrypted_RouteString_From_Anonymous_Object()
+        public static void Create_Encrypted_RouteString_From_Anonymous_Object()
         {
             var additionalRouteValues = new
             {
@@ -69,16 +64,23 @@ namespace Umbraco.Tests.FrontEnd
                 key2 = "value2",
                 Key3 = "Value3",
                 keY4 = "valuE4"
-        };
-            var encryptedRouteString = UmbracoHelper.CreateEncryptedRouteString("FormController", "FormAction", "", additionalRouteValues);
+            };
+
+            var encryptedRouteString = UmbracoHelper.CreateEncryptedRouteString(
+                "FormController",
+                "FormAction",
+                "",
+                additionalRouteValues
+                );
+
             var result = encryptedRouteString.DecryptWithMachineKey();
-            var expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
+            const string expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
 
             Assert.AreEqual(expectedResult, result);
         }
 
         [Test]
-        public void Create_Encrypted_RouteString_From_Dictionary()
+        public static void Create_Encrypted_RouteString_From_Dictionary()
         {
             var additionalRouteValues = new Dictionary<string, object>()
             {
@@ -87,77 +89,74 @@ namespace Umbraco.Tests.FrontEnd
                 {"Key3", "Value3"},
                 {"keY4", "valuE4"}
             };
-            var encryptedRouteString = UmbracoHelper.CreateEncryptedRouteString("FormController", "FormAction", "", additionalRouteValues);
+
+            var encryptedRouteString = UmbracoHelper.CreateEncryptedRouteString(
+                "FormController",
+                "FormAction",
+                "",
+                additionalRouteValues
+                );
+
             var result = encryptedRouteString.DecryptWithMachineKey();
-            var expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
-            
+            const string expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
+
             Assert.AreEqual(expectedResult, result);
         }
 
         [Test]
-        public void Truncate_By_Words()
+        public static void Truncate_By_Words()
         {
-            var text = "Hello world, this is some text <a href='blah'>with a link</a>";
-
             var helper = new UmbracoHelper();
 
-            var result = helper.TruncateByWords(text, 4).ToString();
+            var result = helper.TruncateByWords(SampleWithAnchorElement, 4).ToString();
 
             Assert.AreEqual("Hello world, this is&hellip;", result);
         }
 
         [Test]
-        public void Truncate_By_Words_With_Tag()
+        public static void Truncate_By_Words_With_Tag()
         {
-            var text = "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
-
             var helper = new UmbracoHelper();
 
-            var result = helper.TruncateByWords(text, 4).ToString();
+            var result = helper.TruncateByWords(SampleWithBoldAndAnchorElements, 4).ToString();
 
             Assert.AreEqual("Hello world, <b>this</b> is&hellip;", result);
         }
 
         [Test]
-        public void Truncate_By_Words_Mid_Tag()
+        public static void Truncate_By_Words_Mid_Tag()
         {
-            var text = "Hello world, this is some text <a href='blah'>with a link</a>";
-
             var helper = new UmbracoHelper();
 
-            var result = helper.TruncateByWords(text, 7).ToString();
+            var result = helper.TruncateByWords(SampleWithAnchorElement, 7).ToString();
 
             Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
         }
 
         [Test]
-        public void Strip_All_Html()
+        public static void Strip_All_Html()
         {
-            var text = "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
-
             var helper = new UmbracoHelper();
 
-            var result = helper.StripHtml(text, null).ToString();
+            var result = helper.StripHtml(SampleWithBoldAndAnchorElements, null).ToString();
 
             Assert.AreEqual("Hello world, this is some text with a link", result);
         }
 
         [Test]
-        public void Strip_Specific_Html()
+        public static void Strip_Specific_Html()
         {
-            var text = "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
-
-            string [] tags = {"b"};
+            string[] tags = { "b" };
 
             var helper = new UmbracoHelper();
 
-            var result = helper.StripHtml(text, tags).ToString();
+            var result = helper.StripHtml(SampleWithBoldAndAnchorElements, tags).ToString();
 
-            Assert.AreEqual("Hello world, this is some text <a href='blah'>with a link</a>", result);
+            Assert.AreEqual(SampleWithAnchorElement, result);
         }
 
         [Test]
-        public void Strip_Invalid_Html()
+        public static void Strip_Invalid_Html()
         {
             var text = "Hello world, <bthis</b> is some text <a href='blah'>with a link</a>";
 
@@ -167,5 +166,229 @@ namespace Umbraco.Tests.FrontEnd
 
             Assert.AreEqual("Hello world, is some text with a link", result);
         }
+
+        // ------- Int32 conversion tests
+        [Test]
+        public static void Converting_Boxed_34_To_An_Int_Returns_34()
+        {
+            // Arrange
+            const int sample = 34;
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToInt(
+                sample,
+                out int result
+                );
+
+            // Assert
+            Assert.IsTrue(success);
+            Assert.That(result, Is.EqualTo(34));
+        }
+
+        [Test]
+        public static void Converting_String_54_To_An_Int_Returns_54()
+        {
+            // Arrange
+            const string sample = "54";
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToInt(
+                sample,
+                out int result
+                );
+
+            // Assert
+            Assert.IsTrue(success);
+            Assert.That(result, Is.EqualTo(54));
+        }
+
+        [Test]
+        public static void Converting_Hello_To_An_Int_Returns_False()
+        {
+            // Arrange
+            const string sample = "Hello";
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToInt(
+                sample,
+                out int result
+                );
+
+            // Assert
+            Assert.IsFalse(success);
+            Assert.That(result, Is.EqualTo(0));
+        }
+
+        [Test]
+        public static void Converting_Unsupported_Object_To_An_Int_Returns_False()
+        {
+            // Arrange
+            var clearlyWillNotConvertToInt = new StringBuilder(0);
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToInt(
+                clearlyWillNotConvertToInt,
+                out int result
+                );
+
+            // Assert
+            Assert.IsFalse(success);
+            Assert.That(result, Is.EqualTo(0));
+        }
+
+        // ------- GUID conversion tests
+        [Test]
+        public static void Converting_Boxed_Guid_To_A_Guid_Returns_Original_Guid_Value()
+        {
+            // Arrange
+            Guid sample = Guid.NewGuid();
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToGuid(
+                sample,
+                out Guid result
+                );
+
+            // Assert
+            Assert.IsTrue(success);
+            Assert.That(result, Is.EqualTo(sample));
+        }
+
+        [Test]
+        public static void Converting_String_Guid_To_A_Guid_Returns_Original_Guid_Value()
+        {
+            // Arrange
+            Guid sample = Guid.NewGuid();
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToGuid(
+                sample.ToString(),
+                out Guid result
+                );
+
+            // Assert
+            Assert.IsTrue(success);
+            Assert.That(result, Is.EqualTo(sample));
+        }
+
+        [Test]
+        public static void Converting_Hello_To_A_Guid_Returns_False()
+        {
+            // Arrange
+            const string sample = "Hello";
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToGuid(
+                sample,
+                out Guid result
+                );
+
+            // Assert
+            Assert.IsFalse(success);
+            Assert.That(result, Is.EqualTo(new Guid("00000000-0000-0000-0000-000000000000")));
+        }
+
+        [Test]
+        public static void Converting_Unsupported_Object_To_A_Guid_Returns_False()
+        {
+            // Arrange
+            var clearlyWillNotConvertToGuid = new StringBuilder(0);
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToGuid(
+                clearlyWillNotConvertToGuid,
+                out Guid result
+                );
+
+            // Assert
+            Assert.IsFalse(success);
+            Assert.That(result, Is.EqualTo(new Guid("00000000-0000-0000-0000-000000000000")));
+        }
+
+        // ------- UDI Conversion Tests
+        /// <remarks>
+        /// This requires PluginManager.Current to be initialised before running.
+        /// </remarks>
+        [Test]
+        public static void Converting_Boxed_Udi_To_A_Udi_Returns_Original_Udi_Value()
+        {
+            // Arrange
+            Udi.ResetUdiTypes();
+            Udi sample = new GuidUdi(Constants.UdiEntityType.AnyGuid, Guid.NewGuid());
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToUdi(
+                sample,
+                out Udi result
+                );
+
+            // Assert
+            Assert.IsTrue(success);
+            Assert.That(result, Is.EqualTo(sample));
+        }
+
+        /// <remarks>
+        /// This requires PluginManager.Current to be initialised before running.
+        /// </remarks>
+        [Test]
+        public static void Converting_String_Udi_To_A_Udi_Returns_Original_Udi_Value()
+        {
+            // Arrange
+            Udi.ResetUdiTypes();
+            Udi sample = new GuidUdi(Constants.UdiEntityType.AnyGuid, Guid.NewGuid());
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToUdi(
+                sample.ToString(),
+                out Udi result
+                );
+
+            // Assert
+            Assert.IsTrue(success, "Conversion of UDI failed.");
+            Assert.That(result, Is.EqualTo(sample));
+        }
+
+        /// <remarks>
+        /// This requires PluginManager.Current to be initialised before running.
+        /// </remarks>
+        [Test]
+        public static void Converting_Hello_To_A_Udi_Returns_False()
+        {
+            // Arrange
+            Udi.ResetUdiTypes();
+            const string sample = "Hello";
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToUdi(
+                sample,
+                out Udi result
+                );
+
+            // Assert
+            Assert.IsFalse(success);
+            Assert.That(result, Is.Null);
+        }
+
+        /// <remarks>
+        /// This requires PluginManager.Current to be initialised before running.
+        /// </remarks>
+        [Test]
+        public static void Converting_Unsupported_Object_To_A_Udi_Returns_False()
+        {
+            // Arrange
+            Udi.ResetUdiTypes();
+
+            var clearlyWillNotConvertToGuid = new StringBuilder(0);
+
+            // Act
+            bool success = UmbracoHelper.ConvertIdObjectToUdi(
+                clearlyWillNotConvertToGuid,
+                out Udi result
+                );
+
+            // Assert
+            Assert.IsFalse(success);
+            Assert.That(result, Is.Null);
+        }
     }
 }

src/Umbraco.Tests/Integration/CreateContent.cs

@@ -1,155 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
-using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Interactions;
-using Umbraco.Tests.TestHelpers;
-
-namespace Umbraco.Tests.Integration
-{
-    [Ignore("We don't want to run Selenium tests on TeamCity")]
-    [TestFixture]
-    public class CreateContent : BaseSeleniumTest
-    {
-        [SetUp]
-        public override void Initialize()
-        {
-            base.Initialize();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            base.TearDown();
-        }
-
-        [Test]
-        public void Install_StarterKit_And_Create_Textpage()
-        {
-            // Login to Umbraco
-            Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/login.aspx?redir=");
-            Driver.FindElement(By.Id("lname")).Clear();
-            Driver.FindElement(By.Id("lname")).SendKeys("admin");
-            Driver.FindElement(By.Id("passw")).Clear();
-            Driver.FindElement(By.Id("passw")).SendKeys("test");
-            Driver.FindElement(By.Id("Button1")).Click();
-            Thread.Sleep(500);
-
-            // Install starter kit
-            Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/umbraco.aspx#developer");
-            Thread.Sleep(2000);
-
-            var builder = new Actions(Driver);
-            var packagesNode = Driver.FindElement(By.XPath("//*[@id='init'][3]"));
-            builder.MoveToElement(packagesNode).DoubleClick().Build().Perform();
-            Thread.Sleep(500);
-
-            var installStarterKitNode = Driver.FindElement(By.XPath("(//li[@id='-1']/a/div)[4]"));
-            builder.MoveToElement(installStarterKitNode).Click().Build().Perform();
-            Thread.Sleep(500);
-
-            var rightFrame = Driver.FindElement(By.XPath("//*[@id='right']"));
-            Driver.SwitchTo().Frame(rightFrame);
-            Thread.Sleep(500);
-
-            var simpleKit = Driver.FindElement(By.XPath("/html/body/form/div[2]/div[2]/div/div/div/div/div[4]/nav/ul/li[1]/a"));
-            builder.MoveToElement(simpleKit).Click().Build().Perform();
-            Thread.Sleep(6000);
-
-            // Create new content
-            Driver.SwitchTo().DefaultContent();
-            Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/umbraco.aspx#content");
-            Thread.Sleep(500);
-
-            var contentNode = Driver.FindElement(By.XPath("//*[@id = 'JTree_TreeContainer']/div/ul/li/ul/li/a/div"));
-            builder.MoveToElement(contentNode).ContextClick().Build().Perform();
-            Thread.Sleep(1000);
-
-            var createButton = Driver.FindElement(By.XPath("//*[@id = 'jstree-contextmenu']/li[1]/a/span/div[2]"));
-            createButton.Click();
-            Thread.Sleep(500);
-
-            var umbracoModalBoxIframe = Driver.FindElement(By.CssSelector(".umbModalBoxIframe"));
-            Driver.SwitchTo().Frame(umbracoModalBoxIframe);
-
-            var createTextBox = Driver.FindElement(By.XPath("//input[@type='text'][1]"));
-            createTextBox.Clear();
-            createTextBox.SendKeys("Test Page");
-
-            var submitButton = Driver.FindElement(By.XPath("//input[@type='submit'][1]"));
-            submitButton.Click();
-            Thread.Sleep(2000);
-
-            Driver.SwitchTo().Frame(rightFrame);
-            var saveAndPublishButton = Driver.FindElement(By.XPath("//*[@id='body_TabView1_tab01layer_publish']"));
-            saveAndPublishButton.Click();
-            Thread.Sleep(2000);
-
-            var contentArea = Driver.FindElement(By.XPath("//*[@id='body_TabView1']"));
-            Assert.IsNotNull(contentArea);
-            Thread.Sleep(500);
-
-            // Perform delete
-            Driver.SwitchTo().DefaultContent();
-            var installingModulesNode = Driver.FindElement(By.XPath("//*[@id='1052']/a/div"));
-            builder.MoveToElement(installingModulesNode).ContextClick().Build().Perform();
-            Thread.Sleep(1000);
-
-            var deleteButton = Driver.FindElement(By.CssSelector(".sprDelete"));
-            deleteButton.Click();
-            var alert = Driver.SwitchTo().Alert();
-            alert.Accept();
-            Thread.Sleep(1000);
-
-            // Perform move
-            var goFurtherNode = Driver.FindElement(By.XPath("//*[@id='1053']/a/div"));
-            builder.MoveToElement(goFurtherNode).ContextClick().Build().Perform();
-            Thread.Sleep(1000);
-
-            var moveButton = Driver.FindElement(By.CssSelector(".sprMove"));
-            moveButton.Click();
-            Thread.Sleep(2000);
-
-            umbracoModalBoxIframe = Driver.FindElement(By.CssSelector(".umbModalBoxIframe"));
-            Driver.SwitchTo().Frame(umbracoModalBoxIframe);
-
-            var rootNode = Driver.FindElement(By.XPath("//*[@id='1051']"));
-            builder.MoveToElement(rootNode).DoubleClick().Build().Perform();
-            Thread.Sleep(500);
-            var gettinStartedNode = Driver.FindElement(By.XPath("//*[@id='1055']/a/div"));
-            builder.MoveToElement(gettinStartedNode).Click().Build().Perform();
-            Thread.Sleep(500);
-            submitButton = Driver.FindElement(By.XPath("//input[@type='submit'][1]"));
-            builder.MoveToElement(submitButton).Click().Build().Perform();
-            Thread.Sleep(2000);
-            var closeLink = Driver.FindElement(By.XPath("/html/body/form/div[2]/p[2]/a"));
-            builder.MoveToElement(closeLink).Click().Build().Perform();
-            
-            Driver.SwitchTo().DefaultContent();
-            Thread.Sleep(1000);
-
-            // Perform copy
-            var gettingStartedNode = Driver.FindElement(By.XPath("//*[@id='1054']/a/div"));
-            builder.MoveToElement(gettingStartedNode).ContextClick().Build().Perform();
-            Thread.Sleep(1000);
-
-            var copyButton = Driver.FindElement(By.CssSelector(".sprCopy"));
-            copyButton.Click();
-            Thread.Sleep(2000);
-
-            umbracoModalBoxIframe = Driver.FindElement(By.CssSelector(".umbModalBoxIframe"));
-            Driver.SwitchTo().Frame(umbracoModalBoxIframe);
-
-            rootNode = Driver.FindElement(By.XPath("//*[@id='1051']"));
-            builder.MoveToElement(rootNode).DoubleClick().Build().Perform();
-            Thread.Sleep(500);
-            
-            submitButton = Driver.FindElement(By.XPath("//input[@type='submit'][1]"));
-            builder.MoveToElement(submitButton).Click().Build().Perform();
-            Thread.Sleep(2000);
-            closeLink = Driver.FindElement(By.XPath("/html/body/form/div[2]/p[2]/a"));
-            builder.MoveToElement(closeLink).Click().Build().Perform();
-        }
-    }
-}

src/Umbraco.Tests/Integration/InstallPackage.cs

@@ -1,145 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading;
-using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Interactions;
-using Umbraco.Core;
-using Umbraco.Tests.TestHelpers;
-
-namespace Umbraco.Tests.Integration
-{
-    [Ignore("We don't want to run Selenium tests on TeamCity")]
-    [TestFixture]
-    public class InstallPackage : BaseSeleniumTest
-    {
-        [SetUp]
-        public override void Initialize()
-        {
-            base.Initialize();
-        }
-        
-        [TearDown]
-        public void TearDown()
-        {
-            base.TearDown();
-        }
-
-        [Test]
-        public void Install_Courier_Package()
-        {
-            Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/login.aspx?redir=");
-            Driver.FindElement(By.Id("lname")).Clear();
-            Driver.FindElement(By.Id("lname")).SendKeys("admin");
-            Driver.FindElement(By.Id("passw")).Clear();
-            Driver.FindElement(By.Id("passw")).SendKeys("test");
-            Driver.FindElement(By.Id("Button1")).Click();
-            Thread.Sleep(1000);
-
-            Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/umbraco.aspx#developer");
-            Thread.Sleep(2000);
-
-            var builder = new Actions(Driver);
-            var packagesNode = Driver.FindElement(By.XPath("//*[@id='init'][3]"));
-            builder.MoveToElement(packagesNode).DoubleClick().Build().Perform();
-            Thread.Sleep(1000);
-
-            var installPackageNode = Driver.FindElement(By.XPath("/html/body/div[2]/div/div/div[2]/div/div/div/div/ul/li/ul/li[3]/ul/li[4]/a/div"));
-            builder.MoveToElement(installPackageNode).Click().Build().Perform();
-            Thread.Sleep(1000);
-
-            var rightFrame = Driver.FindElement(By.XPath("//*[@id='right']"));
-            Driver.SwitchTo().Frame(rightFrame);
-
-            const string packagesDir = @"C:\\Downloads\\Packages\\";
-            var file = new DirectoryInfo(packagesDir).GetFiles().First(f => f.Name.ToLowerInvariant().StartsWith("Courier".ToLowerInvariant()));
-            
-            Driver.FindElement(By.Id("cb")).Click();
-            Driver.FindElement(By.XPath("//input[@type='file']")).SendKeys(file.FullName);
-            Driver.FindElement(By.Id("body_ButtonLoadPackage")).Click();
-            Driver.FindElement(By.Id("body_acceptCheckbox")).Click();
-            Driver.FindElement(By.Id("body_ButtonInstall")).Click();
-            Thread.Sleep(1000);
-
-            var successPanel = Driver.FindElement(By.XPath("//*[@id='body_Panel1_content']"));
-            Assert.IsNotNull(successPanel);
-        }
-
-        [Test]
-        public void Install_Contour_Package()
-        {
-            Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/login.aspx?redir=");
-            Driver.FindElement(By.Id("lname")).Clear();
-            Driver.FindElement(By.Id("lname")).SendKeys("admin");
-            Driver.FindElement(By.Id("passw")).Clear();
-            Driver.FindElement(By.Id("passw")).SendKeys("test");
-            Driver.FindElement(By.Id("Button1")).Click();
-            Thread.Sleep(1000);
-
-            Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/umbraco.aspx#developer");
-            Thread.Sleep(2000);
-
-            var builder = new Actions(Driver);
-            var packagesNode = Driver.FindElement(By.XPath("//*[@id='init'][3]"));
-            builder.MoveToElement(packagesNode).DoubleClick().Build().Perform();
-            Thread.Sleep(1000);
-
-            var installPackageNode = Driver.FindElement(By.XPath("/html/body/div[2]/div/div/div[2]/div/div/div/div/ul/li/ul/li[3]/ul/li[4]/a/div"));
-            builder.MoveToElement(installPackageNode).Click().Build().Perform();
-            Thread.Sleep(1000);
-
-            var rightFrame = Driver.FindElement(By.XPath("//*[@id='right']"));
-            Driver.SwitchTo().Frame(rightFrame);
-
-            const string packagesDir = @"C:\\Downloads\\Packages\\";
-            var file = new DirectoryInfo(packagesDir).GetFiles().First(f => f.Name.ToLowerInvariant().StartsWith("UmbracoContour".ToLowerInvariant()));
-
-            Driver.FindElement(By.Id("cb")).Click();
-            Driver.FindElement(By.XPath("//input[@type='file']")).SendKeys(file.FullName);
-            Driver.FindElement(By.Id("body_ButtonLoadPackage")).Click();
-            Driver.FindElement(By.Id("body_acceptCheckbox")).Click();
-            Driver.FindElement(By.Id("body_ButtonInstall")).Click();
-            Thread.Sleep(1000);
-
-            var successPanel = Driver.FindElement(By.XPath("//*[@id='body_Panel1_content']"));
-            Assert.IsNotNull(successPanel);
-        }
-
-        //[Test]
-        //public void Install_CMS_Import_Package()
-        //{
-        //    Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/login.aspx?redir=");
-        //    Driver.FindElement(By.Id("lname")).Clear();
-        //    Driver.FindElement(By.Id("lname")).SendKeys("admin");
-        //    Driver.FindElement(By.Id("passw")).Clear();
-        //    Driver.FindElement(By.Id("passw")).SendKeys("test");
-        //    Driver.FindElement(By.Id("Button1")).Click();
-        //    Thread.Sleep(1000);
-
-        //    Driver.Navigate().GoToUrl(BaseUrl + "/umbraco/umbraco.aspx#developer");
-        //    Thread.Sleep(2000);
-
-        //    var builder = new Actions(Driver);
-        //    var packagesNode = Driver.FindElement(By.XPath("//*[@id='init'][3]"));
-        //    builder.MoveToElement(packagesNode).DoubleClick().Build().Perform();
-        //    Thread.Sleep(1000);
-
-        //    var installPackageNode = Driver.FindElement(By.XPath("/html/body/div[2]/div/div/div[2]/div/div/div/div/ul/li/ul/li[3]/ul/li[4]/a/div"));
-        //    builder.MoveToElement(installPackageNode).Click().Build().Perform();
-        //    Thread.Sleep(1000);
-
-        //    var rightFrame = Driver.FindElement(By.XPath("//*[@id='right']"));
-        //    Driver.SwitchTo().Frame(rightFrame);
-
-        //    Driver.FindElement(By.Id("cb")).Click();
-        //    Driver.FindElement(By.Id("body_file1")).SendKeys("C:\\Downloads\\Packages\\CMSImport-2.3.1.zip");
-        //    Driver.FindElement(By.Id("body_ButtonLoadPackage")).Click();
-        //    Driver.FindElement(By.Id("body_acceptCheckbox")).Click();
-        //    Driver.FindElement(By.Id("body_ButtonInstall")).Click();
-        //    Thread.Sleep(1000);
-
-        //    var successPanel = Driver.FindElement(By.XPath("//*[@id='body_Panel1_content']"));
-        //    Assert.IsNotNull(successPanel);
-        //}
-    }
-}

src/Umbraco.Tests/Models/Collections/Item.cs

@@ -12,7 +12,6 @@ namespace Umbraco.Tests.Models.Collections
     public abstract class Item : IEntity, ICanBeDirty
     {
         private bool _hasIdentity;
-        private int? _hash;
         private int _id;
         private Guid _key;
 
@@ -173,15 +172,7 @@ namespace Umbraco.Tests.Models.Collections
 
         public static bool operator ==(Item left, Item right)
         {
-            /*if (ReferenceEquals(null, left))
-                return false;
-
-            if(ReferenceEquals(null, right))
-                return false;*/
-
             return ReferenceEquals(left, right);
-
-            return left.Equals(right);
         }
 
         public static bool operator !=(Item left, Item right)
@@ -250,4 +241,4 @@ namespace Umbraco.Tests.Models.Collections
             return this.MemberwiseClone();
         }
     }
-}
+}

src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs

@@ -1,15 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Tests.TestHelpers;
 

src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs

@@ -1,38 +1,38 @@
-using System;
+using NUnit.Framework;
 using System.Diagnostics;
-using System.Linq;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Tests.TestHelpers;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Persistence.Querying
 {
     [TestFixture]
     public class PetaPocoSqlTests : BaseUsingSqlCeSyntax
     {
-        //x => 
+        private readonly ISqlSyntaxProvider _sqlSyntax = new SqlCeSyntaxProvider();
 
         [Test]
         public void Where_Clause_With_Starts_With_Additional_Parameters()
         {
             var content = new NodeDto() { NodeId = 123, Path = "-1,123" };
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Path.SqlStartsWith(content.Path, TextColumnType.NVarchar));
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Path.SqlStartsWith(content.Path, TextColumnType.NVarchar), _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[path]) LIKE upper(@0))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(content.Path + "%", sql.Arguments[0]);        
+            Assert.AreEqual(content.Path + "%", sql.Arguments[0]);
         }
 
         [Test]
         public void Where_Clause_With_Starts_With_By_Variable()
         {
-            var content = new NodeDto() {NodeId = 123, Path = "-1,123"};
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Path.StartsWith(content.Path) && x.NodeId != content.NodeId);
+            var content = new NodeDto() { NodeId = 123, Path = "-1,123" };
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Path.StartsWith(content.Path) && x.NodeId != content.NodeId, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[path]) LIKE upper(@0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(2, sql.Arguments.Length);
@@ -43,8 +43,10 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_Not_Starts_With()
         {
-            var level = 1;
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Level == level && !x.Path.StartsWith("-20"));
+            const int level = 1;
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Level == level && x.Path.StartsWith("-20") == false, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(2, sql.Arguments.Length);
@@ -55,8 +57,10 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_EqualsFalse_Starts_With()
         {
-            var level = 1;
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Level == level && x.Path.StartsWith("-20") == false);
+            const int level = 1;
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Level == level && x.Path.StartsWith("-20") == false, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(2, sql.Arguments.Length);
@@ -67,7 +71,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_Equals_Clause()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text.Equals("Hello@world.com"));
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Text.Equals("Hello@world.com"), _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) = upper(@0))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -77,7 +83,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_False_Boolean()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => !x.Trashed);
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Trashed == false, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (NOT ([umbracoNode].[trashed] = @0))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -87,7 +95,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_EqualsFalse_Boolean()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Trashed == false);
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Trashed == false, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (NOT ([umbracoNode].[trashed] = @0))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -97,7 +107,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_Boolean()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Trashed);
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Trashed, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -107,7 +119,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_ToUpper()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text.ToUpper() == "hello".ToUpper());
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Text.ToUpper() == "hello".ToUpper(), _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[text]) = upper(@0)))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -117,7 +131,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_ToString()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text == 1.ToString());
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Text == 1.ToString(), _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[text] = @0))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -127,7 +143,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_With_Wildcard()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text.StartsWith("D"));
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Text.StartsWith("D"), _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) LIKE upper(@0))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -137,7 +155,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_Single_Constant()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.NodeId == 2);
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.NodeId == 2, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] = @0))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
@@ -147,7 +167,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_And_Constant()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.NodeId != 2 && x.NodeId != 3);
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.NodeId != 2 && x.NodeId != 3, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[id] <> @0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(2, sql.Arguments.Length);
@@ -158,7 +180,9 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Where_Clause_Or_Constant()
         {
-            var sql = new Sql("SELECT *").From<NodeDto>().Where<NodeDto>(x => x.Text == "hello" || x.NodeId == 3);
+            var sql = new Sql("SELECT *")
+                .From<NodeDto>(_sqlSyntax)
+                .Where<NodeDto>(x => x.Text == "hello" || x.NodeId == 3, _sqlSyntax);
 
             Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[text] = @0) OR ([umbracoNode].[id] = @1)))", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(2, sql.Arguments.Length);
@@ -173,7 +197,7 @@ namespace Umbraco.Tests.Persistence.Querying
             expected.Select("*").From("[cmsContent]");
 
             var sql = new Sql();
-            sql.Select("*").From<ContentDto>();
+            sql.Select("*").From<ContentDto>(_sqlSyntax);
 
             Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
@@ -190,9 +214,9 @@ namespace Umbraco.Tests.Persistence.Querying
                 .On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]");
 
             var sql = new Sql();
-            sql.Select("*").From<DocumentDto>()
-                .InnerJoin<ContentVersionDto>()
-                .On<DocumentDto, ContentVersionDto>(left => left.VersionId, right => right.VersionId);
+            sql.Select("*").From<DocumentDto>(_sqlSyntax)
+                .InnerJoin<ContentVersionDto>(_sqlSyntax)
+                .On<DocumentDto, ContentVersionDto>(_sqlSyntax, left => left.VersionId, right => right.VersionId);
 
             Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
@@ -206,7 +230,7 @@ namespace Umbraco.Tests.Persistence.Querying
             expected.Select("*").From("[cmsContent]").OrderBy("([cmsContent].[contentType])");
 
             var sql = new Sql();
-            sql.Select("*").From<ContentDto>().OrderBy<ContentDto>(x => x.ContentTypeId);
+            sql.Select("*").From<ContentDto>(_sqlSyntax).OrderBy<ContentDto>(x => x.ContentTypeId, _sqlSyntax);
 
             Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
@@ -220,7 +244,7 @@ namespace Umbraco.Tests.Persistence.Querying
             expected.Select("*").From("[cmsContent]").GroupBy("[contentType]");
 
             var sql = new Sql();
-            sql.Select("*").From<ContentDto>().GroupBy<ContentDto>(x => x.ContentTypeId);
+            sql.Select("*").From<ContentDto>(_sqlSyntax).GroupBy<ContentDto>(x => x.ContentTypeId, _sqlSyntax);
 
             Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
@@ -234,7 +258,7 @@ namespace Umbraco.Tests.Persistence.Querying
             expected.Select("*").From("[cmsContent]").Where("([cmsContent].[nodeId] = @0)", 1045);
 
             var sql = new Sql();
-            sql.Select("*").From<ContentDto>().Where<ContentDto>(x => x.NodeId == 1045);
+            sql.Select("*").From<ContentDto>(_sqlSyntax).Where<ContentDto>(x => x.NodeId == 1045, _sqlSyntax);
 
             Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
@@ -252,13 +276,82 @@ namespace Umbraco.Tests.Persistence.Querying
 
             var sql = new Sql();
             sql.Select("*")
-                .From<ContentDto>()
-                .Where<ContentDto>(x => x.NodeId == 1045)
-                .Where<ContentDto>(x => x.ContentTypeId == 1050);
+                .From<ContentDto>(_sqlSyntax)
+                .Where<ContentDto>(x => x.NodeId == 1045, _sqlSyntax)
+                .Where<ContentDto>(x => x.ContentTypeId == 1050, _sqlSyntax);
+
+            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+            Debug.Print(sql.SQL);
+        }
+
+        [Test]
+        public void Can_Use_Select_With_Star_And_Predicate()
+        {
+            var expected = new Sql();
+            expected.Select("[cmsContent].*")
+                .From("[cmsContent]");
+
+            var sql = new Sql();
+            sql.Select<ContentDto>(_sqlSyntax)
+                .From<ContentDto>(_sqlSyntax);
+
+            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+            Debug.Print(sql.SQL);
+        }
+
+        [Test]
+        public void Can_Use_Select_With_One_Column_And_Predicate()
+        {
+            var expected = new Sql();
+            expected.Select("[cmsContent].[nodeId]")
+                .From("[cmsContent]");
+
+            var sql = new Sql();
+            sql.Select<ContentDto>(_sqlSyntax, c => c.NodeId)
+                .From<ContentDto>(_sqlSyntax);
+
+            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+            Debug.Print(sql.SQL);
+        }
+
+        [Test]
+        public void Can_Use_Select_With_Multiple_Column_And_Predicate()
+        {
+            var expected = new Sql();
+            expected.Select("[cmsContent].[nodeId]", "[cmsContent].[contentType]", "[cmsContent].[pk]")
+                .From("[cmsContent]");
+
+            var sql = new Sql();
+            sql.Select<ContentDto>(_sqlSyntax, c => c.NodeId, c => c.ContentTypeId, c => c.PrimaryKey)
+                .From<ContentDto>(_sqlSyntax);
+
+            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+            Debug.Print(sql.SQL);
+        }
+
+        [Test]
+        public void Can_InnerJoin_With_Select_And_AndSelect()
+        {
+            var expected = new Sql();
+            expected.Select("[cmsDocument].[nodeId], [cmsDocument].[published]\n, [cmsContentVersion].[id]")
+                .From("[cmsDocument]")
+                .InnerJoin("[cmsContentVersion]")
+                .On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]");
+
+            var sql = new Sql();
+            sql.Select<DocumentDto>(_sqlSyntax, d => d.NodeId, d => d.Published)
+                .AndSelect<ContentVersionDto>(_sqlSyntax, cv => cv.Id)
+                .From<DocumentDto>(_sqlSyntax)
+                .InnerJoin<ContentVersionDto>(_sqlSyntax)
+                .On<DocumentDto, ContentVersionDto>(_sqlSyntax, left => left.VersionId, right => right.VersionId);
 
             Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
             Debug.Print(sql.SQL);
         }
     }
-}
+}

src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs

@@ -139,7 +139,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(relationTypes, Is.Not.Null);
                 Assert.That(relationTypes.Any(), Is.True);
                 Assert.That(relationTypes.Any(x => x == null), Is.False);
-                Assert.That(relationTypes.Count(), Is.EqualTo(4));
+                Assert.That(relationTypes.Count(), Is.EqualTo(5));
             }
         }
 
@@ -174,7 +174,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var exists = repository.Exists(3);
-                var doesntExist = repository.Exists(5);
+                var doesntExist = repository.Exists(6);
 
                 // Assert
                 Assert.That(exists, Is.True);
@@ -196,7 +196,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 int count = repository.Count(query);
 
                 // Assert
-                Assert.That(count, Is.EqualTo(4));
+                Assert.That(count, Is.EqualTo(5));
             }
         }
 

src/Umbraco.Tests/Plugins/PluginManagerTests.cs

@@ -285,8 +285,7 @@ AnotherContentFinder
         public void Resolves_Attributed_Trees()
         {
             var trees = _manager.ResolveAttributedTrees();
-            // commit 6c5e35ec2cbfa31be6790d1228e0c2faf5f55bc8 brings the count down to 14
-            Assert.AreEqual(6, trees.Count());
+            Assert.AreEqual(5, trees.Count());
         }
 
         [Test]
@@ -300,7 +299,7 @@ AnotherContentFinder
         public void Resolves_Trees()
         {
             var trees = _manager.ResolveTrees();
-            Assert.AreEqual(34, trees.Count());
+            Assert.AreEqual(33, trees.Count());
         }
 
         [Test]

src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs

@@ -5,6 +5,7 @@ using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.PropertyEditors;
 
 namespace Umbraco.Tests.PropertyEditors
@@ -14,7 +15,7 @@ namespace Umbraco.Tests.PropertyEditors
     /// multiple values such as the drop down list, check box list, color picker, etc....
     /// </summary>
     [TestFixture]
-    public class MultiValuePropertyEditorTests
+    public class MultiValuePropertyEditorTests : BaseUmbracoApplicationTest
     {
         //TODO: Test the other formatting methods for the drop down classes
 
@@ -111,4 +112,4 @@ namespace Umbraco.Tests.PropertyEditors
         }
 
     }
-}
+}