Merge remote-tracking branch 'origin/v10/dev' into v11/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json

.github/workflows/pr-first-response.yml

@@ -11,9 +11,6 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - name: Install dependencies
-        run: |
-          npm install node-fetch@2
       - name: Fetch random comment 🗣️ and add it to the PR
         uses: actions/github-script@v6
         with:
@@ -44,13 +41,13 @@ jobs:
                     });
                 } else {
                     console.log("Returned data not indicate success.");
-                    
+
                     if(response.status !== 200) {
                       console.log("Status code:", response.status)
                     }
 
                     console.log("Returned data:", data);
-                    
+
                     if(data === '') {
                       console.log("An empty response usually indicates that either no comment was found or the actor user was not eligible for getting an automated response (HQ users are not getting auto-responses).")
                     }

src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs

@@ -14,6 +14,7 @@ public class EntityMapDefinition : IMapDefinition
     public void DefineMaps(IUmbracoMapper mapper)
     {
         mapper.Define<IEntitySlim, EntityBasic>((source, context) => new EntityBasic(), Map);
+        mapper.Define<IPropertyType, EntityBasic>((source, context) => new EntityBasic(), Map);
         mapper.Define<PropertyType, EntityBasic>((source, context) => new EntityBasic(), Map);
         mapper.Define<PropertyGroup, EntityBasic>((source, context) => new EntityBasic(), Map);
         mapper.Define<IUser, EntityBasic>((source, context) => new EntityBasic(), Map);
@@ -77,7 +78,7 @@ public class EntityMapDefinition : IMapDefinition
     }
 
     // Umbraco.Code.MapAll -Udi -Trashed
-    private static void Map(PropertyType source, EntityBasic target, MapperContext context)
+    private static void Map(IPropertyType source, EntityBasic target, MapperContext context)
     {
         target.Alias = source.Alias;
         target.Icon = "icon-box";

src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerPropertyEditor.cs

@@ -43,6 +43,8 @@ public class MultiUrlPickerPropertyEditor : DataEditor
         SupportsReadOnly = true;
     }
 
+    public override IPropertyIndexValueFactory PropertyIndexValueFactory { get; } = new NoopPropertyIndexValueFactory();
+
     protected override IConfigurationEditor CreateConfigurationEditor() =>
         new MultiUrlPickerConfigurationEditor(_ioHelper, _editorConfigurationParser);
 

src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less

@@ -1,19 +1,15 @@
-.umb-color-picker {
+.umb-color-picker {
 
     .sp-replacer {
         display: inline-flex;
         margin-right: 12px;
         height: 32px;
+        padding: 5px;
 
         &.sp-light {
             background-color: @white; 
         }
 
-        .sp-preview {
-            margin: 5px;
-            height: auto;
-        }
-
         .sp-dd {
             line-height: 2rem;
         }
@@ -24,4 +20,4 @@
     .sp-replacer {
         cursor: not-allowed;
     }
-}
+}

tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj

@@ -12,5 +12,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Umbraco.Core\Umbraco.Core.csproj" />
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+    <PackageReference Include="Umbraco.Deploy.Core" Version="10.2.2" />
+    <PackageReference Include="Umbraco.Forms.Core" Version="10.4.0" />
   </ItemGroup>
 </Project>