Merge pull request #13007 from dotnet-maestro-bot/merge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'

Author: jkotalik

NuGet.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Keep this file in sync with src/ProjectTemplates/test/Infrastructure/NuGet.config.in. -->
 <configuration>
   <packageSources>
     <clear />

eng/PatchConfig.props

@@ -65,6 +65,7 @@ Later on, this will be checked using this condition:
   </PropertyGroup>
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
     <PackagesInPatch>
+      Microsoft.AspNetCore.Hosting;
     </PackagesInPatch>
   </PropertyGroup>
 </Project>

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

@@ -65,16 +65,10 @@ public WebAssemblyHttpMessageHandler() { }
 }
 namespace Microsoft.AspNetCore.Blazor.Rendering
 {
-    public partial class WebAssemblyRenderer : Microsoft.AspNetCore.Components.Rendering.Renderer
+    public static partial class WebAssemblyEventDispatcher
     {
-        public WebAssemblyRenderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(System.IServiceProvider), default(Microsoft.Extensions.Logging.ILoggerFactory)) { }
-        public override Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get { throw null; } }
-        public System.Threading.Tasks.Task AddComponentAsync(System.Type componentType, string domElementSelector) { throw null; }
-        public System.Threading.Tasks.Task AddComponentAsync<TComponent>(string domElementSelector) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
-        public override System.Threading.Tasks.Task DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.Rendering.EventFieldInfo eventFieldInfo, System.EventArgs eventArgs) { throw null; }
-        protected override void Dispose(bool disposing) { }
-        protected override void HandleException(System.Exception exception) { }
-        protected override System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch batch) { throw null; }
+        [Microsoft.JSInterop.JSInvokableAttribute("DispatchEvent")]
+        public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.Web.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; }
     }
 }
 namespace Microsoft.AspNetCore.Components.Builder

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>
@@ -11,4 +11,10 @@
     <Reference Include="Microsoft.AspNetCore.Components.Web" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\..\Shared\src\BrowserNavigationManagerInterop.cs" />
+    <Compile Include="..\..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
+    <Compile Include="..\..\..\Shared\src\WebEventData.cs" />
+  </ItemGroup>
+
 </Project>

src/Components/Blazor/Blazor/src/Rendering/RendererRegistry.cs

