Merge remote-tracking branch 'refs/remotes/origin/v11/dev' into v12/dev

# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs

src/Umbraco.Web.BackOffice/Controllers/MediaController.cs

@@ -836,6 +836,11 @@ public class MediaController : ContentControllerBase
                                 continue;
                             }
 
+                        if (allowedContentTypes.Any(x => x.Alias == mediaTypeItem.Alias) == false)
+                        {
+                            continue;
+                        }
+
                             mediaTypeAlias = mediaTypeItem.Alias;
                             break;
                         }
@@ -973,7 +978,6 @@ public class MediaController : ContentControllerBase
     /// <returns></returns>
     private async Task<ActionResult<int?>?> GetParentIdAsIntAsync(string? parentId, bool validatePermissions)
     {
-
         // test for udi
         if (UdiParser.TryParse(parentId, out GuidUdi? parentUdi))
         {
@@ -1183,7 +1187,7 @@ public class MediaController : ContentControllerBase
         var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic>>(totalChildren, pageNumber, pageSize)
         {
             Items = children
-            .Select(_umbracoMapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic>>).WhereNotNull()
+                .Select(_umbracoMapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic>>).WhereNotNull()
         };
 
         return pagedResult;

tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj

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