LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Build

Browse Source 
-Tests
This commit is contained in:
JamesNK
2010-03-05 09:20:29 +00:00
parent 3b80e9d25f
commit dba4e783fe
6 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build/build.ps1
+2 -2
View File
@@ -52,8 +52,8 @@ task Merge -depends Build {
del $binaryDir\LinqBridge.dll
$binaryDir = "$sourceDir\Newtonsoft.Json.Tests\bin\Release\DotNet20"
MergeAssembly "$binaryDir\Newtonsoft.Json.Net20.dll" $signKeyPath "$binaryDir\LinqBridge.dll"
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
}
@@ -116,7 +116,7 @@ function MergeAssembly($dllPrimaryAssembly, $signKey, [string[]]$mergedAssemlies
try
{
exec { .\Tools\ILMerge\ilmerge.exe "/internalize" $ilMergeKeyFile "/out:$temporaryDir\$mergedAssemblyName" $dllPrimaryAssembly $mergeAssemblyPaths } "Error executing ILMerge"
exec { .\Tools\ILMerge\ilmerge.exe "/internalize" "/closed" "/log" $ilMergeKeyFile "/out:$temporaryDir\$mergedAssemblyName" $dllPrimaryAssembly $mergeAssemblyPaths } "Error executing ILMerge"
Copy-Item -Path $temporaryDir\$mergedAssemblyName -Destination $dllPrimaryAssembly -Force
}
finally