From 2cf3be8c10d99dfb7170cbbda1edb8aade2d7b71 Mon Sep 17 00:00:00 2001 From: Jaddie Date: Thu, 21 Oct 2021 16:24:54 +0100 Subject: [PATCH 1/3] Migration steps are missed when migrating to V9 from V8.17 --- .../Migrations/Upgrade/UmbracoPlan.cs | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index 277a236e24dc..d1a4bd4b5067 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -219,19 +219,10 @@ protected void DefinePlan() // so we need to ensure that migrations from 8.15 are included in the next // v9*. - Merge() - // to 8.15.0 - .To("{8DDDCD0B-D7D5-4C97-BD6A-6B38CA65752F}") - .To("{4695D0C9-0729-4976-985B-048D503665D8}") - .To("{5C424554-A32D-4852-8ED1-A13508187901}") - .With() - // to 9.0.0 RC1 - .To("{22D801BA-A1FF-4539-BFCC-2139B55594F8}") - .To("{50A43237-A6F4-49E2-A7A6-5DAD65C84669}") - .To("{3D8DADEF-0FDA-4377-A5F0-B52C2110E8F2}") - .To("{1303BDCF-2295-4645-9526-2F32E8B35ABD}") - .To("{86AC839A-0D08-4D09-B7B5-027445E255A1}") - .As("{5060F3D2-88BE-4D30-8755-CF51F28EAD12}"); + // to 8.15.0 + To("{8DDDCD0B-D7D5-4C97-BD6A-6B38CA65752F}"); + To("{4695D0C9-0729-4976-985B-048D503665D8}"); + To("{5C424554-A32D-4852-8ED1-A13508187901}"); Merge() // to 8.17.0 @@ -240,14 +231,21 @@ protected void DefinePlan() // This should be safe to execute again. We need it with a new name to ensure updates from all the following has executed this step. // - 8.15.0 RC - Current state: {4695D0C9-0729-4976-985B-048D503665D8} // - 8.15.0 Final - Current state: {5C424554-A32D-4852-8ED1-A13508187901} - // - 9.0.0 RC1 - Current state: {5060F3D2-88BE-4D30-8755-CF51F28EAD12} + // - 9.0.0 RC1 - Current state: {5060F3D2-88BE-4D30-8755-CF51F28EAD12} .To("{622E5172-42E1-4662-AD80-9504AF5A4E53}") .To("{10F7BB61-C550-426B-830B-7F954F689CDF}") .To("{12DCDE7F-9AB7-4617-804F-AB66BF360980}") .As("{5AAE6276-80DB-4ACF-B845-199BC6C37538}"); + // to 9.0.0 RC1 + To("{22D801BA-A1FF-4539-BFCC-2139B55594F8}"); + To("{50A43237-A6F4-49E2-A7A6-5DAD65C84669}"); + To("{3D8DADEF-0FDA-4377-A5F0-B52C2110E8F2}"); + To("{1303BDCF-2295-4645-9526-2F32E8B35ABD}"); + To("{5060F3D2-88BE-4D30-8755-CF51F28EAD12}"); + // TO 9.0.0-rc4 - To("5E02F241-5253-403D-B5D3-7DB00157E20F"); + To("5E02F241-5253-403D-B5D3-7DB00157E20F"); // Jaddie: This GUID is missing the { }, although this likely can't be changed now as it will break installs going forwards // TO 9.0.0 From 7d1ca670078ca8afbf246d907a7d71e7e97714c7 Mon Sep 17 00:00:00 2001 From: Jaddie Date: Mon, 25 Oct 2021 15:41:23 +0100 Subject: [PATCH 2/3] Adjusted migration plan to run everything and repeat AddPropertyTypeGroupColumns as mentioned by @bergmania --- .../Migrations/Upgrade/UmbracoPlan.cs | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index d1a4bd4b5067..f399c1fef3d3 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -224,18 +224,17 @@ protected void DefinePlan() To("{4695D0C9-0729-4976-985B-048D503665D8}"); To("{5C424554-A32D-4852-8ED1-A13508187901}"); - Merge() - // to 8.17.0 - .To("{153865E9-7332-4C2A-9F9D-F20AEE078EC7}") - .With() - // This should be safe to execute again. We need it with a new name to ensure updates from all the following has executed this step. - // - 8.15.0 RC - Current state: {4695D0C9-0729-4976-985B-048D503665D8} - // - 8.15.0 Final - Current state: {5C424554-A32D-4852-8ED1-A13508187901} - // - 9.0.0 RC1 - Current state: {5060F3D2-88BE-4D30-8755-CF51F28EAD12} - .To("{622E5172-42E1-4662-AD80-9504AF5A4E53}") - .To("{10F7BB61-C550-426B-830B-7F954F689CDF}") - .To("{12DCDE7F-9AB7-4617-804F-AB66BF360980}") - .As("{5AAE6276-80DB-4ACF-B845-199BC6C37538}"); + // to 8.17.0 + To("{153865E9-7332-4C2A-9F9D-F20AEE078EC7}"); + + // This should be safe to execute again. We need it with a new name to ensure updates from all the following has executed this step. + // - 8.15.0 RC - Current state: {4695D0C9-0729-4976-985B-048D503665D8} + // - 8.15.0 Final - Current state: {5C424554-A32D-4852-8ED1-A13508187901} + // - 9.0.0 RC1 - Current state: {5060F3D2-88BE-4D30-8755-CF51F28EAD12} + To("{622E5172-42E1-4662-AD80-9504AF5A4E53}"); + To("{10F7BB61-C550-426B-830B-7F954F689CDF}"); + To("{5AAE6276-80DB-4ACF-B845-199BC6C37538}"); + To("{A2686B49-A082-4B22-97FD-AAB154D46A57}"); // Re-run this migration to make sure it has executed to account for migrations going out of sync between versions. // to 9.0.0 RC1 To("{22D801BA-A1FF-4539-BFCC-2139B55594F8}"); From af17859139ae727a5226e6548f9c234b32422f33 Mon Sep 17 00:00:00 2001 From: Jaddie Date: Tue, 26 Oct 2021 10:47:00 +0100 Subject: [PATCH 3/3] Update src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs Co-authored-by: Bjarke Berg --- src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index f399c1fef3d3..ea629e5c3afb 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -234,7 +234,6 @@ protected void DefinePlan() To("{622E5172-42E1-4662-AD80-9504AF5A4E53}"); To("{10F7BB61-C550-426B-830B-7F954F689CDF}"); To("{5AAE6276-80DB-4ACF-B845-199BC6C37538}"); - To("{A2686B49-A082-4B22-97FD-AAB154D46A57}"); // Re-run this migration to make sure it has executed to account for migrations going out of sync between versions. // to 9.0.0 RC1 To("{22D801BA-A1FF-4539-BFCC-2139B55594F8}"); @@ -242,6 +241,7 @@ protected void DefinePlan() To("{3D8DADEF-0FDA-4377-A5F0-B52C2110E8F2}"); To("{1303BDCF-2295-4645-9526-2F32E8B35ABD}"); To("{5060F3D2-88BE-4D30-8755-CF51F28EAD12}"); + To("{A2686B49-A082-4B22-97FD-AAB154D46A57}"); // Re-run this migration to make sure it has executed to account for migrations going out of sync between versions. // TO 9.0.0-rc4 To("5E02F241-5253-403D-B5D3-7DB00157E20F"); // Jaddie: This GUID is missing the { }, although this likely can't be changed now as it will break installs going forwards