diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index d8730cc347..80bc739545 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.4 + 2.2.5 @@ -77,11 +77,12 @@ - 2.2.1 + 2.2.5 + - 2.2.4 + 2.2.5 @@ -221,27 +222,27 @@ - 2.2.2 + 2.2.5 - - + + - - + + - - + + - 2.2.2 + 2.2.5 - + @@ -326,11 +327,11 @@ - 2.2.0 + 2.2.5 - + @@ -581,14 +582,14 @@ - 2.2.0 + 2.2.5 - + @@ -657,7 +658,7 @@ - 2.2.2 + 2.2.5 @@ -755,7 +756,7 @@ - 2.2.0 + 2.2.5 @@ -1127,19 +1128,19 @@ - 1.1.0 + 1.1.5 + - - 1.1.0 + 1.1.5 + - @@ -1163,13 +1164,13 @@ - 1.1.0 + 1.1.5 + - - + diff --git a/eng/Baseline.xml b/eng/Baseline.xml index c9ebacb3b9..49a2c044e3 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,10 +1,10 @@ - - + @@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + @@ -30,8 +30,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + @@ -42,7 +42,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + @@ -66,7 +66,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + @@ -75,7 +75,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + @@ -83,7 +83,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + @@ -115,10 +115,10 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index efc05a36c7..8342295e7b 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -61,5 +61,4 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.Mvc.Api.Analyzers; - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10edfb8486..4830722a42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,241 +57,241 @@ https://github.com/aspnet/EntityFrameworkCore b9c9b57de1ba41f75427db0a51b2e897d0354656 - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc https://github.com/dotnet/corefx @@ -369,17 +369,17 @@ https://github.com/dotnet/corefx d47cae744ddfb625db8e391cecb261e4c3d7bb1c - + https://github.com/dotnet/core-setup - 372355272004e08c035c61077f5d6ca4d8f9cd22 + fdf81c6faf7c7e0463d191a3a1d36c25c201e5cb - + https://github.com/dotnet/core-setup - 372355272004e08c035c61077f5d6ca4d8f9cd22 + fdf81c6faf7c7e0463d191a3a1d36c25c201e5cb - + https://github.com/dotnet/core-setup - 372355272004e08c035c61077f5d6ca4d8f9cd22 + fdf81c6faf7c7e0463d191a3a1d36c25c201e5cb @@ -388,9 +388,9 @@ https://github.com/dotnet/corefx d47cae744ddfb625db8e391cecb261e4c3d7bb1c - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc https://github.com/dotnet/arcade @@ -404,9 +404,9 @@ https://github.com/dotnet/arcade e6a5d5f970bb872451c6310ae34eda31041fb552 - + https://github.com/aspnet/Extensions - 04a5ac947976fc17e701ffd4cd406b589e14b1e5 + 54d51a340698b6883dd3e47be372c07e0acf75bc diff --git a/eng/Versions.props b/eng/Versions.props index 3ff25c6135..248d132a8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ 1.0.0-beta.19302.2 - 3.0.0-preview6-27803-13 - 3.0.0-preview6-27803-13 - 2.1.0-preview6-27803-13 + 3.0.0-preview6-27804-01 + 3.0.0-preview6-27804-01 + 2.1.0-preview6-27804-01 4.6.0-preview6.19303.8 4.6.0-preview6.19303.8 @@ -51,67 +51,67 @@ 0.10.0-preview7.19303.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 - 3.0.0-preview6.19304.2 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 + 3.0.0-preview6.19304.6 3.0.0-preview7.19303.12 3.0.0-preview7.19303.12 diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index f4cd02ece0..eaf8792537 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -15,8 +15,7 @@ - - + diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs index b8089832f0..f8ea164d53 100644 --- a/eng/tools/BaselineGenerator/Program.cs +++ b/eng/tools/BaselineGenerator/Program.cs @@ -61,7 +61,11 @@ namespace PackageBaselineGenerator var sourceRepository = new SourceRepository(packageSource, providers); if (_update.HasValue()) { - return await RunUpdateAsync(inputPath, input, sourceRepository); + var updateResult = await RunUpdateAsync(inputPath, input, sourceRepository); + if (updateResult != 0) + { + return updateResult; + } } var feedType = await sourceRepository.GetFeedType(CancellationToken.None); diff --git a/eng/tools/BaselineGenerator/README.md b/eng/tools/BaselineGenerator/README.md index 821209aa5e..6f14df37d8 100644 --- a/eng/tools/BaselineGenerator/README.md +++ b/eng/tools/BaselineGenerator/README.md @@ -8,8 +8,8 @@ Add `--package-source {source}` to the commands below if the packages of interes ### Auto-update -1. Run `dotnet run --update` in this project folder. -2. Run `dotnet run` in this project. +Run `dotnet run --update` in this project folder. This will attempt to find the latest patch version of packages and +update the baseline file. ### Manual update diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs index 0cde5b0dcc..98524d6d9a 100644 --- a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs +++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs @@ -1944,7 +1944,7 @@ namespace Microsoft.AspNetCore.SignalR.Client public async Task WaitForActiveConnectionAsync(string methodName, [CallerMemberName] string memberName = null, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = 0) { - await WaitConnectionLockAsync(); + await WaitConnectionLockAsync(methodName); if (CurrentConnectionStateUnsynchronized == null || CurrentConnectionStateUnsynchronized.Stopping) { diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs index d723973629..de1170f1bb 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs @@ -1044,8 +1044,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests } [Theory] - [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] - public async Task ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath) + [MemberData(nameof(HubProtocolsList))] + public async Task ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch(string hubProtocolName) { bool ExpectedErrors(WriteContext writeContext) { @@ -1056,7 +1056,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests var hubProtocol = HubProtocols[hubProtocolName]; using (StartServer(out var server, ExpectedErrors)) { - var connection = CreateHubConnection(server.Url, hubPath, transportType, hubProtocol, LoggerFactory); + var connection = CreateHubConnection(server.Url, "/default", HttpTransportType.LongPolling, hubProtocol, LoggerFactory); try { await connection.StartAsync().OrTimeout(); @@ -1076,7 +1076,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests } } - [Theory(Skip = "Will be fixed by https://github.com/dotnet/corefx/issues/36901")] + [Theory] [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))] public async Task ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath) { @@ -1873,6 +1873,17 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests } } + public static IEnumerable HubProtocolsList + { + get + { + foreach (var protocol in HubProtocols) + { + yield return new object[] { protocol.Key }; + } + } + } + // This list excludes "special" hub paths like "default-nowebsockets" which exist for specific tests. public static string[] HubPaths = new[] { "/default", "/dynamic", "/hubT" }; diff --git a/src/SignalR/clients/ts/FunctionalTests/ComplexObject.cs b/src/SignalR/clients/ts/FunctionalTests/ComplexObject.cs index 96eeda0e2e..ac6b203e20 100644 --- a/src/SignalR/clients/ts/FunctionalTests/ComplexObject.cs +++ b/src/SignalR/clients/ts/FunctionalTests/ComplexObject.cs @@ -10,6 +10,7 @@ namespace FunctionalTests public string String { get; set; } public int[] IntArray { get; set; } public byte[] ByteArray { get; set; } + public Guid Guid { get; set; } public DateTime DateTime { get;set; } } } diff --git a/src/SignalR/clients/ts/FunctionalTests/TestHub.cs b/src/SignalR/clients/ts/FunctionalTests/TestHub.cs index 29fc7aab52..5bd4732c1a 100644 --- a/src/SignalR/clients/ts/FunctionalTests/TestHub.cs +++ b/src/SignalR/clients/ts/FunctionalTests/TestHub.cs @@ -125,6 +125,7 @@ namespace FunctionalTests { ByteArray = new byte[] { 0x1, 0x2, 0x3 }, DateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc), + Guid = new Guid("00010203-0405-0607-0706-050403020100"), IntArray = new int[] { 1, 2, 3 }, String = "hello world", }; diff --git a/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts b/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts index bb577c539a..537c6c4113 100644 --- a/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts @@ -462,6 +462,7 @@ describe("hubConnection", () => { DateTime: protocol.name === "json" ? "2002-04-01T10:20:15Z" : new Date(Date.UTC(2002, 3, 1, 10, 20, 15)), // Apr 1, 2002, 10:20:15am UTC + Guid: "00010203-0405-0607-0706-050403020100", IntArray: [0x01, 0x02, 0x03, 0xff], String: "Hello, World!", }; @@ -504,6 +505,7 @@ describe("hubConnection", () => { DateTime: protocol.name === "json" ? "2000-01-01T00:00:00Z" : new Date(Date.UTC(2000, 0, 1)), + Guid: "00010203-0405-0607-0706-050403020100", IntArray: [0x01, 0x02, 0x03], String: "hello world", }; diff --git a/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj index a252ecf33e..5904b5dc87 100644 --- a/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +++ b/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj @@ -1,4 +1,4 @@ - + Implements the SignalR Hub Protocol using System.Text.Json. diff --git a/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs b/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs index 84de212bfb..a943ab736a 100644 --- a/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs +++ b/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs @@ -124,9 +124,12 @@ namespace Microsoft.AspNetCore.SignalR.Protocol var hasArguments = false; object[] arguments = null; string[] streamIds = null; - JsonDocument argumentsToken = null; - JsonDocument itemsToken = null; - JsonDocument resultToken = null; + bool hasArgumentsToken = false; + Utf8JsonReader argumentsToken = default; + bool hasItemsToken = false; + Utf8JsonReader itemsToken = default; + bool hasResultToken = false; + Utf8JsonReader resultToken = default; ExceptionDispatchInfo argumentBindingException = null; Dictionary headers = null; var completed = false; @@ -192,15 +195,16 @@ namespace Microsoft.AspNetCore.SignalR.Protocol if (string.IsNullOrEmpty(invocationId)) { - // If we don't have an invocation id then we need to store it as a JsonDocument so we can parse it later - resultToken = JsonDocument.ParseValue(ref reader); + // If we don't have an invocation id then we need to value copy the reader so we can parse it later + hasResultToken = true; + resultToken = reader; + reader.Skip(); } else { // If we have an invocation id already we can parse the end result var returnType = binder.GetReturnType(invocationId); - using var token = JsonDocument.ParseValue(ref reader); - result = BindType(token.RootElement, returnType); + result = BindType(ref reader, returnType); } } else if (reader.TextEquals(ItemPropertyNameBytes.EncodedUtf8Bytes)) @@ -216,16 +220,17 @@ namespace Microsoft.AspNetCore.SignalR.Protocol } else { - // If we don't have an id yet then we need to store it as a JsonDocument to parse later - itemsToken = JsonDocument.ParseValue(ref reader); + // If we don't have an id yet then we need to value copy the reader so we can parse it later + hasItemsToken = true; + itemsToken = reader; + reader.Skip(); continue; } try { var itemType = binder.GetStreamItemType(id); - using var token = JsonDocument.ParseValue(ref reader); - item = BindType(token.RootElement, itemType); + item = BindType(ref reader, itemType); } catch (Exception ex) { @@ -246,16 +251,17 @@ namespace Microsoft.AspNetCore.SignalR.Protocol if (string.IsNullOrEmpty(target)) { - // We don't know the method name yet so just store the array in JsonDocument - argumentsToken = JsonDocument.ParseValue(ref reader); + // We don't know the method name yet so just value copy the reader so we can parse it later + hasArgumentsToken = true; + argumentsToken = reader; + reader.Skip(); } else { try { var paramTypes = binder.GetParameterTypes(target); - using var token = JsonDocument.ParseValue(ref reader); - arguments = BindTypes(token.RootElement, paramTypes); + arguments = BindTypes(ref reader, paramTypes); } catch (Exception ex) { @@ -295,22 +301,18 @@ namespace Microsoft.AspNetCore.SignalR.Protocol { case HubProtocolConstants.InvocationMessageType: { - if (argumentsToken != null) + if (hasArgumentsToken) { // We weren't able to bind the arguments because they came before the 'target', so try to bind now that we've read everything. try { var paramTypes = binder.GetParameterTypes(target); - arguments = BindTypes(argumentsToken.RootElement, paramTypes); + arguments = BindTypes(ref argumentsToken, paramTypes); } catch (Exception ex) { argumentBindingException = ExceptionDispatchInfo.Capture(ex); } - finally - { - argumentsToken.Dispose(); - } } message = argumentBindingException != null @@ -320,22 +322,18 @@ namespace Microsoft.AspNetCore.SignalR.Protocol break; case HubProtocolConstants.StreamInvocationMessageType: { - if (argumentsToken != null) + if (hasArgumentsToken) { // We weren't able to bind the arguments because they came before the 'target', so try to bind now that we've read everything. try { var paramTypes = binder.GetParameterTypes(target); - arguments = BindTypes(argumentsToken.RootElement, paramTypes); + arguments = BindTypes(ref argumentsToken, paramTypes); } catch (Exception ex) { argumentBindingException = ExceptionDispatchInfo.Capture(ex); } - finally - { - argumentsToken.Dispose(); - } } message = argumentBindingException != null @@ -344,38 +342,27 @@ namespace Microsoft.AspNetCore.SignalR.Protocol } break; case HubProtocolConstants.StreamItemMessageType: - if (itemsToken != null) + if (hasItemsToken) { try { var returnType = binder.GetStreamItemType(invocationId); - item = BindType(itemsToken.RootElement, returnType); + item = BindType(ref itemsToken, returnType); } catch (JsonException ex) { message = new StreamBindingFailureMessage(invocationId, ExceptionDispatchInfo.Capture(ex)); break; } - finally - { - itemsToken.Dispose(); - } } message = BindStreamItemMessage(invocationId, item, hasItem, binder); break; case HubProtocolConstants.CompletionMessageType: - if (resultToken != null) + if (hasResultToken) { - try - { - var returnType = binder.GetReturnType(invocationId); - result = BindType(resultToken.RootElement, returnType); - } - finally - { - resultToken.Dispose(); - } + var returnType = binder.GetReturnType(invocationId); + result = BindType(ref resultToken, returnType); } message = BindCompletionMessage(invocationId, error, result, hasResult, binder); @@ -698,48 +685,47 @@ namespace Microsoft.AspNetCore.SignalR.Protocol return new InvocationMessage(invocationId, target, arguments, streamIds); } - private object BindType(JsonElement jsonObject, Type type) + private object BindType(ref Utf8JsonReader reader, Type type) { - if (type == typeof(DateTime)) - { - return jsonObject.GetDateTime(); - } - else if (type == typeof(DateTimeOffset)) - { - return jsonObject.GetDateTimeOffset(); - } - - return JsonSerializer.Parse(jsonObject.GetRawText(), type, _payloadSerializerOptions); + return JsonSerializer.ReadValue(ref reader, type, _payloadSerializerOptions); } - private object[] BindTypes(JsonElement jsonArray, IReadOnlyList paramTypes) + private object[] BindTypes(ref Utf8JsonReader reader, IReadOnlyList paramTypes) { object[] arguments = null; var paramIndex = 0; - var argumentsCount = jsonArray.GetArrayLength(); var paramCount = paramTypes.Count; - if (argumentsCount != paramCount) + var depth = reader.CurrentDepth; + reader.CheckRead(); + + while (reader.TokenType != JsonTokenType.EndArray && reader.CurrentDepth > depth) { - throw new InvalidDataException($"Invocation provides {argumentsCount} argument(s) but target expects {paramCount}."); + if (paramIndex < paramCount) + { + arguments ??= new object[paramCount]; + + try + { + arguments[paramIndex] = BindType(ref reader, paramTypes[paramIndex]); + } + catch (Exception ex) + { + throw new InvalidDataException("Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.", ex); + } + } + else + { + // Skip extra arguments and throw error after reading them all + reader.Skip(); + } + reader.CheckRead(); + paramIndex++; } - foreach (var element in jsonArray.EnumerateArray()) + if (paramIndex != paramCount) { - if (arguments == null) - { - arguments = new object[paramCount]; - } - - try - { - arguments[paramIndex] = BindType(element, paramTypes[paramIndex]); - paramIndex++; - } - catch (Exception ex) - { - throw new InvalidDataException("Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.", ex); - } + throw new InvalidDataException($"Invocation provides {paramIndex} argument(s) but target expects {paramCount}."); } return arguments ?? Array.Empty(); diff --git a/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs b/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs index d997233e43..e1d722bcea 100644 --- a/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs +++ b/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal public IAsyncEnumerator GetAsyncEnumerator(CancellationToken cancellationToken = default) { - var enumerator = _asyncEnumerable.GetAsyncEnumerator(); + var enumerator = _asyncEnumerable.GetAsyncEnumerator(_cts.Token); if (cancellationToken.CanBeCanceled) { var registration = cancellationToken.Register((ctsState) => @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal ((CancellationTokenSource)ctsState).Cancel(); }, _cts); - return new CancelableEnumerator(_asyncEnumerable.GetAsyncEnumerator(), registration); + return new CancelableEnumerator(enumerator, registration); } return enumerator; diff --git a/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTestsBase.cs b/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTestsBase.cs index 40d5cf94b4..d0ef4a6e7f 100644 --- a/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTestsBase.cs +++ b/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTestsBase.cs @@ -205,9 +205,8 @@ namespace Microsoft.AspNetCore.SignalR.Common.Tests.Internal.Protocol [InlineData("{\"type\":4,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[ \"abc\", \"xyz\"]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")] [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,\"\",{\"1\":1,\"2\":2}]}", "Invocation provides 3 argument(s) but target expects 2.")] [InlineData("{\"type\":1,\"arguments\":[1,\"\",{\"1\":1,\"2\":2}]},\"invocationId\":\"42\",\"target\":\"foo\"", "Invocation provides 3 argument(s) but target expects 2.")] - // Both of these should be fixed by https://github.com/dotnet/corefx/issues/36901 - // [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[1]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")] - // [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")] + [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[1]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")] + [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")] public void ArgumentBindingErrors(string input, string expectedMessage) { input = Frame(input); @@ -219,6 +218,18 @@ namespace Microsoft.AspNetCore.SignalR.Common.Tests.Internal.Protocol Assert.Equal(expectedMessage, bindingFailure.BindingFailure.SourceException.Message); } + [Theory] + [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[[}]}")] + public void InvalidNestingWhileBindingTypesFails(string input) + { + input = Frame(input); + + var binder = new TestBinder(paramTypes: new[] { typeof(int[]) }, returnType: null); + var data = new ReadOnlySequence(Encoding.UTF8.GetBytes(input)); + var ex = Assert.Throws(() => JsonHubProtocol.TryParseMessage(ref data, binder, out var message)); + Assert.Equal("Error reading JSON.", ex.Message); + } + [Theory] [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[\"2007-03-01T13:00:00Z\"]}")] [InlineData("{\"type\":1,\"invocationId\":\"42\",\"arguments\":[\"2007-03-01T13:00:00Z\"],\"target\":\"foo\"}")]