-Fixed potential inifinite loop when parsing unquoted value

-Added NuGet install.ps1
-Incremented version to 5.0.6
This commit is contained in:
James Newton-King
2013-06-01 14:18:20 +12:00
parent 1b63698c02
commit 13aa07f63e
9 changed files with 144 additions and 9 deletions
+9 -5
View File
@@ -1,12 +1,12 @@
properties {
$zipFileName = "Json50r5.zip"
$zipFileName = "Json50r6.zip"
$majorVersion = "4.5"
$majorWithReleaseVersion = "5.0.5"
$majorWithReleaseVersion = "5.0.6"
$version = GetVersion $majorWithReleaseVersion
$signAssemblies = $false
$signKeyPath = "D:\Development\Releases\newtonsoft.snk"
$buildDocumentation = $false
$buildNuGet = $false
$buildNuGet = $true
$treatWarningsAsErrors = $false
$baseDir = resolve-path ..
@@ -17,7 +17,7 @@
$releaseDir = "$baseDir\Release"
$workingDir = "$baseDir\Working"
$builds = @(
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true},
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true}
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8"; Framework="net-4.0"; Sign=$true},
@{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl4+wp7+win8"; Framework="net-4.0"; Sign=$true},
@{Name = "Newtonsoft.Json.WinRT"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="WinRT"; NuGetDir = "netcore45"; Framework="net-4.5"; Sign=$true},
@@ -77,11 +77,15 @@ task Package -depends Build {
if ($buildNuGet)
{
New-Item -Path $workingDir\NuGet -ItemType Directory
New-Item -Path $workingDir\NuGet\tools -ItemType Directory
Copy-Item -Path "$buildDir\Newtonsoft.Json.nuspec" -Destination $workingDir\NuGet\Newtonsoft.Json.nuspec -recurse
Copy-Item -Path "$buildDir\install.ps1" -Destination $workingDir\NuGet\tools\install.ps1 -recurse
foreach ($build in $builds)
{
if ($build.NuGetDir -ne $null)
if ($build.NuGetDir)
{
$name = $build.TestsName
$finalDir = $build.FinalDir