Post.cshtml shouldn't be there

Tested creating/editing members with custom properties in combination with our snippets and
that seems to work fine now, so not sure what this was supposed to fix.
Fixes U4-4604 Surface Controller functionality changed in 7.1 breaking site

build/Build.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-SET release=7.1.0
+SET release=7.1.1
 SET comment=
 SET version=%release%
 

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -29,7 +29,7 @@
             <dependency id="ClientDependency" version="[1.7.1.2, 2.0.0)" />
             <dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
             <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
-            <dependency id="Newtonsoft.Json" version="[4.5.11, 5.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[6.0.2, 7.0.0)" />
             <dependency id="ImageProcessor" version="[1.8.7, 2.0.0)" />
             <dependency id="ImageProcessor.Web" version="[3.2.1, 4.0.0)" />
         </dependencies>

build/NuSpecs/build/UmbracoCms.targets

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <UmbracoVersion>7.1.0</UmbracoVersion>
+    <UmbracoVersion>7.1.1</UmbracoVersion>
   </PropertyGroup>
   <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
     <PropertyGroup>

src/Umbraco.Core/Configuration/UmbracoVersion.cs

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

src/Umbraco.Core/Umbraco.Core.csproj

@@ -64,7 +64,7 @@
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

src/Umbraco.Core/packages.config

@@ -10,7 +10,7 @@
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net40" />
   <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
 </packages>

src/Umbraco.Tests/App.config

@@ -120,6 +120,14 @@
 
       </dependentAssembly>
 
+      <dependentAssembly>
+        
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        
+      </dependentAssembly>
+      
     </assemblyBinding>
 
   </runtime>

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -84,9 +84,9 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/Umbraco.Tests/packages.config

@@ -19,7 +19,7 @@
   <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
   <package id="Selenium.WebDriver" version="2.32.0" targetFramework="net40" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js

@@ -26,6 +26,8 @@ angular.module("umbraco.directives.html")
 
                             
                             var imagesOnly =  element.attr('images-only') === "true";
+                           
+                            
                             var margin = element.attr('border') ? parseInt(element.attr('border'), 10) : 5;
                             var startingIndex = element.attr('baseline') ? parseInt(element.attr('baseline'), 10) : 0;
                             var minWidth = element.attr('min-width') ? parseInt(element.attr('min-width'), 10) : 420;

src/Umbraco.Web.UI.Client/src/common/services/util.service.js

@@ -259,10 +259,10 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
 
             //first fill in all of the original image sizes and URLs
             for (var i = startingIndex; i < images.length; i++) {
-                var item = images[0];
+                var item = images[i];
 
-                this.setImageData(images[i]);
-                this.setOriginalSize(images[i], maxRowHeight);
+                this.setImageData(item);
+                this.setOriginalSize(item, maxRowHeight);
 
                 if(imagesOnly && !item.isFolder && !item.thumbnail){
                     images.splice(i, 1);

src/Umbraco.Web.UI.Client/src/installer/steps/database.html

@@ -93,7 +93,7 @@
 							<label class="checkbox" for="integratedAuth">
 								<input type="checkbox" name="integratedAuth"
 								placeholder="umbraco-cms"
-								ng-model="installer.current.model.integratedAuth"  /> Use intergrated authentication</label>
+								ng-model="installer.current.model.integratedAuth"  /> Use integrated authentication</label>
 							</div>
 						</div>
 			  </div>

src/Umbraco.Web.UI.Client/src/installer/steps/user.html

@@ -31,6 +31,8 @@
 					    <input type="text" name="installer.current.model.password" 
 					           ng-minlength="{{installer.current.model.minCharLength}}" 
 					           ng-pattern="passwordPattern"
+					           autocorrect="off"
+					           autocapitalize="off"
                                required 
                                ng-model="installer.current.model.password"  />
 					    <small class="inline-help">At least {{installer.current.model.minCharLength}} characters long</small>

src/Umbraco.Web.UI.Client/src/less/listview.less

@@ -87,7 +87,8 @@
 }
 
 .umb-listview .selected i.icon, .umb-listview tr:hover i.icon{display: none}
-.umb-listview .selected input[type="checkbox"], .umb-listview tr:hover input[type="checkbox"]{display: inline-block;}
+.umb-listview .selected input[type="checkbox"], 
+.umb-listview tr:hover input[type="checkbox"]{display: inline-block !important;}
 .umb-listview .inactive{color: @grayLight;}
 
 .umb-listview .selected td{font-weight: bold;}
@@ -171,10 +172,14 @@
   position: relative
 }
 
