[5.0.0-rc2] Change ChangeTrackingStrategy from annotation to field

src/EFCore/Extensions/ConventionEntityTypeExtensions.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -606,8 +607,7 @@ public static IConventionIndex RemoveIndex(
             [NotNull] this IConventionEntityType entityType,
             ChangeTrackingStrategy? changeTrackingStrategy,
             bool fromDataAnnotation = false)
-            => Check.NotNull(entityType, nameof(entityType)).AsEntityType()
-                .SetChangeTrackingStrategy(
+            => ((EntityType)entityType).SetChangeTrackingStrategy(
                     changeTrackingStrategy,
                     fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
 
@@ -616,8 +616,9 @@ public static IConventionIndex RemoveIndex(
         /// </summary>
         /// <param name="entityType"> The entity type. </param>
         /// <returns> The configuration source for <see cref="EntityTypeExtensions.GetChangeTrackingStrategy" />. </returns>
+        [DebuggerStepThrough]
         public static ConfigurationSource? GetChangeTrackingStrategyConfigurationSource([NotNull] this IConventionEntityType entityType)
-            => entityType.FindAnnotation(CoreAnnotationNames.ChangeTrackingStrategy)?.GetConfigurationSource();
+            => ((EntityType)entityType).GetChangeTrackingStrategyConfigurationSource();
 
         /// <summary>
         ///     Sets the LINQ expression filter automatically applied to queries for this entity type.

src/EFCore/Extensions/ConventionModelExtensions.cs

@@ -192,8 +192,7 @@ public static IReadOnlyList<IConventionEntityType> FindLeastDerivedEntityTypes(
             [NotNull] this IConventionModel model,
             ChangeTrackingStrategy? changeTrackingStrategy,
             bool fromDataAnnotation = false)
-            => Check.NotNull((Model)model, nameof(model))
-                .SetChangeTrackingStrategy(
+            => ((Model)model).SetChangeTrackingStrategy(
                     changeTrackingStrategy,
                     fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
 
@@ -202,8 +201,9 @@ public static IReadOnlyList<IConventionEntityType> FindLeastDerivedEntityTypes(
         /// </summary>
         /// <param name="model"> The model to find configuration source for. </param>
         /// <returns> The configuration source for <see cref="ModelExtensions.GetChangeTrackingStrategy" />. </returns>
+        [DebuggerStepThrough]
         public static ConfigurationSource? GetChangeTrackingStrategyConfigurationSource([NotNull] this IConventionModel model)
-            => model.FindAnnotation(CoreAnnotationNames.ChangeTrackingStrategy)?.GetConfigurationSource();
+            => ((Model)model).GetChangeTrackingStrategyConfigurationSource();
 
         /// <summary>
         ///     Returns a value indicating whether the entity types using the given type should be configured

src/EFCore/Extensions/EntityTypeExtensions.cs

@@ -698,13 +698,9 @@ public static IIndex FindIndex([NotNull] this IEntityType entityType, [NotNull]
         /// </summary>
         /// <param name="entityType"> The entity type. </param>
         /// <returns> The change tracking strategy. </returns>
+        [DebuggerStepThrough]
         public static ChangeTrackingStrategy GetChangeTrackingStrategy([NotNull] this IEntityType entityType)
-        {
-            Check.NotNull(entityType, nameof(entityType));
-
-            return (ChangeTrackingStrategy?)entityType[CoreAnnotationNames.ChangeTrackingStrategy]
-                ?? entityType.Model.GetChangeTrackingStrategy();
-        }
+            => ((EntityType)entityType).GetChangeTrackingStrategy();
 
         /// <summary>
         ///     Gets the data stored in the model for the given entity type.

src/EFCore/Extensions/ModelExtensions.cs

@@ -139,8 +139,7 @@ public static bool IsShared([NotNull] this IModel model, [NotNull] Type type)
         /// <returns> The change tracking strategy. </returns>
         [DebuggerStepThrough]
         public static ChangeTrackingStrategy GetChangeTrackingStrategy([NotNull] this IModel model)
-            => (ChangeTrackingStrategy?)Check.NotNull(model, nameof(model))[CoreAnnotationNames.ChangeTrackingStrategy]
-                ?? ChangeTrackingStrategy.Snapshot;
+            => ((Model)model).GetChangeTrackingStrategy();
 
         /// <summary>
         ///     <para>

src/EFCore/Extensions/MutableEntityTypeExtensions.cs

@@ -549,8 +549,7 @@ public static IMutableIndex RemoveIndex(
         public static void SetChangeTrackingStrategy(
             [NotNull] this IMutableEntityType entityType,
             ChangeTrackingStrategy? changeTrackingStrategy)
-            => Check.NotNull(entityType, nameof(entityType)).AsEntityType()
-                .SetChangeTrackingStrategy(changeTrackingStrategy, ConfigurationSource.Explicit);
+            => ((EntityType)entityType).SetChangeTrackingStrategy(changeTrackingStrategy, ConfigurationSource.Explicit);
 
         /// <summary>
         ///     Sets the LINQ expression filter automatically applied to queries for this entity type.

src/EFCore/Extensions/MutableModelExtensions.cs

@@ -196,8 +196,7 @@ public static void SetPropertyAccessMode(
         public static void SetChangeTrackingStrategy(
             [NotNull] this IMutableModel model,
             ChangeTrackingStrategy? changeTrackingStrategy)
-            => Check.NotNull((Model)model, nameof(model))
-                .SetChangeTrackingStrategy(changeTrackingStrategy, ConfigurationSource.Explicit);
+            => ((Model)model).SetChangeTrackingStrategy(changeTrackingStrategy, ConfigurationSource.Explicit);
 
         /// <summary>
         ///     Marks the given entity type as ignored, preventing conventions from adding a matching entity type to the model.

src/EFCore/Metadata/Internal/CoreAnnotationNames.cs

@@ -78,14 +78,6 @@ public static class CoreAnnotationNames
         /// </summary>
         public const string NavigationAccessMode = "NavigationAccessMode";
 
-        /// <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 const string ChangeTrackingStrategy = "ChangeTrackingStrategy";
-
         /// <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
@@ -289,7 +281,6 @@ public static class CoreAnnotationNames
             ValueGeneratorFactory,
             PropertyAccessMode,
             NavigationAccessMode,
-            ChangeTrackingStrategy,
             OwnedTypes,
             DiscriminatorProperty,
             DiscriminatorMappingComplete,

src/EFCore/Metadata/Internal/EntityType.cs

@@ -57,10 +57,12 @@ private readonly SortedDictionary<string, ServiceProperty> _serviceProperties
         private Key _primaryKey;
         private bool? _isKeyless;
         private EntityType _baseType;
+        private ChangeTrackingStrategy? _changeTrackingStrategy;
 
         private ConfigurationSource? _primaryKeyConfigurationSource;
         private ConfigurationSource? _isKeylessConfigurationSource;
         private ConfigurationSource? _baseTypeConfigurationSource;
+        private ConfigurationSource? _changeTrackingStrategyConfigurationSource;
 
         // Warning: Never access these fields directly as access needs to be thread-safe
         private PropertyCounts _counts;
@@ -3064,7 +3066,17 @@ public virtual void AddData([NotNull] IEnumerable<object> data)
 
         #endregion
 
-        #region Annotations
+        #region Other
+
+        /// <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>
+        [DebuggerStepThrough]
+        public virtual ChangeTrackingStrategy GetChangeTrackingStrategy()
+            => _changeTrackingStrategy ?? Model.GetChangeTrackingStrategy();
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -3086,7 +3098,11 @@ public virtual void AddData([NotNull] IEnumerable<object> data)
                 }
             }
 
-            this.SetOrRemoveAnnotation(CoreAnnotationNames.ChangeTrackingStrategy, changeTrackingStrategy, configurationSource);
+            _changeTrackingStrategy = changeTrackingStrategy;
+
+            _changeTrackingStrategyConfigurationSource = _changeTrackingStrategy == null
+                ? (ConfigurationSource?)null
+                : configurationSource.Max(_changeTrackingStrategyConfigurationSource);
 
             return changeTrackingStrategy;
         }
@@ -3131,6 +3147,15 @@ public virtual string CheckChangeTrackingStrategy(ChangeTrackingStrategy value,
             return 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
+        ///     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 ConfigurationSource? GetChangeTrackingStrategyConfigurationSource()
+            => _changeTrackingStrategyConfigurationSource;
+
         /// <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

src/EFCore/Metadata/Internal/Model.cs

@@ -62,6 +62,9 @@ private readonly Dictionary<string, ConfigurationSource> _ignoredTypeNames
             new Dictionary<Type, ConfigurationSource> { { DefaultPropertyBagType, ConfigurationSource.Convention } };
 
         private bool? _skipDetectChanges;
+        private ChangeTrackingStrategy? _changeTrackingStrategy;
+
+        private ConfigurationSource? _changeTrackingStrategyConfigurationSource;
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -931,6 +934,16 @@ public virtual void AddShared([NotNull] Type type, ConfigurationSource configura
             return propertyAccessMode;
         }
 
+        /// <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>
+        [DebuggerStepThrough]
+        public virtual ChangeTrackingStrategy GetChangeTrackingStrategy()
+            => _changeTrackingStrategy ?? ChangeTrackingStrategy.Snapshot;
+
         /// <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
@@ -941,11 +954,24 @@ public virtual void AddShared([NotNull] Type type, ConfigurationSource configura
             ChangeTrackingStrategy? changeTrackingStrategy,
             ConfigurationSource configurationSource)
         {
-            this.SetOrRemoveAnnotation(CoreAnnotationNames.ChangeTrackingStrategy, changeTrackingStrategy, configurationSource);
+            _changeTrackingStrategy = changeTrackingStrategy;
+
+            _changeTrackingStrategyConfigurationSource = _changeTrackingStrategy == null
+                ? (ConfigurationSource?)null
+                : configurationSource.Max(_changeTrackingStrategyConfigurationSource);
 
             return changeTrackingStrategy;
         }
 
+        /// <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 ConfigurationSource? GetChangeTrackingStrategyConfigurationSource()
+            => _changeTrackingStrategyConfigurationSource;
+
         /// <summary>
         ///     Runs the conventions when an annotation was set or removed.
         /// </summary>