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

eng/ProjectReferences.props

@@ -8,11 +8,11 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" ProjectPath="$(RepoRoot)src\Identity\ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepoRoot)src\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.Web.Xdt.Extensions" ProjectPath="$(RepoRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\src\Microsoft.Web.Xdt.Extensions.csproj"  />
+    <ProjectReferenceProvider Include="dotnet-getdocument" ProjectPath="$(RepoRoot)src\Tools\dotnet-getdocument\src\dotnet-getdocument.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Client" ProjectPath="$(RepoRoot)src\Tools\Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Server" ProjectPath="$(RepoRoot)src\Tools\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepoRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj"  />
-    <ProjectReferenceProvider Include="dotnet-getdocument" ProjectPath="$(RepoRoot)src\Mvc\dotnet-getdocument\src\dotnet-getdocument.csproj"  />
-    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Client" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj"  />
-    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Server" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj"  />
-    <ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Mvc\GetDocumentInsider\src\GetDocumentInsider.csproj"  />
+    <ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Tools\GetDocumentInsider\src\GetDocumentInsider.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />

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/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs

@@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Blazor.Rendering
     public static partial class WebAssemblyEventDispatcher
     {
         [Microsoft.JSInterop.JSInvokableAttribute("DispatchEvent")]
-        public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.Web.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; }
+        public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.RenderTree.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; }
     }
 }
 namespace Microsoft.AspNetCore.Components.Builder

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/Rendering/WebAssemblyEventDispatcher.cs

@@ -2,6 +2,7 @@
 // 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.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
 

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

@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Blazor.Services;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Blazor.Rendering

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/BindRazorIntegrationTest.cs

