From 2c66f9ee64553afc01f4839c169cee297b6376ed Mon Sep 17 00:00:00 2001 From: Adrian Wright Date: Thu, 16 Jul 2020 17:21:30 +0100 Subject: [PATCH 1/3] fix various minor spelling mistakes --- .../Components/src/Routing/OptionalTypeRouteConstraint.cs | 2 +- src/Components/Components/test/ParameterViewTest.Assignment.cs | 2 +- src/Components/Components/test/RendererTest.cs | 2 +- .../Components/test/Routing/RouteTableFactoryTests.cs | 2 +- src/Components/Components/test/Routing/RouterTest.cs | 2 +- src/Components/Server/test/Circuits/RemoteRendererTest.cs | 2 +- src/Shared/Components/ServerComponentSerializationSettings.cs | 2 +- .../test/Internal/Protocol/MessagePackHubProtocolTestBase.cs | 2 +- src/submodules/MessagePack-CSharp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Components/Components/src/Routing/OptionalTypeRouteConstraint.cs b/src/Components/Components/src/Routing/OptionalTypeRouteConstraint.cs index 426b26b8f286..dcd0238ea4ff 100644 --- a/src/Components/Components/src/Routing/OptionalTypeRouteConstraint.cs +++ b/src/Components/Components/src/Routing/OptionalTypeRouteConstraint.cs @@ -22,7 +22,7 @@ public OptionalTypeRouteConstraint(TryParseDelegate parser) public override bool Match(string pathSegment, out object? convertedValue) { // Unset values are set to null in the Parameters object created in - // the RouteContext. To match this pattern, unset optional parmeters + // the RouteContext. To match this pattern, unset optional parameters // are converted to null. if (string.IsNullOrEmpty(pathSegment)) { diff --git a/src/Components/Components/test/ParameterViewTest.Assignment.cs b/src/Components/Components/test/ParameterViewTest.Assignment.cs index 7dd8537f4c51..f7d170129d4e 100644 --- a/src/Components/Components/test/ParameterViewTest.Assignment.cs +++ b/src/Components/Components/test/ParameterViewTest.Assignment.cs @@ -71,7 +71,7 @@ public void IncomingParameterMatchesInheritedDeclaredParameter_SetsValue() } [Fact] - public void IncomingParameterMatchesOverridenParameter_ThatDoesNotHasAttribute() + public void IncomingParameterMatchesOverriddenParameter_ThatDoesNotHasAttribute() { // Test for https://github.com/dotnet/aspnetcore/issues/13162 // Arrange diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs index fa47f7284286..d1f8bb56232f 100644 --- a/src/Components/Components/test/RendererTest.cs +++ b/src/Components/Components/test/RendererTest.cs @@ -2124,7 +2124,7 @@ public void RenderBatch_HandlesSynchronousExceptionsInAsyncDisposableComponents( } [Fact] - public void RenderBatch_CanDisposeSynchrounousAsyncDisposableImplementations() + public void RenderBatch_CanDisposeSynchronousAsyncDisposableImplementations() { // Arrange var renderer = new TestRenderer { ShouldHandleExceptions = true }; diff --git a/src/Components/Components/test/Routing/RouteTableFactoryTests.cs b/src/Components/Components/test/Routing/RouteTableFactoryTests.cs index ec5370d578e6..f8893aa0a460 100644 --- a/src/Components/Components/test/Routing/RouteTableFactoryTests.cs +++ b/src/Components/Components/test/Routing/RouteTableFactoryTests.cs @@ -476,7 +476,7 @@ public void PrefersOptionalParamsOverNonOptionalParamsReverseOrder() [Fact] - public void PrefersLiteralTemplateOverParmeterizedTemplates() + public void PrefersLiteralTemplateOverParameterizedTemplates() { // Arrange var routeTable = new TestRouteTableBuilder() diff --git a/src/Components/Components/test/Routing/RouterTest.cs b/src/Components/Components/test/Routing/RouterTest.cs index d9476f349839..7e8a78b38247 100644 --- a/src/Components/Components/test/Routing/RouterTest.cs +++ b/src/Components/Components/test/Routing/RouterTest.cs @@ -81,7 +81,7 @@ async Task OnNavigateAsync(NavigationContext args) var janTaskException = await Record.ExceptionAsync(() => janTask); var febTaskException = await Record.ExceptionAsync(() => febTask); - // Assert neither exceution threw an exception + // Assert neither execution threw an exception Assert.Null(janTaskException); Assert.Null(febTaskException); // Assert refresh should've only been called once for the second route diff --git a/src/Components/Server/test/Circuits/RemoteRendererTest.cs b/src/Components/Server/test/Circuits/RemoteRendererTest.cs index 19f2ff00344a..063685d80f17 100644 --- a/src/Components/Server/test/Circuits/RemoteRendererTest.cs +++ b/src/Components/Server/test/Circuits/RemoteRendererTest.cs @@ -296,7 +296,7 @@ await renderer.RenderComponentAsync( exceptions.Add(e); }; - // Receive the ack for the intial batch + // Receive the ack for the initial batch _ = renderer.OnRenderCompletedAsync(2, null); // Receive the ack for the second batch _ = renderer.OnRenderCompletedAsync(2, null); diff --git a/src/Shared/Components/ServerComponentSerializationSettings.cs b/src/Shared/Components/ServerComponentSerializationSettings.cs index 7aabb013b523..db061bf52a46 100644 --- a/src/Shared/Components/ServerComponentSerializationSettings.cs +++ b/src/Shared/Components/ServerComponentSerializationSettings.cs @@ -19,7 +19,7 @@ internal static class ServerComponentSerializationSettings }; // This setting is not configurable, but realistically we don't expect an app to take more than 30 seconds from when - // it got rendrered to when the circuit got started, and having an expiration on the serialized server-components helps + // it got rendered to when the circuit got started, and having an expiration on the serialized server-components helps // prevent old payloads from being replayed. public static readonly TimeSpan DataExpiration = TimeSpan.FromMinutes(5); } diff --git a/src/SignalR/common/SignalR.Common/test/Internal/Protocol/MessagePackHubProtocolTestBase.cs b/src/SignalR/common/SignalR.Common/test/Internal/Protocol/MessagePackHubProtocolTestBase.cs index 0192641dadc0..8a3a9562b765 100644 --- a/src/SignalR/common/SignalR.Common/test/Internal/Protocol/MessagePackHubProtocolTestBase.cs +++ b/src/SignalR/common/SignalR.Common/test/Internal/Protocol/MessagePackHubProtocolTestBase.cs @@ -85,7 +85,7 @@ public static IEnumerable BaseTestDataNames message: new InvocationMessage(null, "Target", new object[] { 42 }, new string[] { "__test_id__" }), binary: "lgGAwKZUYXJnZXSRKpGrX190ZXN0X2lkX18="), new ProtocolTestData( - name: "InvocationWithMulitpleStreams", + name: "InvocationWithMultipleStreams", message: new InvocationMessage(null, "Target", Array.Empty(), new string[] { "__test_id__", "__test_id2__" }), binary: "lgGAwKZUYXJnZXSQkqtfX3Rlc3RfaWRfX6xfX3Rlc3RfaWQyX18="), diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index a4a14ce447e4..df2a06542354 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit a4a14ce447e4ef694af1a485fb672db35e766111 +Subproject commit df2a065423545aa57ce7fafa1eefdd37c22ef1a5 From 615e70bf844234e77ab597942c1f7763a3e54258 Mon Sep 17 00:00:00 2001 From: Adrian Wright <47532258+adrianwright109@users.noreply.github.com> Date: Thu, 16 Jul 2020 20:30:10 +0100 Subject: [PATCH 2/3] Update src/Components/Components/test/ParameterViewTest.Assignment.cs Co-authored-by: Steve Sanderson --- src/Components/Components/test/ParameterViewTest.Assignment.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Components/test/ParameterViewTest.Assignment.cs b/src/Components/Components/test/ParameterViewTest.Assignment.cs index f7d170129d4e..8e2fb5d60024 100644 --- a/src/Components/Components/test/ParameterViewTest.Assignment.cs +++ b/src/Components/Components/test/ParameterViewTest.Assignment.cs @@ -71,7 +71,7 @@ public void IncomingParameterMatchesInheritedDeclaredParameter_SetsValue() } [Fact] - public void IncomingParameterMatchesOverriddenParameter_ThatDoesNotHasAttribute() + public void IncomingParameterMatchesOverriddenParameter_ThatDoesNotHaveAttribute() { // Test for https://github.com/dotnet/aspnetcore/issues/13162 // Arrange From 5b10c2d1fa50dee0b3ba127273aa5cc184d40b68 Mon Sep 17 00:00:00 2001 From: Adrian Wright Date: Thu, 16 Jul 2020 22:23:55 +0100 Subject: [PATCH 3/3] undo changes to submodule --- src/submodules/MessagePack-CSharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index df2a06542354..a4a14ce447e4 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit df2a065423545aa57ce7fafa1eefdd37c22ef1a5 +Subproject commit a4a14ce447e4ef694af1a485fb672db35e766111