Static analysis: make members static

src/EFCore.Cosmos/Metadata/Conventions/CosmosDiscriminatorConvention.cs

@@ -94,7 +94,7 @@ public virtual void ProcessEntityTypeAnnotationChanged(
         ProcessEntityType(entityTypeBuilder);
     }
 
-    private void ProcessEntityType(IConventionEntityTypeBuilder entityTypeBuilder)
+    private static void ProcessEntityType(IConventionEntityTypeBuilder entityTypeBuilder)
     {
         var entityType = entityTypeBuilder.Metadata;
         if (entityType.BaseType != null)

src/EFCore.Cosmos/Metadata/Conventions/CosmosManyToManyJoinEntityTypeConvention.cs

@@ -183,7 +183,7 @@ private void ProcessJoinPartitionKey(IConventionSkipNavigation skipNavigation)
         }
     }
 
-    private bool ShouldSharePartitionKey(IConventionSkipNavigation skipNavigation)
+    private static bool ShouldSharePartitionKey(IConventionSkipNavigation skipNavigation)
         => skipNavigation.DeclaringEntityType.GetContainer() == skipNavigation.TargetEntityType.GetContainer()
             && skipNavigation.DeclaringEntityType.GetPartitionKeyPropertyName() != null
             && skipNavigation.Inverse?.DeclaringEntityType.GetPartitionKeyPropertyName()

src/EFCore.Cosmos/Query/Internal/ContainsTranslator.cs

@@ -54,6 +54,6 @@ public ContainsTranslator(ISqlExpressionFactory sqlExpressionFactory)
         return null;
     }
 
-    private bool ValidateValues(SqlExpression values)
+    private static bool ValidateValues(SqlExpression values)
         => values is SqlConstantExpression || values is SqlParameterExpression;
 }

src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs

@@ -224,7 +224,7 @@ protected override ShapedQueryExpression CreateShapedQueryExpression(IEntityType
         return CreateShapedQueryExpression(entityType, selectExpression);
     }
 
