diff --git a/Build/Newtonsoft.Json.nuspec b/Build/Newtonsoft.Json.nuspec index 094705d7..d5cfd772 100644 --- a/Build/Newtonsoft.Json.nuspec +++ b/Build/Newtonsoft.Json.nuspec @@ -2,7 +2,7 @@ Newtonsoft.Json - 7.0.1-beta1 + 6.0.8 Json.NET Json.NET is a popular high-performance JSON framework for .NET James Newton-King diff --git a/Build/build.ps1 b/Build/build.ps1 index 7d488120..7046d9e3 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -1,7 +1,7 @@ properties { - $zipFileName = "Json70r1.zip" - $majorVersion = "7.0" - $majorWithReleaseVersion = "7.0.1" + $zipFileName = "Json60r8.zip" + $majorVersion = "6.0" + $majorWithReleaseVersion = "6.0.8" $version = GetVersion $majorWithReleaseVersion $signAssemblies = $false $signKeyPath = "C:\Development\Releases\newtonsoft.snk" diff --git a/Build/install.ps1 b/Build/install.ps1 index dfc78f05..6ff8fcb9 100644 --- a/Build/install.ps1 +++ b/Build/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 \ No newline at end of file +# still yolo \ No newline at end of file diff --git a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs index 0a4e149b..504396f7 100644 --- a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs @@ -56,5 +56,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18111")] +[assembly: AssemblyVersion("6.0.0.0")] +[assembly: AssemblyFileVersion("6.0.8.18111")] diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index a90382a8..56138025 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -75,5 +75,5 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18111")] +[assembly: AssemblyVersion("6.0.0.0")] +[assembly: AssemblyFileVersion("6.0.8.18111")] diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 5c4eee98..494e1c56 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -91,6 +91,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18111")] +[assembly: AssemblyVersion("6.0.0.0")] +[assembly: AssemblyFileVersion("6.0.8.18111")] [assembly: CLSCompliant(true)]