diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8caa8e0e2e45..9a7875f8928a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -29,269 +29,269 @@
https://github.com/aspnet/AspNetCore-Tooling
4b69afe0883e3f16353c438c1fbdd4915710dac4
-
+
https://github.com/aspnet/EntityFrameworkCore
- 765778c7c8b8f9d8ebcafd2424f89eaa931a6538
+ 53073a2e712f6e436ebff5acc45615abacde6a94
-
+
https://github.com/aspnet/EntityFrameworkCore
- 765778c7c8b8f9d8ebcafd2424f89eaa931a6538
+ 53073a2e712f6e436ebff5acc45615abacde6a94
-
+
https://github.com/aspnet/EntityFrameworkCore
- 765778c7c8b8f9d8ebcafd2424f89eaa931a6538
+ 53073a2e712f6e436ebff5acc45615abacde6a94
-
+
https://github.com/aspnet/EntityFrameworkCore
- 765778c7c8b8f9d8ebcafd2424f89eaa931a6538
+ 53073a2e712f6e436ebff5acc45615abacde6a94
-
+
https://github.com/aspnet/EntityFrameworkCore
- 765778c7c8b8f9d8ebcafd2424f89eaa931a6538
+ 53073a2e712f6e436ebff5acc45615abacde6a94
-
+
https://github.com/aspnet/EntityFrameworkCore
- 765778c7c8b8f9d8ebcafd2424f89eaa931a6538
+ 53073a2e712f6e436ebff5acc45615abacde6a94
-
+
https://github.com/aspnet/EntityFrameworkCore
- 765778c7c8b8f9d8ebcafd2424f89eaa931a6538
+ 53073a2e712f6e436ebff5acc45615abacde6a94
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
https://github.com/dotnet/corefx
@@ -385,25 +385,25 @@
https://github.com/dotnet/corefx
b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5
-
+
https://github.com/dotnet/core-setup
- 0b84934a47d2717e666d72bd04df5bd91c21c8b1
+ c78353b800b24f9d13f577c4a9226bd34d2922ec
-
+
https://github.com/dotnet/core-setup
- 0b84934a47d2717e666d72bd04df5bd91c21c8b1
+ c78353b800b24f9d13f577c4a9226bd34d2922ec
-
+
https://github.com/dotnet/core-setup
- 0b84934a47d2717e666d72bd04df5bd91c21c8b1
+ c78353b800b24f9d13f577c4a9226bd34d2922ec
-
+
https://github.com/dotnet/core-setup
- 0b84934a47d2717e666d72bd04df5bd91c21c8b1
+ c78353b800b24f9d13f577c4a9226bd34d2922ec
@@ -412,9 +412,9 @@
https://github.com/dotnet/corefx
b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
https://github.com/dotnet/arcade
@@ -428,9 +428,9 @@
https://github.com/dotnet/arcade
a11024c8c22cc762011addafc30c653c938048f4
-
+
https://github.com/aspnet/Extensions
- ae9878bb9945423ad20f0ba97033fcebfb5d8419
+ fb9eab76fef12fdfbb1c3d1424527403c9f4f929
https://github.com/dotnet/roslyn
diff --git a/eng/Versions.props b/eng/Versions.props
index 1c14e87fd0fe..937acecdfe64 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -54,10 +54,10 @@
3.3.0-beta3-19415-01
- 3.0.0-preview9-19414-17
- 3.0.0-preview9-19414-17
- 3.0.0-preview9-19414-17
- 2.1.0-preview9-19414-17
+ 3.0.0-preview9-19416-01
+ 3.0.0-preview9-19416-01
+ 3.0.0-preview9-19416-01
+ 2.1.0-preview9-19416-01
1.0.0-preview9.19409.17
4.6.0-preview9.19409.17
@@ -87,75 +87,75 @@
3.0.0-preview9.19416.1
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
- 3.0.0-preview9.19415.3
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
+ 3.0.0-preview9.19416.7
- 3.0.0-preview9.19416.8
- 3.0.0-preview9.19416.8
- 3.0.0-preview9.19416.8
- 3.0.0-preview9.19416.8
- 3.0.0-preview9.19416.8
- 3.0.0-preview9.19416.8
- 3.0.0-preview9.19416.8
+ 3.0.0-preview9.19416.12
+ 3.0.0-preview9.19416.12
+ 3.0.0-preview9.19416.12
+ 3.0.0-preview9.19416.12
+ 3.0.0-preview9.19416.12
+ 3.0.0-preview9.19416.12
+ 3.0.0-preview9.19416.12
3.0.0-preview9.19416.1
3.0.0-preview9.19416.1
diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs
index 920fb079de2a..de53d218c5c9 100644
--- a/src/Components/Server/src/Circuits/CircuitHost.cs
+++ b/src/Components/Server/src/Circuits/CircuitHost.cs
@@ -339,7 +339,8 @@ public async Task BeginInvokeDotNetFromJS(string callId, string assemblyName, st
await Renderer.Dispatcher.InvokeAsync(() =>
{
Log.BeginInvokeDotNet(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId);
- DotNetDispatcher.BeginInvokeDotNet(JSRuntime, callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
+ var invocationInfo = new DotNetInvocationInfo(assemblyName, methodIdentifier, dotNetObjectId, callId);
+ DotNetDispatcher.BeginInvokeDotNet(JSRuntime, invocationInfo, argsJson);
});
}
catch (Exception ex)
diff --git a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
index 54abb9f7a9d6..ef42dcaa7283 100644
--- a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
+++ b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
@@ -2,12 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-using System.Runtime.ExceptionServices;
using System.Text.Json;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.JSInterop;
+using Microsoft.JSInterop.Infrastructure;
namespace Microsoft.AspNetCore.Components.Server.Circuits
{
@@ -30,28 +30,34 @@ internal void Initialize(CircuitClientProxy clientProxy)
_clientProxy = clientProxy ?? throw new ArgumentNullException(nameof(clientProxy));
}
- protected override void EndInvokeDotNet(string callId, bool success, object resultOrError, string assemblyName, string methodIdentifier, long dotNetObjectId)
+ protected override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
{
- if (!success)
+ if (!invocationResult.Success)
{
- var actualException = resultOrError is Exception ex ? ex : resultOrError is ExceptionDispatchInfo edi ? edi.SourceException : resultOrError;
- Log.InvokeDotNetMethodException(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId, actualException as Exception);
+ Log.InvokeDotNetMethodException(_logger, invocationInfo, invocationResult.Exception);
+ string errorMessage;
+
if (_options.DetailedErrors)
{
- EndInvokeDotNetCore(callId, success, actualException.ToString());
+ errorMessage = invocationResult.Exception.ToString();
}
else
{
- var message = $"There was an exception invoking '{methodIdentifier}' on assembly '{assemblyName}'. For more details turn on " +
- $"detailed exceptions in '{typeof(CircuitOptions).Name}.{nameof(CircuitOptions.DetailedErrors)}'";
+ errorMessage = $"There was an exception invoking '{invocationInfo.MethodIdentifier}'";
+ if (invocationInfo.AssemblyName != null)
+ {
+ errorMessage += $" on assembly '{invocationInfo.AssemblyName}'";
+ }
- EndInvokeDotNetCore(callId, success, message);
+ errorMessage += $". For more details turn on detailed exceptions in '{nameof(CircuitOptions)}.{nameof(CircuitOptions.DetailedErrors)}'";
}
+
+ EndInvokeDotNetCore(invocationInfo.CallId, success: false, errorMessage);
}
else
{
- Log.InvokeDotNetMethodSuccess(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId);
- EndInvokeDotNetCore(callId, success, resultOrError);
+ Log.InvokeDotNetMethodSuccess(_logger, invocationInfo);
+ EndInvokeDotNetCore(invocationInfo.CallId, success: true, invocationResult.Result);
}
}
@@ -113,27 +119,27 @@ public static class Log
internal static void BeginInvokeJS(ILogger logger, long asyncHandle, string identifier) =>
_beginInvokeJS(logger, asyncHandle, identifier, null);
- internal static void InvokeDotNetMethodException(ILogger logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectReference, Exception exception)
+ internal static void InvokeDotNetMethodException(ILogger logger, in DotNetInvocationInfo invocationInfo , Exception exception)
{
- if (assemblyName != null)
+ if (invocationInfo.AssemblyName != null)
{
- _invokeStaticDotNetMethodException(logger, assemblyName, methodIdentifier, callId, exception);
+ _invokeStaticDotNetMethodException(logger, invocationInfo.AssemblyName, invocationInfo.MethodIdentifier, invocationInfo.CallId, exception);
}
else
{
- _invokeInstanceDotNetMethodException(logger, methodIdentifier, dotNetObjectReference, callId, exception);
+ _invokeInstanceDotNetMethodException(logger, invocationInfo.MethodIdentifier, invocationInfo.DotNetObjectId, invocationInfo.CallId, exception);
}
}
- internal static void InvokeDotNetMethodSuccess(ILogger logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectId)
+ internal static void InvokeDotNetMethodSuccess(ILogger logger, in DotNetInvocationInfo invocationInfo)
{
- if (assemblyName != null)
+ if (invocationInfo.AssemblyName != null)
{
- _invokeStaticDotNetMethodSuccess(logger, assemblyName, methodIdentifier, callId, null);
+ _invokeStaticDotNetMethodSuccess(logger, invocationInfo.AssemblyName, invocationInfo.MethodIdentifier, invocationInfo.CallId, null);
}
else
{
- _invokeInstanceDotNetMethodSuccess(logger, methodIdentifier, dotNetObjectId, callId, null);
+ _invokeInstanceDotNetMethodSuccess(logger, invocationInfo.MethodIdentifier, invocationInfo.DotNetObjectId, invocationInfo.CallId, null);
}
}
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs
index e0ffd9d2e450..40c6d0a0a93f 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs
@@ -195,7 +195,7 @@ public async Task CannotInvokeJSInvokableMethodsWithWrongReferenceId()
var expectedDotNetObjectRef = "[\"1\",true,{\"__dotNetObject\":1}]";
var expectedError = "[\"1\"," +
"false," +
- "\"There was an exception invoking \\u0027Reverse\\u0027 on assembly \\u0027\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
+ "\"There was an exception invoking \\u0027Reverse\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
await GoToTestComponent(Batches);