[master] Update dependencies from 2 repositories

src/Analyzers/Analyzers/test/AnalyzerTestBase.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Analyzers

src/Components/Analyzers/test/AnalyzerTestBase.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Components.Analyzers

src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHost.cs

@@ -38,7 +38,6 @@ public Task StartAsync(CancellationToken cancellationToken = default)
             // this happens in the browser it will be a direct call from Mono. We effectively needs to set the
             // JSRuntime in the 'root' execution context which implies that we want to do as part of a direct
             // call from Program.Main, and before any 'awaits'.
-            JSRuntime.SetCurrentJSRuntime(_runtime);
             SetBrowserHttpMessageHandlerAsDefault();
 
             return StartAsyncAwaited();

src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -13,9 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\Shared\src\BrowserNavigationManagerInterop.cs" />
-    <Compile Include="..\..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
-    <Compile Include="..\..\..\Shared\src\WebEventData.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\BrowserNavigationManagerInterop.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\JsonSerializerOptionsProvider.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\WebEventData.cs" />
+
+    <Compile Include="$(ComponentsSharedSourceRoot)src\ElementReferenceJsonConverter.cs" />
   </ItemGroup>
 
 </Project>

src/Components/Blazor/Blazor/src/Services/WebAssemblyJSRuntime.cs

@@ -1,12 +1,34 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNetCore.Components;
 using Mono.WebAssembly.Interop;
 
 namespace Microsoft.AspNetCore.Blazor.Services
 {
-    internal static class WebAssemblyJSRuntime
+    internal sealed class WebAssemblyJSRuntime : MonoWebAssemblyJSRuntime
     {
-        public static readonly MonoWebAssemblyJSRuntime Instance = new MonoWebAssemblyJSRuntime();
+        private static readonly WebAssemblyJSRuntime _instance = new WebAssemblyJSRuntime();
+        private static bool _initialized;
+
+        public WebAssemblyJSRuntime()
+        {
+            JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter());
+        }
+
+        public static WebAssemblyJSRuntime Instance
+        {
+            get
+            {
+                if (!_initialized)
+                {
+                    // This is executing in MonoWASM. Consequently we do not to have concern ourselves with thread safety.
+                    _initialized = true;
+                    Initialize(_instance);
+                }
+
+                return _instance;
+            }
+        }
     }
 }

src/Components/Blazor/Build/test/RuntimeDependenciesResolverTest.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Blazor.Build.Test

src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj

@@ -5,13 +5,12 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.AspNetCore.Components.netstandard2.0.cs" />
-    <Reference Include="Microsoft.JSInterop"  />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
+    <Reference Include="System.Buffers"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
     <Compile Include="Microsoft.AspNetCore.Components.netcoreapp.cs" />
-    <Reference Include="Microsoft.JSInterop"  />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
   </ItemGroup>

src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs

