ILMerge to Paket.exe

fsprojects · Sep 9, 2014 · 50cb2a9 · 50cb2a9
1 parent 0da323a
commit 50cb2a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/build.fsx b/build.fsx
@@ -157,20 +157,18 @@ Target "SourceLink" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Build a NuGet package
 
-
 Target "MergeAssemblies" (fun _ ->        
     CreateDir buildMergedDir
 
     let toPack =
         ["Paket.exe"; "FSharp.Core.dll"; "Ionic.Zip.dll"; "Newtonsoft.Json.dll"; "UnionArgParser.dll"]
         |> List.map (fun l -> buildDir @@ l)
-        |> List.map (fun l -> "\"" + l + "\"")
         |> separated " "
 
     let result =
         ExecProcess (fun info ->
             info.FileName <- currentDirectory @@ "tools" @@ "ILRepack" @@ "ILRepack.exe"
-            info.Arguments <- sprintf "-internalize -verbose -lib:%s \"/out:%s\" %s" buildDir (buildMergedDir @@ "Paket.exe") toPack
+            info.Arguments <- sprintf "/internalize /verbose /lib:%s /ver:%s /out:%s %s" buildDir release.AssemblyVersion (buildMergedDir @@ "Paket.exe") toPack
             ) (TimeSpan.FromMinutes 5.)
 
     if result <> 0 then failwithf "Error during ILRepack execution."

diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs
@@ -4,9 +4,9 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Paket")>]
 [<assembly: AssemblyProductAttribute("Paket")>]
 [<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET")>]
-[<assembly: AssemblyVersionAttribute("0.0.4")>]
-[<assembly: AssemblyFileVersionAttribute("0.0.4")>]
+[<assembly: AssemblyVersionAttribute("0.0.5")>]
+[<assembly: AssemblyFileVersionAttribute("0.0.5")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "0.0.4"
+    let [<Literal>] Version = "0.0.5"
diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -63,6 +63,7 @@
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
   <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
     <Content Include="..\..\lib\FSharp\FSharp.Core.optdata">
       <Link>FSharp.Core.optdata</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>