From 35526fea4c5828ed887a725c0535f320167e020c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Dec 2025 05:03:24 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20251127.5 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.25562.4 -> To Version 9.0.0-beta.25577.5 --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- .../core-templates/job/source-build.yml | 2 +- .../core-templates/steps/source-build.yml | 2 +- global.json | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 688226d11cdf..2e41f940a1b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 354e770a2564..9bb1e4409b8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25562.4 - 9.0.0-beta.25562.4 - 9.0.0-beta.25562.4 - 9.0.0-beta.25562.4 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 5baedac1e03d..1037ccedcb55 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -65,7 +65,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 0718e4ba902e..7846584d2a77 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -41,7 +41,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 4feb3327cfa8..0dae2addc3f0 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25562.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25562.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25577.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25577.5" } } From 3132e7b15552f4aefc5e5f54c11734803832e23a Mon Sep 17 00:00:00 2001 From: Daria Tiurina Date: Wed, 12 Nov 2025 15:40:40 +0100 Subject: [PATCH 2/7] Fix test EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails (#64326) (cherry picked from commit c4f8522649413b7e1000747f80a3b49b8bc1ed7a) --- .../ServerExecutionTests/WebSocketCompressionTests.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs index 25812209add8..0e65e0fd4778 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs @@ -104,11 +104,17 @@ public void EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails() Assert.True(logs.Count > 0); - Assert.Matches(ParseErrorMessage(), logs[0].Message); + Assert.True( + ParseErrorMessageRegexOld.IsMatch(logs[0].Message) || + ParseErrorMessageRegexNew.IsMatch(logs[0].Message), + $"Expected log message to match one of the CSP error patterns: {ParseErrorMessageRegexOld} or {ParseErrorMessageRegexNew}. Actual: {logs[0].Message}"); } [GeneratedRegex(@"security - Refused to frame 'http://\d+\.\d+\.\d+\.\d+:\d+/' because an ancestor violates the following Content Security Policy directive: ""frame-ancestors 'none'"".")] - private static partial Regex ParseErrorMessage(); + private static partial Regex ParseErrorMessageRegexOld { get; } + + [GeneratedRegex(@"security - Framing 'http://\d+\.\d+\.\d+\.\d+:\d+/' violates the following Content Security Policy directive: ""frame-ancestors 'none'"".")] + private static partial Regex ParseErrorMessageRegexNew { get; } } public partial class DefaultConfigurationWebSocketCompressionTests : AllowedWebSocketCompressionTests From 98fd2f85d10f0bba9ed6fed68d1b86278f246d16 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 23 Jan 2025 09:28:28 +0000 Subject: [PATCH 3/7] Quarantine CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUser (#59992) (cherry picked from commit 2f9d787a72f122d36bc5c3d2aa8fb6240f43b5c8) --- src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs index f3501fb69c1e..4182425ba7bd 100644 --- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs +++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs @@ -89,6 +89,7 @@ public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType [ConditionalTheory] [SkipIfDockerNotPresent] [MemberData(nameof(TransportTypesAndProtocolTypes))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/59991")] public async Task CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUser(HttpTransportType transportType, string protocolName) { using (StartVerifiableLog()) From f76fb84dc2f0c0ca814e2079eb2525c5f37d6bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 12 Dec 2025 21:03:35 +0100 Subject: [PATCH 4/7] Quarantine CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLiteral test Port of same change from 8.0 in https://github.com/dotnet/aspnetcore/pull/63565 --- src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs index 4182425ba7bd..2f1f2fe6106a 100644 --- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs +++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs @@ -185,6 +185,7 @@ public async Task HubConnectionCanSendAndReceiveGroupMessagesGroupNameWithPatter [ConditionalTheory] [SkipIfDockerNotPresent] [MemberData(nameof(TransportTypesAndProtocolTypes))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/63582")] public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLiteral(HttpTransportType transportType, string protocolName) { using (StartVerifiableLog()) From bc7d271ba0cf855b1026f3c7101e030f77c75081 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Dec 2025 05:03:24 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/arcade build 20251211.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.25562.4 -> To Version 9.0.0-beta.25611.4 --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- .../job/source-index-stage1.yml | 2 +- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 19 ++++++++++----- global.json | 4 ++-- 7 files changed, 34 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e41f940a1b3..3d212c4653dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + e9983e548f5b9638784f3b2696eb6cb3e7366548 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 9bb1e4409b8a..6bb1cbfff6d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 + 9.0.0-beta.25611.4 + 9.0.0-beta.25611.4 + 9.0.0-beta.25611.4 + 9.0.0-beta.25611.4 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 662b9fcce154..ddf8c2e00d80 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9b3ad8840fdb..a06513a59407 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -543,23 +543,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index 0dae2addc3f0..5fd19940a519 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25577.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25577.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25611.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25611.4" } } From e45bfedb414402b69a9f434c553f74472e99d4f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Dec 2025 05:02:16 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20251226.6 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.25562.4 -> To Version 9.0.0-beta.25626.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d212c4653dd..2f4be6953098 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 6bb1cbfff6d3..b0614b1fff8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25611.4 - 9.0.0-beta.25611.4 - 9.0.0-beta.25611.4 - 9.0.0-beta.25611.4 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 9.0.0-alpha.1.24575.1 diff --git a/global.json b/global.json index 5fd19940a519..52c2efaac147 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25611.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25611.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6" } } From b71ad44079ecd98463942a9aa067667a7639ac3a Mon Sep 17 00:00:00 2001 From: tomerqodo Date: Sun, 25 Jan 2026 11:58:38 +0200 Subject: [PATCH 7/7] update pr --- .../ServerExecutionTests/WebSocketCompressionTests.cs | 2 +- src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs index 0e65e0fd4778..7df86ae44c1b 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs @@ -105,7 +105,7 @@ public void EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails() Assert.True(logs.Count > 0); Assert.True( - ParseErrorMessageRegexOld.IsMatch(logs[0].Message) || + ParseErrorMessageRegexOld.IsMatch(logs[0].Message) && ParseErrorMessageRegexNew.IsMatch(logs[0].Message), $"Expected log message to match one of the CSP error patterns: {ParseErrorMessageRegexOld} or {ParseErrorMessageRegexNew}. Actual: {logs[0].Message}"); } diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs index 2f1f2fe6106a..9dd7b3993f81 100644 --- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs +++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs @@ -210,8 +210,8 @@ public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLit await connection.InvokeAsync("EchoUser", "*", "Hello, World!").DefaultTimeout(); Assert.Equal("Hello, World!", await tcs.Task.DefaultTimeout()); - await connection.DisposeAsync().DefaultTimeout(); await secondConnection.DisposeAsync().DefaultTimeout(); + await connection.DisposeAsync().DefaultTimeout(); } } @@ -359,7 +359,7 @@ public static IEnumerable TransportTypesAndProtocolTypes } } - internal sealed class WebSocketWrapper : WebSocket + internal class WebSocketWrapper : WebSocket { private readonly WebSocket _inner; private TaskCompletionSource<(WebSocketReceiveResult, ReadOnlyMemory)> _receiveTcs = new(TaskCreationOptions.RunContinuationsAsynchronously); @@ -406,12 +406,12 @@ public void SetReceiveResult((WebSocketReceiveResult, ReadOnlyMemory) resu public override async Task ReceiveAsync(ArraySegment buffer, CancellationToken cancellationToken) { var res = await _receiveTcs.Task; + _receiveTcs = new(TaskCreationOptions.RunContinuationsAsynchronously); // Handle zero-byte reads if (buffer.Count == 0) { return res.Item1; } - _receiveTcs = new(TaskCreationOptions.RunContinuationsAsynchronously); res.Item2.CopyTo(buffer); return res.Item1; }