Skip to content

Commit 0603839

Browse files
authored
Upgrade Newtonsoft.Json from 13.0.1 to 13.0.3 (#195)
1 parent 13370d7 commit 0603839

4 files changed

+52
-68
lines changed
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Matt Thalman <[email protected]>
3+
Date: Tue, 15 Aug 2023 09:49:47 -0500
4+
Subject: [PATCH] Newtonsoft.Json project updates
5+
6+
---
7+
Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 15 +++++----------
8+
1 file changed, 5 insertions(+), 10 deletions(-)
9+
10+
diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
11+
index 47c63018..c939e71a 100644
12+
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
13+
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
14+
@@ -4,10 +4,10 @@
15+
<TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
16+
<LangVersion>9.0</LangVersion>
17+
<!-- version numbers will be updated by build -->
18+
- <AssemblyVersion>11.0.0.0</AssemblyVersion>
19+
- <FileVersion>11.0.1</FileVersion>
20+
- <VersionPrefix>11.0.1</VersionPrefix>
21+
- <VersionSuffix>beta2</VersionSuffix>
22+
+ <AssemblyVersion>13.0.0.0</AssemblyVersion>
23+
+ <FileVersion>13.0.3</FileVersion>
24+
+ <VersionPrefix>13.0.3</VersionPrefix>
25+
+ <VersionSuffix></VersionSuffix>
26+
<Authors>James Newton-King</Authors>
27+
<Company>Newtonsoft</Company>
28+
<Product>Json.NET</Product>
29+
@@ -31,10 +31,9 @@
30+
<MinClientVersion>2.12</MinClientVersion>
31+
<IncludeSymbols>true</IncludeSymbols>
32+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
33+
- <CodeAnalysisRuleset>Newtonsoft.Json.ruleset</CodeAnalysisRuleset>
34+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
35+
<!--Package Validation-->
36+
- <EnablePackageValidation>true</EnablePackageValidation>
37+
+ <EnablePackageValidation>false</EnablePackageValidation>
38+
<PackageValidationBaselineVersion>13.0.1</PackageValidationBaselineVersion>
39+
<!--CP0003 will be logged when the assembly identity between baseline package and current don't match.
40+
Disable that warning since local builds do not strong-name sign the assembly, causing a mistmatch when comparing
41+
@@ -47,10 +46,6 @@
42+
<None Include="packageIcon.png" Pack="true" PackagePath="\" />
43+
<None Include="README.md" Pack="true" PackagePath="\" />
44+
</ItemGroup>
45+
- <ItemGroup>
46+
- <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" PrivateAssets="All" />
47+
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
48+
- </ItemGroup>
49+
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
50+
<AssemblyTitle>Json.NET .NET 6.0</AssemblyTitle>
51+
<DefineConstants>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)</DefineConstants>

patches/newtonsoft-json/0001-update-AssemblyVersion-FileVersion-VersionPrefix-Ver.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

patches/newtonsoft-json/0002-remove-ruleset-and-unnecessary-dependencies.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/newtonsoft-json

Submodule newtonsoft-json updated 226 files

0 commit comments

Comments
 (0)