Merge remote-tracking branch 'upstream/main' into AotCI

Author: eerhardt

src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.cs

@@ -302,7 +302,7 @@ JsonNode TransformSchemaNode(JsonSchemaExporterContext ctx, JsonNode schema)
                     _ = objSchema.TryGetPropertyValue(RequiredPropertyName, out JsonNode? required);
                     if (required is not JsonArray { } requiredArray || requiredArray.Count != propertiesObj.Count)
                     {
-                        requiredArray = [.. propertiesObj.Select(prop => prop.Key)];
+                        requiredArray = [.. propertiesObj.Select(prop => (JsonNode)prop.Key)];
                         objSchema[RequiredPropertyName] = requiredArray;
                     }
                 }

src/Libraries/Microsoft.Extensions.AI/ChatCompletion/ChatClientBuilderServiceCollectionExtensions.cs

@@ -2,10 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.AI;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.Extensions.AI;
+namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>Provides extension methods for registering <see cref="IChatClient"/> with a <see cref="IServiceCollection"/>.</summary>
 public static class ChatClientBuilderServiceCollectionExtensions

src/Libraries/Microsoft.Extensions.AI/Embeddings/EmbeddingGeneratorBuilderServiceCollectionExtensions.cs

@@ -2,10 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.AI;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.Extensions.AI;
+namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>Provides extension methods for registering <see cref="IEmbeddingGenerator{TInput, TEmbedding}"/> with a <see cref="IServiceCollection"/>.</summary>
 public static class EmbeddingGeneratorBuilderServiceCollectionExtensions