Skip to content

Commit 023c027

Browse files
authored
Remove dependency on personal repo for Newtonsoft.Json 9.0.1 and 12.0.2
[release/5.0] Remove dependency on personal repo for Newtonsoft.Json 9.0.1 and 12.0.2
2 parents 0c06316 + 46628a2 commit 023c027

6 files changed

+465
-4
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
</Dependency>
108108
<!-- external dependencies, not handled by Maestro/Arcade -->
109109
<Dependency Name="Newtonsoft.Json" Version="12.0.2">
110-
<Uri>https://github.com/adaggarwal/Newtonsoft.Json</Uri>
111-
<Sha>cac0690ad133c5e166ce5642dc71175791404fad</Sha>
110+
<Uri>https://github.com/JamesNK/Newtonsoft.Json.git</Uri>
111+
<Sha>4ab34b0461fb595805d092a46a58f35f66c84d6a</Sha>
112112
<RepoName>newtonsoft-json</RepoName>
113113
</Dependency>
114114
<Dependency Name="Microsoft.DiaSymReader" Version="1.3.0">
@@ -118,8 +118,8 @@
118118
</Dependency>
119119
<!-- additional Newtonsoft version to ease out individual repo updates to use current source-build version-->
120120
<Dependency Name="Newtonsoft.Json" Version="9.0.1">
121-
<Uri>https://github.com/adaggarwal/Newtonsoft.Json</Uri>
122-
<Sha>e43dae94c26f0c30e9095327a3a9eac87193923d</Sha>
121+
<Uri>https://github.com/JamesNK/Newtonsoft.Json.git</Uri>
122+
<Sha>e5ac9a8473dfdefb8fe2cddae433a9aaa94a5b37</Sha>
123123
<RepoName>newtonsoft-json901</RepoName>
124124
</Dependency>
125125
<!-- dependencies that will go away soon -->
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 252b0a02a539d144a246267010b91870c86744e8 Mon Sep 17 00:00:00 2001
2+
From: adaggarwal <aditya.aggarwal@microsoft.com>
3+
Date: Tue, 28 May 2019 14:48:10 -0500
4+
Subject: [PATCH 1/2] Updated AssemblyVersion, FileVersion, Version Prefix and
5+
Version Suffix
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 12e589b8..f5264490 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>latest</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>12.0.0.0</AssemblyVersion>
24+
+ <FileVersion>12.0.2</FileVersion>
25+
+ <VersionPrefix>12.0.2</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: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From cac0690ad133c5e166ce5642dc71175791404fad Mon Sep 17 00:00:00 2001
2+
From: adaggarw <aditya.aggarwal@microsoft.com>
3+
Date: Wed, 19 Jun 2019 15:43:39 +0000
4+
Subject: [PATCH 2/2] removed ruleset and dependency on a couple packages.
5+
6+
---
7+
Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 7 +------
8+
1 file changed, 1 insertion(+), 6 deletions(-)
9+
10+
diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
11+
index f5264490..bd3b3b11 100644
12+
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
13+
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
14+
@@ -28,16 +28,11 @@
15+
<MinClientVersion>2.12</MinClientVersion>
16+
<IncludeSymbols>true</IncludeSymbols>
17+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
18+
- <CodeAnalysisRuleset>Newtonsoft.Json.ruleset</CodeAnalysisRuleset>
19+
</PropertyGroup>
20+
<ItemGroup>
21+
<None Remove="**\*.orig" />
22+
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
23+
</ItemGroup>
24+
- <ItemGroup>
25+
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.2" PrivateAssets="All" />
26+
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
27+
- </ItemGroup>
28+
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
29+
<AssemblyTitle>Json.NET</AssemblyTitle>
30+
<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_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>
31+
@@ -93,4 +88,4 @@
32+
<NugetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile259</NugetTargetMoniker>
33+
<LanguageTargets>$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets</LanguageTargets>
34+
</PropertyGroup>
35+
-</Project>
36+
\ No newline at end of file
37+
+</Project>
38+
--
39+
2.30.2
40+

0 commit comments

Comments
 (0)