diff --git a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs index bc63a4b0df..1fafb9e81d 100644 --- a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs @@ -271,6 +271,7 @@ namespace Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web @code { public int ParentValue { get; set; } = 42; @@ -292,6 +293,7 @@ namespace Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web @code { public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); @@ -314,6 +316,7 @@ namespace Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web @code { public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); @@ -338,6 +341,7 @@ namespace Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web @code { public int ParentValue { get; set; } = 42; @@ -360,6 +364,7 @@ namespace Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web @code { public bool Enabled { get; set; } diff --git a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs index 6513224c05..d15cf4f584 100644 --- a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs @@ -6,6 +6,7 @@ using System.Linq; 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 @@ namespace Test AdditionalSyntaxTrees.Add(Parse(@" using System; using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Web; namespace Test { public class MyComponent : ComponentBase { [Parameter] - public Action OnClick { get; set; } + public Action OnClick { get; set; } } } ")); var component = CompileToComponent($@" +@using Microsoft.AspNetCore.Components.Web @code {{ private int counter; - private void Increment(UIMouseEventArgs e) {{ + private void Increment(MouseEventArgs e) {{ counter++; }} }}"); @@ -235,7 +238,7 @@ namespace Test AssertFrame.Attribute(frame, "OnClick", 1); // The handler will have been assigned to a lambda - var handler = Assert.IsType>(frame.AttributeValue); + var handler = Assert.IsType>(frame.AttributeValue); Assert.Equal("Test.TestComponent", handler.Target.GetType().FullName); }); } @@ -445,11 +448,12 @@ namespace Test // Act var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web

@code { public string ParentBgColor { get; set; } = ""#FFFFFF""; - public void OnComponentHover(UIMouseEventArgs e) + public void OnComponentHover(MouseEventArgs e) { } } diff --git a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs index 990ec1db18..3f380cbc79 100644 --- a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; 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 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test public async Task SupportsTwoWayBindingForTextboxes() { // Arrange/Act - var component = CompileToComponent( - @" - @code { - public string MyValue { get; set; } = ""Initial value""; - }"); + var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web + +@code { + public string MyValue { get; set; } = ""Initial value""; +}"); var myValueProperty = component.GetType().GetProperty("MyValue"); var renderer = new TestRenderer(); @@ -343,11 +345,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test public async Task SupportsTwoWayBindingForTextareas() { // Arrange/Act - var component = CompileToComponent( - @" - @code { - public string MyValue { get; set; } = ""Initial value""; - }"); + var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web + +@code { + public string MyValue { get; set; } = ""Initial value""; +}"); var myValueProperty = component.GetType().GetProperty("MyValue"); var renderer = new TestRenderer(); @@ -378,11 +381,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test public async Task SupportsTwoWayBindingForDateValues() { // Arrange/Act - var component = CompileToComponent( - @" - @code { - public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3); - }"); + var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web + +@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 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange/Act var testDateFormat = "ddd yyyy-MM-dd"; - var component = CompileToComponent( - $@" - @code {{ - public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4); - }}"); + var component = CompileToComponent($@" +@using Microsoft.AspNetCore.Components.Web + +@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 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web