@@ -0,0 +1,46 @@
+// 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 System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Blazor.Rendering
+{
+    internal static class RendererRegistry
+    {
+        // In case there are multiple concurrent Blazor renderers in the same .NET WebAssembly
+        // process, we track them by ID. This allows events to be dispatched to the correct one,
+        // as well as rooting them for GC purposes, since nothing would otherwise be referencing
+        // them even though we might still receive incoming events from JS.
+
+        private static int _nextId;
+        private static Dictionary<int, WebAssemblyRenderer> _renderers = new Dictionary<int, WebAssemblyRenderer>();
+
+        internal static WebAssemblyRenderer Find(int rendererId)
+        {
+            return _renderers.ContainsKey(rendererId)
+                ? _renderers[rendererId]
+                : throw new ArgumentException($"There is no renderer with ID {rendererId}.");
+        }
+
+        public static int Add(WebAssemblyRenderer renderer)
+        {
+            var id = _nextId++;
+            _renderers.Add(id, renderer);
+            return id;
+        }
+
+        public static bool TryRemove(int rendererId)
+        {
+            if (_renderers.ContainsKey(rendererId))
+            {
+                _renderers.Remove(rendererId);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}

src/Components/Blazor/Blazor/src/Rendering/WebAssemblyEventDispatcher.cs

@@ -0,0 +1,30 @@
+// 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 System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.JSInterop;
+
+namespace Microsoft.AspNetCore.Blazor.Rendering
+{
+    /// <summary>
+    /// Dispatches events from JavaScript to a Blazor WebAssembly renderer.
+    /// Intended for internal use only.
+    /// </summary>
+    public static class WebAssemblyEventDispatcher
+    {
+        /// <summary>
+        /// For framework use only.
+        /// </summary>
+        [JSInvokable(nameof(DispatchEvent))]
+        public static Task DispatchEvent(WebEventDescriptor eventDescriptor, string eventArgsJson)
+        {
+            var webEvent = WebEventData.Parse(eventDescriptor, eventArgsJson);
+            var renderer = RendererRegistry.Find(eventDescriptor.BrowserRendererId);
+            return renderer.DispatchEventAsync(
+                webEvent.EventHandlerId,
+                webEvent.EventFieldInfo,
+                webEvent.EventArgs);
+        }
+    }
+}

src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Blazor.Services;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.Logging;
 
@@ -16,7 +15,7 @@ namespace Microsoft.AspNetCore.Blazor.Rendering
     /// Provides mechanisms for rendering <see cref="IComponent"/> instances in a
     /// web browser, dispatching events to them, and refreshing the UI as required.
     /// </summary>
-    public class WebAssemblyRenderer : Renderer
+    internal class WebAssemblyRenderer : Renderer
     {
         private readonly int _webAssemblyRendererId;
 
@@ -31,10 +30,8 @@ public class WebAssemblyRenderer : Renderer
         public WebAssemblyRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory)
             : base(serviceProvider, loggerFactory)
         {
-            // The browser renderer registers and unregisters itself with the static
-            // registry. This works well with the WebAssembly runtime, and is simple for the
-            // case where Blazor is running in process.
-            _webAssemblyRendererId = RendererRegistry.Current.Add(this);
+            // The WebAssembly renderer registers and unregisters itself with the static registry
+            _webAssemblyRendererId = RendererRegistry.Add(this);
         }
 
         public override Dispatcher Dispatcher => NullDispatcher.Instance;
@@ -77,9 +74,9 @@ public Task AddComponentAsync(Type componentType, string domElementSelector)
 
             WebAssemblyJSRuntime.Instance.Invoke<object>(
                 "Blazor._internal.attachRootComponentToElement",
-                _webAssemblyRendererId,
                 domElementSelector,
-                componentId);
+                componentId,
+                _webAssemblyRendererId);
 
             return RenderRootComponentAsync(componentId);
         }
@@ -88,7 +85,7 @@ public Task AddComponentAsync(Type componentType, string domElementSelector)
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
-            RendererRegistry.Current.TryRemove(_webAssemblyRendererId);
+            RendererRegistry.TryRemove(_webAssemblyRendererId);
         }
 
         /// <inheritdoc />

src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/SurveyPrompt.razor

@@ -4,7 +4,7 @@
 
     <span class="text-nowrap">
         Please take our
-        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2098127">brief survey</a>
+        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2100553">brief survey</a>
     </span>
     and tell us what you think.
 </div>

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

@@ -114,7 +114,7 @@ public sealed partial class CascadingParameterAttribute : System.Attribute
         public CascadingParameterAttribute() { }
         public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
-    public partial class CascadingValue<T> : Microsoft.AspNetCore.Components.IComponent
+    public partial class CascadingValue<TValue> : Microsoft.AspNetCore.Components.IComponent
     {
         public CascadingValue() { }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
@@ -124,7 +124,7 @@ public CascadingValue() { }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
         public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
-        public T Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public TValue Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { }
         public System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) { throw null; }
     }
@@ -188,17 +188,17 @@ public EventCallbackFactory() { }
         public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Func<object, System.Threading.Tasks.Task> callback) { throw null; }
         public Microsoft.AspNetCore.Components.EventCallback Create(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> CreateInferred<T>(object receiver, System.Action<T> callback, T value) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> CreateInferred<TValue>(object receiver, System.Action<TValue> callback, TValue value) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> CreateInferred<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback, T value) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> CreateInferred<TValue>(object receiver, System.Func<TValue, System.Threading.Tasks.Task> callback, TValue value) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, Microsoft.AspNetCore.Components.EventCallback callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, Microsoft.AspNetCore.Components.EventCallback callback) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, Microsoft.AspNetCore.Components.EventCallback<T> callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Action callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Action<T> callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
