From 87682ed58da82b5ba6cf7811921254e2086a9bff Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 14 Aug 2023 15:24:00 -0500 Subject: [PATCH 1/3] Upgrade Newtonsoft.Json repo from 13.0.1 to 13.0.3 --- ...update-AssemblyVersion-FileVersion-VersionPrefix-Ver.patch | 4 ++-- src/newtonsoft-json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/newtonsoft-json/0001-update-AssemblyVersion-FileVersion-VersionPrefix-Ver.patch b/patches/newtonsoft-json/0001-update-AssemblyVersion-FileVersion-VersionPrefix-Ver.patch index 4f415e6c52..2422fa4255 100644 --- a/patches/newtonsoft-json/0001-update-AssemblyVersion-FileVersion-VersionPrefix-Ver.patch +++ b/patches/newtonsoft-json/0001-update-AssemblyVersion-FileVersion-VersionPrefix-Ver.patch @@ -21,8 +21,8 @@ index 4dd7b55a..1c8f94ee 100644 - 11.0.1 - beta2 + 13.0.0.0 -+ 13.0.1 -+ 13.0.1 ++ 13.0.3 ++ 13.0.3 + James Newton-King Newtonsoft diff --git a/src/newtonsoft-json b/src/newtonsoft-json index ae9fe44e13..0a2e291c0d 160000 --- a/src/newtonsoft-json +++ b/src/newtonsoft-json @@ -1 +1 @@ -Subproject commit ae9fe44e1323e91bcbd185ca1a14099fba7c021f +Subproject commit 0a2e291c0d9c0c7675d445703e51750363a549ef From 1dd6aa3b184246e1764cc06bd08d37cea44d7283 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 14 Aug 2023 15:56:40 -0500 Subject: [PATCH 2/3] Update patch --- ...ruleset-and-unnecessary-dependencies.patch | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch b/patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch index 06a3f1b543..0c1a39092d 100644 --- a/patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch +++ b/patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch @@ -1,35 +1,32 @@ -From 36258dcf29495c2054bd4b30050c81e57d405da5 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Fri, 6 Aug 2021 21:00:03 +0000 -Subject: [PATCH 2/2] remove ruleset and unnecessary dependencies +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Mon, 14 Aug 2023 15:54:36 -0500 +Subject: [PATCH] remove ruleset and unnecessary dependencies --- Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj -index 1c8f94ee..2be426fa 100644 +index 47c63018..33dd1a77 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj -@@ -30,7 +30,6 @@ +@@ -31,7 +31,6 @@ 2.12 true snupkg - Newtonsoft.Json.ruleset true - - -@@ -38,10 +37,6 @@ - - + + true +@@ -47,10 +46,6 @@ + + - - - - - - Json.NET - HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_REGEX_TIMEOUTS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;$(AdditionalConstants) --- -2.30.2 - + + Json.NET .NET 6.0 + HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_ASYNC_DISPOSABLE;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_REGEX_TIMEOUTS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;HAVE_INDEXOF_STRING_COMPARISON;HAVE_REPLACE_STRING_COMPARISON;HAVE_REPLACE_STRING_COMPARISON;HAVE_GETHASHCODE_STRING_COMPARISON;HAVE_NULLABLE_ATTRIBUTES;HAVE_DYNAMIC_CODE_COMPILED;HAS_ARRAY_EMPTY;HAVE_DATE_ONLY;$(AdditionalConstants) From 80121f77bdf274bfd56f9dd13c5a9e01ecd9d273 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 17 Aug 2023 13:47:59 -0500 Subject: [PATCH 3/3] Disable package validation, consolidate patches --- ...001-Newtonsoft.Json-project-updates.patch} | 33 +++++++++++++++---- ...ersion-FileVersion-VersionPrefix-Ver.patch | 32 ------------------ 2 files changed, 26 insertions(+), 39 deletions(-) rename patches/newtonsoft-json/{0002-remove-ruleset-and-unnecessary-dependencies.patch => 0001-Newtonsoft.Json-project-updates.patch} (67%) delete mode 100644 patches/newtonsoft-json/0001-update-AssemblyVersion-FileVersion-VersionPrefix-Ver.patch diff --git a/patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch b/patches/newtonsoft-json/0001-Newtonsoft.Json-project-updates.patch similarity index 67% rename from patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch rename to patches/newtonsoft-json/0001-Newtonsoft.Json-project-updates.patch index 0c1a39092d..e86f21e557 100644 --- a/patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch +++ b/patches/newtonsoft-json/0001-Newtonsoft.Json-project-updates.patch @@ -1,24 +1,43 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Matt Thalman -Date: Mon, 14 Aug 2023 15:54:36 -0500 -Subject: [PATCH] remove ruleset and unnecessary dependencies +Date: Tue, 15 Aug 2023 09:49:47 -0500 +Subject: [PATCH] Newtonsoft.Json project updates --- - Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 5 ----- - 1 file changed, 5 deletions(-) + Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj -index 47c63018..33dd1a77 100644 +index 47c63018..c939e71a 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj -@@ -31,7 +31,6 @@ +@@ -4,10 +4,10 @@ + $(LibraryFrameworks) + 9.0 + +- 11.0.0.0 +- 11.0.1 +- 11.0.1 +- beta2 ++ 13.0.0.0 ++ 13.0.3 ++ 13.0.3 ++ + James Newton-King + Newtonsoft + Json.NET +@@ -31,10 +31,9 @@ 2.12 true snupkg - Newtonsoft.Json.ruleset true - true +- true ++ false + 13.0.1 + -- 11.0.0.0 -- 11.0.1 -- 11.0.1 -- beta2 -+ 13.0.0.0 -+ 13.0.3 -+ 13.0.3 -+ - James Newton-King - Newtonsoft - Json.NET --- -2.30.2 -