Merge and resolve conflicts

Author: markwallace-microsoft

dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step08_AzureAIAgent_Declarative.cs

@@ -106,7 +106,7 @@ public async Task AzureAIAgentWithOpenApiAsync()
         var agent = await factory.CreateAgentFromYamlAsync(text, this._kernel) as AzureAIAgent;
         Assert.NotNull(agent);
 
-        await InvokeAgentAsync(agent!, "Use code to determine the values in the Fibonacci sequence that that are less then the value of 101?");
+        await InvokeAgentAsync(agent!, "What country has Dublin as it's capital city?");
     }
 
     [Fact]
@@ -182,9 +182,9 @@ private async Task InvokeAgentAsync(AzureAIAgent agent, string input)
         // Create a thread for the agent conversation.
         AgentThread thread = await agent.Client.CreateThreadAsync(metadata: SampleMetadata);
 
-        // Respond to user input
         try
         {
+            // Invoke agent and display the response.
             await InvokeAsync(input);
         }
         finally

dotnet/src/Agents/AzureAI/Extensions/KernelExtensions.cs

@@ -33,7 +33,7 @@ public static AIProjectClient GetAIProjectClient(this Kernel kernel, AgentDefini
             {
                 var httpClient = kernel.GetAllServices<HttpClient>().FirstOrDefault();
                 AIProjectClientOptions clientOptions = AzureAIClientProvider.CreateAzureClientOptions(httpClient);
-                return new(connectionString!.ToString()!, new AzureCliCredential(), clientOptions);
+                return new(connectionString!.ToString()!, new DefaultAzureCredential(), clientOptions);
             }
         }
 

dotnet/src/Agents/OpenAI/Extensions/KernelExtensions.cs

@@ -38,9 +38,10 @@ public static OpenAIClient GetOpenAIClient(this Kernel kernel, AgentDefinition a
                 throw new InvalidOperationException("OpenAI client type must be specified.");
             }
 
-#pragma warning disable CA2000 // Dispose objects before losing scope, not applicable because the HttpClient is created elsewhere
+#pragma warning disable CA2000 // Dispose objects before losing scope, not applicable because the HttpClient is created and may be used elsewhere
             var httpClient = HttpClientProvider.GetHttpClient(kernel.Services);
 #pragma warning restore CA2000 // Dispose objects before losing scope
+
             if (configuration.Type.Equals(OpenAI, StringComparison.OrdinalIgnoreCase))
             {
                 OpenAIClientOptions clientOptions = OpenAIClientProvider.CreateOpenAIClientOptions(configuration.GetEndpointUri(), httpClient);
@@ -58,7 +59,7 @@ public static OpenAIClient GetOpenAIClient(this Kernel kernel, AgentDefinition a
                     return new AzureOpenAIClient(endpoint, configuration.GetApiKeyCredential(), clientOptions);
                 }
 
-                return new AzureOpenAIClient(endpoint, new AzureCliCredential(), clientOptions);
+                return new AzureOpenAIClient(endpoint, new DefaultAzureCredential(), clientOptions);
             }
 
             throw new InvalidOperationException($"Invalid OpenAI client type '{configuration.Type}' was specified.");