Skip to content

Fix protocol negotiation timeout when STJ reflection is disabled (18.8.1) #16281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azat-msft merged 2 commits into from
Jul 14, 2026
+7 −1
Merged

Fix protocol negotiation timeout when STJ reflection is disabled (18.8.1) #16281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62638f0
Set an explicit reflection-based TypeInfoResolver on the STJ options
nohwnd Jul 14, 2026
8f0f933
Re-trigger CI (flaky RunSettingsManager singleton test on ubuntu leg)
nohwnd Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from appending +<commitId>, which breaks DTAAgent.
-->
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<VersionPrefix>18.8.0</VersionPrefix>
<VersionPrefix>18.8.1</VersionPrefix>
<PreReleaseVersionLabel>release</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
Expand Down
6 changes: 6 additions & 0 deletions src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.Stj.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;

using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
Expand Down Expand Up @@ -74,6 +75,11 @@ static JsonDataSerializer()
NumberHandling = JsonNumberHandling.AllowReadingFromString,
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
ReferenceHandler = ReferenceHandler.IgnoreCycles,
// Assign an explicit reflection-based resolver. When TypeInfoResolver is null, STJ falls back to
// the implicit default resolver which is disabled when a test project sets
// JsonSerializerIsReflectionEnabledByDefault=false (that switch flows into the testhost runtimeconfig),
// making testhost throw while deserializing the first protocol message and the runner time out. See #16274.
TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
};

private static partial (int version, string? messageType) ParseHeaderFromJson(string rawMessage)
Expand Down
Loading