-Changed version to 6.0.8

This commit is contained in:
James Newton-King
2015-01-11 17:03:08 +13:00
parent 6c1e1bfcba
commit 773610fbdf
6 changed files with 33 additions and 14 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Newtonsoft.Json</id>
<version>7.0.1-beta1</version>
<version>6.0.8</version>
<title>Json.NET</title>
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
<authors>James Newton-King</authors>
+3 -3
View File
@@ -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"
+23 -4
View File
@@ -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