From bd0773b8f3b948f47840886c2b3f28b9c8bd5333 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 7 Mar 2025 16:37:00 +0800 Subject: [PATCH] Fix warnings (#3031) --- Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj | 1 + Src/Newtonsoft.Json/JsonException.cs | 2 ++ Src/Newtonsoft.Json/Linq/JContainer.cs | 4 ++-- Src/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs | 2 ++ Src/Newtonsoft.Json/Serialization/JsonObjectContract.cs | 2 ++ .../Serialization/JsonSerializerInternalReader.cs | 2 ++ .../Serialization/JsonSerializerInternalWriter.cs | 2 ++ 7 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj index f564f2bb..3154f4a5 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -192,5 +192,6 @@ Json.NET Tests .NET Standard 1.0 .NETStandard,Version=v1.0 NETSTANDARD1_0;DNXCORE50;PORTABLE;HAVE_REGEX_TIMEOUTS;$(AdditionalConstants) + $(NoWarn);NETSDK1023 \ No newline at end of file diff --git a/Src/Newtonsoft.Json/JsonException.cs b/Src/Newtonsoft.Json/JsonException.cs index 603a7816..27398852 100644 --- a/Src/Newtonsoft.Json/JsonException.cs +++ b/Src/Newtonsoft.Json/JsonException.cs @@ -76,10 +76,12 @@ namespace Newtonsoft.Json /// The that contains contextual information about the source or destination. /// The parameter is null. /// The class name is null or is zero (0). +#pragma warning disable SYSLIB0051 public JsonException(SerializationInfo info, StreamingContext context) : base(info, context) { } +#pragma warning restore SYSLIB0051 #endif internal static JsonException Create(IJsonLineInfo lineInfo, string path, string message) diff --git a/Src/Newtonsoft.Json/Linq/JContainer.cs b/Src/Newtonsoft.Json/Linq/JContainer.cs index dd9ef762..b032d9e2 100644 --- a/Src/Newtonsoft.Json/Linq/JContainer.cs +++ b/Src/Newtonsoft.Json/Linq/JContainer.cs @@ -952,12 +952,12 @@ namespace Newtonsoft.Json.Linq } #if HAVE_COMPONENT_MODEL - string ITypedList.GetListName(PropertyDescriptor[] listAccessors) + string ITypedList.GetListName(PropertyDescriptor[]? listAccessors) { return string.Empty; } - PropertyDescriptorCollection ITypedList.GetItemProperties(PropertyDescriptor[] listAccessors) + PropertyDescriptorCollection ITypedList.GetItemProperties(PropertyDescriptor[]? listAccessors) { #if HAVE_APPCONTEXT if (!ComponentModelIsSupported) diff --git a/Src/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs b/Src/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs index 177fe381..a987fffe 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs @@ -33,6 +33,7 @@ using Newtonsoft.Json.Linq; namespace Newtonsoft.Json.Serialization { +#pragma warning disable SYSLIB0050 [RequiresUnreferencedCode(MiscellaneousUtils.TrimWarning)] [RequiresDynamicCode(MiscellaneousUtils.AotWarning)] internal class JsonFormatterConverter : IFormatterConverter @@ -155,6 +156,7 @@ namespace Newtonsoft.Json.Serialization return GetTokenValue(value); } } +#pragma warning restore SYSLIB0050 } #endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Serialization/JsonObjectContract.cs b/Src/Newtonsoft.Json/Serialization/JsonObjectContract.cs index 82a1f46c..c5e7d16b 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonObjectContract.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonObjectContract.cs @@ -189,6 +189,7 @@ namespace Newtonsoft.Json.Serialization #endif internal object GetUninitializedObject() { +#pragma warning disable SYSLIB0050 // we should never get here if the environment is not fully trusted, check just in case if (!JsonTypeReflector.FullyTrusted) { @@ -196,6 +197,7 @@ namespace Newtonsoft.Json.Serialization } return FormatterServices.GetUninitializedObject(NonNullableUnderlyingType); +#pragma warning restore SYSLIB0050 } #endif } diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs index 9fa36466..d8c163d3 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs @@ -1758,6 +1758,7 @@ namespace Newtonsoft.Json.Serialization [RequiresDynamicCode(MiscellaneousUtils.AotWarning)] private object CreateISerializable(JsonReader reader, JsonISerializableContract contract, JsonProperty? member, string? id) { +#pragma warning disable SYSLIB0050 Type objectType = contract.UnderlyingType; if (!JsonTypeReflector.FullyTrusted) @@ -1826,6 +1827,7 @@ namespace Newtonsoft.Json.Serialization OnDeserialized(reader, contract, createdObject); return createdObject; +#pragma warning restore SYSLIB0050 } [RequiresUnreferencedCode(MiscellaneousUtils.TrimWarning)] diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs index fbf53838..1b6b5759 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs @@ -888,6 +888,7 @@ namespace Newtonsoft.Json.Serialization [RequiresDynamicCode(MiscellaneousUtils.AotWarning)] private void SerializeISerializable(JsonWriter writer, ISerializable value, JsonISerializableContract contract, JsonProperty? member, JsonContainerContract? collectionContract, JsonProperty? containerProperty) { +#pragma warning disable SYSLIB0050 if (!JsonTypeReflector.FullyTrusted) { string message = @"Type '{0}' implements ISerializable but cannot be serialized using the ISerializable interface because the current application is not fully trusted and ISerializable can expose secure data." + Environment.NewLine + @@ -925,6 +926,7 @@ namespace Newtonsoft.Json.Serialization _serializeStack.RemoveAt(_serializeStack.Count - 1); OnSerialized(writer, contract, value); +#pragma warning restore SYSLIB0050 } #endif