From 6ecdff7c68ad58b0cb491f433ef8aff24e260fe4 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Fri, 12 Apr 2019 22:25:38 +0000 Subject: [PATCH 1/4] Merged PR 898: Update MessagePack dependency Update MessagePack dependency --- build/dependencies.props | 2 +- build/sources.props | 2 +- eng/Dependencies.props | 1 + eng/PatchConfig.props | 3 +++ .../src/Protocol/MessagePackHubProtocol.cs | 5 ++--- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 2d9e79f9d5..b205cdc605 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -138,7 +138,7 @@ 2.3.0 3.1.0 1.10.0 - 1.7.3.4 + 1.7.3.7 2.1.1 2.2.0 2.2.0 diff --git a/build/sources.props b/build/sources.props index d9a56c4594..8ef74de40a 100644 --- a/build/sources.props +++ b/build/sources.props @@ -22,7 +22,7 @@ https://dotnet.myget.org/F/roslyn/api/v3/index.json; https://dotnet.myget.org/F/roslyn-tools/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; https://dotnetcli.blob.core.windows.net/dotnet/ diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 8d72e7e495..826d10ce54 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -107,6 +107,7 @@ and are generated based on the last package release. + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 250b506c12..cca6cdea56 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -54,6 +54,9 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.AspNetCoreModule; Microsoft.AspNetCore.AspNetCoreModuleV2; java:signalr; + Microsoft.AspNetCore.SignalR.Protocols.MessagePack; + Microsoft.AspNetCore.SignalR.Redis; + Microsoft.AspNetCore.SignalR.StackExchangeRedis; diff --git a/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs b/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs index d4e29baf92..daeeee5132 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 4332a25c43f60c625ddce7c85508e4d6d42307f1 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Mon, 15 Apr 2019 15:49:37 +0000 Subject: [PATCH 2/4] Update Redis dependency --- build/dependencies.props | 2 +- eng/PatchConfig.props | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index b205cdc605..e1fd3e1817 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -222,7 +222,7 @@ 1.1.11 1.1.11 1.2.6 - 2.0.513 + 2.0.593 1.1.92 1.0.0 4.5.0 diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index cca6cdea56..f623bcf1ca 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -57,6 +57,7 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.SignalR.Protocols.MessagePack; Microsoft.AspNetCore.SignalR.Redis; Microsoft.AspNetCore.SignalR.StackExchangeRedis; + Microsoft.AspNetCore.DataProtection.StackExchangeRedis; From 11ab4bd1961977a48effb644a223a3dc6bf6e111 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 2 May 2019 08:44:51 -0700 Subject: [PATCH 3/4] Fix aspnet e2e tests - add `-CliManifestName` option to run-tests.ps1 command - pass `-CliManifestName` and more from YAML to run-tests.ps1 - pass access token suffix --- .azure/pipelines/e2e-tests.yml | 6 +++--- test/Cli.FunctionalTests/run-tests.ps1 | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml index 06e544cb49..89872313dc 100644 --- a/.azure/pipelines/e2e-tests.yml +++ b/.azure/pipelines/e2e-tests.yml @@ -37,7 +37,7 @@ jobs: inputs: versionSpec: $(Node.Version) - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES + test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES condition: ne(variables['PB_SkipTests'], 'true') displayName: Run E2E tests @@ -73,7 +73,7 @@ jobs: inputs: versionSpec: $(Node.Version) - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES + test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES condition: ne(variables['PB_SkipTests'], 'true') displayName: Run E2E tests @@ -119,7 +119,7 @@ jobs: inputs: versionSpec: $(Node.Version) - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES + test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES condition: ne(variables['PB_SkipTests'], 'true') displayName: Run E2E tests diff --git a/test/Cli.FunctionalTests/run-tests.ps1 b/test/Cli.FunctionalTests/run-tests.ps1 index fe7e21eac5..d59a4feb33 100644 --- a/test/Cli.FunctionalTests/run-tests.ps1 +++ b/test/Cli.FunctionalTests/run-tests.ps1 @@ -44,6 +44,7 @@ param( $HostRid, $ProdConManifestUrl, $ProdConChannel = 'release/2.1', + $CliManifestName = "cli.xml", $AdditionalRestoreSources ) @@ -115,7 +116,7 @@ try { Write-Error "Missing required parameter: AssetRootUrl" } $AssetRootUrl = $AssetRootUrl.TrimEnd('/') - $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/cli.xml${AccessTokenSuffix}" + $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/${CliManifestName}${AccessTokenSuffix}" Write-Host "CliMetadataUrl: $cliMetadataUrl" [xml] $cli = Invoke-RestMethod $cliMetadataUrl $sdkVersion = $cli.Build.ProductVersion From 064dce2bef1852ab8674bb7ee539dc01d384e7a7 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Mon, 6 May 2019 15:30:00 -0700 Subject: [PATCH 4/4] Get e2e tests running - correct `--filter` syntax; perform `contains` match on `Name` and not `FullyQualifiedName` - `FullyQualifiedName` doesn't seem to include NUnit test case data - move to latest test package versions - support recent SDK versions Background: successful but no-op builds have been common lately - blocking real work on aspnet/AspNetCore-Internal#1843 --- test/Cli.FunctionalTests/Cli.FunctionalTests.csproj | 6 +++--- test/Cli.FunctionalTests/Util/DotNetUtil.cs | 4 ++-- test/Cli.FunctionalTests/run-tests.ps1 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj b/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj index b2227fad1e..4632b9769c 100644 --- a/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj +++ b/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj @@ -10,11 +10,11 @@ - + - - + + diff --git a/test/Cli.FunctionalTests/Util/DotNetUtil.cs b/test/Cli.FunctionalTests/Util/DotNetUtil.cs index 5c6d2f51c8..3131e3fcbb 100644 --- a/test/Cli.FunctionalTests/Util/DotNetUtil.cs +++ b/test/Cli.FunctionalTests/Util/DotNetUtil.cs @@ -64,8 +64,8 @@ namespace Cli.FunctionalTests.Util var runtimeVersionString = Regex.Match(info, runtimeVersionPattern, RegexOptions.RightToLeft).Groups[1].Value; var runtimeVersion = SemanticVersion.Parse(runtimeVersionString); - // Supported version range is [2.1.300,2.2.100] (inclusive) - if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 100)) + // Supported version range is [2.1.300,2.2.210] (inclusive) + if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 210)) { return (sdkVersion, runtimeVersion); } diff --git a/test/Cli.FunctionalTests/run-tests.ps1 b/test/Cli.FunctionalTests/run-tests.ps1 index d59a4feb33..c41bf6c192 100644 --- a/test/Cli.FunctionalTests/run-tests.ps1 +++ b/test/Cli.FunctionalTests/run-tests.ps1 @@ -164,7 +164,7 @@ try { [string[]] $filterArgs = @() if ($TestRuntimeIdentifier) { - $filterArgs += '--filter',"rid: $TestRuntimeIdentifier" + $filterArgs += '--filter',"Name~rid: $TestRuntimeIdentifier" } Invoke-Block { & $dotnet test `