-    private ShapedQueryExpression CreateShapedQueryExpression(IEntityType entityType, Expression queryExpression)
+    private static ShapedQueryExpression CreateShapedQueryExpression(IEntityType entityType, Expression queryExpression)
         => new(
             queryExpression,
             new EntityShaperExpression(
@@ -1050,7 +1050,7 @@ private SqlExpression TranslateLambdaExpression(
     private static Expression RemapLambdaBody(Expression shaperBody, LambdaExpression lambdaExpression)
         => ReplacingExpressionVisitor.Replace(lambdaExpression.Parameters.Single(), shaperBody, lambdaExpression.Body);
 
-    private ShapedQueryExpression AggregateResultShaper(
+    private static ShapedQueryExpression AggregateResultShaper(
         ShapedQueryExpression source,
         Expression projection,
         bool throwOnNullResult,

src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitorBase.cs

@@ -735,7 +735,7 @@ var body
             return valueExpression;
         }
 
-        private Expression ConvertJTokenToType(Expression jTokenExpression, Type type)
+        private static Expression ConvertJTokenToType(Expression jTokenExpression, Type type)
             => type == typeof(JToken)
                 ? jTokenExpression
                 : Expression.Call(

src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs

@@ -901,7 +901,7 @@ private static List<TProperty> ParameterListValueExtractor<TEntity, TProperty>(
     private static bool IsNullSqlConstantExpression(Expression expression)
         => expression is SqlConstantExpression sqlConstant && sqlConstant.Value == null;
 
-    private SqlConstantExpression GetConstantOrNull(Expression expression)
+    private static SqlConstantExpression GetConstantOrNull(Expression expression)
         => CanEvaluate(expression)
             ? new SqlConstantExpression(
                 Expression.Constant(
@@ -933,7 +933,7 @@ private static bool CanEvaluate(Expression expression)
     }
 
     [DebuggerStepThrough]
-    private bool TranslationFailed(Expression original, Expression translation, out SqlExpression castTranslation)
+    private static bool TranslationFailed(Expression original, Expression translation, out SqlExpression castTranslation)
     {
         if (original != null
             && !(translation is SqlExpression))

src/EFCore.Cosmos/Query/Internal/QuerySqlGenerator.cs

@@ -430,14 +430,14 @@ protected override Expression VisitSqlConstant(SqlConstantExpression sqlConstant
         return sqlConstantExpression;
     }
 
-    private string GenerateConstant(object value, CoreTypeMapping typeMapping)
+    private static string GenerateConstant(object value, CoreTypeMapping typeMapping)
     {
         var jToken = GenerateJToken(value, typeMapping);
 
         return jToken is null ? "null" : jToken.ToString(Formatting.None);
     }
 
-    private JToken GenerateJToken(object value, CoreTypeMapping typeMapping)
+    private static JToken GenerateJToken(object value, CoreTypeMapping typeMapping)
     {
         if (value?.GetType().IsInteger() == true)
         {

src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseCreator.cs

@@ -86,7 +86,7 @@ public virtual async Task<bool> EnsureCreatedAsync(CancellationToken cancellatio
         return created;
     }
 
-    private IEnumerable<ContainerProperties> GetContainersToCreate(IModel model)
+    private static IEnumerable<ContainerProperties> GetContainersToCreate(IModel model)
     {
         var containers = new Dictionary<string, List<IEntityType>>();
         foreach (var entityType in model.GetEntityTypes().Where(et => et.FindPrimaryKey() != null))

src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs

@@ -47,7 +47,7 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
                 ?? base.FindMapping(mappingInfo));
     }
 
-    private CoreTypeMapping? FindPrimitiveMapping(in TypeMappingInfo mappingInfo)
+    private static CoreTypeMapping? FindPrimitiveMapping(in TypeMappingInfo mappingInfo)
     {
         var clrType = mappingInfo.ClrType!;
         if ((clrType.IsValueType
@@ -61,7 +61,7 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
         return null;
     }
 
-    private CoreTypeMapping? FindCollectionMapping(in TypeMappingInfo mappingInfo)
+    private static CoreTypeMapping? FindCollectionMapping(in TypeMappingInfo mappingInfo)
     {
         var clrType = mappingInfo.ClrType!;
         var elementType = clrType.TryGetSequenceType();

src/EFCore.Cosmos/Storage/Internal/JsonCosmosSerializer.cs

@@ -49,6 +49,6 @@ public override Stream ToStream<T>(T input)
         return streamPayload;
     }
 
-    private JsonSerializer GetSerializer()
+    private static JsonSerializer GetSerializer()
         => CosmosClientWrapper.Serializer;
 }

src/EFCore.Cosmos/Update/Internal/DocumentSource.cs

@@ -303,7 +303,7 @@ public virtual JObject CreateDocument(IUpdateEntry entry, int? ordinal)
         return anyPropertyUpdated ? document : null;
     }
 
-    private IProperty? FindOrdinalKeyProperty(IEntityType entityType)
+    private static IProperty? FindOrdinalKeyProperty(IEntityType entityType)
         => entityType.FindPrimaryKey()!.Properties.FirstOrDefault(
             p =>
                 p.GetJsonPropertyName().Length == 0 && p.IsOrdinalKeyProperty());

src/EFCore.Cosmos/ValueGeneration/Internal/IdValueGenerator.cs

@@ -79,7 +79,7 @@ protected override object NextValue(EntityEntry entry)
         return builder.ToString();
     }
 
-    private void AppendString(StringBuilder builder, object? propertyValue)
+    private static void AppendString(StringBuilder builder, object? propertyValue)
     {
         switch (propertyValue)
         {

src/EFCore.Design/Design/Internal/DbContextOperations.cs

@@ -351,7 +351,7 @@ public virtual ContextInfo GetContextInfo(string? contextType)
         return info;
     }
 
-    private Func<DbContext>? FindContextFromRuntimeDbContextFactory(IServiceProvider appServices, Type contextType)
+    private static Func<DbContext>? FindContextFromRuntimeDbContextFactory(IServiceProvider appServices, Type contextType)
     {
         var factoryInterface = typeof(IDbContextFactory<>).MakeGenericType(contextType);
         var service = appServices.GetService(factoryInterface);

src/EFCore.Design/Migrations/Internal/SnapshotModelProcessor.cs

@@ -129,7 +129,7 @@ private void ProcessElement(IReadOnlyAnnotatable? metadata, string version)
         }
     }
 
-    private void UpdateSequences(IReadOnlyModel model, string version)
+    private static void UpdateSequences(IReadOnlyModel model, string version)
     {
         if ((!version.StartsWith("1.", StringComparison.Ordinal)
                 && !version.StartsWith("2.", StringComparison.Ordinal)
@@ -157,7 +157,7 @@ private void UpdateSequences(IReadOnlyModel model, string version)
         }
     }
 
-    private void UpdateOwnedTypes(IMutableEntityType entityType)
+    private static void UpdateOwnedTypes(IMutableEntityType entityType)
     {
         var ownerships = entityType.GetDeclaredReferencingForeignKeys().Where(fk => fk.IsOwnership && fk.IsUnique)
             .ToList();

src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs

@@ -1342,7 +1342,7 @@ private void CreateAnnotations(
             .AppendLine("static partial void Customize(RuntimeEntityType runtimeEntityType);");
     }
 
-    private void CreateAnnotations<TAnnotatable>(
+    private static void CreateAnnotations<TAnnotatable>(
         TAnnotatable annotatable,
         Action<TAnnotatable, CSharpRuntimeAnnotationCodeGeneratorParameters> process,
         CSharpRuntimeAnnotationCodeGeneratorParameters parameters)

src/EFCore.InMemory/Query/Internal/InMemoryExpressionTranslatingExpressionVisitor.cs

@@ -986,7 +986,7 @@ private static Expression ConvertToNonNullable(Expression expression)
             ? Expression.Convert(expression, expression.Type.UnwrapNullableType())
             : expression;
 
-    private IProperty? FindProperty(Expression expression)
+    private static IProperty? FindProperty(Expression expression)
     {
         if (expression.NodeType == ExpressionType.Convert
             && expression.Type.IsNullableType()

src/EFCore.InMemory/Query/Internal/InMemoryQueryExpression.cs

@@ -836,7 +836,7 @@ private InMemoryQueryExpression Clone()
         return (InMemoryQueryExpression)_cloningExpressionVisitor.Visit(this);
     }
 
-    private Expression GetGroupingKey(Expression key, List<Expression> groupingExpressions, Expression groupingKeyAccessExpression)
+    private static Expression GetGroupingKey(Expression key, List<Expression> groupingExpressions, Expression groupingKeyAccessExpression)
     {
         switch (key)
         {

src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs

@@ -1424,7 +1424,7 @@ MethodInfo GetMethod()
             : source;
     }
 
-    private ShapedQueryExpression TranslateSetOperation(
+    private static ShapedQueryExpression TranslateSetOperation(
         MethodInfo setOperationMethodInfo,
         ShapedQueryExpression source1,
         ShapedQueryExpression source2)
@@ -1446,7 +1446,7 @@ private ShapedQueryExpression TranslateSetOperation(
                 source1.ShaperExpression, source2.ShaperExpression, makeNullable));
     }
 
-    private Expression MatchShaperNullabilityForSetOperation(Expression shaper1, Expression shaper2, bool makeNullable)
+    private static Expression MatchShaperNullabilityForSetOperation(Expression shaper1, Expression shaper2, bool makeNullable)
     {
         switch (shaper1)
         {

src/EFCore.Proxies/Proxies/Internal/ProxyFactory.cs

@@ -141,7 +141,7 @@ private object CreateProxy(
             constructorArguments,
             GetNotifyChangeInterceptors(options, entityType));
 
-    private Type[] GetInterfacesToProxy(
+    private static Type[] GetInterfacesToProxy(
         ProxiesOptionsExtension options,
         Type type)
     {
@@ -168,7 +168,7 @@ private Type[] GetInterfacesToProxy(
         return interfacesToProxy.ToArray();
     }
 
-    private IInterceptor[] GetNotifyChangeInterceptors(
+    private static IInterceptor[] GetNotifyChangeInterceptors(
         ProxiesOptionsExtension options,
         IEntityType entityType,
         LazyLoadingInterceptor? lazyLoadingInterceptor = null)

src/EFCore.Relational/Design/AnnotationCodeGenerator.cs

@@ -580,7 +580,7 @@ protected virtual bool IsHandledByConvention(IIndex index, IAnnotation annotatio
     protected virtual AttributeCodeFragment? GenerateDataAnnotation(IProperty property, IAnnotation annotation)
         => null;
 
-    private IEnumerable<TCodeFragment> GenerateFluentApiCallsHelper<TAnnotatable, TCodeFragment>(
+    private static IEnumerable<TCodeFragment> GenerateFluentApiCallsHelper<TAnnotatable, TCodeFragment>(
         TAnnotatable annotatable,
         IDictionary<string, IAnnotation> annotations,
         Func<TAnnotatable, IAnnotation, TCodeFragment?> generateCodeFragment)
@@ -597,7 +597,7 @@ private IEnumerable<TCodeFragment> GenerateFluentApiCallsHelper<TAnnotatable, TC
         }
     }
 
-    private void RemoveConventionalAnnotationsHelper<TAnnotatable>(
+    private static void RemoveConventionalAnnotationsHelper<TAnnotatable>(
         TAnnotatable annotatable,
         IDictionary<string, IAnnotation> annotations,
         Func<TAnnotatable, IAnnotation, bool> isHandledByConvention)

src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGenerator.cs

@@ -466,7 +466,7 @@ public override void Generate(IIndex index, CSharpRuntimeAnnotationCodeGenerator
         base.Generate(index, parameters);
     }
 
-    private void CreateAnnotations<TAnnotatable>(
+    private static void CreateAnnotations<TAnnotatable>(
         TAnnotatable annotatable,
         Action<TAnnotatable, CSharpRuntimeAnnotationCodeGeneratorParameters> process,
         CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
@@ -484,7 +484,7 @@ parameters with
             });
     }
 
-    private string Capitalize(string @string)
+    private static string Capitalize(string @string)
     {
         switch (@string.Length)
         {

src/EFCore.Relational/Infrastructure/RelationalModelValidator.cs

@@ -1268,7 +1268,7 @@ protected override void ValidateInheritanceMapping(
         }
     }
 
-    private void ValidateTPTMapping(IEntityType rootEntityType, bool forTables)
+    private static void ValidateTPTMapping(IEntityType rootEntityType, bool forTables)
     {
         var derivedTypes = new Dictionary<(string, string?), IEntityType>();
         foreach (var entityType in rootEntityType.GetDerivedTypesInclusive())
@@ -1294,7 +1294,7 @@ private void ValidateTPTMapping(IEntityType rootEntityType, bool forTables)
         }
     }
 
-    private void ValidateTPHMapping(IEntityType rootEntityType, bool forTables)
+    private static void ValidateTPHMapping(IEntityType rootEntityType, bool forTables)
     {
         string? firstName = null;
         string? firstSchema = null;

src/EFCore.Relational/Metadata/Conventions/CheckConstraintConvention.cs

@@ -152,7 +152,7 @@ public virtual void ProcessEntityTypeBaseTypeChanged(
         }
     }
 
-    private bool AreCompatible(IConventionCheckConstraint checkConstraint, IConventionCheckConstraint baseCheckConstraint)
+    private static bool AreCompatible(IConventionCheckConstraint checkConstraint, IConventionCheckConstraint baseCheckConstraint)
     {
         var baseTable = StoreObjectIdentifier.Create(baseCheckConstraint.EntityType, StoreObjectType.Table);
         if (baseTable == null)

src/EFCore.Relational/Metadata/Conventions/RelationalRuntimeModelConvention.cs

@@ -156,7 +156,7 @@ private void CreateAnnotations<TSource, TTarget>(
         target.AddRuntimeAnnotations(annotations);
     }
 
-    private RuntimeDbFunction Create(IDbFunction function, RuntimeModel runtimeModel)
+    private static RuntimeDbFunction Create(IDbFunction function, RuntimeModel runtimeModel)
         => new(
             function.ModelName,
             runtimeModel,
@@ -187,7 +187,7 @@ protected virtual void ProcessFunctionAnnotations(
     {
     }
 
-    private RuntimeDbFunctionParameter Create(IDbFunctionParameter parameter, RuntimeDbFunction runtimeFunction)
+    private static RuntimeDbFunctionParameter Create(IDbFunctionParameter parameter, RuntimeDbFunction runtimeFunction)
         => runtimeFunction.AddParameter(
             parameter.Name,
             parameter.ClrType,
@@ -210,7 +210,7 @@ protected virtual void ProcessFunctionParameterAnnotations(
     {
     }
 
-    private RuntimeSequence Create(ISequence sequence, RuntimeModel runtimeModel)
+    private static RuntimeSequence Create(ISequence sequence, RuntimeModel runtimeModel)
         => new(
             sequence.Name,
             runtimeModel,
@@ -285,7 +285,7 @@ protected override void ProcessPropertyAnnotations(
         }
     }
 
-    private RuntimeRelationalPropertyOverrides Create(
+    private static RuntimeRelationalPropertyOverrides Create(
         IRelationalPropertyOverrides propertyOverrides,
         RuntimeProperty runtimeProperty)
         => new(

src/EFCore.Relational/Metadata/Conventions/RelationalValueGenerationConvention.cs

@@ -98,7 +98,7 @@ public virtual void ProcessEntityTypeAnnotationChanged(
         }
     }
 
-    private void ProcessTableChanged(
+    private static void ProcessTableChanged(
         IConventionEntityTypeBuilder entityTypeBuilder,
         string? oldTable,
         string? oldSchema,

src/EFCore.Relational/Metadata/Conventions/TableValuedDbFunctionConvention.cs

@@ -50,7 +50,7 @@ public virtual void ProcessModelFinalizing(
     ///     Called when an <see cref="IConventionDbFunction" /> is added to the model.
     /// </summary>
     /// <param name="dbFunctionBuilder">The builder for the <see cref="IConventionDbFunction" />.</param>
-    private void ProcessDbFunctionAdded(
+    private static void ProcessDbFunctionAdded(
         IConventionDbFunctionBuilder dbFunctionBuilder)
     {
         var function = dbFunctionBuilder.Metadata;

src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs

@@ -905,7 +905,7 @@ protected virtual IEnumerable<MigrationOperation> Diff(
                                 && EntityTypePathEquals(sm.Property.DeclaringEntityType, tm.Property.DeclaringEntityType, c))),
             (s, t, _) => ColumnStructureEquals(s, t));
 
-    private bool ColumnStructureEquals(IColumn source, IColumn target)
+    private static bool ColumnStructureEquals(IColumn source, IColumn target)
     {
         if (!source.TryGetDefaultValue(out var sourceDefault))
         {
@@ -2316,7 +2316,7 @@ private IEnumerable<MigrationOperation> GetDataOperations(
         }
     }
 
-    private object? GetValue(IColumnModification columnModification)
+    private static object? GetValue(IColumnModification columnModification)
     {
         var converter = GetValueConverter(columnModification.Property!);
         var value = columnModification.UseCurrentValue
@@ -2450,7 +2450,7 @@ protected virtual IEnumerable<string> GetSchemas(IRelationalModel model)
                 ? Array.CreateInstance(type.GetElementType()!, 0)
                 : type.UnwrapNullableType().GetDefaultValue();
 
-    private ValueConverter? GetValueConverter(IProperty property, RelationalTypeMapping? typeMapping = null)
+    private static ValueConverter? GetValueConverter(IProperty property, RelationalTypeMapping? typeMapping = null)
         => property.GetValueConverter() ?? (property.FindRelationalTypeMapping() ?? typeMapping)?.Converter;
 
     private static IEntityType GetMainType(ITable table)

src/EFCore.Relational/Query/Internal/BufferedDataReader.cs

@@ -490,7 +490,7 @@ public override object GetValue(int ordinal)
     public override int GetValues(object[] values)
     {
         AssertReaderIsOpenWithData();
-        return _currentResultSet.GetValues(values);
+        return BufferedDataRecord.GetValues(values);
     }
 
     /// <summary>
@@ -837,7 +837,7 @@ public object GetValue(int ordinal)
             => GetFieldValue<object>(ordinal);
 
 #pragma warning disable IDE0060 // Remove unused parameter
-        public int GetValues(object[] values)
+        public static int GetValues(object[] values)
 #pragma warning restore IDE0060 // Remove unused parameter
             => throw new NotSupportedException();