diff --git a/Build/build.ps1 b/Build/build.ps1 index d1d31bf8..14f2603e 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -113,7 +113,8 @@ task Package -depends Build { } Copy-Item -Path $docDir\readme.txt -Destination $workingDir\Package\ - Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\Bin\ + Copy-Item -Path $docDir\license.txt -Destination $workingDir\Package\ + Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\ robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj TestResults AppPackages /XF *.suo *.user | Out-Default robocopy $buildDir $workingDir\Package\Source\Build /MIR /NP /XD .svn | Out-Default diff --git a/Doc/license.txt b/Doc/license.txt new file mode 100644 index 00000000..0c2edce8 --- /dev/null +++ b/Doc/license.txt @@ -0,0 +1,18 @@ +Copyright (c) 2007 James Newton-King + +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Doc/readme.txt b/Doc/readme.txt index c1f7899b..cd969418 100644 --- a/Doc/readme.txt +++ b/Doc/readme.txt @@ -19,72 +19,4 @@ Json.NET is a popular high-performance JSON framework for .NET Documentation: -http://james.newtonking.com/projects/json/help/ - - -Versions: - -Json.NET comes in different versions for the various .NET frameworks. - --Net45: - .NET latest - --Net40: - .NET 4.0, Mono - --Net35: - .NET 3.5 SP1 - --Net20: - .NET 2.0 - --Silverlight: - Silverlight 5 - --WindowsPhone: - Windows Phone 8 - --WinRT - Windows 8 Store - --Portable - Portable Class Library (.NET 4.5, SL5, WP8, Win8 Store) - - -Notes: - -Microsoft stopped support for the Compact Framework in Visual Studio 2010. -For a Compact Framework 3.5 build download Json.NET 3.5. - -For a Silverlight 3 build download Json.NET 3.5. - -For a Silverlight 4 or Windows Phone 7 build download Json.NET 4.5. - - -Instructions: - - 1. Extract Newtonsoft.Json.dll and Newtonsoft.Json.xml from the archive's /bin - directory into your own applications. - 2. Add a reference to Newtonsoft.Json.dll within Visual Studio.NET to your project. - - -License: - -Copyright (c) 2007 James Newton-King - -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, -merge, publish, distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be included in all copies -or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +http://james.newtonking.com/projects/json/help/ \ No newline at end of file diff --git a/Doc/versions.txt b/Doc/versions.txt index cc0a32f0..a53eb71e 100644 --- a/Doc/versions.txt +++ b/Doc/versions.txt @@ -1,5 +1,3 @@ -Versions: - Json.NET comes in different versions for the various .NET frameworks. -Net45: