Merge branch 'master' into documentation-media-text-fields

Kentico · May 3, 2023 · 939b7e5 · 939b7e5
2 parents 7550471 + 34a58e9
commit 939b7e5
Show file tree

Hide file tree

Showing 8 changed files with 323 additions and 249 deletions.
diff --git a/Migration.Toolkit.CLI/README.md b/Migration.Toolkit.CLI/README.md
diff --git a/Migration.Toolkit.KXP.Api/Migration.Toolkit.KXP.Api.csproj b/Migration.Toolkit.KXP.Api/Migration.Toolkit.KXP.Api.csproj
@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Kentico.Xperience.Admin" Version="26.0.1" />
-      <PackageReference Include="Kentico.Xperience.Core" Version="26.0.1" />
+      <PackageReference Include="Kentico.Xperience.Admin" Version="26.1.0" />
+      <PackageReference Include="Kentico.Xperience.Core" Version="26.1.0" />
     </ItemGroup>
 
 </Project>
diff --git a/Migration.Toolkit.KXP.Extensions/Migration.Toolkit.KXP.Extensions.csproj b/Migration.Toolkit.KXP.Extensions/Migration.Toolkit.KXP.Extensions.csproj
@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Kentico.Xperience.Core" Version="26.0.1" />
-      <PackageReference Include="Kentico.Xperience.WebApp" Version="26.0.1" />
+      <PackageReference Include="Kentico.Xperience.Core" Version="26.1.0" />
+      <PackageReference Include="Kentico.Xperience.WebApp" Version="26.1.0" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     </ItemGroup>

diff --git a/Migration.Toolkit.KXP/Context/KxpContext.cs b/Migration.Toolkit.KXP/Context/KxpContext.cs
@@ -533,6 +533,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<CmsFormFeaturedField>(entity =>
             {
+                entity.Property(e => e.FormFeaturedFieldEnabled).HasDefaultValueSql("((1))");
+
                 entity.Property(e => e.FormFeaturedFieldMapping).HasDefaultValueSql("(N'')");
             });
 
