diff options
| author | JamesNK <james@newtonking.com> | 2011-06-25 08:10:33 +0400 |
|---|---|---|
| committer | JamesNK <james@newtonking.com> | 2011-06-25 08:10:33 +0400 |
| commit | ba6ec3202eba1da2ff4e95dab847a7541ccdb155 (patch) | |
| tree | 385630811113d883f073411ac2c0e924f4523e1f /Build | |
| parent | 857d72530c3ec05f034ad8ea88faf8a89b7850e9 (diff) | |
-Changed Newtonsoft.Json.Net20.dll to use LinqBridge source code rather than ilmerge to fix error
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/build.ps1 | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Build/build.ps1 b/Build/build.ps1 index 934e47b..3282bc1 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -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
|