Make CSharpRuntimeAnnotationCodeGenerator and friends internal

Make UpdateEntryEventData derive from DbContextEventData

Part of #24743

src/EFCore.InMemory/Design/Internal/InMemoryCSharpRuntimeAnnotationCodeGenerator.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 
 namespace Microsoft.EntityFrameworkCore.InMemory.Design.Internal
 {
@@ -11,6 +11,7 @@ namespace Microsoft.EntityFrameworkCore.InMemory.Design.Internal
     ///     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>
+#pragma warning disable EF1001 // Internal EF Core API usage.
     public class InMemoryCSharpRuntimeAnnotationCodeGenerator : CSharpRuntimeAnnotationCodeGenerator
     {
         /// <summary>

src/EFCore.InMemory/Design/Internal/InMemoryDesignTimeServices.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -28,8 +29,10 @@ public virtual void ConfigureDesignTimeServices(IServiceCollection serviceCollec
             Check.NotNull(serviceCollection, nameof(serviceCollection));
 
             serviceCollection.AddEntityFrameworkInMemoryDatabase();
+#pragma warning disable EF1001 // Internal EF Core API usage.
             new EntityFrameworkDesignServicesBuilder(serviceCollection)
                 .TryAdd<ICSharpRuntimeAnnotationCodeGenerator, InMemoryCSharpRuntimeAnnotationCodeGenerator>()
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 .TryAddCoreServices();
         }
     }

src/EFCore.Relational/Design/EntityFrameworkRelationalDesignServicesBuilder.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Microsoft.Extensions.DependencyInjection;
@@ -77,7 +78,9 @@ protected override ServiceCharacteristics GetServiceCharacteristics(Type service
         public override EntityFrameworkServicesBuilder TryAddCoreServices()
         {
             TryAdd<IAnnotationCodeGenerator, AnnotationCodeGenerator>();
+#pragma warning disable EF1001 // Internal EF Core API usage.
             TryAdd<ICSharpRuntimeAnnotationCodeGenerator, RelationalCSharpRuntimeAnnotationCodeGenerator>();
+#pragma warning restore EF1001 // Internal EF Core API usage.
 
             ServiceCollectionMap.GetInfrastructure()
                 .AddDependencySingleton<AnnotationCodeGeneratorDependencies>()

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

@@ -11,13 +11,14 @@
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 
-namespace Microsoft.EntityFrameworkCore.Design
+namespace Microsoft.EntityFrameworkCore.Design.Internal
 {
     /// <summary>
     ///     <para>
     ///         Base class to be used by relational database providers when implementing an <see cref="ICSharpRuntimeAnnotationCodeGenerator" />
     ///     </para>
     /// </summary>
+#pragma warning disable EF1001 // Internal EF Core API usage.
     public class RelationalCSharpRuntimeAnnotationCodeGenerator : CSharpRuntimeAnnotationCodeGenerator
     {
         /// <summary>
@@ -137,12 +138,12 @@ private void Create(
                 var method = function.MethodInfo;
                 mainBuilder.AppendLine(",")
                     .Append("methodInfo: ").Append(code.Literal(method.DeclaringType!)).AppendLine(".GetMethod(").IncrementIndent()
-                    .Append(code.Literal(method.Name)).AppendLine(",")
+                    .Append(code.Literal(method.Name!)).AppendLine(",")
                     .Append(method.IsPublic ? "BindingFlags.Public" : "BindingFlags.NonPublic")
                     .Append(method.IsStatic ? " | BindingFlags.Static" : " | BindingFlags.Instance")
                     .AppendLine(" | BindingFlags.DeclaredOnly,")
                     .AppendLine("null,")
-                    .Append("new Type[] { ").Append(string.Join(", ", method.GetParameters().Select(p => code.Literal(p.ParameterType)))).AppendLine(" },")
+                    .Append("new Type[] { ").Append(string.Join(", ", method.GetParameters().Select(p => code.Literal((Type)p.ParameterType)))).AppendLine(" },")
                     .Append("null)").DecrementIndent();
             }
 

src/EFCore.Relational/Design/RelationalCSharpRuntimeAnnotationCodeGeneratorDependencies.cs → src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGeneratorDependencies.cs

@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Utilities;
 
-namespace Microsoft.EntityFrameworkCore.Design
+namespace Microsoft.EntityFrameworkCore.Design.Internal
 {
     /// <summary>
     ///     <para>

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

@@ -232,22 +232,17 @@ public static bool IsConcurrencyTokenMissing(
 
         private static void RemoveDerivedEntityTypes<T>(Dictionary<IConventionEntityType, T> entityTypeDictionary)
         {
-            var entityTypesWithDerivedTypes =
-                entityTypeDictionary.Where(e => e.Key.GetDirectlyDerivedTypes().Any());
-            foreach (var entityType in entityTypeDictionary.Where(e => e.Key.BaseType != null))
+            foreach (var entityType in entityTypeDictionary.Keys)
             {
-                foreach (var otherEntityType in entityTypesWithDerivedTypes)
+                var baseType = entityType.BaseType;
+                while (baseType != null)
                 {
-                    if (otherEntityType.Equals(entityType))
+                    if (entityTypeDictionary.ContainsKey(baseType))
                     {
-                        continue;
-                    }
-
-                    if (otherEntityType.Key.IsAssignableFrom(entityType.Key))
-                    {
-                        entityTypeDictionary.Remove(entityType.Key);
+                        entityTypeDictionary.Remove(entityType);
                         break;
                     }
+                    baseType = baseType.BaseType;
                 }
             }
         }

src/EFCore.SqlServer/Design/Internal/SqlServerAnnotationCodeGenerator.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;

src/EFCore.SqlServer/Design/Internal/SqlServerCSharpRuntimeAnnotationCodeGenerator.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.SqlServer.Metadata.Internal;
 
@@ -13,6 +13,7 @@ namespace Microsoft.EntityFrameworkCore.SqlServer.Design.Internal
     ///     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>
+#pragma warning disable EF1001 // Internal EF Core API usage.
     public class SqlServerCSharpRuntimeAnnotationCodeGenerator : RelationalCSharpRuntimeAnnotationCodeGenerator
     {
         /// <summary>

src/EFCore.SqlServer/Design/Internal/SqlServerDesignTimeServices.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Microsoft.EntityFrameworkCore.SqlServer.Scaffolding.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -30,9 +31,11 @@ public virtual void ConfigureDesignTimeServices(IServiceCollection serviceCollec
             Check.NotNull(serviceCollection, nameof(serviceCollection));
 
             serviceCollection.AddEntityFrameworkSqlServer();
+#pragma warning disable EF1001 // Internal EF Core API usage.
             new EntityFrameworkRelationalDesignServicesBuilder(serviceCollection)
                 .TryAdd<IAnnotationCodeGenerator, SqlServerAnnotationCodeGenerator>()
                 .TryAdd<ICSharpRuntimeAnnotationCodeGenerator, SqlServerCSharpRuntimeAnnotationCodeGenerator>()
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 .TryAdd<IDatabaseModelFactory, SqlServerDatabaseModelFactory>()
                 .TryAdd<IProviderConfigurationCodeGenerator, SqlServerCodeGenerator>()
                 .TryAddCoreServices();

src/EFCore.Sqlite.Core/Design/Internal/SqliteCSharpRuntimeAnnotationCodeGenerator.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Sqlite.Metadata.Internal;
 
@@ -13,6 +13,7 @@ namespace Microsoft.EntityFrameworkCore.Sqlite.Design.Internal
     ///     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>
+#pragma warning disable EF1001 // Internal EF Core API usage.
     public class SqliteCSharpRuntimeAnnotationCodeGenerator : RelationalCSharpRuntimeAnnotationCodeGenerator
     {
         /// <summary>

src/EFCore.Sqlite.Core/Design/Internal/SqliteDesignTimeServices.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Microsoft.EntityFrameworkCore.Sqlite.Scaffolding.Internal;
 using Microsoft.Extensions.DependencyInjection;
@@ -27,8 +28,10 @@ public class SqliteDesignTimeServices : IDesignTimeServices
         public virtual void ConfigureDesignTimeServices(IServiceCollection serviceCollection)
         {
             serviceCollection.AddEntityFrameworkSqlite();
+#pragma warning disable EF1001 // Internal EF Core API usage.
             new EntityFrameworkRelationalDesignServicesBuilder(serviceCollection)
                 .TryAdd<ICSharpRuntimeAnnotationCodeGenerator, SqliteCSharpRuntimeAnnotationCodeGenerator>()
+#pragma warning restore EF1001 // Internal EF Core API usage.
                 .TryAdd<IDatabaseModelFactory, SqliteDatabaseModelFactory>()
                 .TryAdd<IProviderConfigurationCodeGenerator, SqliteCodeGenerator>()
                 .TryAddCoreServices();

src/EFCore/Design/EntityFrameworkDesignServicesBuilder.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Diagnostics.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;

src/EFCore/Design/CSharpRuntimeAnnotationCodeGenerator.cs → src/EFCore/Design/Internal/CSharpRuntimeAnnotationCodeGenerator.cs

@@ -8,7 +8,7 @@
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 
-namespace Microsoft.EntityFrameworkCore.Design
+namespace Microsoft.EntityFrameworkCore.Design.Internal
 {
     /// <summary>
     ///     <para>

src/EFCore/Design/CSharpRuntimeAnnotationCodeGeneratorDependencies.cs → src/EFCore/Design/Internal/CSharpRuntimeAnnotationCodeGeneratorDependencies.cs

@@ -4,7 +4,7 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Utilities;
 
-namespace Microsoft.EntityFrameworkCore.Design
+namespace Microsoft.EntityFrameworkCore.Design.Internal
 {
     /// <summary>
     ///     <para>

src/EFCore/Design/CSharpRuntimeAnnotationCodeGeneratorParameters.cs → src/EFCore/Design/Internal/CSharpRuntimeAnnotationCodeGeneratorParameters.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace Microsoft.EntityFrameworkCore.Design
+namespace Microsoft.EntityFrameworkCore.Design.Internal
 {
     /// <summary>
     ///     The parameter object for a <see cref="ICSharpRuntimeAnnotationCodeGenerator" />

src/EFCore/Design/ICSharpRuntimeAnnotationCodeGenerator.cs → src/EFCore/Design/Internal/ICSharpRuntimeAnnotationCodeGenerator.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.EntityFrameworkCore.Metadata;
 
-namespace Microsoft.EntityFrameworkCore.Design
+namespace Microsoft.EntityFrameworkCore.Design.Internal
 {
     /// <summary>
     ///     Implemented by database providers to generate the code for annotations.

src/EFCore/Diagnostics/UpdateEntryEventData.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Update;
 
 namespace Microsoft.EntityFrameworkCore.Diagnostics
@@ -11,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore.Diagnostics
     ///     A <see cref="DiagnosticSource" /> event payload class for events that have
     ///     an entity update entry.
     /// </summary>
-    public class UpdateEntryEventData : EventData
+    public class UpdateEntryEventData : DbContextEventData
     {
         /// <summary>
         ///     Constructs the event payload.
@@ -23,7 +24,7 @@ public UpdateEntryEventData(
             EventDefinitionBase eventDefinition,
             Func<EventDefinitionBase, EventData, string> messageGenerator,
             IUpdateEntry entityEntry)
-            : base(eventDefinition, messageGenerator)
+            : base(eventDefinition, messageGenerator, ((InternalEntityEntry)entityEntry).StateManager.Context)
         {
             EntityEntry = entityEntry;
         }

test/EFCore.Cosmos.FunctionalTests/CosmosApiConsistencyTest.cs

@@ -7,7 +7,6 @@
 using Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos

test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs

@@ -11,7 +11,6 @@
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Diagnostics.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal;