55using System . ComponentModel ;
66using System . Diagnostics . CodeAnalysis ;
77using System . Runtime . CompilerServices ;
8- using JetBrains . Annotations ;
98using Microsoft . EntityFrameworkCore . Internal ;
109using Microsoft . EntityFrameworkCore . Metadata . Internal ;
1110
@@ -185,26 +184,22 @@ public async Task SetEntityStateAsync(
185184 CancellationToken cancellationToken = default )
186185 {
187186 var oldState = _stateData . EntityState ;
188- var adding = false ;
189- await SetupAsync ( ) . ConfigureAwait ( false ) ;
187+ bool adding = PrepareForAdd ( entityState ) ;
188+ entityState = await PropagateToUnknownKeyAsync (
189+ oldState , entityState , adding , forceStateWhenUnknownKey , cancellationToken ) . ConfigureAwait ( false ) ;
190190
191191 if ( ( adding || oldState is EntityState . Detached )
192192 && await StateManager . ValueGenerationManager
193193 . GenerateAsync ( this , includePrimaryKey : adding , cancellationToken ) . ConfigureAwait ( false )
194194 && fallbackState . HasValue )
195195 {
196196 entityState = fallbackState . Value ;
197- await SetupAsync ( ) . ConfigureAwait ( false ) ;
198- }
199-
200- SetEntityState ( oldState , entityState , acceptChanges , modifyProperties ) ;
201-
202- async Task SetupAsync ( )
203- {
204197 adding = PrepareForAdd ( entityState ) ;
205198 entityState = await PropagateToUnknownKeyAsync (
206199 oldState , entityState , adding , forceStateWhenUnknownKey , cancellationToken ) . ConfigureAwait ( false ) ;
207200 }
201+
202+ SetEntityState ( oldState , entityState , acceptChanges , modifyProperties ) ;
208203 }
209204
210205 private EntityState PropagateToUnknownKey (
@@ -829,8 +824,13 @@ private static readonly MethodInfo ReadOriginalValueMethod
829824 internal static MethodInfo MakeReadOriginalValueMethod ( Type type )
830825 => ReadOriginalValueMethod . MakeGenericMethod ( type ) ;
831826
832- [ UsedImplicitly ]
833- private T ReadOriginalValue < T > ( IProperty property , int originalValueIndex )
827+ /// <summary>
828+ /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
829+ /// the same compatibility standards as public APIs. It may be changed or removed without notice in
830+ /// any release. You should only use it directly in your code with extreme caution and knowing that
831+ /// doing so can result in application failures when updating to a new Entity Framework Core release.
832+ /// </summary>
833+ public T ReadOriginalValue < T > ( IProperty property , int originalValueIndex )
834834 => _originalValues . GetValue < T > ( this , property , originalValueIndex ) ;
835835
836836 private static readonly MethodInfo ReadRelationshipSnapshotValueMethod
@@ -842,8 +842,13 @@ private static readonly MethodInfo ReadRelationshipSnapshotValueMethod
842842 internal static MethodInfo MakeReadRelationshipSnapshotValueMethod ( Type type )
843843 => ReadRelationshipSnapshotValueMethod . MakeGenericMethod ( type ) ;
844844
845- [ UsedImplicitly ]
846- private T ReadRelationshipSnapshotValue < T > ( IPropertyBase propertyBase , int relationshipSnapshotIndex )
845+ /// <summary>
846+ /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
847+ /// the same compatibility standards as public APIs. It may be changed or removed without notice in
848+ /// any release. You should only use it directly in your code with extreme caution and knowing that
849+ /// doing so can result in application failures when updating to a new Entity Framework Core release.
850+ /// </summary>
851+ public T ReadRelationshipSnapshotValue < T > ( IPropertyBase propertyBase , int relationshipSnapshotIndex )
847852 => _relationshipsSnapshot . GetValue < T > ( this , propertyBase , relationshipSnapshotIndex ) ;
848853
849854 [ UnconditionalSuppressMessage (
@@ -855,21 +860,31 @@ internal static MethodInfo MakeReadStoreGeneratedValueMethod(Type type)
855860 private static readonly MethodInfo ReadStoreGeneratedValueMethod
856861 = typeof ( InternalEntityEntry ) . GetTypeInfo ( ) . GetDeclaredMethod ( nameof ( ReadStoreGeneratedValue ) ) ! ;
857862
858- [ UsedImplicitly ]
859- private T ReadStoreGeneratedValue < T > ( int storeGeneratedIndex )
863+ /// <summary>
864+ /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
865+ /// the same compatibility standards as public APIs. It may be changed or removed without notice in
866+ /// any release. You should only use it directly in your code with extreme caution and knowing that
867+ /// doing so can result in application failures when updating to a new Entity Framework Core release.
868+ /// </summary>
869+ public T ReadStoreGeneratedValue < T > ( int storeGeneratedIndex )
860870 => _storeGeneratedValues . GetValue < T > ( storeGeneratedIndex ) ;
861871
862872 private static readonly MethodInfo ReadTemporaryValueMethod
863- = typeof ( InternalEntityEntry ) . GetTypeInfo ( ) . GetDeclaredMethod ( nameof ( ReadTemporaryValue ) ) ! ;
873+ = typeof ( InternalEntityEntry ) . GetMethod ( nameof ( ReadTemporaryValue ) ) ! ;
864874
865875 [ UnconditionalSuppressMessage (
866876 "ReflectionAnalysis" , "IL2060" ,
867877 Justification = "MakeGenericMethod wrapper, see https://github.com/dotnet/linker/issues/2482" ) ]
868878 internal static MethodInfo MakeReadTemporaryValueMethod ( Type type )
869879 => ReadTemporaryValueMethod . MakeGenericMethod ( type ) ;
870880
871- [ UsedImplicitly ]
872- private T ReadTemporaryValue < T > ( int storeGeneratedIndex )
881+ /// <summary>
882+ /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
883+ /// the same compatibility standards as public APIs. It may be changed or removed without notice in
884+ /// any release. You should only use it directly in your code with extreme caution and knowing that
885+ /// doing so can result in application failures when updating to a new Entity Framework Core release.
886+ /// </summary>
887+ public T ReadTemporaryValue < T > ( int storeGeneratedIndex )
873888 => _temporaryValues . GetValue < T > ( storeGeneratedIndex ) ;
874889
875890 private static readonly MethodInfo GetCurrentValueMethod
@@ -942,7 +957,7 @@ private void WritePropertyValue(
942957
943958 var setter = forMaterialization
944959 ? concretePropertyBase . MaterializationSetter
945- : concretePropertyBase . Setter ;
960+ : concretePropertyBase . GetSetter ( ) ;
946961
947962 setter . SetClrValue ( Entity , value ) ;
948963 }
@@ -1124,7 +1139,7 @@ public void EnsureTemporaryValues()
11241139 {
11251140 if ( _temporaryValues . IsEmpty )
11261141 {
1127- _temporaryValues = new SidecarValues ( ( ( IRuntimeEntityType ) EntityType ) . TemporaryValuesFactory ( this ) ) ;
1142+ _temporaryValues = new SidecarValues ( EntityType . TemporaryValuesFactory ( this ) ) ;
11281143 }
11291144 }
11301145
@@ -1138,7 +1153,7 @@ public void EnsureStoreGeneratedValues()
11381153 {
11391154 if ( _storeGeneratedValues . IsEmpty )
11401155 {
1141- _storeGeneratedValues = new SidecarValues ( ( ( IRuntimeEntityType ) EntityType ) . StoreGeneratedValuesFactory ( ) ) ;
1156+ _storeGeneratedValues = new SidecarValues ( EntityType . StoreGeneratedValuesFactory ( ) ) ;
11421157 }
11431158 }
11441159
0 commit comments