@@ -110,6 +110,8 @@ protected void OnUnhandledException(System.UnhandledExceptionEventArgs e) { }
     public readonly partial struct ElementReference
     {
         private readonly object _dummy;
+        public ElementReference(string id) { throw null; }
+        public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct EventCallback

src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs

@@ -110,6 +110,8 @@ protected void OnUnhandledException(System.UnhandledExceptionEventArgs e) { }
     public readonly partial struct ElementReference
     {
         private readonly object _dummy;
+        public ElementReference(string id) { throw null; }
+        public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct EventCallback

src/Components/Components/src/ElementReference.cs

@@ -3,16 +3,13 @@
 
 using System;
 using System.Globalization;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;
 
 namespace Microsoft.AspNetCore.Components
 {
     /// <summary>
     /// Represents a reference to a rendered element.
     /// </summary>
-    [JsonConverter(typeof(ElementReferenceConverter))]
     public readonly struct ElementReference
     {
         private static long _nextIdForWebAssemblyOnly = 1;
@@ -24,9 +21,9 @@ public readonly struct ElementReference
         /// The Id is unique at least within the scope of a given user/circuit.
         /// This property is public to support Json serialization and should not be used by user code.
         /// </remarks>
-        internal string Id { get; }
+        public string Id { get; }
 
-        private ElementReference(string id)
+        public ElementReference(string id)
         {
             Id = id;
         }
@@ -54,48 +51,5 @@ private static string CreateUniqueId()
                 return Guid.NewGuid().ToString("D", CultureInfo.InvariantCulture);
             }
         }
-
-        private sealed class ElementReferenceConverter : JsonConverter<ElementReference>
-        {
-            private static readonly JsonEncodedText IdProperty = JsonEncodedText.Encode("__internalId");
-
-            public override ElementReference Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                string id = null;
-                while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-                {
-                    if (reader.TokenType == JsonTokenType.PropertyName)
-                    {
-                        if (reader.ValueTextEquals(IdProperty.EncodedUtf8Bytes))
-                        {
-                            reader.Read();
-                            id = reader.GetString();
-                        }
-                        else
-                        {
-                            throw new JsonException($"Unexpected JSON property '{reader.GetString()}'.");
-                        }
-                    }
-                    else
-                    {
-                        throw new JsonException($"Unexcepted JSON Token {reader.TokenType}.");
-                    }
-                }
-
-                if (id is null)
-                {
-                    throw new JsonException("__internalId is required.");
-                }
-
-                return new ElementReference(id);
-            }
-
-            public override void Write(Utf8JsonWriter writer, ElementReference value, JsonSerializerOptions options)
-            {
-                writer.WriteStartObject();
-                writer.WriteString(IdProperty, value.Id);
-                writer.WriteEndObject();
-            }
-        }
     }
 }

src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

@@ -10,16 +10,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="RenderTree" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.JSInterop" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <Reference Include="System.Buffers" />
+  </ItemGroup>
+
   <Target Name="_GetNuspecDependencyPackageVersions">
     <MSBuild Targets="_GetPackageVersionInfo"
         BuildInParallel="$(BuildInParallel)"

src/Components/Components/test/RendererTest.cs

@@ -13,7 +13,6 @@
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 

src/Components/Server/src/Circuits/CircuitHost.cs

@@ -12,7 +12,7 @@
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.JSInterop;
+using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
@@ -25,11 +25,6 @@ internal class CircuitHost : IAsyncDisposable
         private bool _initialized;
         private bool _disposed;
 
-        /// <summary>
-        /// Sets the <see cref="IJSRuntime"/> for the current excution context.
-        /// </summary>
-        public void SetCurrentJSRuntime() => JSInterop.JSRuntime.SetCurrentJSRuntime(JSRuntime);
-
         // This event is fired when there's an unrecoverable exception coming from the circuit, and
         // it need so be torn down. The registry listens to this even so that the circuit can
         // be torn down even when a client is not connected.
@@ -100,7 +95,6 @@ public Task InitializeAsync(CancellationToken cancellationToken)
 
                 try
                 {
-                    SetCurrentJSRuntime();
                     _initialized = true; // We're ready to accept incoming JSInterop calls from here on
 
                     await OnCircuitOpenedAsync(cancellationToken);
@@ -340,9 +334,8 @@ public async Task BeginInvokeDotNetFromJS(string callId, string assemblyName, st
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     Log.BeginInvokeDotNet(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId);
-                    DotNetDispatcher.BeginInvoke(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
+                    DotNetDispatcher.BeginInvokeDotNet(JSRuntime, callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
                 });
             }
             catch (Exception ex)
@@ -366,7 +359,6 @@ public async Task EndInvokeJSFromDotNet(long asyncCall, bool succeded, string ar
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     if (!succeded)
                     {
                         // We can log the arguments here because it is simply the JS error with the call stack.
@@ -377,7 +369,7 @@ await Renderer.Dispatcher.InvokeAsync(() =>
                         Log.EndInvokeJSSucceeded(_logger, asyncCall);
                     }
 
-                    DotNetDispatcher.EndInvoke(arguments);
+                    DotNetDispatcher.EndInvokeJS(JSRuntime, arguments);
                 });
             }
             catch (Exception ex)
