Removed old #if commands

Author: JonPSmith

DataLayer/SpecialisedEntities/Configurations/PaymentConfig.cs

@@ -15,12 +15,6 @@ public void Configure
             entity.HasDiscriminator(b => b.PType) //#A
                 .HasValue<PaymentCash>(PTypes.Cash) //#B
                 .HasValue<PaymentCard>(PTypes.Card); //#C
-
-#if NETSTANDARD2_0
-            //This is needed for TestChangePaymentTypeOk to work - see EF Core issue #7510
-            entity.Property(p => p.PType)
-                .Metadata.AfterSaveBehavior = PropertySaveBehavior.Save;
-#endif
     }
 }
 }

DataLayer/SpecialisedEntities/Configurations/UserConfig.cs

@@ -13,11 +13,7 @@ public void Configure
         {
             entity.HasAlternateKey(p => p.Email);
 
-#if NETSTANDARD2_0
-            entity.OwnsOne(e => e.HomeAddress).ToTable("Addresses");
-#elif NETSTANDARD2_1
-            entity.OwnsOne(e => e.HomeAddress); //Cannot map ownedtype to separate table
-#endif
+            entity.OwnsOne(e => e.HomeAddress); 
         }
     }
 }

EfCoreInAction.Test.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30717.126
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31825.309
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLayer", "DataLayer\DataLayer.csproj", "{2451DCF6-EA52-434D-8A97-D23F4A8C6A72}"
 EndProject
@@ -18,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestSupport", "TestSupport\TestSupport.csproj", "{0CB1A11C-6144-414D-81A9-F880DEB2C71A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFromSqlRaw", "TestFromSqlRaw\TestFromSqlRaw.csproj", "{AADA2740-B6C5-4915-8705-4AD3B40F00D8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -92,6 +94,26 @@ Global
 		{0CB1A11C-6144-414D-81A9-F880DEB2C71A}.Release|x64.Build.0 = Release|Any CPU
 		{0CB1A11C-6144-414D-81A9-F880DEB2C71A}.Release|x86.ActiveCfg = Release|Any CPU
 		{0CB1A11C-6144-414D-81A9-F880DEB2C71A}.Release|x86.Build.0 = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|ARM.Build.0 = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|ARM64.Build.0 = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|x64.Build.0 = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{AADA2740-B6C5-4915-8705-4AD3B40F00D8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TestSupport/EfHelpers/SqliteInMemory.cs

@@ -4,7 +4,6 @@
 using System;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using TestSupport.EfHelpers.Internal;
 
 namespace TestSupport.EfHelpers