updated Newtonsoft.Json to 6.0.8

smst · May 2, 2015 · 5feb290 · 5feb290
1 parent 96457f1
commit 5feb290
Show file tree

Hide file tree

Showing 26 changed files with 9,607 additions and 7,540 deletions.
diff --git a/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj b/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj
@@ -67,7 +67,7 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="ReachFramework" />

diff --git a/Hearthstone Deck Tracker/packages.config b/Hearthstone Deck Tracker/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MahApps.Metro" version="1.1.2.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
 </packages>
diff --git a/packages/Newtonsoft.Json.6.0.3/Newtonsoft.Json.6.0.3.nupkg b/packages/Newtonsoft.Json.6.0.3/Newtonsoft.Json.6.0.3.nupkg
diff --git a/packages/Newtonsoft.Json.6.0.3/lib/net20/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.3/lib/net20/Newtonsoft.Json.dll
diff --git a/packages/Newtonsoft.Json.6.0.3/lib/net35/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.3/lib/net35/Newtonsoft.Json.dll
diff --git a/packages/Newtonsoft.Json.6.0.3/lib/net40/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.3/lib/net40/Newtonsoft.Json.dll
diff --git a/packages/Newtonsoft.Json.6.0.3/lib/net45/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.3/lib/net45/Newtonsoft.Json.dll
diff --git a/packages/Newtonsoft.Json.6.0.3/lib/netcore45/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.3/lib/netcore45/Newtonsoft.Json.dll
diff --git a/packages/Newtonsoft.Json.6.0.3/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.3/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.dll
diff --git a/packages/Newtonsoft.Json.6.0.3/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.3/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll
diff --git a/packages/Newtonsoft.Json.6.0.8/Newtonsoft.Json.6.0.8.nupkg b/packages/Newtonsoft.Json.6.0.8/Newtonsoft.Json.6.0.8.nupkg
diff --git a/packages/Newtonsoft.Json.6.0.8/lib/net20/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.8/lib/net20/Newtonsoft.Json.dll
diff --git a/....Json.6.0.3/lib/net20/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net20/Newtonsoft.Json.xml b/....Json.6.0.3/lib/net20/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net20/Newtonsoft.Json.xml
diff --git a/packages/Newtonsoft.Json.6.0.8/lib/net35/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.8/lib/net35/Newtonsoft.Json.dll
diff --git a/....Json.6.0.3/lib/net45/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net35/Newtonsoft.Json.xml b/....Json.6.0.3/lib/net45/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net35/Newtonsoft.Json.xml
diff --git a/packages/Newtonsoft.Json.6.0.8/lib/net40/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.8/lib/net40/Newtonsoft.Json.dll
diff --git a/....Json.6.0.3/lib/net40/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net40/Newtonsoft.Json.xml b/....Json.6.0.3/lib/net40/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net40/Newtonsoft.Json.xml
diff --git a/packages/Newtonsoft.Json.6.0.8/lib/net45/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.8/lib/net45/Newtonsoft.Json.dll
diff --git a/....Json.6.0.3/lib/net35/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net45/Newtonsoft.Json.xml b/....Json.6.0.3/lib/net35/Newtonsoft.Json.xml → ....Json.6.0.8/lib/net45/Newtonsoft.Json.xml
diff --git a/packages/Newtonsoft.Json.6.0.8/lib/netcore45/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.8/lib/netcore45/Newtonsoft.Json.dll
diff --git a/...n.6.0.3/lib/netcore45/Newtonsoft.Json.xml → ...n.6.0.8/lib/netcore45/Newtonsoft.Json.xml b/...n.6.0.3/lib/netcore45/Newtonsoft.Json.xml → ...n.6.0.8/lib/netcore45/Newtonsoft.Json.xml
diff --git a/packages/Newtonsoft.Json.6.0.8/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.6.0.8/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll
diff --git a/...le-net40+sl4+wp7+win8/Newtonsoft.Json.xml → ...0+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml b/...le-net40+sl4+wp7+win8/Newtonsoft.Json.xml → ...0+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml
diff --git a/...Newtonsoft.Json.6.0.8/lib/portable-net45+wp80+win8+wpa81+aspnetcore50/Newtonsoft.Json.dll b/...Newtonsoft.Json.6.0.8/lib/portable-net45+wp80+win8+wpa81+aspnetcore50/Newtonsoft.Json.dll
diff --git a/...net45+wp80+win8+wpa81/Newtonsoft.Json.xml → ...n8+wpa81+aspnetcore50/Newtonsoft.Json.xml b/...net45+wp80+win8+wpa81/Newtonsoft.Json.xml → ...n8+wpa81+aspnetcore50/Newtonsoft.Json.xml
diff --git a/...s/Newtonsoft.Json.6.0.3/tools/install.ps1 → ...s/Newtonsoft.Json.6.0.8/tools/install.ps1 b/...s/Newtonsoft.Json.6.0.3/tools/install.ps1 → ...s/Newtonsoft.Json.6.0.8/tools/install.ps1
@@ -5,7 +5,7 @@ param($installPath, $toolsPath, $package, $project)
 
 try
 {
-  $url = "http://james.newtonking.com/json"
+  $url = "http://james.newtonking.com/json/install?version=" + $package.Version
   $dte2 = Get-Interface $dte ([EnvDTE80.DTE2])
 
   if ($dte2.ActiveWindow.Caption -eq "Package Manager Console")
@@ -46,11 +46,14 @@ try
 
     $instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor `
       [System.Reflection.BindingFlags]::NonPublic)
+
     $consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor `
       [System.Reflection.BindingFlags]::NonPublic)
+
     if ($instanceField -eq $null -or $consoleField -eq $null) { return }
 
     $instance = $instanceField.GetValue($null)
+
     if ($instance -eq $null) { return }
 
     $consoleProvider = $consoleField.GetValue($instance)
@@ -86,8 +89,24 @@ try
 }
 catch
 {
-  # stop potential errors from bubbling up
-  # worst case the splash page won't open
+  try
+  {
+    $pmPane = $dte2.ToolWindows.OutputWindow.OutputWindowPanes.Item("Package Manager")
+
+    $selection = $pmPane.TextDocument.Selection
+    $selection.StartOfDocument($false)
+    $selection.EndOfDocument($true)
+
+    if ($selection.Text.StartsWith("Installing 'Newtonsoft.Json "))
+    {
+      $dte2.ItemOperations.Navigate($url) | Out-Null
+    }
+  }
+  catch
+  {
+    # stop potential errors from bubbling up
+    # worst case the splash page won't open  
+  }
 }
 
-# yolo
+# still yolo