-        public Microsoft.AspNetCore.Components.EventCallback<T> Create<T>(object receiver, System.Func<T, System.Threading.Tasks.Task> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, Microsoft.AspNetCore.Components.EventCallback<TValue> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Action callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Action<TValue> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Func<System.Threading.Tasks.Task> callback) { throw null; }
+        public Microsoft.AspNetCore.Components.EventCallback<TValue> Create<TValue>(object receiver, System.Func<TValue, System.Threading.Tasks.Task> callback) { throw null; }
     }
     public static partial class EventCallbackFactoryBinderExtensions
     {
@@ -241,13 +241,13 @@ public readonly partial struct EventCallbackWorkItem
         public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct EventCallback<T>
+    public readonly partial struct EventCallback<TValue>
     {
         private readonly object _dummy;
-        public static readonly Microsoft.AspNetCore.Components.EventCallback<T> Empty;
+        public static readonly Microsoft.AspNetCore.Components.EventCallback<TValue> Empty;
         public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; }
         public bool HasDelegate { get { throw null; } }
-        public System.Threading.Tasks.Task InvokeAsync(T arg) { throw null; }
+        public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; }
     }
     public partial interface IComponent
     {
@@ -365,11 +365,11 @@ public readonly partial struct ParameterView
         public static Microsoft.AspNetCore.Components.ParameterView Empty { get { throw null; } }
         public static Microsoft.AspNetCore.Components.ParameterView FromDictionary(System.Collections.Generic.IDictionary<string, object> parameters) { throw null; }
         public Microsoft.AspNetCore.Components.ParameterView.Enumerator GetEnumerator() { throw null; }
-        public T GetValueOrDefault<T>(string parameterName) { throw null; }
-        public T GetValueOrDefault<T>(string parameterName, T defaultValue) { throw null; }
+        public TValue GetValueOrDefault<TValue>(string parameterName) { throw null; }
+        public TValue GetValueOrDefault<TValue>(string parameterName, TValue defaultValue) { throw null; }
         public void SetParameterProperties(object target) { }
         public System.Collections.Generic.IReadOnlyDictionary<string, object> ToDictionary() { throw null; }
-        public bool TryGetValue<T>(string parameterName, out T result) { throw null; }
+        public bool TryGetValue<TValue>(string parameterName, out TValue result) { throw null; }
         [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
         public partial struct Enumerator
         {
@@ -380,7 +380,7 @@ public partial struct Enumerator
         }
     }
     public delegate void RenderFragment(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder);
-    public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment<T>(T value);
+    public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment<TValue>(TValue value);
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct RenderHandle
     {
@@ -466,7 +466,7 @@ public FieldChangedEventArgs(in Microsoft.AspNetCore.Components.Forms.FieldIdent
         public FieldIdentifier(object model, string fieldName) { throw null; }
         public string FieldName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public static Microsoft.AspNetCore.Components.Forms.FieldIdentifier Create<T>(System.Linq.Expressions.Expression<System.Func<T>> accessor) { throw null; }
+        public static Microsoft.AspNetCore.Components.Forms.FieldIdentifier Create<TField>(System.Linq.Expressions.Expression<System.Func<TField>> accessor) { throw null; }
         public bool Equals(Microsoft.AspNetCore.Components.Forms.FieldIdentifier otherIdentifier) { throw null; }
         public override bool Equals(object obj) { throw null; }
         public override int GetHashCode() { throw null; }
@@ -556,13 +556,13 @@ public void AddAttribute(int sequence, string name, bool value) { }
         public void AddAttribute(int sequence, string name, System.MulticastDelegate value) { }
         public void AddAttribute(int sequence, string name, object value) { }
         public void AddAttribute(int sequence, string name, string value) { }
-        public void AddAttribute<T>(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback<T> value) { }
+        public void AddAttribute<TArgument>(int sequence, string name, Microsoft.AspNetCore.Components.EventCallback<TArgument> value) { }
         public void AddComponentReferenceCapture(int sequence, System.Action<object> componentReferenceCaptureAction) { }
         public void AddContent(int sequence, Microsoft.AspNetCore.Components.MarkupString markupContent) { }
         public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragment fragment) { }
         public void AddContent(int sequence, object textContent) { }
         public void AddContent(int sequence, string textContent) { }
-        public void AddContent<T>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<T> fragment, T value) { }
+        public void AddContent<TValue>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<TValue> fragment, TValue value) { }
         public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
         public void AddMarkupContent(int sequence, string markupContent) { }
         public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes) { }

src/Components/Components/src/Auth/CascadingAuthenticationState.razor

@@ -2,7 +2,7 @@
 @implements IDisposable
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
-<CascadingValue T="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@ChildContent" />
+<CascadingValue TValue="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@ChildContent" />
 
 @code {
     private Task<AuthenticationState> _currentAuthenticationStateTask;