Skip to content

Commit 8fc77fa

Browse files
authored
Revert "Upgrade Newtonsoft.Json repo from 13.0.1 to 13.0.3" (#191)
This reverts commit ca7c730.
1 parent ca7c730 commit 8fc77fa

File tree

4 files changed

+68
-52
lines changed

4 files changed

+68
-52
lines changed

patches/newtonsoft-json/0001-Newtonsoft.Json-project-updates.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 92a9b95ed67bc90cec1430a69fab84f2cf8a084f Mon Sep 17 00:00:00 2001
2+
From: Logan Bussell <[email protected]>
3+
Date: Fri, 6 Aug 2021 20:59:02 +0000
4+
Subject: [PATCH 1/2] update AssemblyVersion, FileVersion, VersionPrefix,
5+
VersionSuffix
6+
7+
---
8+
Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 8 ++++----
9+
1 file changed, 4 insertions(+), 4 deletions(-)
10+
11+
diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
12+
index 4dd7b55a..1c8f94ee 100644
13+
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
14+
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
15+
@@ -4,10 +4,10 @@
16+
<TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
17+
<LangVersion>9.0</LangVersion>
18+
<!-- version numbers will be updated by build -->
19+
- <AssemblyVersion>11.0.0.0</AssemblyVersion>
20+
- <FileVersion>11.0.1</FileVersion>
21+
- <VersionPrefix>11.0.1</VersionPrefix>
22+
- <VersionSuffix>beta2</VersionSuffix>
23+
+ <AssemblyVersion>13.0.0.0</AssemblyVersion>
24+
+ <FileVersion>13.0.1</FileVersion>
25+
+ <VersionPrefix>13.0.1</VersionPrefix>
26+
+ <VersionSuffix></VersionSuffix>
27+
<Authors>James Newton-King</Authors>
28+
<Company>Newtonsoft</Company>
29+
<Product>Json.NET</Product>
30+
--
31+
2.30.2
32+
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 36258dcf29495c2054bd4b30050c81e57d405da5 Mon Sep 17 00:00:00 2001
2+
From: Logan Bussell <[email protected]>
3+
Date: Fri, 6 Aug 2021 21:00:03 +0000
4+
Subject: [PATCH 2/2] remove ruleset and unnecessary dependencies
5+
6+
---
7+
Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 5 -----
8+
1 file changed, 5 deletions(-)
9+
10+
diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
11+
index 1c8f94ee..2be426fa 100644
12+
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
13+
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
14+
@@ -30,7 +30,6 @@
15+
<MinClientVersion>2.12</MinClientVersion>
16+
<IncludeSymbols>true</IncludeSymbols>
17+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
18+
- <CodeAnalysisRuleset>Newtonsoft.Json.ruleset</CodeAnalysisRuleset>
19+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
20+
</PropertyGroup>
21+
<ItemGroup>
22+
@@ -38,10 +37,6 @@
23+
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
24+
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
25+
</ItemGroup>
26+
- <ItemGroup>
27+
- <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" PrivateAssets="All" />
28+
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
29+
- </ItemGroup>
30+
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
31+
<AssemblyTitle>Json.NET</AssemblyTitle>
32+
<DefineConstants>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)</DefineConstants>
33+
--
34+
2.30.2
35+

src/newtonsoft-json

Submodule newtonsoft-json updated 226 files

0 commit comments

Comments
 (0)