-Changed Newtonsoft.Json.Net20.dll to use LinqBridge source code rather than ilmerge to fix error

2011-06-25 04:10:33 +00:00
parent 857d72530c
commit ba6ec3202e
15 changed files with 3291 additions and 67 deletions
@@ -58,20 +58,8 @@ task Build -depends Clean {
  }
 }

-# Merge LinqBridge into .NET 2.0 build
-task Merge -depends Build {
-  $binaryDir = "$sourceDir\Newtonsoft.Json\bin\Release\Net20"
-  MergeAssembly "$binaryDir\Newtonsoft.Json.Net20.dll" $signKeyPath "$binaryDir\LinqBridge.dll"
-  del $binaryDir\LinqBridge.dll
-
-  $binaryDir = "$sourceDir\Newtonsoft.Json.Tests\bin\Release\Net20"
-  MergeAssembly "$binaryDir\Newtonsoft.Json.Tests.Net20.dll" $signKeyPath "$binaryDir\LinqBridge.dll"
-  MergeAssembly "$binaryDir\Newtonsoft.Json.Net20.dll" $signKeyPath "$binaryDir\LinqBridge.dll"
-  del $binaryDir\LinqBridge.dll
-}
-
 # Optional build documentation, add files to final zip
-task Package -depends Merge {
+task Package -depends Build {
  foreach ($build in $builds)
  {
    $name = $build.TestsName