Code cleanup for EFCore (#22182)

src/EFCore/ChangeTracking/ChangeTracker.cs

@@ -196,10 +196,10 @@ private void TryDetectChanges()
         ///     </para>
         ///     <para>
         ///         Note that this method calls <see cref="DetectChanges" /> unless
-        ///         <see cref="AutoDetectChangesEnabled" /> has been set to <see langword="false"/>.
+        ///         <see cref="AutoDetectChangesEnabled" /> has been set to <see langword="false" />.
         ///     </para>
         /// </summary>
-        /// <returns> <see langword="true"/> if there are changes to save, otherwise <see langword="false"/>. </returns>
+        /// <returns> <see langword="true" /> if there are changes to save, otherwise <see langword="false" />. </returns>
         public virtual bool HasChanges()
         {
             TryDetectChanges();
@@ -231,7 +231,8 @@ public virtual void DetectChanges()
         ///     represent the current state of the database. This method is typically called by <see cref="DbContext.SaveChanges()" />
         ///     after changes have been successfully saved to the database.
         /// </summary>
-        public virtual void AcceptAllChanges() => StateManager.AcceptAllChanges();
+        public virtual void AcceptAllChanges()
+            => StateManager.AcceptAllChanges();
 
         /// <summary>
         ///     <para>
@@ -402,7 +403,7 @@ Task IResettableService.ResetStateAsync(CancellationToken cancellationToken)
         ///         Stops tracking all currently tracked entities.
         ///     </para>
         ///     <para>
-        ///         <see cref="DbContext"/> is designed to have a short lifetime where a new instance is created for each unit-of-work.
+        ///         <see cref="DbContext" /> is designed to have a short lifetime where a new instance is created for each unit-of-work.
         ///         This manner means all tracked entities are discarded when the context is disposed at the end of each unit-of-work.
         ///         However, clearing all tracked entities using this method may be useful in situations where creating a new context
         ///         instance is not practical.
@@ -413,7 +414,7 @@ Task IResettableService.ResetStateAsync(CancellationToken cancellationToken)
         ///         This method is much more efficient at clearing all tracked entities from the context.
         ///     </para>
         ///     <para>
-        ///         Note that this method does not generate <see cref="StateChanged"/> events since entities are not individually detached.
+        ///         Note that this method does not generate <see cref="StateChanged" /> events since entities are not individually detached.
         ///     </para>
         /// </summary>
         public virtual void Clear()
@@ -440,22 +441,25 @@ public virtual DebugView DebugView
         /// </summary>
         /// <returns> A string that represents the current object. </returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public override string ToString() => base.ToString();
+        public override string ToString()
+            => base.ToString();
 
         /// <summary>
         ///     Determines whether the specified object is equal to the current object.
         /// </summary>
         /// <param name="obj"> The object to compare with the current object. </param>
-        /// <returns> <see langword="true"/> if the specified object is equal to the current object; otherwise, <see langword="false"/>. </returns>
+        /// <returns> <see langword="true" /> if the specified object is equal to the current object; otherwise, <see langword="false" />. </returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => base.Equals(obj);
+        public override bool Equals(object obj)
+            => base.Equals(obj);
 
         /// <summary>
         ///     Serves as the default hash function.
         /// </summary>
         /// <returns> A hash code for the current object. </returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => base.GetHashCode();
+        public override int GetHashCode()
+            => base.GetHashCode();
 
         #endregion
     }

src/EFCore/ChangeTracking/ChangeTrackerExtensions.cs

@@ -51,7 +51,7 @@ public static string ToDebugString(
 
         private sealed class EntityEntryComparer : IComparer<InternalEntityEntry>
         {
-            public static EntityEntryComparer Instance = new EntityEntryComparer();
+            public static readonly EntityEntryComparer Instance = new EntityEntryComparer();
 
             public int Compare(InternalEntityEntry x, InternalEntityEntry y)
             {
@@ -79,6 +79,5 @@ public int Compare(InternalEntityEntry x, InternalEntityEntry y)
                 return 0;
             }
         }
-
     }
 }

