From 42eec2cbfa9d8a86c110b7384a9cfbba8a5b0641 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 7 Aug 2019 15:44:03 -0700 Subject: [PATCH] Fix build break by using API that's available across net472 and netcoreapp3.0 (dotnet/extensions#2157) \n\nCommit migrated from https://github.com/dotnet/extensions/commit/6e96af8eba3bba8f4a8e02e38dd3ac9549f85d34 --- .../Microsoft.JSInterop/test/DotNetDispatcherTest.cs | 8 ++++---- .../Microsoft.JSInterop/test/JSRuntimeBaseTest.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/JSInterop/Microsoft.JSInterop/test/DotNetDispatcherTest.cs b/src/JSInterop/Microsoft.JSInterop/test/DotNetDispatcherTest.cs index 8e9d0dc3b9..282aa0f364 100644 --- a/src/JSInterop/Microsoft.JSInterop/test/DotNetDispatcherTest.cs +++ b/src/JSInterop/Microsoft.JSInterop/test/DotNetDispatcherTest.cs @@ -250,7 +250,7 @@ namespace Microsoft.JSInterop DotNetDispatcher.EndInvoke(argsJson); // Assert - Assert.True(task.IsCompletedSuccessfully); + Assert.True(task.IsCompleted && task.Status == TaskStatus.RanToCompletion); var result = task.Result; Assert.Equal(testDTO.StringVal, result.StringVal); Assert.Equal(testDTO.IntVal, result.IntVal); @@ -597,7 +597,7 @@ namespace Microsoft.JSInterop DotNetDispatcher.ParseEndInvokeArguments(jsRuntime, $"[{jsRuntime.LastInvocationAsyncHandle}, true, {{\"intVal\": 7}}]"); - Assert.True(task.IsCompletedSuccessfully); + Assert.True(task.IsCompleted && task.Status == TaskStatus.RanToCompletion); Assert.Equal(7, task.Result.IntVal); } @@ -609,7 +609,7 @@ namespace Microsoft.JSInterop DotNetDispatcher.ParseEndInvokeArguments(jsRuntime, $"[{jsRuntime.LastInvocationAsyncHandle}, true, [1, 2, 3]]"); - Assert.True(task.IsCompletedSuccessfully); + Assert.True(task.IsCompleted && task.Status == TaskStatus.RanToCompletion); Assert.Equal(new[] { 1, 2, 3 }, task.Result); } @@ -621,7 +621,7 @@ namespace Microsoft.JSInterop DotNetDispatcher.ParseEndInvokeArguments(jsRuntime, $"[{jsRuntime.LastInvocationAsyncHandle}, true, null]"); - Assert.True(task.IsCompletedSuccessfully); + Assert.True(task.IsCompleted && task.Status == TaskStatus.RanToCompletion); Assert.Null(task.Result); } diff --git a/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeBaseTest.cs b/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeBaseTest.cs index 468f8efba3..2714886f9a 100644 --- a/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeBaseTest.cs +++ b/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeBaseTest.cs @@ -66,7 +66,7 @@ namespace Microsoft.JSInterop runtime.EndInvokeJS(2, succeeded: true, ref reader); - Assert.True(task.IsCompletedSuccessfully); + Assert.True(task.IsCompleted && task.Status == TaskStatus.RanToCompletion); } [Fact]