From 33affd0f975d80efe8e6274123f9ae27836a4d8d Mon Sep 17 00:00:00 2001
From: Rockford Lhotka <rocky@lhotka.net>
Date: Wed, 3 Apr 2019 00:54:28 -0500
Subject: [PATCH] #1059 Implement sync code in HttpProxy that works from
 Windows Forms

---
 Source/Csla.Shared/DataPortalClient/HttpProxy.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/Csla.Shared/DataPortalClient/HttpProxy.cs b/Source/Csla.Shared/DataPortalClient/HttpProxy.cs
index c3e3441d44..a755e71dde 100644
--- a/Source/Csla.Shared/DataPortalClient/HttpProxy.cs
+++ b/Source/Csla.Shared/DataPortalClient/HttpProxy.cs
@@ -412,13 +412,14 @@ public async Task<DataPortalResult> Delete(Type objectType, object criteria, Dat
 
     private async Task<byte[]> CallDataPortalServer(HttpClient client, byte[] serialized, string operation, string routingToken, bool isSync)
     {
-      var task = CallDataPortalServer(client, serialized, operation, routingToken);
+      //var task = CallDataPortalServer(client, serialized, operation, routingToken);
 #if !NET40
       if (isSync)
-        serialized = task.RunWithContext(_client.Timeout);
+        Task.Run(async () => 
+        serialized = await CallDataPortalServer(client, serialized, operation, routingToken)).Wait();
       else
 #endif
-      serialized = await task;
+        serialized = await CallDataPortalServer(client, serialized, operation, routingToken);
       return serialized;
     }