Unify Json.Net to v10.0.3.

TrackableEntities · Nov 9, 2017 · 59277d6 · 59277d6
1 parent a877d48
commit 59277d6
Show file tree

Hide file tree

Showing 22 changed files with 6 additions and 6 deletions.
diff --git a/Build/NuGet.exe b/Build/NuGet.exe
diff --git a/Build/Scripts/Debug/TrackableEntities.Client-test.cmd b/Build/Scripts/Debug/TrackableEntities.Client-test.cmd
@@ -1,5 +1,5 @@
 cd ..\..\..\
-set PackageVersion=2.5.0-test
+set PackageVersion=2.5.6-test
 set Configuration=Debug
 rem pass 1 to debug, 0 to run without pausing
 Build\Scripts\TrackableEntities.Client.cmd 1
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.6.1.nupkg b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.6.1.nupkg
diff --git a/...ackages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.6.1.symbols.nupkg b/...ackages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.6.1.symbols.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.6.1.nupkg b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.6.1.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.6.1.symbols.nupkg b/NuGet/Packages/TrackableEntities.Client/TrackableEntities.Client.2.5.6.1.symbols.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.6.1.nupkg b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.6.1.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.6.1.symbols.nupkg b/NuGet/Packages/TrackableEntities.Common/TrackableEntities.Common.2.5.6.1.symbols.nupkg
diff --git a/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.6.1.nupkg b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.6.1.nupkg
diff --git a/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.6.1.symbols.nupkg b/NuGet/Packages/TrackableEntities.EF.5/TrackableEntities.EF.5.2.5.6.1.symbols.nupkg
diff --git a/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.6.1.nupkg b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.6.1.nupkg
diff --git a/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.6.1.symbols.nupkg b/NuGet/Packages/TrackableEntities.EF.6/TrackableEntities.EF.6.2.5.6.1.symbols.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.6.1.nupkg b/NuGet/Packages/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.6.1.nupkg
diff --git a/...ges/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.6.1.symbols.nupkg b/...ges/TrackableEntities.Patterns.EF.6/TrackableEntities.Patterns.EF.6.2.5.6.1.symbols.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.6.1.nupkg b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.6.1.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.6.1.symbols.nupkg b/NuGet/Packages/TrackableEntities.Patterns/TrackableEntities.Patterns.2.5.6.1.symbols.nupkg
diff --git a/NuGet/Tools/NuGet.exe b/NuGet/Tools/NuGet.exe
diff --git a/Source/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.csproj b/Source/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.csproj
@@ -41,7 +41,7 @@
   </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\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Source/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec b/Source/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec
@@ -16,7 +16,7 @@
         <dependencies>
             <group targetFramework="net40">
                 <dependency id="TrackableEntities.Common" version="$PackageVersion$" />
-                <dependency id="Newtonsoft.Json" version="6.0.8" />
+                <dependency id="Newtonsoft.Json" version="10.0.3" />
             </group>
         </dependencies>
     </metadata>

diff --git a/Source/TrackableEntities.Client.Net4/packages.config b/Source/TrackableEntities.Client.Net4/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40-client" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net40-client" />
 </packages>
diff --git a/Source/TrackableEntities.Client.Sl5/TrackableEntities.Client.Sl5.csproj b/Source/TrackableEntities.Client.Sl5/TrackableEntities.Client.Sl5.csproj
@@ -57,7 +57,7 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\portable-net40+sl5+win8+wp8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows" />

diff --git a/build-test.cmd b/build-test.cmd
@@ -1,4 +1,4 @@
-set PackageVersion=2.5.6
+set PackageVersion=2.5.6.1
 rem set Configuration=Debug
 rem build.cmd -debug
 build.cmd