From cd605e9d3e4ee38acde7cb4ac0afb8492ebe8ea6 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 21 Jun 2015 01:12:11 +0000 Subject: [PATCH] -Remove beta3 from NuGet version --- Build/build.ps1 | 2 +- Build/install.ps1 | 4 ++-- Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index de1e238f..948c9eb1 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -2,7 +2,7 @@ $zipFileName = "Json70r1.zip" $majorVersion = "7.0" $majorWithReleaseVersion = "7.0.1" - $nugetPrelease = "beta3" + $nugetPrelease = $null $version = GetVersion $majorWithReleaseVersion $packageId = "Newtonsoft.Json" $signAssemblies = $false diff --git a/Build/install.ps1 b/Build/install.ps1 index 6ff8fcb9..3715c2da 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/install?version=" + $package.Version + $url = "http://www.newtonsoft.com/json/install?version=" + $package.Version $dte2 = Get-Interface $dte ([EnvDTE80.DTE2]) if ($dte2.ActiveWindow.Caption -eq "Package Manager Console") @@ -97,7 +97,7 @@ catch $selection.StartOfDocument($false) $selection.EndOfDocument($true) - if ($selection.Text.StartsWith("Installing 'Newtonsoft.Json ")) + if ($selection.Text.StartsWith("Attempting to gather dependencies information for package 'Newtonsoft.Json." + $package.Version + "'")) { $dte2.ItemOperations.Navigate($url) | Out-Null } diff --git a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs index ccd14494..6e080d9b 100644 --- a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs @@ -57,4 +57,4 @@ 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.18610")] +[assembly: AssemblyFileVersion("7.0.1.18621")] diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 337b3edd..7968f7e4 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -76,4 +76,4 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18610")] +[assembly: AssemblyFileVersion("7.0.1.18621")] diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index fffb2610..d69ec8c2 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -92,5 +92,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("7.0.0.0")] -[assembly: AssemblyFileVersion("7.0.1.18610")] +[assembly: AssemblyFileVersion("7.0.1.18621")] [assembly: CLSCompliant(true)]