From 8283e6ac2b0bd33303b4314795f6d0318c1cec29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2019 17:44:06 +0000 Subject: [PATCH] [release/3.0] Update dependencies from aspnet/EntityFrameworkCore (#13210) * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190816.12 - Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19416.12 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19416.12 - dotnet-ef - 3.0.0-preview9.19416.12 - Microsoft.EntityFrameworkCore - 3.0.0-preview9.19416.12 - Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19416.12 - Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19416.12 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19416.12 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore) * React to breaking changes --- eng/Version.Details.xml | 288 +++++++++--------- eng/Versions.props | 144 ++++----- .../Server/src/Circuits/CircuitHost.cs | 3 +- .../Server/src/Circuits/RemoteJSRuntime.cs | 44 +-- .../InteropReliabilityTests.cs | 2 +- 5 files changed, 244 insertions(+), 237 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8caa8e0e2e..9a7875f892 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 1c14e87fd0..937acecdfe 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 920fb079de..de53d218c5 100644 --- a/src/Components/Server/src/Circuits/CircuitHost.cs +++ b/src/Components/Server/src/Circuits/CircuitHost.cs @@ -339,7 +339,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits 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 54abb9f7a9..ef42dcaa72 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 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits _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 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits 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 e0ffd9d2e4..40c6d0a0a9 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs @@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests 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);