@@ -415,7 +407,6 @@ public async Task DispatchEvent(string eventDescriptorJson, string eventArgsJson
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     return Renderer.DispatchEventAsync(
                         webEventData.EventHandlerId,
                         webEventData.EventFieldInfo,
@@ -443,7 +434,6 @@ public async Task OnLocationChangedAsync(string uri, bool intercepted)
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     Log.LocationChange(_logger, uri, CircuitId);
                     var navigationManager = (RemoteNavigationManager)Services.GetRequiredService<NavigationManager>();
                     navigationManager.NotifyLocationChanged(uri, intercepted);

src/Components/Server/src/Circuits/RemoteJSRuntime.cs

@@ -11,7 +11,7 @@
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
-    internal class RemoteJSRuntime : JSRuntimeBase
+    internal class RemoteJSRuntime : JSRuntime
     {
         private readonly CircuitOptions _options;
         private readonly ILogger<RemoteJSRuntime> _logger;
@@ -22,6 +22,7 @@ public RemoteJSRuntime(IOptions<CircuitOptions> options, ILogger<RemoteJSRuntime
             _options = options.Value;
             _logger = logger;
             DefaultAsyncTimeout = _options.JSInteropDefaultCallTimeout;
+            JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter());
         }
 
         internal void Initialize(CircuitClientProxy clientProxy)
@@ -58,7 +59,7 @@ private void EndInvokeDotNetCore(string callId, bool success, object resultOrErr
         {
             _clientProxy.SendAsync(
                 "JS.EndInvokeDotNet",
-                JsonSerializer.Serialize(new[] { callId, success, resultOrError }, JsonSerializerOptionsProvider.Options));
+                JsonSerializer.Serialize(new[] { callId, success, resultOrError }, JsonSerializerOptions));
         }
 
         protected override void BeginInvokeJS(long asyncHandle, string identifier, string argsJson)

src/Components/Server/src/Circuits/RemoteRenderer.cs

@@ -64,11 +64,11 @@ public Task AddComponentAsync(Type componentType, string domElementSelector)
             var component = InstantiateComponent(componentType);
             var componentId = AssignRootComponentId(component);
 
-            var attachComponentTask = _jsRuntime.InvokeAsync<object>(
+            var attachComponentTask = _jsRuntime.InvokeVoidAsync(
                 "Blazor._internal.attachRootComponentToElement",
                 domElementSelector,
                 componentId);
-            CaptureAsyncExceptions(attachComponentTask);
+            CaptureAsyncExceptions(attachComponentTask.AsTask());
 
             return RenderRootComponentAsync(componentId);
         }

src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

@@ -41,6 +41,7 @@
   <ItemGroup>
     <Compile Include="$(ComponentsSharedSourceRoot)src\CacheHeaderSettings.cs" Link="Shared\CacheHeaderSettings.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="Circuits" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\ElementReferenceJsonConverter.cs" />
 
     <Compile Include="..\..\Shared\src\BrowserNavigationManagerInterop.cs" />
     <Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />

src/Components/Server/test/Circuits/CircuitRegistryTest.cs

@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;

src/Components/Server/test/Circuits/RemoteRendererTest.cs

@@ -427,12 +427,8 @@ await renderer.RenderComponentAsync<AutoParameterTestComponent>(
         private TestRemoteRenderer GetRemoteRenderer(IServiceProvider serviceProvider, CircuitClientProxy circuitClient = null)
         {
             var jsRuntime = new Mock<IJSRuntime>();
-            jsRuntime.Setup(r => r.InvokeAsync<object>(
-                "Blazor._internal.attachRootComponentToElement",
-                It.IsAny<int>(),
-                It.IsAny<string>(),
-                It.IsAny<int>()))
-                .ReturnsAsync(Task.FromResult<object>(null));
+            jsRuntime.Setup(r => r.InvokeAsync<object>("Blazor._internal.attachRootComponentToElement", It.IsAny<object[]>()))
+                .ReturnsAsync(new ValueTask<object>((object)null));
 
             return new TestRemoteRenderer(
                 serviceProvider,