-Changed version to 6.0.8
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>Newtonsoft.Json</id>
|
<id>Newtonsoft.Json</id>
|
||||||
<version>7.0.1-beta1</version>
|
<version>6.0.8</version>
|
||||||
<title>Json.NET</title>
|
<title>Json.NET</title>
|
||||||
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
|
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
|
||||||
<authors>James Newton-King</authors>
|
<authors>James Newton-King</authors>
|
||||||
|
|||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
properties {
|
properties {
|
||||||
$zipFileName = "Json70r1.zip"
|
$zipFileName = "Json60r8.zip"
|
||||||
$majorVersion = "7.0"
|
$majorVersion = "6.0"
|
||||||
$majorWithReleaseVersion = "7.0.1"
|
$majorWithReleaseVersion = "6.0.8"
|
||||||
$version = GetVersion $majorWithReleaseVersion
|
$version = GetVersion $majorWithReleaseVersion
|
||||||
$signAssemblies = $false
|
$signAssemblies = $false
|
||||||
$signKeyPath = "C:\Development\Releases\newtonsoft.snk"
|
$signKeyPath = "C:\Development\Releases\newtonsoft.snk"
|
||||||
|
|||||||
+23
-4
@@ -5,7 +5,7 @@ param($installPath, $toolsPath, $package, $project)
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
$url = "http://james.newtonking.com/json"
|
$url = "http://james.newtonking.com/json/install?version=" + $package.Version
|
||||||
$dte2 = Get-Interface $dte ([EnvDTE80.DTE2])
|
$dte2 = Get-Interface $dte ([EnvDTE80.DTE2])
|
||||||
|
|
||||||
if ($dte2.ActiveWindow.Caption -eq "Package Manager Console")
|
if ($dte2.ActiveWindow.Caption -eq "Package Manager Console")
|
||||||
@@ -46,11 +46,14 @@ try
|
|||||||
|
|
||||||
$instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor `
|
$instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor `
|
||||||
[System.Reflection.BindingFlags]::NonPublic)
|
[System.Reflection.BindingFlags]::NonPublic)
|
||||||
|
|
||||||
$consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor `
|
$consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor `
|
||||||
[System.Reflection.BindingFlags]::NonPublic)
|
[System.Reflection.BindingFlags]::NonPublic)
|
||||||
|
|
||||||
if ($instanceField -eq $null -or $consoleField -eq $null) { return }
|
if ($instanceField -eq $null -or $consoleField -eq $null) { return }
|
||||||
|
|
||||||
$instance = $instanceField.GetValue($null)
|
$instance = $instanceField.GetValue($null)
|
||||||
|
|
||||||
if ($instance -eq $null) { return }
|
if ($instance -eq $null) { return }
|
||||||
|
|
||||||
$consoleProvider = $consoleField.GetValue($instance)
|
$consoleProvider = $consoleField.GetValue($instance)
|
||||||
@@ -86,8 +89,24 @@ try
|
|||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
# stop potential errors from bubbling up
|
try
|
||||||
# worst case the splash page won't open
|
{
|
||||||
|
$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
|
||||||
@@ -56,5 +56,5 @@ using System.Runtime.InteropServices;
|
|||||||
//
|
//
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("7.0.0.0")]
|
[assembly: AssemblyVersion("6.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("7.0.1.18111")]
|
[assembly: AssemblyFileVersion("6.0.8.18111")]
|
||||||
|
|||||||
@@ -75,5 +75,5 @@ using System.Security;
|
|||||||
// You can specify all the values or you can default the Revision and Build Numbers
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
|
|
||||||
[assembly: AssemblyVersion("7.0.0.0")]
|
[assembly: AssemblyVersion("6.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("7.0.1.18111")]
|
[assembly: AssemblyFileVersion("6.0.8.18111")]
|
||||||
|
|||||||
@@ -91,6 +91,6 @@ using System.Security;
|
|||||||
// You can specify all the values or you can default the Revision and Build Numbers
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
|
|
||||||
[assembly: AssemblyVersion("7.0.0.0")]
|
[assembly: AssemblyVersion("6.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("7.0.1.18111")]
|
[assembly: AssemblyFileVersion("6.0.8.18111")]
|
||||||
[assembly: CLSCompliant(true)]
|
[assembly: CLSCompliant(true)]
|
||||||
|
|||||||
Reference in New Issue
Block a user