Enable internal code usage analyzer on the providers

Fixes #15393
dotnet · Apr 16, 2020 · 2ca6a19 · 2ca6a19
1 parent 922f290
commit 2ca6a19
Show file tree

Hide file tree

Showing 28 changed files with 120 additions and 100 deletions.
diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EFCore\EFCore.csproj" PrivateAssets="contentfiles;build" />
+    <ProjectReference Condition="'$(BuildingByReSharper)' != 'true'" Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitor.cs b/...ShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitor.cs
@@ -365,9 +365,12 @@ private void AddInclude(
                 var includeMethod = navigation.IsCollection ? _includeCollectionMethodInfo : _includeReferenceMethodInfo;
                 var includingClrType = navigation.DeclaringEntityType.ClrType;
                 var relatedEntityClrType = navigation.TargetEntityType.ClrType;
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                // #16707
                 var entityEntryVariable = _trackQueryResults
                     ? shaperBlock.Variables.Single(v => v.Type == typeof(InternalEntityEntry))
                     : (Expression)Expression.Constant(null, typeof(InternalEntityEntry));
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 var concreteEntityTypeVariable = shaperBlock.Variables.Single(v => v.Type == typeof(IEntityType));
                 var inverseNavigation = navigation.Inverse;
                 var fixup = GenerateFixup(
@@ -394,7 +397,10 @@ private static readonly MethodInfo _includeReferenceMethodInfo
                     .GetDeclaredMethod(nameof(IncludeReference));
 
             private static void IncludeReference<TIncludingEntity, TIncludedEntity>(
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                // #16707
                 InternalEntityEntry entry,
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 object entity,
                 IEntityType entityType,
                 TIncludedEntity relatedEntity,
@@ -426,7 +432,10 @@ private static void IncludeReference<TIncludingEntity, TIncludedEntity>(
                 // For non-null relatedEntity StateManager will set the flag
                 else if (relatedEntity == null)
                 {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                    // #16707
                     entry.SetIsLoaded(navigation);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 }
             }
 
@@ -435,7 +444,10 @@ private static readonly MethodInfo _includeCollectionMethodInfo
                     .GetDeclaredMethod(nameof(IncludeCollection));
 
             private static void IncludeCollection<TIncludingEntity, TIncludedEntity>(
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                // #16707
                 InternalEntityEntry entry,
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 object entity,
                 IEntityType entityType,
                 IEnumerable<TIncludedEntity> relatedEntities,
@@ -473,7 +485,10 @@ private static void IncludeCollection<TIncludingEntity, TIncludedEntity>(
                 }
                 else
                 {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                    // #16707
                     entry.SetIsLoaded(navigation);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                     if (relatedEntities != null)
                     {
                         using var enumerator = relatedEntities.GetEnumerator();

diff --git a/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseWrapper.cs b/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseWrapper.cs
@@ -88,12 +88,18 @@ public override int SaveChanges(IList<IUpdateEntry> entries)
 
                 if (!entityType.IsDocumentRoot())
                 {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                    // #16707
                     var root = GetRootDocument((InternalEntityEntry)entry);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                     if (!entriesSaved.Contains(root)
                         && rootEntriesToSave.Add(root)
                         && root.EntityState == EntityState.Unchanged)
                     {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                        // #16707
                         ((InternalEntityEntry)root).SetEntityState(EntityState.Modified);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                     }
 
                     continue;
@@ -154,7 +160,10 @@ public override async Task<int> SaveChangesAsync(
                         && rootEntriesToSave.Add(root)
                         && root.EntityState == EntityState.Unchanged)
                     {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                        // #16707
                         ((InternalEntityEntry)root).SetEntityState(EntityState.Modified);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                     }
 
                     continue;
@@ -325,6 +334,8 @@ public virtual DocumentSource GetDocumentSource([NotNull] IEntityType entityType
             return documentSource;
         }
 
+#pragma warning disable EF1001 // Internal EF Core API usage.
+        // #16707
         private IUpdateEntry GetRootDocument(InternalEntityEntry entry)
         {
             var stateManager = entry.StateManager;
@@ -349,6 +360,7 @@ private IUpdateEntry GetRootDocument(InternalEntityEntry entry)
 
             return principal.EntityType.IsDocumentRoot() ? principal : GetRootDocument(principal);
         }
+#pragma warning restore EF1001 // Internal EF Core API usage.
 
         private Exception ThrowUpdateException(CosmosException exception, IUpdateEntry entry)
         {

diff --git a/src/EFCore.Cosmos/Update/Internal/DocumentSource.cs b/src/EFCore.Cosmos/Update/Internal/DocumentSource.cs
@@ -112,17 +112,23 @@ public virtual JObject CreateDocument([NotNull] IUpdateEntry entry, int? ordinal
                 }
                 else if (fk.IsUnique)
                 {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                    // #16707
                     var dependentEntry = ((InternalEntityEntry)entry).StateManager.TryGetEntry(embeddedValue, fk.DeclaringEntityType);
                     document[embeddedPropertyName] = _database.GetDocumentSource(dependentEntry.EntityType).CreateDocument(dependentEntry);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 }
                 else
                 {
                     var embeddedOrdinal = 0;
                     var array = new JArray();
                     foreach (var dependent in (IEnumerable)embeddedValue)
                     {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                        // #16707
                         var dependentEntry = ((InternalEntityEntry)entry).StateManager.TryGetEntry(dependent, fk.DeclaringEntityType);
                         array.Add(_database.GetDocumentSource(dependentEntry.EntityType).CreateDocument(dependentEntry, embeddedOrdinal));
+#pragma warning restore EF1001 // Internal EF Core API usage.
                         embeddedOrdinal++;
                     }
 
@@ -141,7 +147,7 @@ public virtual JObject CreateDocument([NotNull] IUpdateEntry entry, int? ordinal
         /// </summary>
         public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpdateEntry entry)
             => UpdateDocument(document, entry, null);
-        
+
         /// <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
@@ -151,7 +157,10 @@ public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpd
         public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpdateEntry entry, int? ordinal)
         {
             var anyPropertyUpdated = false;
+#pragma warning disable EF1001 // Internal EF Core API usage.
+            // #16707
             var stateManager = ((InternalEntityEntry)entry).StateManager;
+#pragma warning restore EF1001 // Internal EF Core API usage.
             foreach (var property in entry.EntityType.GetProperties())
             {
                 if (entry.EntityState == EntityState.Added
@@ -196,7 +205,10 @@ public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpd
                 }
                 else if (fk.IsUnique)
                 {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                    // #16707
                     var embeddedEntry = ((InternalEntityEntry)entry).StateManager.TryGetEntry(embeddedValue, fk.DeclaringEntityType);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                     if (embeddedEntry == null)
                     {
                         continue;
@@ -222,6 +234,8 @@ public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpd
                         var shouldSetTemporaryKeys = false;
                         foreach (var dependent in (IEnumerable)embeddedValue)
                         {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                            // #16707
                             var embeddedEntry = stateManager.TryGetEntry(dependent, fk.DeclaringEntityType);
                             if (embeddedEntry == null)
                             {
@@ -233,6 +247,7 @@ public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpd
                                 shouldSetTemporaryKeys = true;
                                 break;
                             }
+#pragma warning restore EF1001 // Internal EF Core API usage.
 
                             embeddedOrdinal++;
                         }
@@ -242,13 +257,16 @@ public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpd
                             var temporaryOrdinal = -1;
                             foreach (var dependent in (IEnumerable)embeddedValue)
                             {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                                // #16707
                                 var embeddedEntry = stateManager.TryGetEntry(dependent, fk.DeclaringEntityType);
                                 if (embeddedEntry == null)
                                 {
                                     continue;
                                 }
 
                                 embeddedEntry.SetTemporaryValue(ordinalKeyProperty, temporaryOrdinal, setModified: false);
+#pragma warning restore EF1001 // Internal EF Core API usage.
 
                                 temporaryOrdinal--;
                             }
@@ -259,7 +277,10 @@ public virtual JObject UpdateDocument([NotNull] JObject document, [NotNull] IUpd
                     var array = new JArray();
                     foreach (var dependent in (IEnumerable)embeddedValue)
                     {
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                        // #16707
                         var embeddedEntry = ((InternalEntityEntry)entry).StateManager.TryGetEntry(dependent, fk.DeclaringEntityType);
+#pragma warning restore EF1001 // Internal EF Core API usage.
                         if (embeddedEntry == null)
                         {
                             continue;

diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EFCore\EFCore.csproj" PrivateAssets="contentfiles;build" />
+    <ProjectReference Condition="'$(BuildingByReSharper)' != 'true'" Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs
@@ -459,7 +459,10 @@ private static (Expression, Expression) DecomposeJoinCondition(Expression joinCo
 
             static Expression CreateAnonymousObject(List<Expression> expressions)
                 => Expression.New(
+#pragma warning disable EF1001 // Internal EF Core API usage.
+                    // #20565
                     AnonymousObject.AnonymousObjectCtor,
+#pragma warning restore EF1001 // Internal EF Core API usage.
                     Expression.NewArrayInit(
                         typeof(object),
                         expressions.Select(e => Expression.Convert(e, typeof(object)))));

diff --git a/src/EFCore.Proxies/EFCore.Proxies.csproj b/src/EFCore.Proxies/EFCore.Proxies.csproj
@@ -21,6 +21,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EFCore\EFCore.csproj" PrivateAssets="contentfiles;build" />
+    <ProjectReference Condition="'$(BuildingByReSharper)' != 'true'" Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EFCore.Proxies/Proxies/Internal/PropertyChangedInterceptor.cs b/src/EFCore.Proxies/Proxies/Internal/PropertyChangedInterceptor.cs
@@ -8,7 +8,6 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Proxies.Internal
 {
@@ -70,7 +69,8 @@ public virtual void Intercept(IInvocation invocation)
                 var property = _entityType.FindProperty(propertyName);
                 if (property != null)
                 {
-                    var comparer = property.IsKeyOrForeignKey()
+                    var comparer = property.IsKey()
+                        || property.IsForeignKey()
                         ? property.GetKeyValueComparer()
                         : property.GetValueComparer();
 

diff --git a/src/EFCore.Proxies/Proxies/Internal/PropertyChangingInterceptor.cs b/src/EFCore.Proxies/Proxies/Internal/PropertyChangingInterceptor.cs
@@ -8,7 +8,6 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Proxies.Internal
 {
@@ -70,7 +69,8 @@ public virtual void Intercept(IInvocation invocation)
                 var property = _entityType.FindProperty(propertyName);
                 if (property != null)
                 {
-                    var comparer = property.IsKeyOrForeignKey()
+                    var comparer = property.IsKey()
+                        || property.IsForeignKey()
                         ? property.GetKeyValueComparer()
                         : property.GetValueComparer();
 

diff --git a/src/EFCore.Proxies/Proxies/Internal/ProxyBindingRewriter.cs b/src/EFCore.Proxies/Proxies/Internal/ProxyBindingRewriter.cs
@@ -73,14 +73,18 @@ public virtual void ProcessModelFinalizing(IConventionModelBuilder modelBuilder,
                         var proxyType = _proxyFactory.CreateProxyType(_options, entityType);
 
                         // WARNING: This code is EF internal; it should not be copied. See #10789 #14554
+#pragma warning disable EF1001 // Internal EF Core API usage.
                         var binding = (InstantiationBinding)entityType[CoreAnnotationNames.ConstructorBinding];
+#pragma warning restore EF1001 // Internal EF Core API usage.
                         if (binding == null)
                         {
                             _directBindingConvention.ProcessModelFinalizing(modelBuilder, context);
                         }
 
                         // WARNING: This code is EF internal; it should not be copied. See #10789 #14554
+#pragma warning disable EF1001 // Internal EF Core API usage.
                         binding = (InstantiationBinding)entityType[CoreAnnotationNames.ConstructorBinding];
+#pragma warning restore EF1001 // Internal EF Core API usage.
 
                         if (_options.UseLazyLoadingProxies)
                         {
@@ -106,7 +110,9 @@ public virtual void ProcessModelFinalizing(IConventionModelBuilder modelBuilder,
 
                             entityType.SetAnnotation(
                                 // WARNING: This code is EF internal; it should not be copied. See #10789 #14554
+#pragma warning disable EF1001 // Internal EF Core API usage.
                                 CoreAnnotationNames.ConstructorBinding,
+#pragma warning restore EF1001 // Internal EF Core API usage.
                                 new FactoryMethodBinding(
                                     _proxyFactory,
                                     _createLazyLoadingProxyMethod,
@@ -123,7 +129,9 @@ public virtual void ProcessModelFinalizing(IConventionModelBuilder modelBuilder,
                         {
                             entityType.SetAnnotation(
                                 // WARNING: This code is EF internal; it should not be copied. See #10789 #14554
+#pragma warning disable EF1001 // Internal EF Core API usage.
                                 CoreAnnotationNames.ConstructorBinding,
+#pragma warning restore EF1001 // Internal EF Core API usage.
                                 new FactoryMethodBinding(
                                     _proxyFactory,
                                     _createProxyMethod,

diff --git a/src/EFCore.Proxies/Proxies/Internal/ProxyChangeTrackingConvention.cs b/src/EFCore.Proxies/Proxies/Internal/ProxyChangeTrackingConvention.cs
@@ -40,7 +40,9 @@ public virtual void ProcessModelInitialized(IConventionModelBuilder modelBuilder
             if (_options?.UseChangeTrackingProxies == true)
             {
                 modelBuilder.HasChangeTrackingStrategy(ChangeTrackingStrategy.ChangingAndChangedNotifications);
+#pragma warning disable EF1001 // Internal EF Core API usage.
                 modelBuilder.HasAnnotation(CoreAnnotationNames.SkipChangeTrackingStrategyValidationAnnotation, "true");
+#pragma warning restore EF1001 // Internal EF Core API usage.
             }
         }
     }

diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EFCore\EFCore.csproj" PrivateAssets="contentfiles;build" />
-    <ProjectReference Condition="'$(DisableEFAnalyzer)' != 'true'" Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Condition="'$(BuildingByReSharper)' != 'true'" Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EFCore.Relational/Extensions/Internal/RelationalExpressionExtensions.cs b/src/EFCore.Relational/Extensions/Internal/RelationalExpressionExtensions.cs
diff --git a/src/EFCore.Relational/Query/ExpressionExtensions.cs b/src/EFCore.Relational/Query/ExpressionExtensions.cs
@@ -1,6 +1,7 @@
 // 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.Linq.Expressions;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -10,6 +11,11 @@ namespace Microsoft.EntityFrameworkCore.Query
 {
     public static class ExpressionExtensions
     {
+        public static bool IsLogicalNot([NotNull] this SqlUnaryExpression sqlUnaryExpression)
+            => sqlUnaryExpression.OperatorType == ExpressionType.Not
+                && (sqlUnaryExpression.Type == typeof(bool)
+                    || sqlUnaryExpression.Type == typeof(bool?));
+
         public static RelationalTypeMapping InferTypeMapping([NotNull] params SqlExpression[] expressions)
         {
             Check.NotNull(expressions, nameof(expressions));