-Increment version to 1.0.9

-Changed aspnetcore50 to dnxcore50 -Simplify license -NuGet icon
JamesNK · Jun 27, 2015 · 707291b · 707291b
1 parent de87d3b
commit 707291b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 107 deletions.
diff --git a/Build/Newtonsoft.Json.Schema.nuspec b/Build/Newtonsoft.Json.Schema.nuspec
@@ -2,12 +2,13 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Newtonsoft.Json.Schema</id>
-    <version>1.0.8</version>
+    <version>1.0.9</version>
     <title>Json.NET Schema</title>
     <description>Json.NET Schema is a complete and easy-to-use JSON Schema framework for .NET</description>
     <authors>Newtonsoft</authors>
     <language>en-US</language>
     <projectUrl>http://www.newtonsoft.com/jsonschema</projectUrl>
+    <iconUrl>http://www.newtonsoft.com/content/images/nugeticon.png</iconUrl>
     <licenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json.Schema/master/LICENSE.md</licenseUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>json schema</tags>

diff --git a/Build/build.ps1 b/Build/build.ps1
@@ -1,7 +1,7 @@
 properties { 
-  $zipFileName = "JsonSchema10r8.zip"
+  $zipFileName = "JsonSchema10r9.zip"
   $majorVersion = "1.0"
-  $majorWithReleaseVersion = "1.0.8"
+  $majorWithReleaseVersion = "1.0.9"
   $version = GetVersion $majorWithReleaseVersion
   $signAssemblies = $false
   $signKeyPath = "C:\Development\Releases\newtonsoft.snk"
@@ -22,7 +22,7 @@
     @{Name = "Newtonsoft.Json.Schema"; TestsName = "Newtonsoft.Json.Schema.Tests"; TestsFunction = "NUnitTests"; Constants=$null; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true},
     @{Name = "Newtonsoft.Json.Schema.Net35"; TestsName = "Newtonsoft.Json.Schema.Net35.Tests"; TestsFunction = "NUnitTests"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"; Sign=$true},
     @{Name = "Newtonsoft.Json.Schema.Net40"; TestsName = "Newtonsoft.Json.Schema.Net40.Tests"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
-    @{Name = "Newtonsoft.Json.Schema.Portable"; TestsName = "Newtonsoft.Json.Schema.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+aspnetcore50"; Framework="net-4.0"; Sign=$true}
+    @{Name = "Newtonsoft.Json.Schema.Portable"; TestsName = "Newtonsoft.Json.Schema.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+dnxcore50"; Framework="net-4.0"; Sign=$true}
   )
 }
 

diff --git a/Doc/license.txt b/Doc/license.txt
@@ -12,57 +12,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
 
 
-## FOSS License Exception
-
-This Exception applies to open source applications built with Json.NET Schema
-("The Software"), and to open source Derivative Works of the Software, that use
-the Software under the terms of GNU Affero General Public License, version 3
-("AGPLv3"). The Exception extends AGPLv3 by providing additional grants that
-allows developers of FOSS applications to include Json.NET Schema with their FOSS
-applications in combination with other software licensed under the licenses from
-the "Open Source License List" below, provided that:
-
-You obey the AGPLv3 terms for the Software and the Derivative Work, except for 
-the separate parts of the Derivative Work ("Additions") which constitute independent 
-work and are not dervied from the Software.
-
-  - All Additions are distributed subject to one of the licenses listed below.
-  - Your software distribution provides complete source code for the Additions.
-  - The Derivative Work and its Additions are intended for use in end-user applications 
-    and do not constitute software intended for use by software developers, such as 
-    software libraries, components, and development kits.
-  - If you violate any of the terms in this Exception, you lose all rights granted 
-    to you by the Exception and revert to the terms of AGPLv3.
-
-Newtonsoft reserves all rights not expressly granted in these terms and conditions. 
-
-### Open Source License List
-
-Name                                                   | Version
-:----------------------------------------------------- | :------------
-Academic Free License                                  | 2.0
-Apache Software License                                | 2.0
-Apple Public Source License                            | 2.0
-Artistic license                                       | From Perl 5.8.0
-BSD license                                            | July 22 1999
-Common Development and Distribution License (CDDL)     | 1.0
-Common Public License                                  | 1.0
-Eclipse Public License                                 | 1.0
-Educational Community License                          | 2.0
-European Union Public License (EUPL)                   | 1.1
-GNU General Public License (GPL)                       | 2.0
-GNU Library or "Lesser" General Public License (LGPL)  | 3.0
-Jabber Open Source License                             | 1.0
-MIT License (As listed in file MIT-License.txt)        | -
-Mozilla Public License (MPL)                           | 1.0/1.1
-Open Software License                                  | 2.0
-OpenSSL license (with original SSLeay license)         | 2003 (1998)
-University of Illinois/NCSA Open Source License        | -
-W3C License                                            | 2001
-X11 License                                            | 2001
-Zlib/libpng License                                    | -
-
-
 ## Commercial License
 
 In addition to this license, Json.NET Schema is offered under a commerical license.
diff --git a/Doc/readme.txt b/Doc/readme.txt
@@ -40,4 +40,4 @@ Json.NET Schema has different libraries for the various .NET Framework versions.
   .NET 3.5
 
 -Portable:
-  .NET 4.5, Windows Phone 8, Windows 8 Store, ASP.NET CoreCLR, Xamarin
+  .NET 4.5, Windows Phone 8, Windows 8 Store, .NET Core, Xamarin
diff --git a/LICENSE.md b/LICENSE.md
@@ -12,57 +12,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
 
 
-## FOSS License Exception
-
-This Exception applies to open source applications built with Json.NET Schema
-("The Software"), and to open source Derivative Works of the Software, that use
-the Software under the terms of GNU Affero General Public License, version 3
-("AGPLv3"). The Exception extends AGPLv3 by providing additional grants that
-allows developers of FOSS applications to include Json.NET Schema with their FOSS
-applications in combination with other software licensed under the licenses from
-the "Open Source License List" below, provided that:
-
-You obey the AGPLv3 terms for the Software and the Derivative Work, except for 
-the separate parts of the Derivative Work ("Additions") which constitute independent 
-work and are not dervied from the Software.
-
-  - All Additions are distributed subject to one of the licenses listed below.
-  - Your software distribution provides complete source code for the Additions.
-  - The Derivative Work and its Additions are intended for use in end-user applications 
-    and do not constitute software intended for use by software developers, such as 
-    software libraries, components, and development kits.
-  - If you violate any of the terms in this Exception, you lose all rights granted 
-    to you by the Exception and revert to the terms of AGPLv3.
-
-Newtonsoft reserves all rights not expressly granted in these terms and conditions. 
-
-### Open Source License List
-
-Name                                                   | Version
-:----------------------------------------------------- | :------------
-Academic Free License                                  | 2.0
-Apache Software License                                | 2.0
-Apple Public Source License                            | 2.0
-Artistic license                                       | From Perl 5.8.0
-BSD license                                            | July 22 1999
-Common Development and Distribution License (CDDL)     | 1.0
-Common Public License                                  | 1.0
-Eclipse Public License                                 | 1.0
-Educational Community License                          | 2.0
-European Union Public License (EUPL)                   | 1.1
-GNU General Public License (GPL)                       | 2.0
-GNU Library or "Lesser" General Public License (LGPL)  | 3.0
-Jabber Open Source License                             | 1.0
-MIT License (As listed in file MIT-License.txt)        | -
-Mozilla Public License (MPL)                           | 1.0/1.1
-Open Software License                                  | 2.0
-OpenSSL license (with original SSLeay license)         | 2003 (1998)
-University of Illinois/NCSA Open Source License        | -
-W3C License                                            | 2001
-X11 License                                            | 2001
-Zlib/libpng License                                    | -
-
-
 ## Commercial License
 
 In addition to this license, Json.NET Schema is offered under a commerical license.