[6.0] Code cleanup for remaining product projects

src/EFCore.Abstractions/DbFunctionAttribute.cs

@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Utilities;
-using CA = System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.EntityFrameworkCore
 {
@@ -48,7 +48,7 @@ public DbFunctionAttribute(string name, string? schema = null)
         /// <summary>
         ///     The name of the function in the database.
         /// </summary>
-        [CA.DisallowNull]
+        [DisallowNull]
         public virtual string? Name
         {
             get => _name;

src/EFCore.Abstractions/Infrastructure/ILazyLoader.cs

@@ -51,7 +51,7 @@ void SetLoaded(
         /// <param name="cancellationToken"> A <see cref="CancellationToken" /> to observe while waiting for the task to complete. </param>
         /// <param name="navigationName"> The navigation property name. </param>
         /// <returns> A task that represents the asynchronous operation. </returns>
-        /// <exception cref="OperationCanceledException"> If the <see cref="CancellationToken"/> is canceled. </exception>
+        /// <exception cref="OperationCanceledException"> If the <see cref="CancellationToken" /> is canceled. </exception>
 #pragma warning disable CA1068 // CancellationToken parameters must come last
         Task LoadAsync(
 #pragma warning restore CA1068 // CancellationToken parameters must come last

src/EFCore.Abstractions/PrecisionAttribute.cs

@@ -14,7 +14,7 @@ namespace Microsoft.EntityFrameworkCore
     /// <remarks>
     ///     See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see> for more information.
     /// </remarks>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
     public class PrecisionAttribute : Attribute
     {
         /// <summary>

src/EFCore.Abstractions/UnicodeAttribute.cs

@@ -11,7 +11,7 @@ namespace Microsoft.EntityFrameworkCore
     /// <remarks>
     ///     See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see> for more information.
     /// </remarks>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
     public sealed class UnicodeAttribute : Attribute
     {
         /// <summary>

src/EFCore.Analyzers/InternalUsageDiagnosticAnalyzer.cs

@@ -198,7 +198,7 @@ private static void AnalyzeNamedTypeSymbol(SymbolAnalysisContext context, INamed
                     var location = declaringSyntax.GetSyntax() switch
                     {
                         CSharpSyntax.ClassDeclarationSyntax s when s.BaseList?.Types.Count > 0
-                        => s.BaseList.Types[0].GetLocation(),
+                            => s.BaseList.Types[0].GetLocation(),
                         { } otherSyntax => otherSyntax.GetLocation()
                     };
 
@@ -288,15 +288,15 @@ private static SyntaxNode NarrowDownSyntax(SyntaxNode syntax)
             => syntax switch
             {
                 CSharpSyntax.InvocationExpressionSyntax s
-                when s.Expression is CSharpSyntax.MemberAccessExpressionSyntax memberAccessSyntax
-                => memberAccessSyntax.Name,
+                    when s.Expression is CSharpSyntax.MemberAccessExpressionSyntax memberAccessSyntax
+                    => memberAccessSyntax.Name,
                 CSharpSyntax.MemberAccessExpressionSyntax s => s.Name,
                 CSharpSyntax.ObjectCreationExpressionSyntax s => s.Type,
                 CSharpSyntax.PropertyDeclarationSyntax s => s.Type,
                 CSharpSyntax.VariableDeclaratorSyntax declarator
-                => declarator.Parent is CSharpSyntax.VariableDeclarationSyntax declaration
-                    ? declaration.Type
-                    : (SyntaxNode)declarator,
+                    => declarator.Parent is CSharpSyntax.VariableDeclarationSyntax declaration
+                        ? declaration.Type
+                        : declarator,
                 CSharpSyntax.TypeOfExpressionSyntax s => s.Type,
 
                 // TODO: VB syntax narrowing (#22085)

src/EFCore.Cosmos/ChangeTracking/Internal/ListComparer.cs

@@ -36,7 +36,8 @@ public ListComparer(ValueComparer elementComparer, bool readOnly)
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public override Type Type => typeof(TCollection);
+        public override Type Type
+            => typeof(TCollection);
 
         private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TElement> elementComparer)
         {

src/EFCore.Cosmos/ChangeTracking/Internal/NullableListComparer.cs

@@ -37,7 +37,8 @@ public NullableListComparer(ValueComparer elementComparer, bool readOnly)
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public override Type Type => typeof(TCollection);
+        public override Type Type
+            => typeof(TCollection);
 
         private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TElement> elementComparer)
         {
@@ -68,6 +69,7 @@ private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TEleme
 
                     return false;
                 }
+
                 if (bElement is null || !elementComparer.Equals(aElement, bElement))
                 {
                     return false;

src/EFCore.Cosmos/ChangeTracking/Internal/NullableSingleDimensionalArrayComparer.cs

@@ -22,10 +22,11 @@ public sealed class NullableSingleDimensionalArrayComparer<TElement> : ValueComp
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public NullableSingleDimensionalArrayComparer(ValueComparer elementComparer) : base(
-            (a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer),
-            o => GetHashCode(o, (ValueComparer<TElement>)elementComparer),
-            source => Snapshot(source, (ValueComparer<TElement>)elementComparer))
+        public NullableSingleDimensionalArrayComparer(ValueComparer elementComparer)
+            : base(
+                (a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer),
+                o => GetHashCode(o, (ValueComparer<TElement>)elementComparer),
+                source => Snapshot(source, (ValueComparer<TElement>)elementComparer))
         {
         }
 
@@ -35,7 +36,8 @@ public NullableSingleDimensionalArrayComparer(ValueComparer elementComparer) : b
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public override Type Type => typeof(TElement?[]);
+        public override Type Type
+            => typeof(TElement?[]);
 
         private static bool Compare(TElement?[]? a, TElement?[]? b, ValueComparer<TElement> elementComparer)
         {
@@ -66,6 +68,7 @@ private static bool Compare(TElement?[]? a, TElement?[]? b, ValueComparer<TEleme
 
                     return false;
                 }
+
                 if (bElement is null || !elementComparer.Equals(aElement, bElement))
                 {
                     return false;

src/EFCore.Cosmos/ChangeTracking/Internal/NullableStringDictionaryComparer.cs

@@ -37,7 +37,8 @@ public NullableStringDictionaryComparer(ValueComparer elementComparer, bool read
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public override Type Type => typeof(TCollection);
+        public override Type Type
+            => typeof(TCollection);
 
         private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TElement> elementComparer)
         {

src/EFCore.Cosmos/ChangeTracking/Internal/SingleDimensionalArrayComparer.cs

@@ -21,10 +21,11 @@ public sealed class SingleDimensionalArrayComparer<TElement> : ValueComparer<TEl
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public SingleDimensionalArrayComparer(ValueComparer elementComparer) : base(
-            (a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer),
-            o => GetHashCode(o, (ValueComparer<TElement>)elementComparer),
-            source => Snapshot(source, (ValueComparer<TElement>)elementComparer))
+        public SingleDimensionalArrayComparer(ValueComparer elementComparer)
+            : base(
+                (a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer),
+                o => GetHashCode(o, (ValueComparer<TElement>)elementComparer),
+                source => Snapshot(source, (ValueComparer<TElement>)elementComparer))
         {
         }
 
@@ -34,7 +35,8 @@ public SingleDimensionalArrayComparer(ValueComparer elementComparer) : base(
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public override Type Type => typeof(TElement[]);
+        public override Type Type
+            => typeof(TElement[]);
 
         private static bool Compare(TElement[]? a, TElement[]? b, ValueComparer<TElement> elementComparer)
         {
@@ -84,6 +86,7 @@ private static TElement[] Snapshot(TElement[] source, ValueComparer<TElement> el
                 var element = source[i];
                 snapshot[i] = element is null ? default! : elementComparer.Snapshot(element);
             }
+
             return snapshot;
         }
     }

src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs

@@ -36,7 +36,8 @@ public StringDictionaryComparer(ValueComparer elementComparer, bool readOnly)
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public override Type Type => typeof(TCollection);
+        public override Type Type
+            => typeof(TCollection);
 
         private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TElement> elementComparer)
         {

src/EFCore.Cosmos/Diagnostics/CosmosEventId.cs

@@ -67,7 +67,7 @@ public static readonly EventId ExecutingSqlQuery
         ///     </para>
         /// </summary>
         public static readonly EventId ExecutingReadItem
-                = new((int)Id.ExecutingReadItem, _commandPrefix + Id.ExecutingReadItem);
+            = new((int)Id.ExecutingReadItem, _commandPrefix + Id.ExecutingReadItem);
 
         /// <summary>
         ///     <para>
@@ -81,7 +81,7 @@ public static readonly EventId ExecutingReadItem
         ///     </para>
         /// </summary>
         public static readonly EventId ExecutedReadNext
-                = new((int)Id.ExecutedReadNext, _commandPrefix + Id.ExecutedReadNext);
+            = new((int)Id.ExecutedReadNext, _commandPrefix + Id.ExecutedReadNext);
 
         /// <summary>
         ///     <para>
@@ -95,7 +95,7 @@ public static readonly EventId ExecutedReadNext
         ///     </para>
         /// </summary>
         public static readonly EventId ExecutedReadItem
-                = new((int)Id.ExecutedReadItem, _commandPrefix + Id.ExecutedReadItem);
+            = new((int)Id.ExecutedReadItem, _commandPrefix + Id.ExecutedReadItem);
 
         /// <summary>
         ///     <para>
@@ -109,7 +109,7 @@ public static readonly EventId ExecutedReadItem
         ///     </para>
         /// </summary>
         public static readonly EventId ExecutedCreateItem
-                = new((int)Id.ExecutedCreateItem, _commandPrefix + Id.ExecutedCreateItem);
+            = new((int)Id.ExecutedCreateItem, _commandPrefix + Id.ExecutedCreateItem);
 
         /// <summary>
         ///     <para>
@@ -123,7 +123,7 @@ public static readonly EventId ExecutedCreateItem
         ///     </para>
         /// </summary>
         public static readonly EventId ExecutedReplaceItem
-                = new((int)Id.ExecutedReplaceItem, _commandPrefix + Id.ExecutedReplaceItem);
+            = new((int)Id.ExecutedReplaceItem, _commandPrefix + Id.ExecutedReplaceItem);
 
         /// <summary>
         ///     <para>
@@ -137,6 +137,6 @@ public static readonly EventId ExecutedReplaceItem
         ///     </para>
         /// </summary>
         public static readonly EventId ExecutedDeleteItem
-                = new((int)Id.ExecutedDeleteItem, _commandPrefix + Id.ExecutedDeleteItem);
+            = new((int)Id.ExecutedDeleteItem, _commandPrefix + Id.ExecutedDeleteItem);
     }
 }

src/EFCore.Cosmos/Diagnostics/Internal/CosmosLoggerExtensions.cs

@@ -111,7 +111,7 @@ public static void ExecutingReadItem(
                 diagnostics.DispatchEventData(definition, eventData, diagnosticSourceEnabled, simpleLogEnabled);
             }
         }
-        
+
         private static string ExecutingReadItem(EventDefinitionBase definition, EventData payload)
         {
             var d = (EventDefinition<string, string, string?>)definition;
@@ -213,7 +213,8 @@ public static void ExecutedReadItem(
             if (diagnostics.ShouldLog(definition))
             {
                 var logSensitiveData = diagnostics.ShouldLogSensitiveData();
-                definition.Log(diagnostics,
+                definition.Log(
+                    diagnostics,
                     elapsed.TotalMilliseconds.ToString(),
                     requestCharge.ToString(),
                     activityId,
@@ -244,12 +245,12 @@ private static string ExecutedReadItem(EventDefinitionBase definition, EventData
             var d = (EventDefinition<string, string, string, string, string, string?>)definition;
             var p = (CosmosItemCommandExecutedEventData)payload;
             return d.GenerateMessage(
-                    p.Elapsed.Milliseconds.ToString(),
-                    p.RequestCharge.ToString(),
-                    p.ActivityId,
-                    p.ContainerId,
-                    p.LogSensitiveData ? p.ResourceId : "?",
-                    p.LogSensitiveData ? p.PartitionKey : "?");
+                p.Elapsed.Milliseconds.ToString(),
+                p.RequestCharge.ToString(),
+                p.ActivityId,
+                p.ContainerId,
+                p.LogSensitiveData ? p.ResourceId : "?",
+                p.LogSensitiveData ? p.PartitionKey : "?");
         }
 
         /// <summary>
@@ -272,7 +273,8 @@ public static void ExecutedCreateItem(
             if (diagnostics.ShouldLog(definition))
             {
                 var logSensitiveData = diagnostics.ShouldLogSensitiveData();
-                definition.Log(diagnostics,
+                definition.Log(
+                    diagnostics,
                     elapsed.TotalMilliseconds.ToString(),
                     requestCharge.ToString(),
                     activityId,
@@ -303,12 +305,12 @@ private static string ExecutedCreateItem(EventDefinitionBase definition, EventDa
             var d = (EventDefinition<string, string, string, string, string, string?>)definition;
             var p = (CosmosItemCommandExecutedEventData)payload;
             return d.GenerateMessage(
-                    p.Elapsed.Milliseconds.ToString(),
-                    p.RequestCharge.ToString(),
-                    p.ActivityId,
-                    p.ContainerId,
-                    p.LogSensitiveData ? p.ResourceId : "?",
-                    p.LogSensitiveData ? p.PartitionKey : "?");
+                p.Elapsed.Milliseconds.ToString(),
+                p.RequestCharge.ToString(),
+                p.ActivityId,
+                p.ContainerId,
+                p.LogSensitiveData ? p.ResourceId : "?",
+                p.LogSensitiveData ? p.PartitionKey : "?");
         }
 
         /// <summary>
@@ -331,7 +333,8 @@ public static void ExecutedDeleteItem(
             if (diagnostics.ShouldLog(definition))
             {
                 var logSensitiveData = diagnostics.ShouldLogSensitiveData();
-                definition.Log(diagnostics,
+                definition.Log(
+                    diagnostics,
                     elapsed.TotalMilliseconds.ToString(),
                     requestCharge.ToString(),
                     activityId,
@@ -362,12 +365,12 @@ private static string ExecutedDeleteItem(EventDefinitionBase definition, EventDa
             var d = (EventDefinition<string, string, string, string, string, string?>)definition;
             var p = (CosmosItemCommandExecutedEventData)payload;
             return d.GenerateMessage(
-                    p.Elapsed.Milliseconds.ToString(),
-                    p.RequestCharge.ToString(),
-                    p.ActivityId,
-                    p.ContainerId,
-                    p.LogSensitiveData ? p.ResourceId : "?",
-                    p.LogSensitiveData ? p.PartitionKey : "?");
+                p.Elapsed.Milliseconds.ToString(),
+                p.RequestCharge.ToString(),
+                p.ActivityId,
+                p.ContainerId,
+                p.LogSensitiveData ? p.ResourceId : "?",
+                p.LogSensitiveData ? p.PartitionKey : "?");
         }
 
         /// <summary>
@@ -390,7 +393,8 @@ public static void ExecutedReplaceItem(
             if (diagnostics.ShouldLog(definition))
             {
                 var logSensitiveData = diagnostics.ShouldLogSensitiveData();
-                definition.Log(diagnostics,
+                definition.Log(
+                    diagnostics,
                     elapsed.TotalMilliseconds.ToString(),
                     requestCharge.ToString(),
                     activityId,
@@ -421,12 +425,12 @@ private static string ExecutedReplaceItem(EventDefinitionBase definition, EventD
             var d = (EventDefinition<string, string, string, string, string, string?>)definition;
             var p = (CosmosItemCommandExecutedEventData)payload;
             return d.GenerateMessage(
-                    p.Elapsed.Milliseconds.ToString(),
-                    p.RequestCharge.ToString(),
-                    p.ActivityId,
-                    p.ContainerId,
-                    p.LogSensitiveData ? p.ResourceId : "?",
-                    p.LogSensitiveData ? p.PartitionKey : "?");
+                p.Elapsed.Milliseconds.ToString(),
+                p.RequestCharge.ToString(),
+                p.ActivityId,
+                p.ContainerId,
+                p.LogSensitiveData ? p.ResourceId : "?",
+                p.LogSensitiveData ? p.PartitionKey : "?");
         }
 
         private static string FormatParameters(IReadOnlyList<(string Name, object? Value)> parameters, bool shouldLogParameterValues)