Review updates

Author: ajcvickers

src/EFCore.Relational/Infrastructure/RelationalModelValidator.cs

@@ -1393,6 +1393,8 @@ protected virtual void ValidateCompatible(
                     storeObject.DisplayName()));
         }
 
+        var typeMapping = property.GetRelationalTypeMapping();
+        var duplicateTypeMapping = duplicateProperty.GetRelationalTypeMapping();
         var currentTypeString = property.GetColumnType(storeObject);
         var previousTypeString = duplicateProperty.GetColumnType(storeObject);
         if (!string.Equals(currentTypeString, previousTypeString, StringComparison.OrdinalIgnoreCase))
@@ -1409,9 +1411,6 @@ protected virtual void ValidateCompatible(
                     currentTypeString));
         }
 
-        var typeMapping = property.GetRelationalTypeMapping();
-        var duplicateTypeMapping = duplicateProperty.GetRelationalTypeMapping();
-
         Type currentProviderType, previousProviderType;
         if (QuirkEnabled29531)
         {

src/EFCore.Relational/Update/Internal/RowForeignKeyValueFactoryFactory.cs

@@ -80,9 +80,11 @@ private static IRowForeignKeyValueFactory CreateSimple<TKey, TForeignKey>(
             return principalType.IsNullableType()
                 ? (IRowForeignKeyValueFactory<TKey>)Activator.CreateInstance(
                     typeof(SimpleNullablePrincipalRowForeignKeyValueFactory<,,>).MakeGenericType(
-                        typeof(TKey), typeof(TKey).UnwrapNullableType(), typeof(TForeignKey)), foreignKey, dependentColumn, columnAccessors)!
+                        typeof(TKey), typeof(TKey).UnwrapNullableType(), typeof(TForeignKey)), foreignKey, dependentColumn,
+                    columnAccessors)!
                 : new SimpleNonNullableRowForeignKeyValueFactory<TKey, TForeignKey>(
-                    foreignKey, dependentColumn, columnAccessors, valueConverterSelector);        }
+                    foreignKey, dependentColumn, columnAccessors, valueConverterSelector);
+        }
         else
         {
             var dependentColumn = foreignKey.Columns.First();
@@ -107,7 +109,8 @@ private static IRowForeignKeyValueFactory CreateSimple<TKey, TForeignKey>(
             return principalColumn.IsNullable
                 ? (IRowForeignKeyValueFactory<TKey>)Activator.CreateInstance(
                     typeof(SimpleNullablePrincipalRowForeignKeyValueFactory<,,>).MakeGenericType(
-                        typeof(TKey), typeof(TKey).UnwrapNullableType(), typeof(TKey), typeof(TForeignKey)), foreignKey, dependentColumn, columnAccessors)!
+                        typeof(TKey), typeof(TKey).UnwrapNullableType(), typeof(TKey), typeof(TForeignKey)), foreignKey, dependentColumn,
+                    columnAccessors)!
                 : new SimpleNonNullableRowForeignKeyValueFactory<TKey, TForeignKey>(
                     foreignKey, dependentColumn, columnAccessors, valueConverterSelector);
         }

src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs

@@ -186,7 +186,7 @@ public async Task SetEntityStateAsync(
         CancellationToken cancellationToken = default)
     {
         var oldState = _stateData.EntityState;
-        bool adding;
+        var adding = false;
         await SetupAsync().ConfigureAwait(false);
 
         if ((adding || oldState is EntityState.Detached)