@@ -1155,8 +1157,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             {
                 entity.Property(e => e.ActionEnabled).HasDefaultValueSql("((1))");
 
-                entity.Property(e => e.ActionWorkflowType).HasDefaultValueSql("((0))");
-
                 entity.HasOne(d => d.ActionResource)
                     .WithMany(p => p.CmsWorkflowActions)
                     .HasForeignKey(d => d.ActionResourceId)

diff --git a/Migration.Toolkit.KXP/Models/CmsContentRelationship.cs b/Migration.Toolkit.KXP/Models/CmsContentRelationship.cs
@@ -9,25 +9,25 @@ namespace Migration.Toolkit.KXP.Models
     [Table("CMS_ContentRelationship")]
     public partial class CmsContentRelationship
     {
-        [Column("graph_id_7F94B75F70E84E8FB9B227B6C692806A")]
-        public long GraphId7f94b75f70e84e8fb9b227b6c692806a { get; set; }
-        [Column("$edge_id_6B1607C77385450BB8F50DCEA5189C6F")]
+        [Column("graph_id_741F379D95C34D2CB17F74FAD4E11C91")]
+        public long GraphId741f379d95c34d2cb17f74fad4e11c91 { get; set; }
+        [Column("$edge_id_845C2B755CDD4FEC9A746480DCADD809")]
         [StringLength(1000)]
-        public string EdgeId6b1607c77385450bb8f50dcea5189c6f { get; set; } = null!;
-        [Column("from_obj_id_476D08013231480588EE995977E21DF5")]
-        public int FromObjId476d08013231480588ee995977e21df5 { get; set; }
-        [Column("from_id_4CB26B80E523479DB829CF207AF83D88")]
-        public long FromId4cb26b80e523479db829cf207af83d88 { get; set; }
-        [Column("$from_id_5A00FF7305FC4CA3A10D84BC73A532BA")]
+        public string EdgeId845c2b755cdd4fec9a746480dcadd809 { get; set; } = null!;
+        [Column("from_obj_id_3EA6B379F9EC4B5199DD1285908AC97F")]
+        public int FromObjId3ea6b379f9ec4b5199dd1285908ac97f { get; set; }
+        [Column("from_id_C68E204CDD8A4F0989D187E933226765")]
+        public long FromIdC68e204cdd8a4f0989d187e933226765 { get; set; }
+        [Column("$from_id_A7B8B75CECF84F869552F10D5EF8843B")]
         [StringLength(1000)]
-        public string? FromId5a00ff7305fc4ca3a10d84bc73a532ba { get; set; }
-        [Column("to_obj_id_2C87E30CDE554517903E799E869F71D6")]
-        public int ToObjId2c87e30cde554517903e799e869f71d6 { get; set; }
-        [Column("to_id_3E6168226DCE4BEFA2E6F70D09CE793F")]
-        public long ToId3e6168226dce4befa2e6f70d09ce793f { get; set; }
-        [Column("$to_id_961490D158BF4023B5DEA1BE5BE417C6")]
+        public string? FromIdA7b8b75cecf84f869552f10d5ef8843b { get; set; }
+        [Column("to_obj_id_BF32BEBD1107428DA8A9CB51500FB66F")]
+        public int ToObjIdBf32bebd1107428da8a9cb51500fb66f { get; set; }
+        [Column("to_id_A0E3165266D0441680EFF403F1E7F54E")]
+        public long ToIdA0e3165266d0441680eff403f1e7f54e { get; set; }
+        [Column("$to_id_30C5D1E23418447DB3E03D10DE678C5E")]
         [StringLength(1000)]
-        public string? ToId961490d158bf4023b5dea1be5be417c6 { get; set; }
+        public string? ToId30c5d1e23418447db3e03d10de678c5e { get; set; }
         [Key]
         [Column("ContentRelationshipID")]
         public int ContentRelationshipId { get; set; }

diff --git a/Migration.Toolkit.KXP/Models/CmsContentRelationshipItem.cs b/Migration.Toolkit.KXP/Models/CmsContentRelationshipItem.cs
@@ -10,11 +10,11 @@ namespace Migration.Toolkit.KXP.Models
     [Index("ContentRelationshipItemObjectType", "ContentRelationshipItemObjectId", Name = "IX_CMS_ContentRelationshipItem_ObjectType_ObjectID", IsUnique = true)]
     public partial class CmsContentRelationshipItem
     {
-        [Column("graph_id_ADFBD307F6894A6B9C2C0A3D9A6058DC")]
-        public long GraphIdAdfbd307f6894a6b9c2c0a3d9a6058dc { get; set; }
-        [Column("$node_id_B12FA7C97AAB49A3BC4B145536D270E3")]
+        [Column("graph_id_0F42876FB2D4400FB0F5DC129B956195")]
+        public long GraphId0f42876fb2d4400fb0f5dc129b956195 { get; set; }
+        [Column("$node_id_BB9B40FFA6D34F9F9733E1D3D9259FC6")]
         [StringLength(1000)]
-        public string NodeIdB12fa7c97aab49a3bc4b145536d270e3 { get; set; } = null!;
+        public string NodeIdBb9b40ffa6d34f9f9733e1d3d9259fc6 { get; set; } = null!;
         [Key]
         [Column("ContentRelationshipItemID")]
         public int ContentRelationshipItemId { get; set; }

diff --git a/Migration.Toolkit.KXP/Models/CmsFormFeaturedField.cs b/Migration.Toolkit.KXP/Models/CmsFormFeaturedField.cs
@@ -25,5 +25,7 @@ public partial class CmsFormFeaturedField
         public string FormFeaturedFieldName { get; set; } = null!;
         [StringLength(200)]
         public string FormFeaturedFieldIconClass { get; set; } = null!;
+        [Required]
+        public bool? FormFeaturedFieldEnabled { get; set; }
     }
 }