From 7ec4476ab7a9e9373b856d66e7dba3ba31687693 Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Tue, 20 Jan 2026 20:16:00 +0300 Subject: [PATCH 1/3] [dotnet] [bidi] AOT safe json converter for Input.Origin class --- .../BiDi/Json/Converters/InputOriginConverter.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs b/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs index b11a63643f353..fe5379e99965a 100644 --- a/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs +++ b/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs @@ -19,14 +19,11 @@ using OpenQA.Selenium.BiDi.Input; using System; -using System.Diagnostics.CodeAnalysis; using System.Text.Json; using System.Text.Json.Serialization; namespace OpenQA.Selenium.BiDi.Json.Converters; -[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Json serializer options should have AOT-safe type resolution")] -[UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Json serializer options should have AOT-safe type resolution")] internal class InputOriginConverter : JsonConverter { public override Origin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) @@ -49,7 +46,10 @@ public override void Write(Utf8JsonWriter writer, Origin value, JsonSerializerOp writer.WriteStartObject(); writer.WriteString("type", "element"); writer.WritePropertyName("element"); - JsonSerializer.Serialize(writer, element.Element, options); + + var sharedReferenceTypeInfo = options.GetTypeInfo(); + JsonSerializer.Serialize(writer, element.Element, sharedReferenceTypeInfo); + writer.WriteEndObject(); } } From 08fbb8848706a635857ca31b59e1af935318065f Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Tue, 20 Jan 2026 20:39:03 +0300 Subject: [PATCH 2/3] Update InputOriginConverter.cs --- .../src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs b/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs index fe5379e99965a..6c523e6020659 100644 --- a/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs +++ b/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs @@ -47,8 +47,7 @@ public override void Write(Utf8JsonWriter writer, Origin value, JsonSerializerOp writer.WriteString("type", "element"); writer.WritePropertyName("element"); - var sharedReferenceTypeInfo = options.GetTypeInfo(); - JsonSerializer.Serialize(writer, element.Element, sharedReferenceTypeInfo); + JsonSerializer.Serialize(writer, element.Element, options.GetTypeInfo()); writer.WriteEndObject(); } From 59aa53c6e70773dca2be851b4910f9b63ea2b35a Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Tue, 20 Jan 2026 21:03:02 +0300 Subject: [PATCH 3/3] Format --- .../webdriver/BiDi/Json/Converters/InputOriginConverter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs b/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs index 6c523e6020659..c4161d4baff7e 100644 --- a/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs +++ b/dotnet/src/webdriver/BiDi/Json/Converters/InputOriginConverter.cs @@ -46,9 +46,9 @@ public override void Write(Utf8JsonWriter writer, Origin value, JsonSerializerOp writer.WriteStartObject(); writer.WriteString("type", "element"); writer.WritePropertyName("element"); - + JsonSerializer.Serialize(writer, element.Element, options.GetTypeInfo()); - + writer.WriteEndObject(); } }