Permalink
Browse files

ILMerge is now on NuGet. Switched our manually maintained ILMerge.exe…

… in tool to a package and updated build script
  • Loading branch information...
1 parent 9a32c2d commit 02b8d708d1c837a6b78874db8dbb95518c7b1c97 @nikmd23 nikmd23 committed Aug 23, 2012
Showing with 15 additions and 12 deletions.
  1. +1 −0 .nuget/packages.config
  2. +10 −10 {tools → }/ILMergeInternalize.txt
  3. +4 −2 default.ps1
  4. BIN tools/ILMerge.exe
View
@@ -3,4 +3,5 @@
<package id="psake" version="4.2.0.1" />
<package id="SharpZipLib" version="0.86.0" />
<package id="xunit.runners" version="1.9.0.1566" />
+ <package id="ilmerge" version="2.12.0803" />
</packages>
@@ -1,10 +1,10 @@
-Castle.Core.Interceptor.IInvocation
-Castle.Core.Interceptor.IInterceptor
-Castle.Core.Interceptor.IProxyTargetAccessor
-Castle.DynamicProxy.CompositionInvocation
-Castle.DynamicProxy.AbstractInvocation
-Castle.DynamicProxy.Generators.AttributesToAvoidReplicating
-Castle.DynamicProxy.InheritanceInvocation
-Castle.DynamicProxy.IInterceptorSelector
-Castle.DynamicProxy.IProxyGenerationHook
-Castle.DynamicProxy.IProxyTargetAccessor
+Castle.Core.Interceptor.IInvocation
+Castle.Core.Interceptor.IInterceptor
+Castle.Core.Interceptor.IProxyTargetAccessor
+Castle.DynamicProxy.CompositionInvocation
+Castle.DynamicProxy.AbstractInvocation
+Castle.DynamicProxy.Generators.AttributesToAvoidReplicating
+Castle.DynamicProxy.InheritanceInvocation
+Castle.DynamicProxy.IInterceptorSelector
+Castle.DynamicProxy.IProxyGenerationHook
+Castle.DynamicProxy.IProxyTargetAccessor
View
@@ -63,11 +63,13 @@ task compile -depends clean {
task merge -depends test {
"Merging"
+ cd $package_dir\ilmerge.*\
+
" Glimpse.Core"
- exec { & $tools_dir\ilmerge.exe /targetplatform:"v4,$framework_dir" /log /out:"$source_dir\Glimpse.Core\nuspec\lib\net40\Glimpse.Core.dll" /internalize:$tools_dir\ILMergeInternalize.txt "$source_dir\Glimpse.Core\bin\Release\Glimpse.Core.dll" "$source_dir\Glimpse.Core\bin\Release\Newtonsoft.Json.dll" "$source_dir\Glimpse.Core\bin\Release\Castle.Core.dll" "$source_dir\Glimpse.Core\bin\Release\NLog.dll" "$source_dir\Glimpse.Core\bin\Release\AntiXssLibrary.dll" "$source_dir\Glimpse.Core\bin\Release\Tavis.UriTemplates.dll" }
+ exec { & .\ilmerge.exe /targetplatform:"v4,$framework_dir" /log /out:"$source_dir\Glimpse.Core\nuspec\lib\net40\Glimpse.Core.dll" /internalize:$base_dir\ILMergeInternalize.txt "$source_dir\Glimpse.Core\bin\Release\Glimpse.Core.dll" "$source_dir\Glimpse.Core\bin\Release\Newtonsoft.Json.dll" "$source_dir\Glimpse.Core\bin\Release\Castle.Core.dll" "$source_dir\Glimpse.Core\bin\Release\NLog.dll" "$source_dir\Glimpse.Core\bin\Release\AntiXssLibrary.dll" "$source_dir\Glimpse.Core\bin\Release\Tavis.UriTemplates.dll" }
" Glimpse.Core.Net35"
- exec { & $tools_dir\ilmerge.exe /log /out:"$source_dir\Glimpse.Core\nuspec\lib\net35\Glimpse.Core.dll" /internalize:$tools_dir\ILMergeInternalize.txt "$source_dir\Glimpse.Core.Net35\bin\Release\Glimpse.Core.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\Newtonsoft.Json.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\Castle.Core.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\NLog.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\AntiXssLibrary.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\Tavis.UriTemplates.dll"}
+ exec { & .\ilmerge.exe /log /out:"$source_dir\Glimpse.Core\nuspec\lib\net35\Glimpse.Core.dll" /internalize:$base_dir\ILMergeInternalize.txt "$source_dir\Glimpse.Core.Net35\bin\Release\Glimpse.Core.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\Newtonsoft.Json.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\Castle.Core.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\NLog.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\AntiXssLibrary.dll" "$source_dir\Glimpse.Core.Net35\bin\Release\Tavis.UriTemplates.dll"}
" Glimpse.AspNet"
copy $source_dir\Glimpse.AspNet\bin\Release\Glimpse.AspNet.* $source_dir\Glimpse.AspNet\nuspec\lib\net40\
View
Binary file not shown.

0 comments on commit 02b8d70

Please sign in to comment.