Update Newtonsoft.Json

CoreTweet · Jul 23, 2016 · 0099e7e · 0099e7e
1 parent bf1d1db
commit 0099e7e
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 32 deletions.
diff --git a/CoreTweet.Pcl/CoreTweet.Pcl.csproj b/CoreTweet.Pcl/CoreTweet.Pcl.csproj
@@ -35,8 +35,8 @@
     <DocumentationFile>..\Release\portable-net45+dnxcore50+win8+wpa81+MonoAndroid+xamarinios+MonoTouch\CoreTweet.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/CoreTweet.Pcl/packages.config b/CoreTweet.Pcl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
diff --git a/CoreTweet.Shared/Internal/Extensions.cs b/CoreTweet.Shared/Internal/Extensions.cs
@@ -144,15 +144,14 @@ internal static void Rethrow(this Exception ex)
         }
     }
 
-#if WIN_RT || PCL
+#if (WIN_RT || PCL) && !NETCOREAPP1_0
     internal static class TypeInfoExtensions
     {
         internal static IEnumerable<Type> GetInterfaces(this TypeInfo source)
         {
             return source.ImplementedInterfaces;
         }
 
-#if !NETCOREAPP1_0
         internal static PropertyInfo GetProperty(this TypeInfo source, string name)
         {
             return source.GetDeclaredProperty(name);
@@ -162,7 +161,6 @@ internal static MethodInfo GetGetMethod(this PropertyInfo source)
         {
             return source.GetMethod;
         }
-#endif
     }
 #endif
 

diff --git a/CoreTweet.Universal/CoreTweet.Universal.csproj b/CoreTweet.Universal/CoreTweet.Universal.csproj
@@ -40,8 +40,9 @@
     <TargetPlatform Include="Windows, Version=8.1" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/CoreTweet.Universal/packages.config b/CoreTweet.Universal/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="portable-win81+wpa81" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable46-win81+wpa81" />
 </packages>
diff --git a/CoreTweet.net35/CoreTweet.net35.csproj b/CoreTweet.net35/CoreTweet.net35.csproj
@@ -31,11 +31,12 @@
     <DocumentationFile>..\Release\net35\CoreTweet.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net35\Newtonsoft.Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/CoreTweet.net35/packages.config b/CoreTweet.net35/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" />
 </packages>
diff --git a/CoreTweet.net40/CoreTweet.net40.csproj b/CoreTweet.net40/CoreTweet.net40.csproj
@@ -31,11 +31,12 @@
     <DocumentationFile>..\Release\net40\CoreTweet.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
@@ -50,12 +51,9 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup />
   <Import Project="..\CoreTweet.Shared\CoreTweet.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/CoreTweet.net40/packages.config b/CoreTweet.net40/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="4.5.11"/>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
 </packages>
diff --git a/CoreTweet.net45/CoreTweet.net45.csproj b/CoreTweet.net45/CoreTweet.net45.csproj
@@ -31,11 +31,12 @@
     <DocumentationFile>..\Release\net45\CoreTweet.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
   </ItemGroup>

diff --git a/CoreTweet.net45/packages.config b/CoreTweet.net45/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>
diff --git a/CoreTweet.nuspec b/CoreTweet.nuspec
@@ -20,17 +20,32 @@ See also: https://github.com/CoreTweet/CoreTweet
         <tags>Twitter</tags>
         <dependencies>
             <group>
-                <dependency id="Newtonsoft.Json" version="6.0.8" />
-            </group>
-            <group targetFramework="net35">
-                <!-- Support old Mono -->
-                <dependency id="Newtonsoft.Json" version="4.5.11" />
+                <dependency id="Newtonsoft.Json" version="9.0.1" />
             </group>
             <group targetFramework="netstandard1.1">
-                <!-- Newtonsoft.Json started supporting .NETStandard from 9.0.1 -->
                 <dependency id="Newtonsoft.Json" version="9.0.1" />
+                <dependency id="System.Dynamic.Runtime" version="4.0.11" />
+                <dependency id="System.Globalization" version="4.0.11" />
+                <dependency id="System.Linq" version="4.1.0" />
+                <dependency id="System.Linq.Expressions" version="4.1.0" />
+                <dependency id="System.Net.Http" version="4.1.0" />
+                <dependency id="System.Reflection.Extensions" version="4.0.1" />
+                <dependency id="System.Runtime.Extensions" version="4.1.0" />
+                <dependency id="System.Text.RegularExpressions" version="4.1.0" />
+                <dependency id="System.Threading" version="4.0.11" />
+            </group>
+            <group targetFramework="netcoreapp1.0">
+                <dependency id="Newtonsoft.Json" version="9.0.1" />
+                <dependency id="System.Dynamic.Runtime" version="4.0.11" />
+                <dependency id="System.Globalization" version="4.0.11" />
+                <dependency id="System.IO.FileSystem", version="4.0.1" />
+                <dependency id="System.Linq" version="4.1.0" />
                 <dependency id="System.Linq.Expressions" version="4.1.0" />
                 <dependency id="System.Net.Http" version="4.1.0" />
+                <dependency id="System.Reflection.Extensions" version="4.0.1" />
+                <dependency id="System.Runtime.Extensions" version="4.1.0" />
+                <dependency id="System.Text.RegularExpressions" version="4.1.0" />
+                <dependency id="System.Threading" version="4.0.11" />
             </group>
         </dependencies>
     </metadata>