Merge dev-v7.6 into dev-v7-deploy

src/Umbraco.Core/Models/ContentTypeBase.cs

@@ -326,7 +326,7 @@ namespace Umbraco.Core.Models
             }
         }
 
-            /// <summary>
+        /// <summary>
         /// A boolean flag indicating if a property type has been removed from this instance.
         /// </summary>
         /// <remarks>

src/Umbraco.Core/Models/PublicAccessEntry.cs

@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models
             NoAccessNodeId = noAccessNode.Id;
             _protectedNodeId = protectedNode.Id;
 
-            _ruleCollection = new ObservableCollection<PublicAccessRule>(ruleCollection);            
+            _ruleCollection = new ObservableCollection<PublicAccessRule>(ruleCollection);
             _ruleCollection.CollectionChanged += _ruleCollection_CollectionChanged;
         }
 
@@ -81,7 +81,7 @@ namespace Umbraco.Core.Models
         internal IEnumerable<Guid> RemovedRules
         {
             get { return _removedRules; }
-        } 
+        }
 
         public IEnumerable<PublicAccessRule> Rules
         {
@@ -123,7 +123,7 @@ namespace Umbraco.Core.Models
             get { return _noAccessNodeId; }
             set { SetPropertyValueAndDetectChanges(value, ref _noAccessNodeId, Ps.Value.NoAccessNodeIdSelector); }
         }
-       
+
         [DataMember]
         public int ProtectedNodeId
         {

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

@@ -0,0 +1,29 @@
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
+
+namespace Umbraco.Core.Models.Rdbms
+{
+    [TableName("umbracoLock")]
+    [PrimaryKey("id")]
+    [ExplicitColumns]
+    internal class LockDto
+    {
+        public LockDto()
+        {
+            Value = 1;
+        }
+
+        [Column("id")]
+        [PrimaryKeyColumn(Name = "PK_umbracoLock")]
+        public int Id { get; set; }
+
+        [Column("value")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public int Value { get; set; }
+
+        [Column("name")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        [Length(64)]
+        public string Name { get; set; }
+    }
+}