From 60ced5db8c1a4fc5ce382a16c68203dae5d75aa3 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@barend.se>
Date: Thu, 19 Aug 2021 23:29:40 +0200
Subject: [PATCH] Retarget migration to 8.17

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs     | 10 ++++------
 .../AddPropertyTypeGroupColumns.cs                     |  2 +-
 src/Umbraco.Core/Umbraco.Core.csproj                   |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename src/Umbraco.Core/Migrations/Upgrade/{V_8_16_0 => V_8_17_0}/AddPropertyTypeGroupColumns.cs (97%)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 1101345cc7..8e3e5a4862 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Migrations.Upgrade.V_8_6_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_9_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_10_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_15_0;
-using Umbraco.Core.Migrations.Upgrade.V_8_16_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_17_0;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -120,7 +120,6 @@ namespace Umbraco.Core.Migrations.Upgrade
 
 
             // plan starts at 7.14.0 (anything before 7.14.0 is not supported)
-            //
             From(GetInitState(new SemVersion(7, 14, 0)));
 
             // begin migrating from v7 - remove all keys and indexes
@@ -175,13 +174,12 @@ namespace Umbraco.Core.Migrations.Upgrade
             // finish migrating from v7 - recreate all keys and indexes
             To<CreateKeysAndIndexes>("{3F9764F5-73D0-4D45-8804-1240A66E43A2}");
 
+            // to 8.0.0
             To<RenameLabelAndRichTextPropertyEditorAliases>("{E0CBE54D-A84F-4A8F-9B13-900945FD7ED9}");
             To<MergeDateAndDateTimePropertyEditor>("{78BAF571-90D0-4D28-8175-EF96316DA789}");
-            // release-8.0.0
 
             // to 8.0.1
             To<ChangeNuCacheJsonFormat>("{80C0A0CB-0DD5-4573-B000-C4B7C313C70D}");
-            // release-8.0.1
 
             // to 8.1.0
             To<ConvertTinyMceAndGridMediaUrlsToLocalLink>("{B69B6E8C-A769-4044-A27E-4A4E18D1645A}");
@@ -204,12 +202,12 @@ namespace Umbraco.Core.Migrations.Upgrade
             // to 8.10.0
             To<AddPropertyTypeLabelOnTopColumn>("{D6A8D863-38EC-44FB-91EC-ACD6A668BD18}");
 
-            // to 8.15.0...
+            // to 8.15.0
             To<AddCmsContentNuByteColumn>("{8DDDCD0B-D7D5-4C97-BD6A-6B38CA65752F}");
             To<UpgradedIncludeIndexes>("{4695D0C9-0729-4976-985B-048D503665D8}");
             To<UpdateCmsPropertyGroupIdSeed>("{5C424554-A32D-4852-8ED1-A13508187901}");
 
-            // to 8.16.0
+            // to 8.17.0
             To<AddPropertyTypeGroupColumns>("{153865E9-7332-4C2A-9F9D-F20AEE078EC7}");
 
             //FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumns.cs
similarity index 97%
rename from src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumns.cs
index ce02d15e0d..588f4f2d03 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumns.cs
@@ -2,7 +2,7 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.Dtos;
 
-namespace Umbraco.Core.Migrations.Upgrade.V_8_16_0
+namespace Umbraco.Core.Migrations.Upgrade.V_8_17_0
 {
     public class AddPropertyTypeGroupColumns : MigrationBase
     {
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 08b6470b63..03d75b68d3 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -144,7 +144,7 @@
     <Compile Include="Migrations\Upgrade\V_8_15_0\UpdateCmsPropertyGroupIdSeed.cs" />
     <Compile Include="Migrations\Upgrade\V_8_15_0\UpgradedIncludeIndexes.cs" />
     <Compile Include="Migrations\Upgrade\V_8_10_0\AddPropertyTypeLabelOnTopColumn.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_16_0\AddPropertyTypeGroupColumns.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_17_0\AddPropertyTypeGroupColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_9_0\ExternalLoginTableUserData.cs" />
     <Compile Include="Models\Blocks\BlockEditorDataConverter.cs" />
     <Compile Include="Models\Blocks\BlockEditorData.cs" />