Use EFCore 3.1

src/OpenRiaServices.Client.Web/Framework/Web/WcfDomainClientFactory.cs

@@ -203,7 +203,9 @@ protected virtual ChannelFactory<TContract> CreateChannelFactory<TContract>(Uri
                 {
                     // in debug mode set the timeout to a higher number to
                     // facilitate debugging
-                    factory.Endpoint.Binding.OpenTimeout = TimeSpan.FromMinutes(5);
+                    factory.Endpoint.Binding.OpenTimeout = TimeSpan.FromMinutes(10);
+                    factory.Endpoint.Binding.ReceiveTimeout = TimeSpan.FromMinutes(10);
+                    factory.Endpoint.Binding.SendTimeout = TimeSpan.FromMinutes(10);
                 }
 #endif
             }

src/OpenRiaServices.Client/Test/Client.Test/Data/CrossDomainServiceQueryTests.cs

@@ -511,7 +511,7 @@ public void TestLoad_WithParameters()
             });
             EnqueueCallback(delegate
             {
-                Assert.IsTrue(catalog.Products.Count == 8);
+                Assert.AreEqual(8, catalog.Products.Count);
             });
             EnqueueTestComplete();
         }
@@ -584,4 +584,44 @@ protected override Northwind CreateNorthwind()
             return new Northwind(TestURIs.DbCtx_Northwind);
         }
     }
+
+    [TestClass]
+    public class EFCoreQueryTests : CrossDomainServiceQueryTests
+    {
+        public EFCoreQueryTests()
+            : base(TestURIs.EFCore_Catalog, ProviderType.EFCore)
+        {
+        }
+
+        protected override Northwind CreateNorthwind()
+        {
+            return new Northwind(TestURIs.EFCore_Northwind);
+        }
+
+        /// <summary>
+        /// Test queries on projected FK members to make sure they work
+        /// </summary>
+        [TestMethod]
+        [Asynchronous]
+        public void TestFKProjectionQuery()
+        {
+            Catalog catalog = new Catalog(TestURIs.EFCore_Catalog);
+            LoadOperation lo1 = catalog.Load(catalog.GetEmployeesQuery(), false);
+
+            // test both Where and OrderBy expressions involving projected members
+            LoadOperation lo2 = catalog.Load(catalog.GetPurchaseOrdersQuery().Where(p => p.EmployeeID > 5).OrderBy(p => p.EmployeeID).Take(1), false);
+
+            EnqueueConditional(delegate
+            {
+                return !catalog.IsLoading;
+            });
+            EnqueueCallback(delegate
+            {
+                Assert.IsFalse(lo1.HasError || lo2.HasError);
+                Assert.IsTrue(catalog.Employees.Count > 0, "catalog.Employees.Count should be greater than 0");
+                Assert.IsTrue(catalog.PurchaseOrders.Count > 0, "catalog.PurchaseOrders.Count should be greater than 0");
+            });
+            EnqueueTestComplete();
+        }
+    }
 }

src/OpenRiaServices.Client/Test/Client.Test/Data/DomainContextTestBase.cs

@@ -17,7 +17,12 @@ public enum ProviderType
         /// <summary>
         /// Unspecified, non-DAL provider
         /// </summary>
-        Unspecified
+        Unspecified,
+
+        /// <summary>
+        /// EF Core Linq to SQL provider
+        /// </summary>
+        EFCore
     }
 
     /// <summary>

src/OpenRiaServices.Client/Test/Client.Test/Data/UpdateTests.cs

