Second pass

dotnet · Sep 23, 2021 · 4fadf4b · 4fadf4b
1 parent c63d482
commit 4fadf4b
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 33 deletions.
diff --git a/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs b/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs
@@ -1890,7 +1890,7 @@ public void HandleINotifyCollectionChanged(
                         break;
                     case NotifyCollectionChangedAction.Reset:
                         throw new InvalidOperationException(CoreStrings.ResetNotSupported);
-                        // Note: ignoring Move since index not important
+                    // Note: ignoring Move since index not important
                 }
             }
         }

diff --git a/src/EFCore/DbContextOptions.cs b/src/EFCore/DbContextOptions.cs
@@ -152,8 +152,9 @@ public override bool Equals(object? obj)
         protected virtual bool Equals(DbContextOptions other)
             => _extensionsMap.Count == other._extensionsMap.Count
                 && _extensionsMap.Zip(other._extensionsMap)
-                    .All(p => p.First.Value.Ordinal == p.Second.Value.Ordinal
-                        && p.First.Value.Extension.Info.ShouldUseSameServiceProvider(p.Second.Value.Extension.Info));
+                    .All(
+                        p => p.First.Value.Ordinal == p.Second.Value.Ordinal
+                            && p.First.Value.Extension.Info.ShouldUseSameServiceProvider(p.Second.Value.Extension.Info));
 
         /// <inheritdoc />
         public override int GetHashCode()

diff --git a/src/EFCore/DbContextOptions`.cs b/src/EFCore/DbContextOptions`.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 
 namespace Microsoft.EntityFrameworkCore
@@ -44,7 +43,7 @@ public DbContextOptions(
         }
 
         private DbContextOptions(
-           ImmutableSortedDictionary<Type, (IDbContextOptionsExtension Extension, int Ordinal)> extensions)
+            ImmutableSortedDictionary<Type, (IDbContextOptionsExtension Extension, int Ordinal)> extensions)
             : base(extensions)
         {
         }

diff --git a/src/EFCore/Extensions/EntityFrameworkQueryableExtensions.cs b/src/EFCore/Extensions/EntityFrameworkQueryableExtensions.cs
@@ -3056,8 +3056,8 @@ source.Provider is EntityQueryProvider
         /// </exception>
         public static IQueryable<T> TagWithCallSite<T>(
             this IQueryable<T> source,
-            [NotParameterized][CallerFilePath] string? filePath = null,
-            [NotParameterized][CallerLineNumber] int lineNumber = 0)
+            [NotParameterized] [CallerFilePath] string? filePath = null,
+            [NotParameterized] [CallerLineNumber] int lineNumber = 0)
         {
             Check.NotNull(source, nameof(source));
 

diff --git a/src/EFCore/Infrastructure/EntityFrameworkEventSource.cs b/src/EFCore/Infrastructure/EntityFrameworkEventSource.cs
@@ -32,6 +32,7 @@ public sealed class EntityFrameworkEventSource : EventSource
         private PollingCounter? _totalExecutionStrategyOperationFailuresCounter;
         private IncrementingPollingCounter? _executionStrategyOperationFailuresPerSecondCounter;
         private PollingCounter? _totalOptimisticConcurrencyFailuresCounter;
+
         private IncrementingPollingCounter? _optimisticConcurrencyFailuresPerSecondCounter;
         // ReSharper restore NotAccessedField.Local
 
@@ -137,13 +138,13 @@ protected override void OnEventCommand(EventCommandEventArgs command)
                 };
 
                 _totalQueriesCounter ??= new PollingCounter("total-queries", this, () => Interlocked.Read(ref _totalQueries))
-                { DisplayName = "Queries (Total)" };
+                    { DisplayName = "Queries (Total)" };
 
                 _queriesPerSecondCounter ??= new IncrementingPollingCounter(
-                    "queries-per-second",
-                    this,
-                    () => Interlocked.Read(ref _totalQueries))
-                { DisplayName = "Queries", DisplayRateTimeScale = TimeSpan.FromSeconds(1) };
+                        "queries-per-second",
+                        this,
+                        () => Interlocked.Read(ref _totalQueries))
+                    { DisplayName = "Queries", DisplayRateTimeScale = TimeSpan.FromSeconds(1) };
 
                 _totalSaveChangesCounter ??= new PollingCounter("total-save-changes", this, () => Interlocked.Read(ref _totalSaveChanges))
                 {
@@ -154,19 +155,19 @@ protected override void OnEventCommand(EventCommandEventArgs command)
                         "save-changes-per-second",
                         this,
                         () => Interlocked.Read(ref _totalSaveChanges))
-                { DisplayName = "SaveChanges", DisplayRateTimeScale = TimeSpan.FromSeconds(1) };
+                    { DisplayName = "SaveChanges", DisplayRateTimeScale = TimeSpan.FromSeconds(1) };
 
                 _compiledQueryCacheHitRateCounter ??= new PollingCounter(
-                    "compiled-query-cache-hit-rate",
-                    this,
-                    () => _compiledQueryCacheInfo.CalculateAndReset())
-                { DisplayName = "Query Cache Hit Rate", DisplayUnits = "%" };
+                        "compiled-query-cache-hit-rate",
+                        this,
+                        () => _compiledQueryCacheInfo.CalculateAndReset())
+                    { DisplayName = "Query Cache Hit Rate", DisplayUnits = "%" };
 
                 _totalExecutionStrategyOperationFailuresCounter ??= new PollingCounter(
                         "total-execution-strategy-operation-failures",
                         this,
                         () => Interlocked.Read(ref _totalExecutionStrategyOperationFailures))
