Code style upgrade (#900)

* Use collection syntax across the entire code base
* Add a few missing `ConfigureAwait`
* Fix a test not compatible with Entra auth

Author: dluc

.editorconfig

@@ -446,12 +446,34 @@ dotnet_diagnostic.CA1032.severity = none # We're using RCS1194 which seems to co
 dotnet_diagnostic.CA1034.severity = none # Do not nest type. Alternatively, change its accessibility so that it is not externally visible
 dotnet_diagnostic.CA1054.severity = none # URI parameters should not be strings
 dotnet_diagnostic.CA1062.severity = none # Disable null check, C# already does it for us
-dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
+dotnet_diagnostic.CA1515.severity = none # Because an application's API isn't typically referenced from outside the assembly, types can be made internal
 dotnet_diagnostic.CA1805.severity = none # Member is explicitly initialized to its default value
 dotnet_diagnostic.CA1822.severity = none # Member does not access instance data and can be marked as static
 dotnet_diagnostic.CA1848.severity = none # For improved performance, use the LoggerMessage delegates
 dotnet_diagnostic.CA2227.severity = none # Change to be read-only by removing the property setter
 dotnet_diagnostic.CA2253.severity = none # Named placeholders in the logging message template should not be comprised of only numeric characters
+dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
+dotnet_diagnostic.IDE0001.severity = none # Simplify name
+dotnet_diagnostic.IDE0002.severity = none # Simplify member access
+dotnet_diagnostic.IDE0004.severity = none # Remove unnecessary cast
+dotnet_diagnostic.IDE0010.severity = none # Populate switch
+dotnet_diagnostic.IDE0032.severity = none # Use auto property
+dotnet_diagnostic.IDE0035.severity = none # Remove unreachable code
+dotnet_diagnostic.IDE0051.severity = none # Remove unused private member
+dotnet_diagnostic.IDE0052.severity = none # Remove unread private member
+dotnet_diagnostic.IDE0056.severity = none # Indexing can be simplified
+dotnet_diagnostic.IDE0057.severity = none # Substring can be simplified
+dotnet_diagnostic.IDE0058.severity = none # Remove unused expression value
+dotnet_diagnostic.IDE0059.severity = none # Unnecessary assignment of a value
+dotnet_diagnostic.IDE0060.severity = none # Remove unused parameter
+dotnet_diagnostic.IDE0066.severity = none # Use 'switch' expression
+dotnet_diagnostic.IDE0072.severity = none # Populate switch
+dotnet_diagnostic.IDE0080.severity = none # Remove unnecessary suppression operator
+dotnet_diagnostic.IDE0100.severity = none # Remove unnecessary equality operator
+dotnet_diagnostic.IDE0110.severity = none # Remove unnecessary discards
+dotnet_diagnostic.IDE0160.severity = none # Use block-scoped namespace
+dotnet_diagnostic.IDE0290.severity = none # Use primary constructor
+dotnet_diagnostic.IDE0305.severity = none # Collection initialization can be simplified
 dotnet_diagnostic.RCS1021.severity = none # Use expression-bodied lambda.
 dotnet_diagnostic.RCS1061.severity = none # Merge 'if' with nested 'if'.
 dotnet_diagnostic.RCS1069.severity = none # Remove unnecessary case label.
@@ -480,26 +502,11 @@ dotnet_diagnostic.RCS1226.severity = none # Add paragraph to documentation comme
 dotnet_diagnostic.RCS1234.severity = none # Enum duplicate value
 dotnet_diagnostic.RCS1238.severity = none # Avoid nested ?: operators.
 dotnet_diagnostic.RCS1241.severity = none # Implement IComparable when implementing IComparable<T><T>.
-dotnet_diagnostic.IDE0001.severity = none # Simplify name
-dotnet_diagnostic.IDE0002.severity = none # Simplify member access
-dotnet_diagnostic.IDE0004.severity = none # Remove unnecessary cast
-dotnet_diagnostic.IDE0035.severity = none # Remove unreachable code
-dotnet_diagnostic.IDE0051.severity = none # Remove unused private member
-dotnet_diagnostic.IDE0052.severity = none # Remove unread private member
-dotnet_diagnostic.IDE0058.severity = none # Remove unused expression value
-dotnet_diagnostic.IDE0059.severity = none # Unnecessary assignment of a value
-dotnet_diagnostic.IDE0060.severity = none # Remove unused parameter
-dotnet_diagnostic.IDE0080.severity = none # Remove unnecessary suppression operator
-dotnet_diagnostic.IDE0100.severity = none # Remove unnecessary equality operator
-dotnet_diagnostic.IDE0110.severity = none # Remove unnecessary discards
-dotnet_diagnostic.IDE0032.severity = none # Use auto property
-dotnet_diagnostic.IDE0160.severity = none # Use block-scoped namespace
 dotnet_diagnostic.VSTHRD111.severity = none # Use .ConfigureAwait(bool) is hidden by default, set to none to prevent IDE from changing on autosave
 dotnet_diagnostic.xUnit1004.severity = none # Test methods should not be skipped. Remove the Skip property to start running the test again.
 
 dotnet_diagnostic.SKEXP0003.severity = none # XYZ is for evaluation purposes only
 dotnet_diagnostic.SKEXP0010.severity = none
-dotnet_diagnostic.SKEXP0010.severity = none
 dotnet_diagnostic.SKEXP0011.severity = none
 dotnet_diagnostic.SKEXP0052.severity = none
 dotnet_diagnostic.SKEXP0101.severity = none

Directory.Packages.props

@@ -75,8 +75,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>

applications/evaluation/Distribution.cs

@@ -17,13 +17,13 @@ public struct Distribution : IEquatable<Distribution>
     public Distribution() { }
 
     // TODO: use tolerance when comparing floating numbers for equality
-    public override bool Equals(object? obj) => obj is Distribution distribution &&
-                                                this.Simple == distribution.Simple &&
-                                                this.Reasoning == distribution.Reasoning &&
-                                                this.MultiContext == distribution.MultiContext &&
-                                                this.Conditioning == distribution.Conditioning;
+    public override readonly bool Equals(object? obj) => obj is Distribution distribution &&
+                                                         this.Simple == distribution.Simple &&
+                                                         this.Reasoning == distribution.Reasoning &&
+                                                         this.MultiContext == distribution.MultiContext &&
+                                                         this.Conditioning == distribution.Conditioning;
 
-    public override int GetHashCode()
+    public override readonly int GetHashCode()
     {
         return HashCode.Combine(this.Simple, this.Reasoning, this.MultiContext, this.Conditioning);
     }
@@ -38,9 +38,8 @@ public override int GetHashCode()
         return !(left == right);
     }
 