src/EFCore/ChangeTracking/CollectionEntry`.cs

@@ -54,7 +54,8 @@ public CollectionEntry([NotNull] InternalEntityEntry internalEntry, [NotNull] IN
         ///     The <see cref="EntityEntry{TEntity}" /> to which this member belongs.
         /// </summary>
         /// <value> An entry for the entity that owns this member. </value>
-        public new virtual EntityEntry<TEntity> EntityEntry => new EntityEntry<TEntity>(InternalEntry);
+        public new virtual EntityEntry<TEntity> EntityEntry
+            => new EntityEntry<TEntity>(InternalEntry);
 
         /// <summary>
         ///     Gets or sets the value currently assigned to this property. If the current value is set using this property,

src/EFCore/ChangeTracking/EntityEntry.cs

@@ -61,7 +61,8 @@ public EntityEntry([NotNull] InternalEntityEntry internalEntry)
         /// <summary>
         ///     Gets the entity being tracked by this entry.
         /// </summary>
-        public virtual object Entity => InternalEntry.Entity;
+        public virtual object Entity
+            => InternalEntry.Entity;
 
         /// <summary>
         ///     <para>
@@ -114,17 +115,20 @@ public virtual void DetectChanges()
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         [EntityFrameworkInternal]
-        InternalEntityEntry IInfrastructure<InternalEntityEntry>.Instance => InternalEntry;
+        InternalEntityEntry IInfrastructure<InternalEntityEntry>.Instance
+            => InternalEntry;
 
         /// <summary>
         ///     Gets the context that is tracking the entity.
         /// </summary>
-        public virtual DbContext Context => InternalEntry.StateManager.Context;
+        public virtual DbContext Context
+            => InternalEntry.StateManager.Context;
 
         /// <summary>
         ///     Gets the metadata about the shape of the entity, its relationships to other entities, and how it maps to the database.
         /// </summary>
-        public virtual IEntityType Metadata => InternalEntry.EntityType;
+        public virtual IEntityType Metadata
+            => InternalEntry.EntityType;
 
         /// <summary>
         ///     Provides access to change tracking information and operations for a given
@@ -286,7 +290,8 @@ public virtual IEnumerable<CollectionEntry> Collections
         ///         true since any value is considered a valid key value.
         ///     </para>
         /// </summary>
-        public virtual bool IsKeySet => InternalEntry.IsKeySet.IsSet;
+        public virtual bool IsKeySet
+            => InternalEntry.IsKeySet.IsSet;
 
         /// <summary>
         ///     Gets the current property values for this entity.
@@ -372,7 +377,8 @@ public virtual async Task<PropertyValues> GetDatabaseValuesAsync(CancellationTok
         ///         not yet have had its permanent key value created.
         ///     </para>
         /// </summary>
-        public virtual void Reload() => Reload(GetDatabaseValues());
+        public virtual void Reload()
+            => Reload(GetDatabaseValues());
 
         /// <summary>
         ///     <para>
@@ -420,7 +426,8 @@ private IEntityFinder Finder
         ///     Returns a string that represents the current object.
         /// </summary>
         /// <returns> A string that represents the current object. </returns>
-        public override string ToString() => InternalEntry.ToString();
+        public override string ToString()
+            => InternalEntry.ToString();
 
         /// <summary>
         ///     <para>
@@ -442,16 +449,18 @@ public virtual DebugView DebugView
         ///     Determines whether the specified object is equal to the current object.
         /// </summary>
         /// <param name="obj"> The object to compare with the current object. </param>
-        /// <returns> <see langword="true"/> if the specified object is equal to the current object; otherwise, <see langword="false"/>. </returns>
+        /// <returns> <see langword="true" /> if the specified object is equal to the current object; otherwise, <see langword="false" />. </returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => base.Equals(obj);
+        public override bool Equals(object obj)
+            => base.Equals(obj);
 
         /// <summary>
         ///     Serves as the default hash function.
         /// </summary>
         /// <returns> A hash code for the current object. </returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => base.GetHashCode();
+        public override int GetHashCode()
+            => base.GetHashCode();
 
         #endregion
     }

src/EFCore/ChangeTracking/EntityEntryEventArgs.cs

@@ -32,6 +32,7 @@ public EntityEntryEventArgs(
         /// <summary>
         ///     The <see cref="EntityEntry" /> for the entity.
         /// </summary>
-        public virtual EntityEntry Entry => _entry ??= new EntityEntry(_internalEntityEntry);
+        public virtual EntityEntry Entry
+            => _entry ??= new EntityEntry(_internalEntityEntry);
     }
 }

src/EFCore/ChangeTracking/EntityEntryGraphNode.cs

@@ -42,7 +42,8 @@ public EntityEntryGraphNode(
         /// <summary>
         ///     Gets the entry tracking information about this entity.
         /// </summary>
-        public virtual EntityEntry SourceEntry => _sourceEntry == null ? null : new EntityEntry(_sourceEntry);
+        public virtual EntityEntry SourceEntry
+            => _sourceEntry == null ? null : new EntityEntry(_sourceEntry);
 
         /// <summary>
         ///     Gets the navigation property that is being traversed to reach this node in the graph.
@@ -52,7 +53,8 @@ public EntityEntryGraphNode(
         /// <summary>
         ///     Gets the entry tracking information about this entity.
         /// </summary>
-        public virtual EntityEntry Entry => new EntityEntry(_entry);
+        public virtual EntityEntry Entry
+            => new EntityEntry(_entry);
 
         /// <summary>
         ///     <para>
@@ -63,7 +65,8 @@ public EntityEntryGraphNode(
         ///         application code.
         ///     </para>
         /// </summary>
-        InternalEntityEntry IInfrastructure<InternalEntityEntry>.Instance => _entry;
+        InternalEntityEntry IInfrastructure<InternalEntityEntry>.Instance
+            => _entry;
 
         /// <summary>
         ///     Creates a new node for the entity that is being traversed next in the graph.

src/EFCore/ChangeTracking/EntityEntry`.cs