+
+.umb-listview  .table-striped thead input[type="checkbox"] {
+  margin-left: 7px;
+}
+
 .umb-listview  .table-striped tbody input[type="checkbox"] {
   display: none;
-  top: 10px;
-  left:10px;
+  margin-left: 7px;
   z-index: 5;
 }
 

src/Umbraco.Web.UI.Client/src/less/property-editors.less

@@ -398,8 +398,8 @@ ul.color-picker li a  {
 
 .umb-photo-folder .umb-non-thumbnail i{
   color: @grayLight;
-  font-size: 70px;
-  line-height: 80px;
+  font-size: 50px;
+  line-height: 60px;
   display: block;
   margin: auto;
   padding-top: 20px;

src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html

@@ -100,15 +100,14 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
 	<div class="umb-panel-body with-footer">
         <div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader" 
         	ng-hide="active() == 0"></div>
-
         <umb-photo-folder 
-        	min-height="75" 
+        	min-height="105" 
         	min-width="150"
         	max-height="250"
             ideal-items-per-row="3"
         	on-click="clickHandler"
         	ng-model="images"
-        	images-only="true"
+        	images-only="{{onlyImages}}"
         	filter-by="searchTerm"/>
 	</div>	
 

src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html

@@ -20,7 +20,7 @@
         </umb-upload-dropzone>
 
     <umb-photo-folder
-        min-height="100"
+        min-height="105"
         min-width="220"
         on-click="clickHandler"
         ng-model="images" />

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -165,9 +165,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -2530,9 +2530,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7100</DevelopmentServerPort>
+          <DevelopmentServerPort>7110</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7100</IISUrl>
+          <IISUrl>http://localhost:7110</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/packages.config

@@ -24,7 +24,7 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net40" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
   <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />

src/Umbraco.Web.UI/web.Template.Debug.config

@@ -152,6 +152,13 @@
         <bindingRedirect oldVersion="1.4.5.0-1.4.6.0" newVersion="1.4.6.0" />
       </dependentAssembly>
 
+      <dependentAssembly  xdt:Transform="Remove"
+												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+
     </assemblyBinding>
 
   </runtime>

src/Umbraco.Web.UI/web.Template.config

@@ -244,7 +244,12 @@
       <dependentAssembly>
         <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>
+
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 

src/Umbraco.Web/Editors/UpdateCheckController.cs

@@ -24,7 +24,7 @@ namespace Umbraco.Web.Editors
             {
                 try
                 {
-                    var check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();
+                    var check = new org.umbraco.update.CheckForUpgrade();
                     var result = check.CheckUpgrade(UmbracoVersion.Current.Major,
                                                     UmbracoVersion.Current.Minor,
                                                     UmbracoVersion.Current.Build,

src/Umbraco.Web/Install/Controllers/InstallController.cs

@@ -69,6 +69,9 @@ namespace Umbraco.Web.Install.Controllers
             //get the base umbraco folder
             ViewBag.UmbracoBaseFolder = IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
+            InstallHelper ih = new InstallHelper(_umbracoContext);
+            ih.InstallStatus(false, "");
+
             //always ensure full path (see NOTE in the class remarks)
             return View(GlobalSettings.Path.EnsureEndsWith('/') + "install/views/index.cshtml");
         }

src/Umbraco.Web/Install/InstallHelper.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Script.Serialization;
 using System.Web.UI;
+using umbraco.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
@@ -14,6 +15,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Web.Install.InstallSteps;
 using Umbraco.Web.Install.Models;
 
+
 namespace Umbraco.Web.Install
 {
     internal class InstallHelper
@@ -88,8 +90,50 @@ namespace Umbraco.Web.Install
             if (Directory.Exists(IOHelper.MapPath("~/Areas/UmbracoInstall")))
             {                
                 Directory.Delete(IOHelper.MapPath("~/Areas/UmbracoInstall"), true);
+            }   
+        }
+
+        internal void InstallStatus(bool isCompleted, string errorMsg)
+        {
+            try
+            {
+                string userAgent = _umbContext.HttpContext.Request.UserAgent;
+
+                // Check for current install Id
+                Guid installId = Guid.NewGuid();
+                StateHelper.Cookies.Cookie installCookie = new StateHelper.Cookies.Cookie("umb_installId", 1);
+                if (!String.IsNullOrEmpty(installCookie.GetValue()))
+                {
+                    if (Guid.TryParse(installCookie.GetValue(), out installId))
+                    {
+                        // check that it's a valid Guid
+                        if (installId == Guid.Empty)
+                            installId = Guid.NewGuid();
+                    }
+                }
+                installCookie.SetValue(installId.ToString());
+
+                string dbProvider = String.Empty;
+                if (!IsBrandNewInstall)
+                    dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
+
+                org.umbraco.update.CheckForUpgrade check = new org.umbraco.update.CheckForUpgrade();
+                check.Install(installId,
+                    !IsBrandNewInstall,
+                    isCompleted,
+                    DateTime.Now,
+                    UmbracoVersion.Current.Major,
+                    UmbracoVersion.Current.Minor,
+                    UmbracoVersion.Current.Build,
+                    UmbracoVersion.CurrentComment,
+                    errorMsg,
+                    userAgent,
+                    dbProvider);
+            }
+            catch (Exception ex)
+            {
+
             }
-                
         }
 
         /// <summary>

src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs

@@ -48,6 +48,11 @@ namespace Umbraco.Web.Install.InstallSteps
             //// login token from a previous version when we didn't have csrf tokens in place
             //var security = new WebSecurity(new HttpContextWrapper(Context), ApplicationContext.Current);
             //security.ClearCurrentLogin();
+
+            //reports the ended install
+            InstallHelper ih = new InstallHelper(UmbracoContext.Current);
+            ih.InstallStatus(true, "");
+
             return null;
         }
 

src/Umbraco.Web/Mvc/RenderViewEngine.cs

@@ -92,25 +92,27 @@ namespace Umbraco.Web.Mvc
 		/// <param name="controllerContext"></param>
 		/// <param name="isPartial"></param>
 		/// <returns></returns>
-		private bool ShouldFindView(ControllerContext controllerContext, bool isPartial)
-		{
-		    var umbracoToken = controllerContext.GetDataTokenInViewContextHierarchy("umbraco");
+        private bool ShouldFindView(ControllerContext controllerContext, bool isPartial)
+        {
+            //first check if we're rendering a partial view for the back office, or surface controller, etc...
+            //anything that is not IUmbracoRenderModel as this should only pertain to Umbraco views.
+            if (isPartial
+                && controllerContext.RouteData.DataTokens.ContainsKey("umbraco")
+                && !(controllerContext.RouteData.DataTokens["umbraco"] is RenderModel))
+            {
+                return true;
+            }
 
-			//first check if we're rendering a partial view for the back office, or surface controller, etc...
-			//anything that is not IUmbracoRenderModel as this should only pertain to Umbraco views.
-			if (isPartial && umbracoToken is RenderModel)
-			{
-				return true;
-			}
+            //only find views if we're rendering the umbraco front end
+            if (controllerContext.RouteData.DataTokens.ContainsKey("umbraco")
+                && controllerContext.RouteData.DataTokens["umbraco"] != null
+                && controllerContext.RouteData.DataTokens["umbraco"] is RenderModel)
+            {
+                return true;
+            }
 
-			//only find views if we're rendering the umbraco front end
-            if (umbracoToken is RenderModel)
-			{
-				return true;
-			}
-
-			return false;
-		}
+            return false;
+        }
 
 	}
 }

src/Umbraco.Web/Umbraco.Web.csproj

@@ -139,9 +139,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NuGet.Core, Version=1.0.11220.104, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>

src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18034
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,12 +9,11 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18034.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18444.
 // 
 #pragma warning disable 1591
 
-namespace umbraco.presentation.org.umbraco.update
-{
+namespace Umbraco.Web.org.umbraco.update {
     using System;
     using System.Web.Services;
     using System.Diagnostics;
@@ -24,7 +23,7 @@ namespace umbraco.presentation.org.umbraco.update
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="CheckForUpgradeSoap", Namespace="http://update.umbraco.org/")]
@@ -181,7 +180,7 @@ namespace umbraco.presentation.org.umbraco.update
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18034")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18408")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -226,7 +225,7 @@ namespace umbraco.presentation.org.umbraco.update
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18034")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18408")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://update.umbraco.org/")]
     public enum UpgradeType {
@@ -254,15 +253,15 @@ namespace umbraco.presentation.org.umbraco.update
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
     public delegate void InstallCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
     public delegate void CheckUpgradeCompletedEventHandler(object sender, CheckUpgradeCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class CheckUpgradeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {

src/Umbraco.Web/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="Umbraco.Web.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
     </configSections>
@@ -39,6 +39,10 @@
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

src/Umbraco.Web/packages.config

@@ -19,7 +19,7 @@
   <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />

src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Linq;
 using System.Web.Security;
 using System.Web.UI;
 using System.Web.UI.WebControls;
@@ -32,10 +33,10 @@ namespace umbraco.presentation.umbraco.dialogs
         protected ContentPicker errorPagePicker = new ContentPicker();
 
         override protected void OnInit(EventArgs e)
-        {           
+        {
             base.OnInit(e);
         }
-        
+
         protected void selectMode(object sender, EventArgs e)
         {
             p_mode.Visible = false;
@@ -111,7 +112,7 @@ namespace umbraco.presentation.umbraco.dialogs
                             SimpleLoginLabel.Visible = true;
                             SimpleLoginLabel.Text = m.UserName;
                             pane_advanced.Visible = false;
-                            bt_protect.CommandName = "simple";    
+                            bt_protect.CommandName = "simple";
                         }
 
                     }
@@ -131,9 +132,9 @@ namespace umbraco.presentation.umbraco.dialogs
             _memberGroups.ID = "Membergroups";
             _memberGroups.Width = 175;
             var selectedGroups = "";
-            var roles = Roles.GetAllRoles();
+            var roles = Roles.GetAllRoles().OrderBy(x => x);
 
-            if (roles.Length > 0)
+            if (roles.Any())
             {
                 foreach (string role in roles)
                 {
@@ -185,7 +186,7 @@ namespace umbraco.presentation.umbraco.dialogs
             if (Page.IsValid)
             {
                 int pageId = int.Parse(helper.Request("nodeId"));
-                
+
                 if (e.CommandName == "simple")
                 {
                     var memberLogin = simpleLogin.Visible ? simpleLogin.Text : SimpleLoginLabel.Text;
@@ -222,7 +223,7 @@ namespace umbraco.presentation.umbraco.dialogs
                     }
                     else if (pp_pass.Visible)
                     {
-                        SimpleLoginNameValidator.IsValid = false;                        
+                        SimpleLoginNameValidator.IsValid = false;
                         SimpleLoginLabel.Visible = true;
                         SimpleLoginLabel.Text = memberLogin;
                         simpleLogin.Visible = false;
@@ -567,6 +568,6 @@ namespace umbraco.presentation.umbraco.dialogs
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder js;
 
-        
+
     }
 }

src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs

@@ -26,8 +26,8 @@ namespace umbraco.presentation.webservices
         {
             if (!AuthorizeRequest()) return null;
 
-            var check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();                        
-            org.umbraco.update.UpgradeResult result = check.CheckUpgrade(UmbracoVersion.Current.Major,
+            var check = new global::Umbraco.Web.org.umbraco.update.CheckForUpgrade();
+            var result = check.CheckUpgrade(UmbracoVersion.Current.Major,
                                                                          UmbracoVersion.Current.Minor,
                                                                          UmbracoVersion.Current.Build,
                                                                          UmbracoVersion.CurrentComment);
@@ -74,7 +74,7 @@ namespace umbraco.presentation.webservices
             if (!String.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
             dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
 
-            org.umbraco.update.CheckForUpgrade check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();
+            var check = new global::Umbraco.Web.org.umbraco.update.CheckForUpgrade();
             check.Install(installId,
                 isUpgrade,
                 isCompleted,

src/umbraco.MacroEngines/packages.config

@@ -14,6 +14,6 @@
   <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
 </packages>

src/umbraco.MacroEngines/umbraco.MacroEngines.csproj

@@ -65,9 +65,9 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />