Merge remote-tracking branch 'origin/release/14.0' into v14/dev

build/azure-pipelines.yml

@@ -553,6 +553,7 @@ stages:
     dependsOn:
       - Build
       - Build_Docs
+      - Deploy_MyGet # Change to "Deploy_Nuget" after release of v14
     condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.uploadApiDocs}}))
     jobs:
       - job:

src/Umbraco.Infrastructure/Services/Implement/UserIdKeyResolver.cs

@@ -85,10 +85,8 @@ internal sealed class UserIdKeyResolver : IUserIdKeyResolver
                 .From<UserDto>()
                 .Where<UserDto>(x => x.Id == id);
 
-            string? guidString = await scope.Database.ExecuteScalarAsync<string?>(query);
-            Guid fetchedKey = guidString is not null
-                ? new Guid(guidString)
-                : throw new InvalidOperationException("No user found with the specified id");
+            Guid fetchedKey = scope.Database.ExecuteScalar<Guid?>(query)
+                              ?? throw new InvalidOperationException("No user found with the specified id");
 
             _idToKey[id] = fetchedKey;