Update to .NET SDK 9.0.0-rc2, CMS and Deploy 15.0.0-rc2 and fix obsol…

…etes
umbraco · Oct 24, 2024 · aca8b1a · aca8b1a
1 parent aa2303f
commit aca8b1a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,7 +12,7 @@
   </ItemGroup>
   <!-- Umbraco packages -->
   <ItemGroup>
-    <PackageVersion Include="Umbraco.Cms.Web.Common" Version="[15.0.0-rc1, 16)" />
-    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[15.0.0-rc1, 16)" />
+    <PackageVersion Include="Umbraco.Cms.Web.Common" Version="[15.0.0-rc2, 16)" />
+    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[15.0.0-rc2, 16)" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12",
+    "version": "9.0.100-rc.2.24474.11",
     "rollForward": "latestFeature",
     "allowPrerelease": true
   }

diff --git a/src/Umbraco.Deploy.Contrib/Migrators/DocTypeGridEditorPropertyTypeMigrator.cs b/src/Umbraco.Deploy.Contrib/Migrators/DocTypeGridEditorPropertyTypeMigrator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
@@ -68,9 +69,13 @@ public DocTypeGridEditorPropertyTypeMigrator(ILogger<GridPropertyTypeMigrator> l
 
         return new BlockItemData()
         {
-            Udi = Udi.Create(Constants.UdiEntityType.Element, value.Id),
+            Key = value.Id,
             ContentTypeKey = contentType.Key,
-            RawPropertyValues = value.Value
+            Values = value.Value.Select(x => new BlockPropertyValue()
+            {
+                Alias = x.Key,
+                Value = x.Value,
+            }).ToList(),
         };
     }
 

diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
@@ -4,12 +4,12 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
   <!-- Umbraco packages -->
   <ItemGroup>
-    <PackageVersion Include="Umbraco.Cms.Tests" Version="15.0.0-rc1" />
+    <PackageVersion Include="Umbraco.Cms.Tests" Version="15.0.0-rc2" />
   </ItemGroup>
   <!-- Third-party packages -->
   <ItemGroup>
     <PackageVersion Include="Moq" Version="4.17.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="all" />
   </ItemGroup>
-</Project>
+</Project>