yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch origin/dev-v7 into dev-v8

Browse Source
This commit is contained in:
Stephan
2016-07-18 14:42:06 +02:00
parent d04efbf5a4 c617599fef
commit 77c2766d55
113 changed files with 1507 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Models.Rdbms
[Column("contentNodeId")]
[ForeignKey(typeof(NodeDto))]
[Index(IndexTypes.NonClustered, Name = "IX_cmsPropertyData_1")]
[Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsPropertyData_1", ForColumns = "contentNodeId,versionId,propertytypeid")]
public int NodeId { get; set; }
[Column("versionId")]

7
src/Umbraco.Core/Models/Rdbms/StylesheetDto.cs
View File

@@ -1,12 +1,11 @@
using NPoco;
using System;
using NPoco;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.DatabaseAnnotations;
namespace Umbraco.Core.Models.Rdbms
{
[TableName("cmsStylesheet")]
[PrimaryKey("nodeId", AutoIncrement = false)]
[ExplicitColumns]
[Obsolete("This is no longer used and will be removed from Umbraco in future versions")]
internal class StylesheetDto
{
[Column("nodeId")]

7
src/Umbraco.Core/Models/Rdbms/StylesheetPropertyDto.cs
View File

@@ -1,12 +1,11 @@
using NPoco;
using System;
using NPoco;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.DatabaseAnnotations;
namespace Umbraco.Core.Models.Rdbms
{
[TableName("cmsStylesheetProperty")]
[PrimaryKey("nodeId", AutoIncrement = false)]
[ExplicitColumns]
[Obsolete("This is no longer used and will be removed from Umbraco in future versions")]
internal class StylesheetPropertyDto
{
[Column("nodeId")]