From 64c7c6b43939456fbe3bc59a6e4420f6deb52776 Mon Sep 17 00:00:00 2001 From: Mole Date: Thu, 8 Jun 2023 14:49:52 +0200 Subject: [PATCH 1/3] Fetch GUID directly and make it non async (#14358) --- .../Services/Implement/UserIdKeyResolver.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Infrastructure/Services/Implement/UserIdKeyResolver.cs b/src/Umbraco.Infrastructure/Services/Implement/UserIdKeyResolver.cs index b8a3c15553..e8ebbd6df5 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/UserIdKeyResolver.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/UserIdKeyResolver.cs @@ -85,10 +85,8 @@ internal sealed class UserIdKeyResolver : IUserIdKeyResolver .From() .Where(x => x.Id == id); - string? guidString = await scope.Database.ExecuteScalarAsync(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(query) + ?? throw new InvalidOperationException("No user found with the specified id"); _idToKey[id] = fetchedKey; From c512039083150c2c60133392a47a2c2c50d17d81 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 13 Jun 2023 12:52:16 +0200 Subject: [PATCH 2/3] upload api docs after myget release --- build/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 59362a566c..3926734061 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -551,8 +551,8 @@ stages: umbracoMajorVersion: $[ stageDependencies.Build.A.outputs['determineMajorVersion.majorVersion'] ] displayName: Upload API Documention dependsOn: - - Build - Build_Docs + - Deploy_MyGet condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.uploadApiDocs}})) jobs: - job: From 95f7cdd4186f44ddbb77a68106630d2322944b14 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 20 Jun 2023 13:56:45 +0200 Subject: [PATCH 3/3] add dependency on 'Build' stage to get output parameter --- build/azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 3926734061..b33e4a6cc0 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -551,8 +551,9 @@ stages: umbracoMajorVersion: $[ stageDependencies.Build.A.outputs['determineMajorVersion.majorVersion'] ] displayName: Upload API Documention dependsOn: + - Build - Build_Docs - - Deploy_MyGet + - 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: