Fix 8.0 migration

src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ContentVariationMigration.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using NPoco;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
@@ -59,5 +61,58 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 Database.Update(dto);
             }
         }
+
+        // we *need* to use this private DTO here, which does *not* have extra properties, which would kill the migration
+
+        [TableName(TableName)]
+        [PrimaryKey("pk")]
+        [ExplicitColumns]
+        private class ContentTypeDto
+        {
+            public const string TableName = Constants.DatabaseSchema.Tables.ContentType;
+
+            [Column("pk")]
+            [PrimaryKeyColumn(IdentitySeed = 535)]
+            public int PrimaryKey { get; set; }
+
+            [Column("nodeId")]
+            [ForeignKey(typeof(NodeDto))]
+            [Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsContentType")]
+            public int NodeId { get; set; }
+
+            [Column("alias")]
+            [NullSetting(NullSetting = NullSettings.Null)]
+            public string Alias { get; set; }
+
+            [Column("icon")]
+            [Index(IndexTypes.NonClustered)]
+            [NullSetting(NullSetting = NullSettings.Null)]
+            public string Icon { get; set; }
+
+            [Column("thumbnail")]
+            [Constraint(Default = "folder.png")]
+            public string Thumbnail { get; set; }
+
+            [Column("description")]
+            [NullSetting(NullSetting = NullSettings.Null)]
+            [Length(1500)]
+            public string Description { get; set; }
+
+            [Column("isContainer")]
+            [Constraint(Default = "0")]
+            public bool IsContainer { get; set; }
+
+            [Column("allowAtRoot")]
+            [Constraint(Default = "0")]
+            public bool AllowAtRoot { get; set; }
+
+            [Column("variations")]
+            [Constraint(Default = "1" /*ContentVariation.InvariantNeutral*/)]
+            public byte Variations { get; set; }
+
+            [ResultColumn]
+            public NodeDto NodeDto { get; set; }
+        }
+
     }
 }