A few more tweaks

Author: stephentoub

src/Libraries/.editorconfig

@@ -5648,7 +5648,7 @@ dotnet_diagnostic.SA1202.severity = suggestion
 # Title    : Constants should appear before fields
 # Category : StyleCop.CSharp.OrderingRules
 # Help Link: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1203.md
-dotnet_diagnostic.SA1203.severity = warning
+dotnet_diagnostic.SA1203.severity = suggestion
 
 # Title    : Static elements should appear before instance elements
 # Category : StyleCop.CSharp.OrderingRules

src/Libraries/Microsoft.Extensions.AI.Abstractions/AdditionalPropertiesDictionary{TValue}.cs

@@ -10,7 +10,6 @@
 using System.Linq;
 using Microsoft.Shared.Diagnostics;
 
-#pragma warning disable S2365 // Properties should not make collection or array copies
 #pragma warning disable S4039 // Interface methods should be callable by derived types
 #pragma warning disable CA1033 // Interface methods should be callable by derived types
 
@@ -253,7 +252,9 @@ private sealed class DebugView(AdditionalPropertiesDictionary<TValue> properties
         private readonly AdditionalPropertiesDictionary<TValue> _properties = Throw.IfNull(properties);
 
         [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+#pragma warning disable S2365 // Properties should not make collection or array copies
         public AdditionalProperty[] Items => (from p in _properties select new AdditionalProperty(p.Key, p.Value)).ToArray();
+#pragma warning restore S2365
 
         [DebuggerDisplay("{Value}", Name = "[{Key}]")]
         public readonly struct AdditionalProperty(string key, TValue value)

src/Libraries/Microsoft.Extensions.AI.Abstractions/Embeddings/EmbeddingGeneratorExtensions.cs

@@ -8,8 +8,6 @@
 using System.Threading.Tasks;
 using Microsoft.Shared.Diagnostics;
 
-#pragma warning disable S4136 // Method overloads should be grouped together
-
 namespace Microsoft.Extensions.AI;
 
 /// <summary>Provides a collection of static methods for extending <see cref="IEmbeddingGenerator{TInput,TEmbedding}"/> instances.</summary>

src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionArguments.cs

@@ -77,14 +77,10 @@ public AIFunctionArguments(IEqualityComparer<string>? comparer)
     /// </remarks>
     public AIFunctionArguments(IDictionary<string, object?>? arguments, IEqualityComparer<string>? comparer)
     {
-#pragma warning disable S1698 // Consider using 'Equals' if value comparison is intended.
         _arguments =
-            arguments is null
-                ? new Dictionary<string, object?>(comparer)
-                : (arguments is Dictionary<string, object?> dc) && (comparer is null || dc.Comparer == comparer)
-                    ? dc
-                    : new Dictionary<string, object?>(arguments, comparer);
-#pragma warning restore S1698 // Consider using 'Equals' if value comparison is intended.
+            arguments is null ? new(comparer) :
+            arguments is Dictionary<string, object?> dc && (comparer is null || ReferenceEquals(dc.Comparer, comparer)) ? dc :
+            new(arguments, comparer);
     }
 
     /// <summary>Gets or sets services optionally associated with these arguments.</summary>

src/Libraries/Microsoft.Extensions.AI.Abstractions/Functions/AIFunctionFactory.cs

@@ -23,7 +23,6 @@
 using Microsoft.Shared.Diagnostics;
 
 #pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
-#pragma warning disable SA1203 // Constants should appear before fields
 
 namespace Microsoft.Extensions.AI;
 
@@ -1046,8 +1045,8 @@ static void ThrowNullServices(string parameterName) =>
             static object ThrowIfNullResult(object? result) => result ?? throw new InvalidOperationException("Function returned null unexpectedly.");
         }
 
-        private static readonly MethodInfo _taskGetResult = typeof(Task<>).GetProperty(nameof(Task<int>.Result), BindingFlags.Instance | BindingFlags.Public)!.GetMethod!;
-        private static readonly MethodInfo _valueTaskAsTask = typeof(ValueTask<>).GetMethod(nameof(ValueTask<int>.AsTask), BindingFlags.Instance | BindingFlags.Public)!;
+        private static readonly MethodInfo _taskGetResult = typeof(Task<>).GetProperty(nameof(Task<>.Result), BindingFlags.Instance | BindingFlags.Public)!.GetMethod!;
+        private static readonly MethodInfo _valueTaskAsTask = typeof(ValueTask<>).GetMethod(nameof(ValueTask<>.AsTask), BindingFlags.Instance | BindingFlags.Public)!;
 
         private static MethodInfo GetMethodFromGenericMethodDefinition(Type specializedType, MethodInfo genericMethodDefinition)
         {

src/Libraries/Microsoft.Extensions.AI.AzureAIInference/AzureAIInferenceChatClient.cs

@@ -15,7 +15,6 @@
 using Azure.AI.Inference;
 using Microsoft.Shared.Diagnostics;
 
-#pragma warning disable S1135 // Track uses of "TODO" tags
 #pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
 #pragma warning disable SA1204 // Static elements should appear before instance elements
 
@@ -183,13 +182,6 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
             // Transfer over tool call updates.
             if (chatCompletionUpdate.ToolCallUpdate is { } toolCallUpdate)
             {
-                // TODO https://github.com/Azure/azure-sdk-for-net/issues/46830: Azure.AI.Inference
-                // has removed the Index property from ToolCallUpdate. It's now impossible via the
-                // exposed APIs to correctly handle multiple parallel tool calls, as the CallId is
-                // often null for anything other than the first update for a given call, and Index
-                // isn't available to correlate which updates are for which call. This is a temporary
-                // workaround to at least make a single tool call work and also make work multiple
-                // tool calls when their updates aren't interleaved.
                 if (toolCallUpdate.Id is not null)
                 {
                     lastCallId = toolCallUpdate.Id;
@@ -485,8 +477,6 @@ private static IEnumerable<ChatRequestMessage> ToAzureAIInferenceChatMessages(IE
             }
             else if (input.Role == ChatRole.Assistant)
             {
-                // TODO: ChatRequestAssistantMessage only enables text content currently.
-                // Update it with other content types when it supports that.
                 ChatRequestAssistantMessage message = new(string.Concat(input.Contents.Where(c => c is TextContent)));
 
                 foreach (var content in input.Contents)

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantsChatClient.cs

@@ -17,8 +17,6 @@
 #pragma warning disable S125 // Sections of code should not be commented out
 #pragma warning disable S1751 // Loops with at most one iteration should be refactored
 #pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
-#pragma warning disable S4456 // Parameter validation in yielding methods should be wrapped
-#pragma warning disable S4457 // Parameter validation in "async"/"await" methods should be wrapped
 
 namespace Microsoft.Extensions.AI;
 

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIEmbeddingGenerator.cs

@@ -13,7 +13,6 @@
 using OpenAI.Embeddings;
 
 #pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
-#pragma warning disable EA0011 // Consider removing unnecessary conditional access operator (?)
 
 namespace Microsoft.Extensions.AI;
 

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

@@ -4,8 +4,6 @@
 using System;
 using Microsoft.Shared.Diagnostics;
 
-#pragma warning disable SA1629 // Documentation text should end with a period
-
 namespace Microsoft.Extensions.AI;
 
 /// <summary>Provides extensions for configuring <see cref="ConfigureOptionsEmbeddingGenerator{TInput, TEmbedding}"/> instances.</summary>

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

@@ -58,8 +58,8 @@ public IEmbeddingGenerator<TInput, TEmbedding> Build(IServiceProvider? services
                 if (embeddingGenerator is null)
                 {
                     Throw.InvalidOperationException(
-                        $"The {nameof(IEmbeddingGenerator<TInput, TEmbedding>)} entry at index {i} returned null. " +
-                        $"Ensure that the callbacks passed to {nameof(Use)} return non-null {nameof(IEmbeddingGenerator<TInput, TEmbedding>)} instances.");
+                        $"The {nameof(IEmbeddingGenerator<,>)} entry at index {i} returned null. " +
+                        $"Ensure that the callbacks passed to {nameof(Use)} return non-null {nameof(IEmbeddingGenerator<,>)} instances.");
                 }
             }
         }