Simplify target framework directives

Author: Dresel

src/SpatialFocus.EntityFrameworkCore.Extensions/NamingExtension.cs

@@ -29,13 +29,11 @@ public static void ConfigureNames(this ModelBuilder modelBuilder, NamingOptions
 				}
 
 				// Properties
-#if NET5_0_OR_GREATER
 				entity.GetProperties()
 					.ToList()
+#if NET5_0_OR_GREATER
 					.ForEach(x => x.SetColumnName(namingOptions.ColumnNamingFunction(x.GetColumnBaseName())));
 #else
-				entity.GetProperties()
-					.ToList()
 					.ForEach(x => x.SetColumnName(namingOptions.ColumnNamingFunction(x.GetColumnName())));
 #endif
 
@@ -48,13 +46,11 @@ public static void ConfigureNames(this ModelBuilder modelBuilder, NamingOptions
 					.ForEach(x => x.SetConstraintName(namingOptions.ConstraintNamingFunction(x.GetConstraintName())));
 
 				// Indices
-#if NET5_0_OR_GREATER
 				entity.GetIndexes()
 					.ToList()
+#if NET5_0_OR_GREATER
 					.ForEach(x => x.SetDatabaseName(namingOptions.ConstraintNamingFunction(x.GetDatabaseName())));
 #else
-				entity.GetIndexes()
-					.ToList()
 					.ForEach(x => x.SetName(namingOptions.ConstraintNamingFunction(x.GetName())));
 #endif
 			}

test/SpatialFocus.EntityFrameworkCore.Extensions.Test/NamingOptionsTest.cs

@@ -28,55 +28,42 @@ protected ProductContext GetContext(EnumLookupOptions? enumLookupOptions = null,
 			return context;
 		}
 
-#if NET5_0_OR_GREATER
 		[Fact]
 		public void OverrideColumnNaming()
 		{
 			ProductContext context = GetContext(namingOptions: new NamingOptions().OverrideColumnNaming(NamingScheme.SnakeCase));
 
 			IEntityType findEntityType = context.Model.FindEntityType(typeof(ProductTag));
-
+#if NET5_0_OR_GREATER
 			Assert.Equal("product_tag_id", findEntityType.FindProperty(nameof(ProductTag.ProductTagId)).GetColumnBaseName());
-		}
 #else
-		[Fact]
-		public void OverrideColumnNaming()
-		{
-			ProductContext context = GetContext(namingOptions: new NamingOptions().OverrideColumnNaming(NamingScheme.SnakeCase));
-
-			IEntityType findEntityType = context.Model.FindEntityType(typeof(ProductTag));
-
 			Assert.Equal("product_tag_id", findEntityType.FindProperty(nameof(ProductTag.ProductTagId)).GetColumnName());
-		}
 #endif
+		}
 
-#if NET5_0_OR_GREATER
 		[Fact]
 		public void OverrideConstraintNaming()
 		{
 			ProductContext context = GetContext(namingOptions: new NamingOptions().OverrideConstraintNaming(NamingScheme.SnakeCase));
 
 			IEntityType findEntityType = context.Model.FindEntityType(typeof(ProductTag));
 			Assert.Equal("ProductTag", findEntityType.GetTableName());
+
+#if NET5_0_OR_GREATER
 			Assert.Equal("ProductTagId", findEntityType.FindProperty(nameof(ProductTag.ProductTagId)).GetColumnBaseName());
-			Assert.True(findEntityType.GetKeys().All(x => x.GetName() == NamingScheme.SnakeCase(x.GetDefaultName())));
-			Assert.True(findEntityType.GetForeignKeys().All(x => x.GetConstraintName() == NamingScheme.SnakeCase(x.GetDefaultName())));
-			Assert.True(findEntityType.GetIndexes().All(x => x.GetDatabaseName() == NamingScheme.SnakeCase(x.GetDefaultDatabaseName())));
-		}
 #else
-		[Fact]
-		public void OverrideConstraintNaming()
-		{
-			ProductContext context = GetContext(namingOptions: new NamingOptions().OverrideConstraintNaming(NamingScheme.SnakeCase));
-
-			IEntityType findEntityType = context.Model.FindEntityType(typeof(ProductTag));
-			Assert.Equal("ProductTag", findEntityType.GetTableName());
 			Assert.Equal("ProductTagId", findEntityType.FindProperty(nameof(ProductTag.ProductTagId)).GetColumnName());
+#endif
+
 			Assert.True(findEntityType.GetKeys().All(x => x.GetName() == NamingScheme.SnakeCase(x.GetDefaultName())));
 			Assert.True(findEntityType.GetForeignKeys().All(x => x.GetConstraintName() == NamingScheme.SnakeCase(x.GetDefaultName())));
+
+#if NET5_0_OR_GREATER
+			Assert.True(findEntityType.GetIndexes().All(x => x.GetDatabaseName() == NamingScheme.SnakeCase(x.GetDefaultDatabaseName())));
+#else
 			Assert.True(findEntityType.GetIndexes().All(x => x.GetName() == NamingScheme.SnakeCase(x.GetDefaultName())));
-		}
 #endif
+		}
 
 		[Fact]
 		public void OverrideTableNaming()