Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0

src/Umbraco.Tests/Models/UmbracoEntityTests.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.Models
@@ -10,10 +11,10 @@ namespace Umbraco.Tests.Models
         public void UmbracoEntity_Can_Be_Initialized_From_Dynamic()
         {
             var boolIsTrue = true;
-            var intIsTrue = 1;
+            ulong ulongIsTrue = 1; // because MySql might return ulong
 
             var trashedWithBool = new UmbracoEntity((dynamic)boolIsTrue);
-            var trashedWithInt = new UmbracoEntity((dynamic)intIsTrue);
+            var trashedWithInt = new UmbracoEntity((dynamic)ulongIsTrue);
 
             Assert.IsTrue(trashedWithBool.Trashed);
             Assert.IsTrue(trashedWithInt.Trashed);

src/Umbraco.Web/Standalone/PowershellAssemblyResolver.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 
 namespace Umbraco.Web.Standalone
 {
-    public static class PowershellAssemblyResolver
+    internal static class PowershellAssemblyResolver
     {
         private static readonly Dictionary<string, string> Assemblies;
         private static readonly object Locko = new object();

src/Umbraco.Web/Standalone/WriteableConfigSystem.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Web.Standalone
     // see http://stackoverflow.com/questions/15653621/how-to-update-add-modify-delete-keys-in-appsettings-section-of-web-config-at-r
     // see http://www.codeproject.com/Articles/69364/Override-Configuration-Manager
 
-    public sealed class WriteableConfigSystem : IInternalConfigSystem
+    internal sealed class WriteableConfigSystem : IInternalConfigSystem
     {
         private static readonly ReaderWriterLockSlim RwLock = new ReaderWriterLockSlim();
         private static WriteableConfigSystem _installed;