From cc08ba0657fe6353e219452ee3442352e75e6356 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 18 Mar 2021 08:17:21 +1300 Subject: [PATCH 1/3] Remove compiler package and update sourcelink --- Src/Directory.Build.props | 3 +-- Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props index 11ecc4181..193daca09 100644 --- a/Src/Directory.Build.props +++ b/Src/Directory.Build.props @@ -5,8 +5,7 @@ 4.2.3 2.9.2 4.3.0 - 1.0.0-beta2-19367-01 - 3.8.0 + 1.0.0 16.3.0 4.8.1 3.11.0 diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj index bbb6328aa..485a57d29 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj @@ -41,8 +41,6 @@ - - Json.NET From e83a8dca24cbe5b555e76a0f4a9b6fe12f52d928 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 18 Mar 2021 08:35:46 +1300 Subject: [PATCH 2/3] Fix build warnings --- Src/Newtonsoft.Json/JsonSerializer.cs | 4 +--- Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Src/Newtonsoft.Json/JsonSerializer.cs b/Src/Newtonsoft.Json/JsonSerializer.cs index c4e6b6930..23f5c6b62 100644 --- a/Src/Newtonsoft.Json/JsonSerializer.cs +++ b/Src/Newtonsoft.Json/JsonSerializer.cs @@ -867,9 +867,7 @@ internal virtual void PopulateInternal(JsonReader reader, object target) [DebuggerStepThrough] public T? Deserialize(JsonReader reader) { -#pragma warning disable CS8601 // Possible null reference assignment. - return (T)Deserialize(reader, typeof(T)); -#pragma warning restore CS8601 // Possible null reference assignment. + return (T?)Deserialize(reader, typeof(T)); } /// diff --git a/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs b/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs index 9b62e0709..a92e2639b 100644 --- a/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs +++ b/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs @@ -492,8 +492,12 @@ void IDictionary.Add(object key, object value) #endif else { + // Consider changing this code to call GenericDictionary.Remove when value is null. + // #pragma warning disable CS8601 // Possible null reference assignment. +#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. GenericDictionary[(TKey)key] = (TValue)value; +#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. #pragma warning restore CS8601 // Possible null reference assignment. } } From 661c60c9262cc82a4c7ff6b70277bddf5271bafd Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 18 Mar 2021 08:45:35 +1300 Subject: [PATCH 3/3] Update code analysis package --- Src/Directory.Build.props | 2 +- Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props index 193daca09..661350885 100644 --- a/Src/Directory.Build.props +++ b/Src/Directory.Build.props @@ -3,7 +3,7 @@ 4.6.2 0.10.10 4.2.3 - 2.9.2 + 5.0.3 4.3.0 1.0.0 16.3.0 diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj index 485a57d29..4dd7b55a0 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj @@ -39,7 +39,7 @@ - +