-                { DisplayName = "Execution Strategy Operation Failures (Total)" };
+                    { DisplayName = "Execution Strategy Operation Failures (Total)" };
 
                 _executionStrategyOperationFailuresPerSecondCounter ??= new IncrementingPollingCounter(
                     "execution-strategy-operation-failures-per-second",
@@ -181,7 +182,7 @@ protected override void OnEventCommand(EventCommandEventArgs command)
                         "total-optimistic-concurrency-failures",
                         this,
                         () => Interlocked.Read(ref _totalOptimisticConcurrencyFailures))
-                { DisplayName = "Optimistic Concurrency Failures (Total)" };
+                    { DisplayName = "Optimistic Concurrency Failures (Total)" };
 
                 _optimisticConcurrencyFailuresPerSecondCounter ??= new IncrementingPollingCounter(
                     "optimistic-concurrency-failures-per-second",

diff --git a/src/EFCore/Metadata/Conventions/RelationshipDiscoveryConvention.cs b/src/EFCore/Metadata/Conventions/RelationshipDiscoveryConvention.cs
@@ -257,7 +257,7 @@ private IReadOnlyList<RelationshipCandidate> FindRelationshipCandidates(
                     new RelationshipCandidate(
                         candidateTargetEntityTypeBuilder, navigations, inverseNavigationCandidates, shouldBeOwnership);
 
-                Continue:;
+                Continue: ;
             }
 
             return UpdateTargetEntityTypes(entityTypeBuilder, relationshipCandidates);

diff --git a/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs b/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs
@@ -2283,16 +2283,17 @@ private bool CanSetPrincipalKey(
             if (configurationSource == ConfigurationSource.Explicit
                 && principalEntityTypeBuilder.Metadata.IsKeyless)
             {
-                throw new InvalidOperationException(CoreStrings.PrincipalKeylessType(
-                    principalEntityTypeBuilder.Metadata.DisplayName(),
-                    principalEntityTypeBuilder.Metadata.DisplayName()
-                    + (navigationToDependent?.Name == null
-                        ? ""
-                        : "." + navigationToDependent.Value.Name),
-                    dependentEntityTypeBuilder.Metadata.DisplayName()
-                    + (navigationToPrincipal?.Name == null
-                        ? ""
-                        : "." + navigationToPrincipal.Value.Name)));
+                throw new InvalidOperationException(
+                    CoreStrings.PrincipalKeylessType(
+                        principalEntityTypeBuilder.Metadata.DisplayName(),
+                        principalEntityTypeBuilder.Metadata.DisplayName()
+                        + (navigationToDependent?.Name == null
+                            ? ""
+                            : "." + navigationToDependent.Value.Name),
+                        dependentEntityTypeBuilder.Metadata.DisplayName()
+                        + (navigationToPrincipal?.Name == null
+                            ? ""
+                            : "." + navigationToPrincipal.Value.Name)));
             }
 
             Check.DebugAssert(

diff --git a/src/EFCore/Query/QueryableMethods.cs b/src/EFCore/Query/QueryableMethods.cs
@@ -72,7 +72,7 @@ public static class QueryableMethods
 
         /// <summary>
         ///     The <see cref="MethodInfo" /> for
-        ///     <see cref="Queryable.Count{TSource}(IQueryable{TSource},Expression{Func{TSource,bool}})" />
+        ///     <see cref="Queryable.Count{TSource}(IQueryable{TSource},System.Linq.Expressions.Expression{System.Func{TSource,bool}})" />
         /// </summary>
         public static MethodInfo CountWithPredicate { get; }
 

diff --git a/src/Shared/Check.cs b/src/Shared/Check.cs
@@ -18,7 +18,7 @@ internal static class Check
     {
         [ContractAnnotation("value:null => halt")]
         [return: NotNull]
-        public static T NotNull<T>([NoEnumeration][AllowNull][NotNull] T value, [InvokerParameterName] string parameterName)
+        public static T NotNull<T>([NoEnumeration] [AllowNull] [NotNull] T value, [InvokerParameterName] string parameterName)
         {
             if (value is null)
             {

diff --git a/src/Shared/Multigraph.cs b/src/Shared/Multigraph.cs
@@ -23,7 +23,7 @@ public IEnumerable<TEdge> GetEdges(TVertex from, TVertex to)
             {
                 if (successorSet.TryGetValue(to, out var edges))
                 {
-                    return edges is IEnumerable<TEdge> edgeList ? edgeList : (new TEdge[] { (TEdge)edges! });
+                    return edges is IEnumerable<TEdge> edgeList ? edgeList : (new[] { (TEdge)edges! });
                 }
             }
 
@@ -63,6 +63,7 @@ public void AddEdge(TVertex from, TVertex to, TEdge edge)
                     edgeList = new List<TEdge> { (TEdge)edges! };
                     successorEdges[to] = edgeList;
                 }
+
                 edgeList.Add(edge);
             }
             else
@@ -106,6 +107,7 @@ public void AddEdges(TVertex from, TVertex to, IEnumerable<TEdge> newEdges)
                     edgeList = new List<TEdge> { (TEdge)edges! };
                     successorEdges[to] = edgeList;
                 }
+
                 edgeList.AddRange(newEdges);
             }
             else