From 7ce798af2fe9b00c2af151629d576fbda77278c1 Mon Sep 17 00:00:00 2001 From: Julien Roncaglia Date: Tue, 2 May 2017 22:01:02 +0200 Subject: [PATCH] Add back some IL-merging even if it doesn't work --- build/build.fsx | 3 ++- paket.dependencies | 1 + paket.lock | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/build.fsx b/build/build.fsx index 801ed9c..f5aa542 100644 --- a/build/build.fsx +++ b/build/build.fsx @@ -220,7 +220,8 @@ Task "Pack" [] <| fun _ -> (fun p -> { p with Libraries = !! (appBinDir "*.dll") - ToolPath = rootDir "ilrepack.exe" + SearchDirectories = [appBinDir] + ToolPath = rootDir "packages" "ILRepack" "tools" "ilrepack.exe" }) (artifactsDir "merged.exe") (appBinDir "stidgen.exe") diff --git a/paket.dependencies b/paket.dependencies index 9f9066b..acea380 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -18,3 +18,4 @@ nuget NFluent ~> 1.3 nuget FAKE nuget SourceLink.Fake ~> 1.1 github fsharp/FAKE modules/Octokit/Octokit.fsx +nuget ILRepack diff --git a/paket.lock b/paket.lock index 3daabcf..83fdad3 100644 --- a/paket.lock +++ b/paket.lock @@ -41,6 +41,7 @@ NUGET System.Threading.ThreadPool (>= 4.0.10) - framework: >= netstandard16 System.Threading.Timer (>= 4.0.1) - framework: >= netstandard16 System.ValueTuple (>= 4.3) - framework: >= net10, netstandard10, netstandard11, netstandard12, netstandard13, netstandard14, netstandard15 + ILRepack (2.0.12) ManagedEsent (1.9.4) - framework: >= net46 Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full Microsoft.Bcl.Build (>= 1.0.14)