@@ -42,7 +42,8 @@ public EntityEntry([NotNull] InternalEntityEntry internalEntry)
         /// <summary>
         ///     Gets the entity being tracked by this entry.
         /// </summary>
-        public new virtual TEntity Entity => (TEntity)base.Entity;
+        public new virtual TEntity Entity
+            => (TEntity)base.Entity;
 
         /// <summary>
         ///     Provides access to change tracking information and operations for a given

src/EFCore/ChangeTracking/EntryCurrentValueComparer`.cs

@@ -51,7 +51,7 @@ public int Compare(IUpdateEntry x, IUpdateEntry y)
         /// </summary>
         /// <param name="x"> The first object to compare. </param>
         /// <param name="y"> The second object to compare. </param>
-        /// <returns> <see langword="true"/> if the specified objects are equal; otherwise, <see langword="false"/>. </returns>
+        /// <returns> <see langword="true" /> if the specified objects are equal; otherwise, <see langword="false" />. </returns>
         public bool Equals(IUpdateEntry x, IUpdateEntry y)
             => Compare(x, y) == 0;
 

src/EFCore/ChangeTracking/IDependentKeyValueFactory.cs

@@ -25,7 +25,7 @@ public interface IDependentKeyValueFactory<TKey>
         /// </summary>
         /// <param name="valueBuffer"> The value buffer representing the entity instance. </param>
         /// <param name="key"> The key instance. </param>
-        /// <returns> <see langword="true"/> if the key instance was created; <see langword="false"/> otherwise. </returns>
+        /// <returns> <see langword="true" /> if the key instance was created; <see langword="false" /> otherwise. </returns>
         [ContractAnnotation("=>true, key:notnull; =>false, key:null")]
         bool TryCreateFromBuffer(in ValueBuffer valueBuffer, out TKey key);
 
@@ -34,7 +34,7 @@ public interface IDependentKeyValueFactory<TKey>
         /// </summary>
         /// <param name="entry"> The entry tracking an entity instance. </param>
         /// <param name="key"> The key instance. </param>
-        /// <returns> <see langword="true"/> if the key instance was created; <see langword="false"/> otherwise. </returns>
+        /// <returns> <see langword="true" /> if the key instance was created; <see langword="false" /> otherwise. </returns>
         [ContractAnnotation("=>true, key:notnull; =>false, key:null")]
         bool TryCreateFromCurrentValues([NotNull] IUpdateEntry entry, out TKey key);
 
@@ -44,7 +44,7 @@ public interface IDependentKeyValueFactory<TKey>
         /// </summary>
         /// <param name="entry"> The entry tracking an entity instance. </param>
         /// <param name="key"> The key instance. </param>
-        /// <returns> <see langword="true"/> if the key instance was created; <see langword="false"/> otherwise. </returns>
+        /// <returns> <see langword="true" /> if the key instance was created; <see langword="false" /> otherwise. </returns>
         [ContractAnnotation("=>true, key:notnull; =>false, key:null")]
         bool TryCreateFromPreStoreGeneratedCurrentValues([NotNull] IUpdateEntry entry, out TKey key);
 
@@ -53,7 +53,7 @@ public interface IDependentKeyValueFactory<TKey>
         /// </summary>
         /// <param name="entry"> The entry tracking an entity instance. </param>
         /// <param name="key"> The key instance. </param>
-        /// <returns> <see langword="true"/> if the key instance was created; <see langword="false"/> otherwise. </returns>
+        /// <returns> <see langword="true" /> if the key instance was created; <see langword="false" /> otherwise. </returns>
         [ContractAnnotation("=>true, key:notnull; =>false, key:null")]
         bool TryCreateFromOriginalValues([NotNull] IUpdateEntry entry, out TKey key);
 
@@ -63,7 +63,7 @@ public interface IDependentKeyValueFactory<TKey>
         /// </summary>
         /// <param name="entry"> The entry tracking an entity instance. </param>
         /// <param name="key"> The key instance. </param>
-        /// <returns> <see langword="true"/> if the key instance was created; <see langword="false"/> otherwise. </returns>
+        /// <returns> <see langword="true" /> if the key instance was created; <see langword="false" /> otherwise. </returns>
         [ContractAnnotation("=>true, key:notnull; =>false, key:null")]
         bool TryCreateFromRelationshipSnapshot([NotNull] IUpdateEntry entry, out TKey key);
 

src/EFCore/ChangeTracking/Internal/ArrayPropertyValues.cs

@@ -7,7 +7,6 @@
 using System.Reflection;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Query;
@@ -34,7 +33,8 @@ public class ArrayPropertyValues : PropertyValues
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public ArrayPropertyValues([NotNull] InternalEntityEntry internalEntry, [NotNull] object[] values)
-            : base(internalEntry) => _values = values;
+            : base(internalEntry)
+            => _values = values;
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/ChangeTracking/Internal/ChangeDetector.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -55,15 +54,17 @@ public ChangeDetector(
         ///     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 virtual void Suspend() => _suspended = true;
+        public virtual void Suspend()
+            => _suspended = true;
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
         ///     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 virtual void Resume() => _suspended = false;
+        public virtual void Resume()
+            => _suspended = false;
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/ChangeTracking/Internal/CurrentValueComparerFactory.cs

@@ -81,7 +81,7 @@ public virtual IComparer<IUpdateEntry> Create([NotNull] IPropertyBase propertyBa
                             propertyBase.DeclaringType.DisplayName(),
                             propertyBase.Name,
                             modelType.ShortDisplayName(),
-                            providerType.ShortDisplayName() ));
+                            providerType.ShortDisplayName()));
                 }
             }
 

src/EFCore/ChangeTracking/Internal/EmptyShadowValuesFactoryFactory.cs

@@ -48,7 +48,8 @@ protected override ValueComparer GetValueComparer(IProperty property)
         ///     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>
-        protected override bool UseEntityVariable => false;
+        protected override bool UseEntityVariable
+            => false;
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/ChangeTracking/Internal/EntityEntryGraphIterator.cs

@@ -109,19 +109,19 @@ public virtual async Task TraverseGraphAsync<TState>(
                         {
                             var targetEntry = stateManager.GetOrCreateEntry(relatedEntity, targetType);
                             await TraverseGraphAsync(
-                                (EntityEntryGraphNode<TState>)node.CreateNode(node, targetEntry, navigation),
-                                handleNode,
-                                cancellationToken)
+                                    (EntityEntryGraphNode<TState>)node.CreateNode(node, targetEntry, navigation),
+                                    handleNode,
+                                    cancellationToken)
                                 .ConfigureAwait(false);
                         }
                     }
                     else
                     {
                         var targetEntry = stateManager.GetOrCreateEntry(navigationValue, targetType);
                         await TraverseGraphAsync(
-                            (EntityEntryGraphNode<TState>)node.CreateNode(node, targetEntry, navigation),
-                            handleNode,
-                            cancellationToken)
+                                (EntityEntryGraphNode<TState>)node.CreateNode(node, targetEntry, navigation),
+                                handleNode,
+                                cancellationToken)
                             .ConfigureAwait(false);
                     }
                 }