(() => EventCallback.Factory.CreateBinder(component, setter, value));
+
+ Assert.Equal(
+ $"The type '{typeof(ClassWithoutTypeConverter).FullName}' does not have an associated TypeConverter that supports conversion from a string. " +
+ $"Apply 'TypeConverterAttribute' to the type to register a converter.",
+ ex.Message);
+ }
+
private class EventCountingComponent : IComponent, IHandleEvent
{
public int Count;
@@ -403,5 +518,42 @@ namespace Microsoft.AspNetCore.Components
throw new System.NotImplementedException();
}
}
+
+ private class ClassWithoutTypeConverter
+ {
+ }
+
+ [TypeConverter(typeof(SecretMessageTypeConverter))]
+ private class SecretMessage
+ {
+ public string Message { get; set; }
+
+ public override string ToString()
+ {
+ return Message;
+ }
+ }
+
+ private class SecretMessageTypeConverter : TypeConverter
+ {
+ public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+ {
+ if (sourceType == typeof(string))
+ {
+ return true;
+ }
+
+ return false;
+ }
+ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+ {
+ if (value is string message)
+ {
+ return new SecretMessage() { Message = message, };
+ }
+
+ return null;
+ }
+ }
}
}
diff --git a/src/Components/test/E2ETest/Tests/BindTest.cs b/src/Components/test/E2ETest/Tests/BindTest.cs
index 51fcc9ea9d..4931dd786e 100644
--- a/src/Components/test/E2ETest/Tests/BindTest.cs
+++ b/src/Components/test/E2ETest/Tests/BindTest.cs
@@ -1,6 +1,7 @@
// 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 BasicTestApp;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
@@ -538,5 +539,48 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
Browser.Equal("0.011", () => boundValue.Text);
Assert.Equal("0.011", mirrorValue.GetAttribute("value"));
}
+
+ [Fact]
+ public void CanBindTextboxGenericInt()
+ {
+ var target = Browser.FindElement(By.Id("textbox-generic-int"));
+ var boundValue = Browser.FindElement(By.Id("textbox-generic-int-value"));
+ var mirrorValue = Browser.FindElement(By.Id("textbox-generic-int-mirror"));
+ Assert.Equal("-42", target.GetAttribute("value"));
+ Assert.Equal("-42", boundValue.Text);
+ Assert.Equal("-42", mirrorValue.GetAttribute("value"));
+
+ // Modify target; value is not updated because it's not convertable.
+ target.Clear();
+ Browser.Equal("-42", () => boundValue.Text);
+ Assert.Equal("-42", mirrorValue.GetAttribute("value"));
+
+ // Modify target; verify value is updated and that textboxes linked to the same data are updated
+ target.SendKeys("42\t");
+ Browser.Equal("42", () => boundValue.Text);
+ Assert.Equal("42", mirrorValue.GetAttribute("value"));
+ }
+
+ [Fact]
+ public void CanBindTextboxGenericGuid()
+ {
+ var target = Browser.FindElement(By.Id("textbox-generic-guid"));
+ var boundValue = Browser.FindElement(By.Id("textbox-generic-guid-value"));
+ var mirrorValue = Browser.FindElement(By.Id("textbox-generic-guid-mirror"));
+ Assert.Equal("00000000-0000-0000-0000-000000000000", target.GetAttribute("value"));
+ Assert.Equal("00000000-0000-0000-0000-000000000000", boundValue.Text);
+ Assert.Equal("00000000-0000-0000-0000-000000000000", mirrorValue.GetAttribute("value"));
+
+ // Modify target; value is not updated because it's not convertable.
+ target.Clear();
+ Browser.Equal("00000000-0000-0000-0000-000000000000", () => boundValue.Text);
+ Assert.Equal("00000000-0000-0000-0000-000000000000", mirrorValue.GetAttribute("value"));
+
+ // Modify target; verify value is updated and that textboxes linked to the same data are updated
+ var newValue = Guid.NewGuid().ToString();
+ target.SendKeys(newValue + "\t");
+ Browser.Equal(newValue, () => boundValue.Text);
+ Assert.Equal(newValue, mirrorValue.GetAttribute("value"));
+ }
}
}
diff --git a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
index 362db2936f..a8b393660b 100644
--- a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
@@ -90,6 +90,19 @@
+
+ Generic bind (int):
+
+ @textboxGenericIntValue
+
+
+
+ Generic bind (guid):
+
+ @textboxGenericGuidValue
+
+
+
Text Area
Initially blank:
@@ -138,36 +151,39 @@
@code {
- string textboxInitiallyBlankValue = null;
- string textboxInitiallyPopulatedValue = "Hello";
+string textboxInitiallyBlankValue = null;
+string textboxInitiallyPopulatedValue = "Hello";
- string textAreaInitiallyBlankValue = null;
- string textAreaInitiallyPopulatedValue = "Hello";
+string textAreaInitiallyBlankValue = null;
+string textAreaInitiallyPopulatedValue = "Hello";
- bool? checkboxInitiallyNullValue = null;
- bool checkboxInitiallyUncheckedValue = false;
- bool checkboxInitiallyCheckedValue = true;
+bool? checkboxInitiallyNullValue = null;
+bool checkboxInitiallyUncheckedValue = false;
+bool checkboxInitiallyCheckedValue = true;
- int textboxIntValue = -42;
- int? textboxNullableIntValue = null;
- long textboxLongValue = 3_000_000_000;
- long? textboxNullableLongValue = null;
- float textboxFloatValue = 3.141f;
- float? textboxNullableFloatValue = null;
- double textboxDoubleValue = 3.14159265359d;
- double? textboxNullableDoubleValue = null;
- decimal textboxDecimalValue = 0.0000000000000000000000000001M;
- decimal? textboxNullableDecimalValue = null;
- decimal textboxDecimalInvalidValue = 0.0000000000000000000000000001M;
- decimal? textboxNullableDecimalInvalidValue = null;
+int textboxIntValue = -42;
+int? textboxNullableIntValue = null;
+long textboxLongValue = 3_000_000_000;
+long? textboxNullableLongValue = null;
+float textboxFloatValue = 3.141f;
+float? textboxNullableFloatValue = null;
+double textboxDoubleValue = 3.14159265359d;
+double? textboxNullableDoubleValue = null;
+decimal textboxDecimalValue = 0.0000000000000000000000000001M;
+decimal? textboxNullableDecimalValue = null;
+decimal textboxDecimalInvalidValue = 0.0000000000000000000000000001M;
+decimal? textboxNullableDecimalInvalidValue = null;
- bool includeFourthOption = false;
- enum SelectableValue { First, Second, Third, Fourth }
- SelectableValue selectValue = SelectableValue.Second;
+int textboxGenericIntValue = -42;
+Guid textboxGenericGuidValue = Guid.Empty;
- void AddAndSelectNewSelectOption()
- {
- includeFourthOption = true;
- selectValue = SelectableValue.Fourth;
- }
+bool includeFourthOption = false;
+enum SelectableValue { First, Second, Third, Fourth }
+SelectableValue selectValue = SelectableValue.Second;
+
+void AddAndSelectNewSelectOption()
+{
+ includeFourthOption = true;
+ selectValue = SelectableValue.Fourth;
+}
}
diff --git a/src/Components/test/testassets/BasicTestApp/BindGenericComponent.razor b/src/Components/test/testassets/BasicTestApp/BindGenericComponent.razor
new file mode 100644
index 0000000000..54072b918e
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/BindGenericComponent.razor
@@ -0,0 +1,9 @@
+@typeparam TValue
+
+
+
+@code {
+ [Parameter] string Id { get; set; }
+ [Parameter] TValue Value { get; set; }
+ [Parameter] EventCallback ValueChanged { get; set; }
+}
diff --git a/src/Hosting/test/FunctionalTests/ShutdownTests.cs b/src/Hosting/test/FunctionalTests/ShutdownTests.cs
index 82e707487d..4c94b289a7 100644
--- a/src/Hosting/test/FunctionalTests/ShutdownTests.cs
+++ b/src/Hosting/test/FunctionalTests/ShutdownTests.cs
@@ -28,6 +28,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows)]
[OSSkipCondition(OperatingSystems.MacOSX)]
+ [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2577", FlakyOn.All)]
public async Task ShutdownTestRun()
{
await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run");
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
index 0a8f69b60f..ab30a8005b 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
@@ -5,6 +5,7 @@ using System;
using System.Globalization;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
@@ -343,6 +344,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
[Theory]
[MemberData(nameof(ConvertibleTypeData))]
+ [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2626", FlakyOn.AzP.Linux)]
public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_FrenchThirtyTwoThousandPointOne(Type destinationType)
{
// Arrange
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/JsonHelperTestBase.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/JsonHelperTestBase.cs
index 90d994af41..cfbabe735b 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/JsonHelperTestBase.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/JsonHelperTestBase.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
protected abstract IJsonHelper GetJsonHelper();
[Fact]
- public void Serialize_EscapesHtmlByDefault()
+ public virtual void Serialize_EscapesHtmlByDefault()
{
// Arrange
var helper = GetJsonHelper();
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs
index 4550976a40..e754844dec 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs
@@ -2,7 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Html;
using Microsoft.Extensions.Options;
+using Xunit;
namespace Microsoft.AspNetCore.Mvc.Rendering
{
@@ -13,5 +15,24 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
var options = new JsonOptions() { JsonSerializerOptions = { PropertyNamingPolicy = JsonNamingPolicy.CamelCase } };
return new SystemTextJsonHelper(Options.Create(options));
}
+
+ [Fact]
+ public override void Serialize_EscapesHtmlByDefault()
+ {
+ // Arrange
+ var helper = GetJsonHelper();
+ var obj = new
+ {
+ HTML = "John Doe"
+ };
+ var expectedOutput = "{\"html\":\"\\u003cb\\u003eJohn Doe\\u003c\\u002fb\\u003e\"}";
+
+ // Act
+ var result = helper.Serialize(obj);
+
+ // Assert
+ var htmlString = Assert.IsType(result);
+ Assert.Equal(expectedOutput, htmlString.ToString());
+ }
}
}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml
deleted file mode 100644
index 999a0ed5bf..0000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml
+++ /dev/null
@@ -1,25 +0,0 @@
-@using Microsoft.AspNetCore.Http.Features
-
-@{
- var consentFeature = Context.Features.Get();
- var showBanner = !consentFeature?.CanTrack ?? false;
- var cookieString = consentFeature?.CreateConsentCookie();
-}
-
-@if (showBanner)
-{
-
- Use this space to summarize your privacy and cookie use policy.
Learn More.
-
-