- Input: +
+ Input:
Output: @message @@ -33,24 +33,9 @@ bool buttonReceivedFocusOut; string message; - void OnFocus(FocusEventArgs e) + void OnFocusEvent(FocusEventArgs e) { - message += "onfocus,"; - } - - void OnBlur(FocusEventArgs e) - { - message += "onblur,"; - } - - void OnFocusIn(FocusEventArgs e) - { - message += "onfocusin,"; - } - - void OnFocusOut(FocusEventArgs e) - { - message += "onfocusout,"; + message += $"{e.Type},"; } void Clear() diff --git a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor index 43db51d66bdc..9bcea598706e 100644 --- a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor @@ -15,5 +15,10 @@ Type here: { Console.WriteLine(JsonSerializer.Serialize(eventArgs)); keysPressed.Add(eventArgs.Key); + + if (eventArgs.Type != "keypress") + { + throw new ArgumentException($"Expected 'keypress' event type, got {eventArgs.Type}"); + } } } diff --git a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor index d529d3094568..d23aee7f48d3 100644 --- a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor @@ -7,20 +7,20 @@ Output: @message
- Mouseover: + Mouseover:
- Mousemove city! + Mousemove city!
- Mousedown: + Mousedown:
- Pointerdown: + Pointerdown:
-
@@ -40,52 +40,22 @@
string message;
- void OnMouseOver(MouseEventArgs e)
+ void OnMouseEvent(MouseEventArgs e)
{
DumpEvent(e);
- message += "onmouseover,";
+ message += $"{e.Type},";
}
- void OnMouseOut(MouseEventArgs e)
+ void OnPointerEvent(PointerEventArgs e)
{
DumpEvent(e);
- message += "onmouseout,";
+ message += $"{e.Type},";
}
- void OnMouseMove(MouseEventArgs e)
+ void OnDragEvent(DragEventArgs e)
{
DumpEvent(e);
- message += "onmousemove,";
- }
-
- void OnMouseDown(MouseEventArgs e)
- {
- DumpEvent(e);
- message += "onmousedown,";
- }
-
- void OnMouseUp(MouseEventArgs e)
- {
- DumpEvent(e);
- message += "onmouseup,";
- }
-
- void OnPointerDown(PointerEventArgs e)
- {
- DumpEvent(e);
- message += "onpointerdown";
- }
-
- void OnDragStart(DragEventArgs e)
- {
- DumpEvent(e);
- message += "ondragstart,";
- }
-
- void OnDrop(DragEventArgs e)
- {
- DumpEvent(e);
- message += "ondrop,";
+ message += $"{e.Type},";
}
void OnPolymorphicEvent(EventArgs e)
diff --git a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
index 1d3489203c7d..12a6f0ed2e55 100644
--- a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
@@ -28,7 +28,7 @@
void OnTouch(TouchEventArgs e)
{
- message += e.Type;
+ message += $"{e.Type},";
Console.WriteLine(JsonSerializer.Serialize(e));
StateHasChanged();
}
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index fd244b466367..4d61b765af67 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -109,22 +109,17 @@ public void RefAssemblyReferencesHaveExpectedAssemblyVersions()
Assert.All(dlls, path =>
{
- // Skip netstandard2.0 System.IO.Pipelines assembly. References have old versions.
- var filename = Path.GetFileName(path);
- if (!string.Equals("System.IO.Pipelines.dll", filename, StringComparison.OrdinalIgnoreCase))
- {
- using var fileStream = File.OpenRead(path);
- using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
- var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
+ using var fileStream = File.OpenRead(path);
+ using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
+ var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
- Assert.All(reader.AssemblyReferences, handle =>
- {
- var reference = reader.GetAssemblyReference(handle);
- var result = 0 == reference.Version.Revision;
+ Assert.All(reader.AssemblyReferences, handle =>
+ {
+ var reference = reader.GetAssemblyReference(handle);
+ var result = (0 == reference.Version.Revision && 0 == reference.Version.Build);
- Assert.True(result, $"In {filename}, {reference.GetAssemblyName()} has unexpected version {reference.Version}.");
- });
- }
+ Assert.True(result, $"In {Path.GetFileName(path)}, {reference.GetAssemblyName()} has unexpected version {reference.Version}.");
+ });
});
}
diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
index 2aff8567ca1f..305d812df71e 100644
--- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
+++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
@@ -25,6 +25,7 @@
- Request ID: @Model?.RequestId
+ Request ID: @Model.RequestId