From 8e8dfb394847febacfb9ce52b2ccae272eb7fd45 Mon Sep 17 00:00:00 2001
From: Chris <66376200+crickman@users.noreply.github.com>
Date: Tue, 14 Oct 2025 14:17:18 -0700
Subject: [PATCH] Better (#1463)

---
 .../AzureAgentProvider.cs                             | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/AzureAgentProvider.cs b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/AzureAgentProvider.cs
index 8ad65c3523..ac44890c1c 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/AzureAgentProvider.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/AzureAgentProvider.cs
@@ -48,21 +48,18 @@ public sealed class AzureAgentProvider(string projectEndpoint, TokenCredential p
     }
 
     /// <inheritdoc/>
-    public override Task<ChatMessage> CreateMessageAsync(string conversationId, ChatMessage conversationMessage, CancellationToken cancellationToken = default)
+    public override async Task<ChatMessage> CreateMessageAsync(string conversationId, ChatMessage conversationMessage, CancellationToken cancellationToken = default)
     {
-        // TODO: Switch to asynchronous "CreateMessageAsync", when fix properly applied:
-        //  BUG: https://github.com/Azure/azure-sdk-for-net/issues/52571
-        //   PR: https://github.com/Azure/azure-sdk-for-net/pull/52653
         PersistentThreadMessage newMessage =
-            this.GetAgentsClient().Messages.CreateMessage(
+            await this.GetAgentsClient().Messages.CreateMessageAsync(
                 conversationId,
                 role: s_roleMap[conversationMessage.Role.Value.ToUpperInvariant()],
                 contentBlocks: GetContent(),
                 attachments: null,
                 metadata: GetMetadata(),
-                cancellationToken);
+                cancellationToken).ConfigureAwait(false);
 
-        return Task.FromResult(ToChatMessage(newMessage));
+        return ToChatMessage(newMessage);
 
         Dictionary<string, string>? GetMetadata()
         {