-Build

JamesNK · Apr 2, 2017 · 3c9b670 · 3c9b670
1 parent f11ac20
commit 3c9b670
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Build/build.ps1 b/Build/build.ps1
@@ -27,7 +27,7 @@
     @{Name = "Newtonsoft.Json.Roslyn"; TestsName = "Newtonsoft.Json.Tests.Roslyn"; BuildFunction = "NetCliBuild"; TestsFunction = "NetCliTests"; NuGetDir = "netstandard1.0,netstandard1.3"; Framework=$null; Enabled=$true},
     @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; NuGetDir = "net45"; Framework="net-4.0"; Enabled=$true},
     @{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; NuGetDir = "portable-net45+win8+wpa81+wp8"; Framework="net-4.0"; Enabled=$true},
-    @{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; NuGetDir = "portable-net40+win8+wpa81+wp8+sl5"; Framework="net-4.0"; Enabled=$true},
+    @{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; NuGetDir = "portable-net40+sl5+win8+wpa81+wp8"; Framework="net-4.0"; Enabled=$true},
     @{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; NuGetDir = "net40"; Framework="net-4.0"; Enabled=$true},
     @{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; NuGetDir = "net35"; Framework="net-2.0"; Enabled=$true},
     @{Name = "Newtonsoft.Json.Net20"; TestsName = "Newtonsoft.Json.Tests.Net20"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; NuGetDir = "net20"; Framework="net-2.0"; Enabled=$true}

diff --git a/Doc/readme.txt b/Doc/readme.txt
@@ -13,7 +13,7 @@ Json.NET is a popular high-performance JSON framework for .NET
 -High performance, faster than .NET's built-in JSON serializers
 -Write indented, easy to read JSON
 -Convert JSON to and from XML
--Supports .NET 2, .NET 3.5, .NET 4, .NET 4.5, Silverlight, Windows Phone and Windows 8 Store
+-Supports .NET 2, .NET 3.5, .NET 4, .NET 4.5, Silverlight, Windows Phone, Windows 8 Store and .NET Core
 
 
 Documentation:
@@ -25,24 +25,30 @@ Versions:
 
 Json.NET has different libraries for the various .NET Framework versions.
 
--Net45:
-  .NET latest (4.5)
+-net45:
+  .NET 4.5+
 
--Net40:
+-net40:
   .NET 4.0
 
--Net35:
+-net35:
   .NET 3.5
 
--Net20:
+-net20:
   .NET 2.0, Unity
 
--Portable45:
-  .NET 4.5, Windows Phone 8, Windows 8 Store, .NET Core
+-portable-net45+win8+wpa81+wp8:
+  .NET 4.5, Windows Phone 8, Windows 8 Store
 
--Portable40:
+-portable-net40+sl5+win8+wpa81+wp8:
   .NET 4.0, Windows Phone 8, Windows 8 Store, Silverlight 5, MonoTouch, MonoDroid
 
+-netstandard1.0:
+  .NET Standard 1.0
+
+-netstandard1.3:
+  .NET Standard 1.3
+
 
 Notes: