From 182c48f0b0681d479a5cbf7b4faa8012697305a3 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Fri, 12 Apr 2019 17:40:48 +0000 Subject: [PATCH 1/8] Merged PR 891: Update MessagePack dependency Update MessagePack dependency Related work items: #142 --- build/dependencies.props | 2 +- build/sources.props | 2 +- eng/Dependencies.props | 1 + eng/PatchConfig.props | 2 ++ .../src/Protocol/MessagePackHubProtocol.cs | 5 ++--- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b5f3763217..d120513bd4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -108,7 +108,7 @@ 4.2.1 3.1.0 1.10.0 - 1.7.3.4 + 1.7.3.7 2.1.1 2.2.1 5.2.6 diff --git a/build/sources.props b/build/sources.props index 5b458ddf09..7648381d3b 100644 --- a/build/sources.props +++ b/build/sources.props @@ -19,7 +19,7 @@ https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; https://dotnet.myget.org/F/roslyn/api/v3/index.json; https://vside.myget.org/F/vssdk/api/v3/index.json; - https://vside.myget.org/F/vsmac/api/v3/index.json + https://vside.myget.org/F/vsmac/api/v3/index.json; diff --git a/eng/Dependencies.props b/eng/Dependencies.props index e98d42be14..2f7b478d68 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -98,6 +98,7 @@ and are generated based on the last package release. + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 29e74d4f85..c25500cb91 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -28,6 +28,8 @@ Later on, this will be checked using this condition: + Microsoft.AspNetCore.SignalR.Protocols.MessagePack; + Microsoft.AspNetCore.SignalR.Redis; diff --git a/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs b/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs index 0b693605bf..36e4886e42 100644 --- a/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs +++ b/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs @@ -245,14 +245,13 @@ namespace Microsoft.AspNetCore.SignalR.Protocol var headerCount = ReadMapLength(input, ref offset, "headers"); if (headerCount > 0) { - // If headerCount is larger than int.MaxValue, things are going to go horribly wrong anyway :) - var headers = new Dictionary((int)headerCount, StringComparer.Ordinal); + var headers = new Dictionary(StringComparer.Ordinal); for (var i = 0; i < headerCount; i++) { var key = ReadString(input, ref offset, $"headers[{i}].Key"); var value = ReadString(input, ref offset, $"headers[{i}].Value"); - headers[key] = value; + headers.Add(key, value); } return headers; } From d558350d5052e09c57bc54de60227bfd2abd355c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 14 May 2019 10:49:47 -0700 Subject: [PATCH 2/8] Move updateMigrations.cmd back into its correct subfolder --- {migrations => src/Templating/migrations}/updateMigrations.cmd | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {migrations => src/Templating/migrations}/updateMigrations.cmd (100%) diff --git a/migrations/updateMigrations.cmd b/src/Templating/migrations/updateMigrations.cmd similarity index 100% rename from migrations/updateMigrations.cmd rename to src/Templating/migrations/updateMigrations.cmd From 6ab3df58afad9ff867ba7ded85f332d8a45c1c6b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 4 Jun 2019 16:58:12 -0700 Subject: [PATCH 3/8] Update branding to 2.1.12 (#10865) --- build/dependencies.props | 6 +-- build/submodules.props | 2 +- eng/Baseline.Designer.props | 22 +++++----- eng/Baseline.xml | 16 ++++---- eng/PatchConfig.props | 5 ++- eng/tools/BaselineGenerator/Program.cs | 6 ++- eng/tools/BaselineGenerator/README.md | 4 +- .../ArchiveBaseline.2.1.11.txt | 1 + .../ArchiveBaseline.2.1.11.txt | 1 + .../ZipManifestGenerator/Program.cs | 10 +++++ .../ZipManifestGenerator/README.md | 21 +++------- .../ZipManifestGenerator/UpdateBaselines.ps1 | 40 +++++++++++++++++++ version.props | 2 +- 13 files changed, 93 insertions(+), 43 deletions(-) create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.11.txt create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.11.txt create mode 100644 src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 diff --git a/build/dependencies.props b/build/dependencies.props index 316c47c1ad..608ac5f664 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,9 +2,8 @@ - 2.1.10 - 2.1.10 - 4.5.2 + 2.1.11 + 2.1.11 @@ -187,6 +186,7 @@ 4.5.0 5.2.0 3.1.1 + 4.5.3 4.3.4 4.5.3 4.5.0 diff --git a/build/submodules.props b/build/submodules.props index a088430493..4370c412c7 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -37,6 +37,6 @@ - + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index a88565ad31..519b19b9db 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.10 + 2.1.11 @@ -542,14 +542,14 @@ - 2.1.6 + 2.1.11 - + @@ -618,15 +618,15 @@ - 2.1.3 + 2.1.11 - + @@ -634,7 +634,7 @@ - + @@ -727,7 +727,7 @@ - 2.1.3 + 2.1.11 @@ -1081,19 +1081,19 @@ - 1.0.4 + 1.0.11 + - - 1.0.4 + 1.0.11 + - diff --git a/eng/Baseline.xml b/eng/Baseline.xml index e4001b8f78..6011202d83 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,10 +1,10 @@ - - + @@ -61,7 +61,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -70,7 +70,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -79,7 +79,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -111,8 +111,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - - + + @@ -127,4 +127,4 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + \ No newline at end of file diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 15c67e764d..57bc9bf38d 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -35,5 +35,8 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.SignalR.Redis; - + + + + 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 fa3e4e0bda..4a77247a38 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/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.11.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.11.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.11.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.11.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.11.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.11.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/ZipManifestGenerator/Program.cs b/src/PackageArchive/ZipManifestGenerator/Program.cs index 883d21b7c4..649a2631db 100644 --- a/src/PackageArchive/ZipManifestGenerator/Program.cs +++ b/src/PackageArchive/ZipManifestGenerator/Program.cs @@ -5,6 +5,7 @@ using System; using System.IO; using System.IO.Compression; using System.Linq; +using System.Net; using System.Net.Http; using System.Threading.Tasks; @@ -21,6 +22,8 @@ Usage: The output file path for the ZIP manifest file."); } + private const int ZipDoesNotExist = 404; + public static async Task Main(string[] args) { if (args.Length != 2) @@ -42,6 +45,13 @@ Usage: Console.WriteLine($"log: Downloading {url}"); zipPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + ".zip"); var response = await new HttpClient().GetAsync(url); + + if (response.StatusCode == HttpStatusCode.NotFound) + { + Console.Error.WriteLine($"Could not find {url}."); + return ZipDoesNotExist; + } + response.EnsureSuccessStatusCode(); using (var outStream = File.Create(zipPath)) diff --git a/src/PackageArchive/ZipManifestGenerator/README.md b/src/PackageArchive/ZipManifestGenerator/README.md index 9922f2e465..441b96ebba 100644 --- a/src/PackageArchive/ZipManifestGenerator/README.md +++ b/src/PackageArchive/ZipManifestGenerator/README.md @@ -1,5 +1,5 @@ ZipManifestGenerator ---------- +-------------------- This console app is used to generate the list of files in a zip archive. @@ -13,19 +13,10 @@ Usage: Example: dotnet run ./archive.zip files.txt ``` -## Example for servicing updates +## Servicing updates -To generate a new manifest for the incremental CI server package caches, you would run +For convenience, this folder contains [./UpdateBaselines.ps1](./UpdateBaselines.ps1) to update +the baselines from the last patch release. -```ps1 -$ProdConBuild='20180919-01' -$Version='2.1.5' - -$patchUrl = "https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/${ProdconBuild}/final/assets/aspnetcore/Runtime/${Version}/nuGetPackagesArchive-ci-server-${Version}.patch.zip" - -dotnet run $patchUrl "../Archive.CiServer.Patch/ArchiveBaseline.${Version}.txt" - -$compatPatchUrl = "https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/${ProdconBuild}/final/assets/aspnetcore/Runtime/${Version}/nuGetPackagesArchive-ci-server-compat-${Version}.patch.zip" - -dotnet run $compatPatchUrl "../Archive.CiServer.Patch.Compat/ArchiveBaseline.${Version}.txt" -``` +Using version.props to figure out the last version, this script reads the build manifests from https://github.com/dotnet/versions/tree/master/build-info/dotnet/product/cli/release and +invokes the manifest generator diff --git a/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 b/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 new file mode 100644 index 0000000000..9e0481e40e --- /dev/null +++ b/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 @@ -0,0 +1,40 @@ +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' + +Push-Location $PSScriptRoot +try { + + [xml]$versionProps = Get-Content "$PSScriptRoot/../../../version.props" + $LastVersion = "$($versionProps.Project.PropertyGroup.AspNetCoreMajorVersion).$($versionProps.Project.PropertyGroup.AspNetCoreMinorVersion).$($versionProps.Project.PropertyGroup.AspNetCorePatchVersion - 1)" + $manifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/release/$LastVersion/build.xml" + $buildXml = Invoke-RestMethod -Method GET $manifestUrl + $feedUrl = $buildXml.OrchestratedBuild.Endpoint.Url + $baseFeedUrl = $feedUrl -replace 'final/index.json','' + + Write-Host "Last patch version = $LastVersion" + Write-Host "BaseURL = $baseFeedUrl" + + function CreateBaseLineFromZip($url, $filePath) { + dotnet run $url $filePath + + if ($lastexitcode -eq 404) { + Write-Host -f Yellow "It appears there was no patch zip in the last release, so creating an empty baseline file in $filePath." + Set-Content -path $filePath '' + } + elseif($lastexitcode -ne 0) { + Write-Error "ZipGenerator failed" + exit 1 + } + } + + CreateBaseLineFromZip ` + "$baseFeedUrl/final/assets/aspnetcore/Runtime/${LastVersion}/nuGetPackagesArchive-ci-server-${LastVersion}.patch.zip" ` + "../Archive.CiServer.Patch/ArchiveBaseline.${LastVersion}.txt" + + CreateBaseLineFromZip ` + "$baseFeedUrl/final/assets/aspnetcore/Runtime/${LastVersion}/nuGetPackagesArchive-ci-server-compat-${LastVersion}.patch.zip" ` + "../Archive.CiServer.Patch.Compat/ArchiveBaseline.${LastVersion}.txt" +} +finally { + Pop-Location +} diff --git a/version.props b/version.props index 13a113a115..8c94afbed8 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 1 - 11 + 12 servicing Servicing t000 From c9724896e271144a92c1e4bdb4ed9f6589742834 Mon Sep 17 00:00:00 2001 From: Brennan Date: Tue, 4 Jun 2019 21:51:08 -0700 Subject: [PATCH 4/8] [Preview 6] Use JsonReader interop with JsonSerializer (#10733) --- .../FunctionalTests/HubConnectionTests.cs | 19 ++- .../ts/FunctionalTests/ComplexObject.cs | 1 + .../clients/ts/FunctionalTests/TestHub.cs | 1 + .../FunctionalTests/ts/HubConnectionTests.ts | 2 + ...t.AspNetCore.SignalR.Protocols.Json.csproj | 2 +- .../src/Protocol/JsonHubProtocol.cs | 132 ++++++++---------- .../Protocol/JsonHubProtocolTestsBase.cs | 17 ++- 7 files changed, 93 insertions(+), 81 deletions(-) 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/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\"}")] From f97817ef12952b46b1e57a8a724fa0a59b6aee4d Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 5 Jun 2019 05:47:06 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190604.10 - Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview6.19304.10 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview6.19304.10 - dotnet-ef - 3.0.0-preview6.19304.10 - Microsoft.EntityFrameworkCore - 3.0.0-preview6.19304.10 - Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview6.19304.10 - Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview6.19304.10 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview6.19304.10 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Internal.Extensions.Refs - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - NETStandard.Library.Ref - 2.1.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App - 3.0.0-preview6-27804-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Internal.AspNetCore.Analyzers - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.0-preview6.19304.6 (parent: Microsoft.EntityFrameworkCore) --- eng/Version.Details.xml | 284 ++++++++++++++++++++-------------------- eng/Versions.props | 142 ++++++++++---------- 2 files changed, 213 insertions(+), 213 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25b2e9eaba..93607ef7cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,269 +29,269 @@ https://github.com/aspnet/AspNetCore-Tooling 16628fa0fbf8f9948840a549fec0b898cb469f4b - + https://github.com/aspnet/EntityFrameworkCore - 2a3b2d25434148421c39134f5e80c5427f20a5a5 + a71fcc98c0be2e688da55cd1c9975eb76aac9a45 - + https://github.com/aspnet/EntityFrameworkCore - 2a3b2d25434148421c39134f5e80c5427f20a5a5 + a71fcc98c0be2e688da55cd1c9975eb76aac9a45 - + https://github.com/aspnet/EntityFrameworkCore - 2a3b2d25434148421c39134f5e80c5427f20a5a5 + a71fcc98c0be2e688da55cd1c9975eb76aac9a45 - + https://github.com/aspnet/EntityFrameworkCore - 2a3b2d25434148421c39134f5e80c5427f20a5a5 + a71fcc98c0be2e688da55cd1c9975eb76aac9a45 - + https://github.com/aspnet/EntityFrameworkCore - 2a3b2d25434148421c39134f5e80c5427f20a5a5 + a71fcc98c0be2e688da55cd1c9975eb76aac9a45 - + https://github.com/aspnet/EntityFrameworkCore - 2a3b2d25434148421c39134f5e80c5427f20a5a5 + a71fcc98c0be2e688da55cd1c9975eb76aac9a45 - + https://github.com/aspnet/EntityFrameworkCore - 2a3b2d25434148421c39134f5e80c5427f20a5a5 + a71fcc98c0be2e688da55cd1c9975eb76aac9a45 - + 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 167e6eff0a..7cc57ac98f 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,75 +51,75 @@ 0.10.0-preview6.19303.4 - 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-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.10 + 3.0.0-preview6.19304.10 + 3.0.0-preview6.19304.10 + 3.0.0-preview6.19304.10 + 3.0.0-preview6.19304.10 + 3.0.0-preview6.19304.10 + 3.0.0-preview6.19304.10 3.0.0-preview6.19304.1 3.0.0-preview6.19304.1 From 3501a4223939caf550cec13a7e4e4a747f136ebe Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 4 Jun 2019 17:07:31 -0700 Subject: [PATCH 6/8] Prepare 2.2.6 --- build/dependencies.props | 32 ++++++------ eng/Baseline.Designer.props | 51 ++++++++++--------- eng/Baseline.xml | 24 ++++----- .../ArchiveBaseline.2.2.5.txt | 1 + .../ArchiveBaseline.2.2.5.txt | 1 + .../ZipManifestGenerator/UpdateBaselines.ps1 | 2 +- version.props | 2 +- 7 files changed, 58 insertions(+), 55 deletions(-) create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.5.txt create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.5.txt diff --git a/build/dependencies.props b/build/dependencies.props index 0bca2823bf..39d1a507a2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,25 +2,22 @@ - 2.2.4 - 2.2.4 - 2.2.0 - 2.2.0 - 4.6.0 - - - - 2.2.0 - 2.2.0 - 2.2.0 - 2.2.0 - 2.2.0 - 2.2.0 + 2.2.5 + 2.2.5 + + 2.2.4 + 2.2.4 + 2.2.4 + 2.2.4 + 2.2.4 + 2.2.4 + + $(MicrosoftNETCoreAppPackageVersion) @@ -64,6 +61,7 @@ 2.2.0 2.2.0 2.2.0 + 2.2.5 2.2.0 2.2.0 2.2.0 @@ -76,6 +74,7 @@ 2.2.0 2.2.0 2.2.0 + 2.2.5 2.2.0 2.2.0 2.2.0 @@ -220,18 +219,19 @@ 4.5.0 1.5.0 4.5.0 + 4.6.1 4.5.0 4.5.0 5.3.0 3.2.0 4.5.3 - 4.5.1 + 4.5.3 4.3.4 4.5.3 4.5.0 3.1.1 4.3.0 - 4.5.1 + 4.5.2 1.6.0 4.3.0 4.5.0 diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 5e3125dab4..62cc7a6854 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 @@ -767,7 +768,7 @@ - 2.2.0 + 2.2.5 @@ -1149,19 +1150,19 @@ - 1.1.0 + 1.1.5 + - - 1.1.0 + 1.1.5 + - @@ -1185,13 +1186,13 @@ - 1.1.0 + 1.1.5 + - - + diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 2e4369b272..cc802678a3 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. --> - + @@ -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. - + @@ -84,7 +84,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + @@ -117,10 +117,10 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + - + diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.5.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.5.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.5.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.5.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.5.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.5.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 b/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 index 9e0481e40e..e0d210054d 100644 --- a/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 +++ b/src/PackageArchive/ZipManifestGenerator/UpdateBaselines.ps1 @@ -5,7 +5,7 @@ Push-Location $PSScriptRoot try { [xml]$versionProps = Get-Content "$PSScriptRoot/../../../version.props" - $LastVersion = "$($versionProps.Project.PropertyGroup.AspNetCoreMajorVersion).$($versionProps.Project.PropertyGroup.AspNetCoreMinorVersion).$($versionProps.Project.PropertyGroup.AspNetCorePatchVersion - 1)" + $LastVersion = "$($versionProps.Project.PropertyGroup.AspNetCoreMajorVersion).$($versionProps.Project.PropertyGroup.AspNetCoreMinorVersion | select -first 1).$($versionProps.Project.PropertyGroup.AspNetCorePatchVersion - 1)" $manifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/release/$LastVersion/build.xml" $buildXml = Invoke-RestMethod -Method GET $manifestUrl $feedUrl = $buildXml.OrchestratedBuild.Endpoint.Url diff --git a/version.props b/version.props index 5aa246be58..f5ceabf956 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 2 - 5 + 6 servicing $([System.DateTime]::Now.ToString('yyMMdd'))-99 From 7eb77e46caf5442c475591d4f65e9390f6697bc4 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 5 Jun 2019 12:07:22 -0700 Subject: [PATCH 7/8] Disable OSX 10.14 tests on Helix and use OSX 10.13 instead (#10824) --- eng/targets/Helix.Common.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 @@ - - + From 61e689471f640689a5534e5ce9b463b6873a91ad Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Wed, 5 Jun 2019 13:06:36 -0700 Subject: [PATCH 8/8] Propagate cancellation token IAsyncEnumerators (#10901) --- src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs | 2 +- src/SignalR/common/Shared/AsyncEnumerableAdapters.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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;