-Build

Build/build.ps1

@@ -5,7 +5,7 @@
   $version = GetVersion $majorWithReleaseVersion
   $signAssemblies = $false
   $signKeyPath = "C:\Development\Releases\newtonsoft.snk"
-  $buildDocumentation = $false
+  $buildDocumentation = $true
   $buildNuGet = $true
   $treatWarningsAsErrors = $false
   $workingName = if ($workingName) {$workingName} else {"Working"}
@@ -113,16 +113,20 @@ task Package -depends Build {
     exec { .\Tools\NuGet\NuGet.exe pack $workingDir\NuGet\Newtonsoft.Json.nuspec -Symbols }
     move -Path .\*.nupkg -Destination $workingDir\NuGet
   }
+
+  Write-Host "Build documentation: $buildDocumentation"
   
   if ($buildDocumentation)
   {
     $mainBuild = $builds | where { $_.Name -eq "Newtonsoft.Json" } | select -first 1
     $mainBuildFinalDir = $mainBuild.FinalDir
     $documentationSourcePath = "$workingDir\Package\Bin\$mainBuildFinalDir"
+    $docOutputPath = "$workingDir\Documentation\"
     Write-Host -ForegroundColor Green "Building documentation from $documentationSourcePath"
+    Write-Host "Documentation output to $docOutputPath"
 
     # Sandcastle has issues when compiling with .NET 4 MSBuild - http://shfb.codeplex.com/Thread/View.aspx?ThreadId=50652
-    exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:DocumentationSourcePath=$documentationSourcePath" $docDir\doc.shfbproj | Out-Default } "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 "/p:DocumentationSourcePath=$documentationSourcePath" "/p:OutputPath=$docOutputPath" $docDir\doc.shfbproj | Out-Default } "Error building documentation. Check that you have Sandcastle, Sandcastle Help File Builder and HTML Help Workshop installed."
     
     move -Path $workingDir\Documentation\LastBuild.log -Destination $workingDir\Documentation.log
   }

Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs

@@ -57,4 +57,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.1.18030")]
+[assembly: AssemblyFileVersion("7.0.1.18110")]

Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs

@@ -76,4 +76,4 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.1.18030")]
+[assembly: AssemblyFileVersion("7.0.1.18110")]

Src/Newtonsoft.Json/Properties/AssemblyInfo.cs

@@ -92,5 +92,5 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.1.18030")]
+[assembly: AssemblyFileVersion("7.0.1.18110")]
 [assembly: CLSCompliant(true)]