-    public bool Equals(Distribution other)
+    public readonly bool Equals(Distribution other)
     {
         return this == other;
     }
 }
-

applications/evaluation/Evaluators/AnswerCorrectness/StatementExtraction.cs

@@ -12,5 +12,5 @@ internal sealed class StatementExtraction
 #pragma warning restore CA1812 // 'StatementExtraction' is an internal class that is apparently never instantiated. If so, remove the code from the assembly. If this class is intended to contain only static members, make it 'static' (Module in Visual Basic). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1812)
 {
     [JsonPropertyName("statements")]
-    public List<string> Statements { get; set; } = new List<string>();
+    public List<string> Statements { get; set; } = [];
 }

applications/evaluation/Evaluators/ContextRecall/GroundTruthClassifications.cs

@@ -12,5 +12,5 @@ internal sealed class GroundTruthClassifications
 #pragma warning restore CA1812 // 'GroundTruthClassifications' is an internal class that is apparently never instantiated. If so, remove the code from the assembly. If this class is intended to contain only static members, make it 'static' (Module in Visual Basic). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1812)
 {
     [JsonPropertyName("evaluations")]
-    public List<GroundTruthClassification> Evaluations { get; set; } = new();
+    public List<GroundTruthClassification> Evaluations { get; set; } = [];
 }

applications/evaluation/Evaluators/Faithfulness/FaithfulnessEvaluations.cs