@@ -1938,7 +1938,7 @@ public void SimpleUpdateDeleteConflict()
             this.EnqueueCompletion(() => so2);
             EnqueueCallback(delegate
             {
-                Assert.AreEqual(Resource.DomainContext_SubmitOperationFailed_Conflicts, so2.Error.Message);
+                Assert.AreEqual(Resource.DomainContext_SubmitOperationFailed_Conflicts, so2.Error?.Message);
                 Entity[] entitiesInConflict = so2.EntitiesInError.ToArray();
                 Assert.AreEqual(1, so2.ChangeSet.RemovedEntities.Count, "Unexpected amount of removed entities.");
                 Assert.AreEqual(1, entitiesInConflict.Length, "Unexpected amount of entities in conflict.");
@@ -3077,7 +3077,7 @@ public virtual void ResolveTest_DeleteUpdateConflict_Bug597087()
                 Assert.IsInstanceOfType(so.Error, typeof(DomainOperationException));
                 DomainOperationException ex = so.Error as DomainOperationException;
 
-                Assert.AreEqual(Resource.DomainContext_SubmitOperationFailed_Conflicts, so.Error.Message);
+                Assert.AreEqual(Resource.DomainContext_SubmitOperationFailed_Conflicts, so.Error?.Message);
                 Assert.AreEqual(1, so.EntitiesInError.Count());
                 EntityConflict conflict = so.EntitiesInError.Single().EntityConflict;
                 Assert.IsTrue(conflict.IsDeleted);
@@ -3148,7 +3148,7 @@ public virtual void ResolveTest_MultipleInstances_MixedResolveMethods()
             EnqueueCallback(delegate
             {
                 Product[] products = nw2.Products.ToArray();
-                if (this.ProviderType == ProviderType.EF)
+                if (this.ProviderType == ProviderType.EF || ProviderType == ProviderType.EFCore)
                 {
                     // Verify Product0 changes was not synced back to the client since resubmit still fails with conflict
                     Assert.IsNull(products[0].EntityConflict);
@@ -3200,7 +3200,7 @@ public virtual void ResolveTest_MultipleInstances_MixedResolveMethods()
                 delegate
                 {
                     Product[] products = nw1.Products.ToArray();
-                    if (this.ProviderType == ProviderType.EF)
+                    if (this.ProviderType == ProviderType.EF || ProviderType == ProviderType.EFCore)
                     {
                         // verify nw2 changes are not persisted
                         Assert.AreEqual(nw1NewUnitPrice[0], products[0].UnitPrice);
@@ -3283,7 +3283,7 @@ public virtual void ResolveTest_MultipleInstances_ReturnTrueFalse()
 
                 Product[] products = nw2.Products.ToArray();
                 EntityConflict conflict = null;
-                if (this.ProviderType == ProviderType.EF)
+                if (this.ProviderType == ProviderType.EF || ProviderType == ProviderType.EFCore)
                 {
                     // EF only supports getting the first conflict so only Product0's conflicts will be generated and only
                     // its resolve method is called. Hence the conflict is resolved successfully the first round. When resubmit
@@ -3387,7 +3387,7 @@ public virtual void ResolveTest_MultipleInstances_ReturnTrueTrue()
             EnqueueCallback(delegate
             {
                 Product[] products = nw2.Products.ToArray();
-                if (this.ProviderType == ProviderType.EF)
+                if (this.ProviderType == ProviderType.EF || ProviderType == ProviderType.EFCore)
                 {
                     // EF only supports getting the first conflict so only Product0's conflicts will be generated and only
                     // its resolve method is called. Hence the conflict is resolved successfully the first round. When resubmit
@@ -3433,7 +3433,7 @@ public virtual void ResolveTest_MultipleInstances_ReturnTrueTrue()
                 delegate
                 {
                     Product[] products = nw1.Products.ToArray();
-                    if (ProviderType == ProviderType.EF)
+                    if (ProviderType == ProviderType.EF || ProviderType == ProviderType.EFCore)
                     {
                         // verify store values are not changed since submit failed
                         Assert.AreEqual(nw1NewUnitPrice[0], products[0].UnitPrice);
@@ -3584,7 +3584,7 @@ public virtual void ResolveTest_MultipleInstances_FirstSucceedsSecondThrows()
                 DomainOperationException ex = so.Error as DomainOperationException;
 
                 Product[] products = nw2.Products.ToArray();
-                if (this.ProviderType == ProviderType.EF)
+                if (this.ProviderType == ProviderType.EF || ProviderType == ProviderType.EFCore)
                 {
                     // EF only supports getting the first conflict, so Product0's conflicts will be generated during first submit,
                     // then they are resolved server side and resubmit is called. Product1's conflicts will then be generated. Since
@@ -4473,6 +4473,31 @@ TestContext testContext
 
     }
 
+    [TestClass]
+    public class EFCoreUpdateTests : UpdateTests
+    {
+        public EFCoreUpdateTests()
+            : base(TestURIs.EFCore_Northwind_CUD, ProviderType.EFCore)
+        {
+        }
+
+        /// <summary>
+        /// Silverlight version of class initializer doesn't take TestContext
+        /// </summary>
+        [ClassInitialize]
+        public static void ClassSetup(
+#if !SILVERLIGHT
+            TestContext testContext
+#endif
+)
+        {
+            // ensure that our isolation DB has been created once and only once
+            // at the test fixture level
+            TestDatabase.Initialize();
+        }
+
+    }
+
     [TestClass]
     public class DbCtxUpdateTests : UpdateTests
     {

src/OpenRiaServices.Client/Test/Client.Test/TestUris.cs

@@ -26,7 +26,12 @@ public static class TestURIs
     public static readonly Uri DbCtx_Northwind_CUD = new Uri(RootURI, "TestDomainServices-DbCtx-Northwind_CUD.svc");
     public static readonly Uri DbCtx_Northwind = new Uri(RootURI, "TestDomainServices-DbCtx-Northwind.svc");
     public static readonly Uri DbCtx_Catalog = new Uri(RootURI, "TestDomainServices-DbCtx-Catalog.svc");
-    public static readonly Uri EFCodeFirst = new Uri(RootURI, "EFCodeFirst-EFCodeFirstTestDomainService.svc");    
+    public static readonly Uri EFCodeFirst = new Uri(RootURI, "EFCodeFirst-EFCodeFirstTestDomainService.svc");
+
+    // EF Core
+    public static readonly Uri EFCore_Northwind = new Uri(RootURI, "TestDomainServices-EFCore-Northwind.svc");
+    public static readonly Uri EFCore_Northwind_CUD = new Uri(RootURI, "TestDomainServices-EFCore-Northwind_CUD.svc");
+    public static readonly Uri EFCore_Catalog = new Uri(RootURI, "TestDomainServices-EFCore-Catalog.svc");
 
     // LTS
     public static readonly Uri LTS_Catalog = new Uri(RootURI, "TestDomainServices-LTS-Catalog.svc");