Merge pull request #3655 from mconnew/FixWSHttpSyncContextProblem

Fix WS HTTP Sync Context problem
dotnet · May 30, 2019 · 8bb5c47 · 8bb5c47
2 parents 2410294 + d4a36f6
commit 8bb5c47
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/...em.Private.ServiceModel/src/System/ServiceModel/Security/SecuritySessionClientSettings.cs b/...em.Private.ServiceModel/src/System/ServiceModel/Security/SecuritySessionClientSettings.cs
@@ -1492,13 +1492,13 @@ public Task<Message> RequestAsync(Message message)
                 return RequestAsync(message, DefaultSendTimeout);
             }
 
-            Message IRequestChannel.Request(Message message) => RequestAsync(message, DefaultSendTimeout).GetAwaiter().GetResult();
+            Message IRequestChannel.Request(Message message) => ((IRequestChannel)this).Request(message, DefaultSendTimeout);
 
-            Message IRequestChannel.Request(Message message, TimeSpan timeout) => RequestAsync(message, timeout).GetAwaiter().GetResult();
+            Message IRequestChannel.Request(Message message, TimeSpan timeout) => RequestAsyncInternal(message, timeout).WaitForCompletionNoSpin();
 
-            IAsyncResult IRequestChannel.BeginRequest(Message message, AsyncCallback callback, object state) => RequestAsync(message, DefaultSendTimeout).ToApm(callback, state);
+            IAsyncResult IRequestChannel.BeginRequest(Message message, AsyncCallback callback, object state) => ((IRequestChannel)this).BeginRequest(message, DefaultSendTimeout, callback, state);
 
-            IAsyncResult IRequestChannel.BeginRequest(Message message, TimeSpan timeout, AsyncCallback callback, object state) => RequestAsync(message, timeout).ToApm(callback, state);
+            IAsyncResult IRequestChannel.BeginRequest(Message message, TimeSpan timeout, AsyncCallback callback, object state) => RequestAsyncInternal(message, timeout).ToApm(callback, state);
 
             Message IRequestChannel.EndRequest(IAsyncResult result) => result.ToApmEnd<Message>();
 
@@ -1543,6 +1543,11 @@ private Message ProcessReply(Message reply, TimeSpan timeout, SecurityProtocolCo
                 return processedReply;
             }
 
+            private async Task<Message> RequestAsyncInternal(Message message, TimeSpan timeout)
+            {
+                await TaskHelpers.EnsureDefaultTaskScheduler();
+                return await RequestAsync(message, timeout);
+            }
 
             public async Task<Message> RequestAsync(Message message, TimeSpan timeout)
             {

diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/xunit/WcfTestCase.cs b/src/System.Private.ServiceModel/tests/Common/Infrastructure/xunit/WcfTestCase.cs
@@ -58,7 +58,7 @@ internal WcfTestCase(IXunitTestCase testCase, string skippedReason = null, bool
 
         public int Timeout { get { return 0; } }
 
-        public void Deserialize(IXunitSerializationInfo info) { _testCase.Deserialize(info); }
+        public void Deserialize(IXunitSerializationInfo info) { _testCase?.Deserialize(info); }
 
         public async Task<RunSummary> RunAsync(
             IMessageSink diagnosticMessageSink, IMessageBus messageBus, object[] constructorArguments,

diff --git a/...portWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs b/...portWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs
@@ -11,7 +11,7 @@
 public class BasicHttpTransportWithMessageCredentialSecurityTests : ConditionalWcfTest
 {
     [WcfFact]
-    [Issue(2870)]
+    [Issue(2870, OS = OSID.AnyOSX)]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(SSL_Available))]

diff --git a/...ansportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs b/...ansportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs
@@ -13,7 +13,7 @@
 public class WSHttpTransportWithMessageCredentialSecurityTests : ConditionalWcfTest
 {
     [WcfFact]
-    [Issue(2870)]
+    [Issue(2870, OS = OSID.AnyOSX)]
     [Condition(nameof(Root_Certificate_Installed),
            nameof(Client_Certificate_Installed),
            nameof(SSL_Available))]