@@ -12,5 +12,5 @@ internal sealed class FaithfulnessEvaluations
 #pragma warning restore CA1812 // 'FaithfulnessEvaluations' is an internal class that is apparently never instantiated. If so, remove the code from the assembly. If this class is intended to contain only static members, make it 'static' (Module in Visual Basic). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1812)
 {
     [JsonPropertyName("evaluations")]
-    public List<StatementEvaluation> Evaluations { get; set; } = new();
+    public List<StatementEvaluation> Evaluations { get; set; } = [];
 }

applications/evaluation/TestSet/TestSetItem.cs

@@ -15,7 +15,7 @@ public sealed class TestSetItem
 
     public int GroundTruthVerdict { get; set; }
 
-    public IEnumerable<string> Context { get; set; } = Array.Empty<string>();
+    public IEnumerable<string> Context { get; set; } = [];
 
     public ICollection<MemoryFilter> Filters { get; set; } = Array.Empty<MemoryFilter>();
 

applications/evaluation/TestSetEvaluator.cs

@@ -129,7 +129,7 @@ public class QuestionEvaluation
 
     public MemoryAnswer MemoryAnswer { get; set; } = null!;
 
-    public EvaluationMetrics Metrics { get; set; } = new EvaluationMetrics();
+    public EvaluationMetrics Metrics { get; set; } = new();
 
-    public Dictionary<string, object?> Metadata { get; set; } = new();
+    public Dictionary<string, object?> Metadata { get; set; } = [];
 }

applications/evaluation/TestSetGenerator.cs

@@ -97,7 +97,7 @@ public async IAsyncEnumerable<TestSetItem> GenerateTestSetsAsync(
 
         var documentIds = new List<string>();
 
-        await foreach (var record in this._memory.GetListAsync(index, limit: int.MaxValue))
+        await foreach (var record in this._memory.GetListAsync(index, limit: int.MaxValue).ConfigureAwait(false))
         {
             if (documentIds.Contains(record.GetDocumentId()))
             {
@@ -110,7 +110,7 @@ public async IAsyncEnumerable<TestSetItem> GenerateTestSetsAsync(
         foreach (var documentId in documentIds)
         {
             var partitionRecords = await this._memory.GetListAsync(index,
-                    filters: new[] { new MemoryFilter().ByDocument(documentId) },
+                    filters: [new MemoryFilter().ByDocument(documentId)],
                     limit: int.MaxValue)
                 .ToArrayAsync()
                 .ConfigureAwait(false);
@@ -123,7 +123,7 @@ public async IAsyncEnumerable<TestSetItem> GenerateTestSetsAsync(
                     .Concat(this.GetMultiContextTestSetsAsync(nodes.Skip(simpleCount + reasoningCount).Take(multiContextCount), language: language, retryCount: retryCount))
                     .Concat(this.GetConditioningTestSetsAsync(nodes.Skip(simpleCount + reasoningCount + multiContextCount).Take(conditioningCount), language: language, retryCount: retryCount));
 
-            await foreach (var item in questions)
+            await foreach (var item in questions.ConfigureAwait(false))
             {
                 yield return item;
             }

applications/tests/Evaluation.Tests/TestsetGenerationTests.cs

@@ -81,14 +81,13 @@ await this._memory
                 documentId: "file1-NASA-news",
                 steps: Constants.PipelineWithoutSummary);
 
-        var evaluation = await this._testSetEvaluator.EvaluateTestSetAsync("default4tests", new[]
-        {
+        var evaluation = await this._testSetEvaluator.EvaluateTestSetAsync("default4tests", [
             new TestSetItem
             {
                 Question = "What is the role of the Department of Defense in the recovery operations for the Artemis II mission?",
                 GroundTruth = "The Department of Defense personnel are involved in practicing recovery operations for the Artemis II mission. They use a crew module test article to help verify the recovery team's readiness to recover the Artemis II crew and the Orion spacecraft.",
             }
-        }).ToArrayAsync();
+        ]).ToArrayAsync();
 
         Assert.NotEmpty(evaluation);
     }