Merge branch 'master' into graphql/simplified

.drone.yml

@@ -53,7 +53,7 @@ steps:
         - release/*
 
   - name: test_run
-    image: mcr.microsoft.com/dotnet/sdk:5.0
+    image: mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim
     environment:
       CONFIG__SERVER__URL: http://localhost:8080
       CONFIG__WAIT: 60

Dockerfile

@@ -1,7 +1,7 @@
 #
 # Stage 1, Build Backend
 #
-FROM mcr.microsoft.com/dotnet/sdk:5.0 as backend
+FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim as backend
 
 ARG SQUIDEX__VERSION=4.0.0
 

backend/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldDto.cs

@@ -69,6 +69,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models
                 SimpleMapper.Map(field,
                     new NestedFieldDto
                     {
+                        FieldId = field.Id,
                         Properties = properties
                     });