From bc40ef0a4c35ecf40d4d2d59e1396aa43492ed79 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 19 Oct 2014 19:53:49 +1300 Subject: [PATCH] -Reverted iOS NuGet target -Readme.txt --- Build/build.ps1 | 2 +- Doc/readme.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index 263dfb60..0c76fc1b 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -19,7 +19,7 @@ $builds = @( @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+aspnetcore50"; Framework="net-4.0"; Sign=$true}, - @{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81+xamarinios10"; Framework="net-4.0"; Sign=$true}, + @{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81"; Framework="net-4.0"; Sign=$true}, @{Name = $null; TestsName = "Newtonsoft.Json.Tests.AspNetCore50"; TestsFunction = "CoreClrTests"; Constants="ASPNETCORE50"; FinalDir="ASPNETCORE50"; NuGetDir = $null; Framework=$null; Sign=$null}, @{Name = "Newtonsoft.Json.WinRT"; TestsName = "Newtonsoft.Json.Tests.WinRT"; TestsFunction = "WinRTTests"; Constants="NETFX_CORE"; FinalDir="WinRT"; NuGetDir = "netcore45"; Framework="net-4.5"; Sign=$true}, @{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true}, diff --git a/Doc/readme.txt b/Doc/readme.txt index 46beeee8..579b5369 100644 --- a/Doc/readme.txt +++ b/Doc/readme.txt @@ -19,7 +19,7 @@ Json.NET is a popular high-performance JSON framework for .NET Documentation: -http://james.newtonking.com/projects/json/help/ +http://james.newtonking.com/json/help/ Versions: @@ -42,7 +42,7 @@ Json.NET has different libraries for the various .NET Framework versions. Windows 8 Store -Portable45: - .NET 4.5, Windows Phone 8, Windows 8 Store + .NET 4.5, Windows Phone 8, Windows 8 Store, ASP.NET CoreCLR -Portable40: .NET 4.0, Windows Phone 8, Windows 8 Store, Silverlight 5, MonoTouch, MonoDroid