-Build

Build/build.ps1

@@ -8,6 +8,7 @@
   $buildDir = "$baseDir\Build"
   $sourceDir = "$baseDir\Src"
   $toolsDir = "$baseDir\Tools"
+  $docDir = "$baseDir\Doc"
   $releaseDir = "$baseDir\Release"
   $workingDir = "$baseDir\Working"
   $builds = @(
@@ -68,12 +69,14 @@ task Package -depends Merge {
   
   if ($buildDocumentation)
   {
-    exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release .\Doc\doc.shfbproj } "Error building documentation. Check that you have Sandcastle, Sandcastle Help File Builder and HTML Help Workshop installed."
+    exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release $docDir\doc.shfbproj } "Error building documentation. Check that you have Sandcastle, Sandcastle Help File Builder and HTML Help Workshop installed."
     
-    New-Item -Path $workingDir\Package\Documentation -ItemType Directory
-    move -Path $workingDir\Documentation\Documentation.chm -Destination $workingDir\Package\Documentation\Documentation.chm
+    move -Path $workingDir\Documentation\Documentation.chm -Destination $workingDir\Package\Documentation.chm
     move -Path $workingDir\Documentation\LastBuild.log -Destination $workingDir\Documentation.log
   }
+  
+  Copy-Item -Path $docDir\readme.txt -Destination $workingDir\Package\
+  Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\Bin\
 
   robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj /XF *.suo *.user
   robocopy $buildDir $workingDir\Package\Source\Build /MIR /NP /XD .svn
@@ -116,7 +119,7 @@ function MergeAssembly($dllPrimaryAssembly, $signKey, [string[]]$mergedAssemlies
   
   try
   {
-    exec { .\Tools\ILMerge\ilmerge.exe "/internalize" "/closed" "/log" $ilMergeKeyFile "/out:$temporaryDir\$mergedAssemblyName" $dllPrimaryAssembly $mergeAssemblyPaths } "Error executing ILMerge"
+    exec { .\Tools\ILMerge\ilmerge.exe "/internalize" "/closed" "/log:$workingDir\$mergedAssemblyName.MergeLog.txt" $ilMergeKeyFile "/out:$temporaryDir\$mergedAssemblyName" $dllPrimaryAssembly $mergeAssemblyPaths } "Error executing ILMerge"
     Copy-Item -Path $temporaryDir\$mergedAssemblyName -Destination $dllPrimaryAssembly -Force
   }
   finally

Doc/readme.txt

@@ -0,0 +1,52 @@
+Json.NET
+
+http://james.newtonking.com/projects/json-net.aspx
+http://www.codeplex.com/json/
+
+
+Description:
+
+Json.NET makes working with JSON formatted data in .NET simple. Quickly read and write JSON using LINQ to JSON or serialize your .NET objects with a single method call using the JsonSerializer.
+
+-Flexible JSON serializer to convert .NET objects to JSON and back again 
+-LINQ to JSON for reading and writing JSON 
+-Writes indented, easy to read JSON 
+-Convert JSON to and from XML 
+-Supports Silverlight and the Compact Framework
+
+
+
+Versions:
+
+Json.NET comes in different versions for the various .NET frameworks.
+
+-DotNet:
+  .NET latest (3.5 SP1)
+
+-DotNet20:
+  .NET 2.0
+
+-Silverlight:
+  Silverlight 3.0
+
+-Compact:
+  Compact Framework 3.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.

Doc/versions.txt

@@ -0,0 +1,15 @@
+Versions:
+
+Json.NET comes in different versions for the various .NET frameworks.
+
+-DotNet:
+  .NET latest (3.5 SP1)
+
+-DotNet20:
+  .NET 2.0
+
+-Silverlight:
+  Silverlight 3.0
+
+-Compact:
+  Compact Framework 3.5