@@ -271,6 +271,7 @@ public void Render_BuiltIn_BindToInputWithoutType_WritesAttributes()
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @bind=""@ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
@@ -292,6 +293,7 @@ public void Render_BuiltIn_BindToInputText_WithFormat_WritesAttributes()
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""text"" @bind=""@CurrentDate"" @bind:format=""MM/dd/yyyy""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -314,6 +316,7 @@ public void Render_BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttribut
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""text"" @bind=""@CurrentDate"" @bind:format=""@Format""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -338,6 +341,7 @@ public void Render_BuiltIn_BindToInputText_WritesAttributes()
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""text"" @bind=""@ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
@@ -360,6 +364,7 @@ public void Render_BuiltIn_BindToInputCheckbox_WritesAttributes()
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""checkbox"" @bind=""@Enabled"" />
 @code {
     public bool Enabled { get; set; }

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

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
+using Microsoft.AspNetCore.Components.Web;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -202,23 +203,25 @@ public void Render_ChildComponent_WithEventHandler(string expression)
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public Action<UIMouseEventArgs> OnClick { get; set; }
+        public Action<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
 
             var component = CompileToComponent($@"
+@using Microsoft.AspNetCore.Components.Web
 <MyComponent OnClick=""{expression}""/>
 
 @code {{
     private int counter;
-    private void Increment(UIMouseEventArgs e) {{
+    private void Increment(MouseEventArgs e) {{
         counter++;
     }}
 }}");
@@ -235,7 +238,7 @@ private void Increment(UIMouseEventArgs e) {{
                     AssertFrame.Attribute(frame, "OnClick", 1);
 
                     // The handler will have been assigned to a lambda
-                    var handler = Assert.IsType<Action<UIMouseEventArgs>>(frame.AttributeValue);
+                    var handler = Assert.IsType<Action<MouseEventArgs>>(frame.AttributeValue);
                     Assert.Equal("Test.TestComponent", handler.Target.GetType().FullName);
                 });
         }
@@ -445,11 +448,12 @@ public void Regression_784()
 
             // Act
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <p @onmouseover=""OnComponentHover"" style=""background: @ParentBgColor;"" />
 @code {
     public string ParentBgColor { get; set; } = ""#FFFFFF"";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 }

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

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
+using Microsoft.AspNetCore.Components.Web;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -308,11 +309,12 @@ public void SupportsUsingStatements()
         public async Task SupportsTwoWayBindingForTextboxes()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<input @bind=""MyValue"" />
-                @code {
-                    public string MyValue { get; set; } = ""Initial value"";
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyValue"" />
+@code {
+    public string MyValue { get; set; } = ""Initial value"";
+}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();
@@ -343,11 +345,12 @@ public async Task SupportsTwoWayBindingForTextboxes()
         public async Task SupportsTwoWayBindingForTextareas()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<textarea @bind=""MyValue"" ></textarea>
-                @code {
-                    public string MyValue { get; set; } = ""Initial value"";
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<textarea @bind=""MyValue"" ></textarea>
+@code {
+    public string MyValue { get; set; } = ""Initial value"";
+}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();
@@ -378,11 +381,12 @@ public async Task SupportsTwoWayBindingForTextareas()
         public async Task SupportsTwoWayBindingForDateValues()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<input @bind=""MyDate"" />
-                @code {
-                    public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3);
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyDate"" />
+@code {
+    public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3);
+}");
             var myDateProperty = component.GetType().GetProperty("MyDate");
 
             var renderer = new TestRenderer();
@@ -416,11 +420,12 @@ public async Task SupportsTwoWayBindingForDateValuesWithFormatString()
         {
             // Arrange/Act
             var testDateFormat = "ddd yyyy-MM-dd";
-            var component = CompileToComponent(
-                $@"<input @bind=""@MyDate"" @bind:format=""{testDateFormat}"" />
-                @code {{
-                    public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4);
-                }}");
+            var component = CompileToComponent($@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""@MyDate"" @bind:format=""{testDateFormat}"" />
+@code {{
+    public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4);
+}}");
             var myDateProperty = component.GetType().GetProperty("MyDate");
 
             var renderer = new TestRenderer();
@@ -467,6 +472,7 @@ public void SupportsEventHandlerWithLambda()
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <button @onclick=""x => Clicked = true"" />
 @code {
     public bool Clicked { get; set; }
@@ -486,10 +492,10 @@ public void SupportsEventHandlerWithLambda()
                 {
                     AssertFrame.Attribute(frame, "onclick", 1);
 
-                    var func = Assert.IsType<Action<UIMouseEventArgs>>(frame.AttributeValue);
+                    var func = Assert.IsType<Action<MouseEventArgs>>(frame.AttributeValue);
                     Assert.False((bool)clicked.GetValue(component));
 
-                    func(new UIMouseEventArgs());
+                    func(new MouseEventArgs());
                     Assert.True((bool)clicked.GetValue(component));
                 });
         }
@@ -499,9 +505,10 @@ public void SupportsEventHandlerWithMethodGroup()
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <button @onclick=""OnClick"" />
 @code {
-    public void OnClick(UIMouseEventArgs e) { Clicked = true; }
+    public void OnClick(MouseEventArgs e) { Clicked = true; }
     public bool Clicked { get; set; }
 }");
 
@@ -513,33 +520,34 @@ public void SupportsEventHandlerWithMethodGroup()
             var frames = GetRenderTree(renderer, component);
 
             // Assert
-            Action<UIMouseEventArgs> func = default; // Since this is a method group, we don't need to create an EventCallback
+            Action<MouseEventArgs> func = default; // Since this is a method group, we don't need to create an EventCallback
             Assert.Collection(
                 frames,
                 frame => AssertFrame.Element(frame, "button", 2, 0),
                 frame =>
                 {
                     AssertFrame.Attribute(frame, "onclick", 1);
 
-                    func = Assert.IsType<Action<UIMouseEventArgs>>(frame.AttributeValue);
+                    func = Assert.IsType<Action<MouseEventArgs>>(frame.AttributeValue);
                     Assert.False((bool)clicked.GetValue(component));
 
 
                 });
 
-            func.Invoke(new UIMouseEventArgs());
+            func.Invoke(new MouseEventArgs());
             Assert.True((bool)clicked.GetValue(component));
         }
 
         [Fact]
         public async Task SupportsTwoWayBindingForBoolValues()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<input @bind=""MyValue"" />
-                @code {
-                    public bool MyValue { get; set; } = true;
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyValue"" />
+@code {
+    public bool MyValue { get; set; } = true;
+}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();
@@ -571,11 +579,12 @@ public async Task SupportsTwoWayBindingForEnumValues()
         {
             // Arrange/Act
             var myEnumType = FullTypeName<MyEnum>();
-            var component = CompileToComponent(
-                $@"<input @bind=""MyValue"" />
-                @code {{
-                    public {myEnumType} MyValue {{ get; set; }} = {myEnumType}.{nameof(MyEnum.FirstValue)};
-                }}");
+            var component = CompileToComponent($@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyValue"" />
+@code {{
+    public {myEnumType} MyValue {{ get; set; }} = {myEnumType}.{nameof(MyEnum.FirstValue)};
+}}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();