Skip to content

Revert "Upgrade Newtonsoft.Json repo from 13.0.1 to 13.0.3 (#189)" #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 92a9b95ed67bc90cec1430a69fab84f2cf8a084f Mon Sep 17 00:00:00 2001
From: Logan Bussell <[email protected]>
Date: Fri, 6 Aug 2021 20:59:02 +0000
Subject: [PATCH 1/2] update AssemblyVersion, FileVersion, VersionPrefix,
VersionSuffix

---
Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
index 4dd7b55a..1c8f94ee 100644
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
@@ -4,10 +4,10 @@
<TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
<LangVersion>9.0</LangVersion>
<!-- version numbers will be updated by build -->
- <AssemblyVersion>11.0.0.0</AssemblyVersion>
- <FileVersion>11.0.1</FileVersion>
- <VersionPrefix>11.0.1</VersionPrefix>
- <VersionSuffix>beta2</VersionSuffix>
+ <AssemblyVersion>13.0.0.0</AssemblyVersion>
+ <FileVersion>13.0.1</FileVersion>
+ <VersionPrefix>13.0.1</VersionPrefix>
+ <VersionSuffix></VersionSuffix>
<Authors>James Newton-King</Authors>
<Company>Newtonsoft</Company>
<Product>Json.NET</Product>
--
2.30.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 36258dcf29495c2054bd4b30050c81e57d405da5 Mon Sep 17 00:00:00 2001
From: Logan Bussell <[email protected]>
Date: Fri, 6 Aug 2021 21:00:03 +0000
Subject: [PATCH 2/2] 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
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
@@ -30,7 +30,6 @@
<MinClientVersion>2.12</MinClientVersion>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
- <CodeAnalysisRuleset>Newtonsoft.Json.ruleset</CodeAnalysisRuleset>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>
<ItemGroup>
@@ -38,10 +37,6 @@
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
</ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" PrivateAssets="All" />
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
- </ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
<AssemblyTitle>Json.NET</AssemblyTitle>
<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>
--
2.30.2

2 changes: 1 addition & 1 deletion src/newtonsoft-json
Submodule newtonsoft-json updated 226 files