Merge branch 'cleanup'

RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+#### 5.0.0-beta005 - 2017-10-02
+* ENHANCEMENT: Improve error messages of Fake.Core.Process - https://github.com/fsharp/FAKE/pull/1696
+* BUGFIX: `fake --version` was printing the wrong version - https://github.com/fsharp/FAKE/pull/1696
+* BUGFIX: `Fake.Api.GitHub` was not part of FakeLib - https://github.com/fsharp/FAKE/pull/1696
+
 #### 5.0.0-beta004 - 2017-10-02
 * BUILD: Remove hardcoded paths to FSharpTargets, replace with FSharp.Compiler.Tools - https://github.com/fsharp/FAKE/pull/1693
 * ENHANCEMENT: Fake.IO.FileSystem Rework, functionality moved from `Fake.IO.FileSystem` to `Fake.IO` and APIs have been adapted to the new design guideline - https://github.com/fsharp/FAKE/pull/1670

build.fsx

@@ -22,17 +22,8 @@ open System.Reflection
 
 #endif
 
-// TODO Remove '#load' once released
-#load "src/app/Fake.IO.FileSystem/Path.fs"
-#load "src/app/Fake.IO.FileSystem/FileInfo.fs"
-#load "src/app/Fake.IO.FileSystem/FileSystemOperators.fs"
-#load "src/app/Fake.IO.FileSystem/DirectoryInfo.fs"
-#load "src/app/Fake.IO.FileSystem/File.fs"
-#load "src/app/Fake.IO.FileSystem/Directory.fs"
-#load "src/app/Fake.IO.FileSystem/FileSystemInfo.fs"
-#load "src/app/Fake.IO.FileSystem/Shell.fs"
-
 open System.IO
+open Fake.Api
 open Fake.Core
 open Fake.Tools
 open Fake.IO
@@ -670,7 +661,7 @@ Target.Create "DotnetRestore" (fun _ ->
 let runtimes =
   [ "win7-x86"; "win7-x64"; "osx.10.11-x64"; "ubuntu.14.04-x64"; "ubuntu.16.04-x64" ]
 
-Target.Create "DotnetPackage" (fun _ ->
+Target.Create "DotnetPackage_" (fun _ ->
     let nugetDir = System.IO.Path.GetFullPath nugetDncDir
 
     Environment.setEnvironVar "Version" release.NugetVersion
@@ -892,10 +883,6 @@ Target.Create "ReleaseDocs" (fun _ ->
     Git.Branches.push "gh-pages"
 )
 
-// Remove '#load' once released
-#load "src/app/Fake.Api.GitHub/GitHub.fs"
-open Fake.Api
-
 Target.Create "FastRelease" (fun _ ->
 
     Git.Staging.StageAll ""
@@ -950,6 +937,7 @@ Target.Create "Default" ignore
 Target.Create "StartDnc" ignore
 Target.Create "Release" ignore
 Target.Create "BuildSolution" ignore
+Target.Create "DotnetPackage" ignore
 Target.Create "AfterBuild" ignore
 
 open Fake.Core.TargetOperators
@@ -960,6 +948,9 @@ open Fake.Core.TargetOperators
     ?=> "StartDnc"
     ==> "InstallDotnetCore"
     ==> "DownloadPaket"
+    ==> "SetAssemblyInfo"
+    ==> "DotnetPackage_"
+    ==> "UnskipAndRevertAssemblyInfo"
     ==> "DotnetPackage"
 
 // Full framework build

paket.dependencies

@@ -79,7 +79,7 @@ group NetcoreBuild
     nuget FSharp.Core ~> 4.1.0
     nuget System.AppContext prerelease
     nuget Paket.Core prerelease
-    //nuget Fake.Api.GitHub prerelease
+    nuget Fake.Api.GitHub prerelease
     nuget Fake.Core.Target prerelease
     nuget Fake.Core.Globbing prerelease
     nuget Fake.Core.SemVer prerelease

src/app/Fake.Core.Process/Process.fs

@@ -17,7 +17,7 @@ let kill (proc : Process) =
     Trace.tracefn "Trying to kill process %s (Id = %d)" proc.ProcessName proc.Id
     try 
         proc.Kill()
-    with exn -> ()
+    with ex -> Trace.logfn "Killing %s failed with %s" proc.ProcessName ex.Message
 
 let private killCreatedProcessesVar = "Fake.Core.Process.killCreatedProcesses"
 let private getKillCreatedProcesses, _, public setKillCreatedProcesses = 
@@ -49,7 +49,7 @@ type ProcessList() =
 
                         Trace.logfn "Trying to kill %s" proc.ProcessName
                         kill proc
-                    with exn -> Trace.logfn "Killing %s failed with %s" proc.ProcessName exn.Message                              
+                    with exn -> Trace.logfn "Killing %s failed with %s" proc.ProcessName exn.Message
             with exn -> ()
         startedProcesses.Clear()
     member x.KillAll() = killProcesses()
@@ -178,7 +178,7 @@ let ExecProcessWithLambdas configProcessStartInfoF (timeOut : TimeSpan) silent e
         if shouldEnableProcessTracing() && (not <| proc.StartInfo.FileName.EndsWith "fsi.exe") then 
             Trace.tracefn "%s %s" proc.StartInfo.FileName proc.StartInfo.Arguments
         start proc
-    with exn -> failwithf "Start of process %s failed. %s" proc.StartInfo.FileName exn.Message
+    with ex -> raise <| exn(sprintf "Start of process %s failed." proc.StartInfo.FileName, ex)
     if silent then 
         proc.BeginErrorReadLine()
         proc.BeginOutputReadLine()
@@ -283,7 +283,7 @@ let fireAndForget configProcessStartInfoF =
     configProcessStartInfoF proc.StartInfo
     try 
         start proc
-    with exn -> failwithf "Start of process %s failed. %s" proc.StartInfo.FileName exn.Message
+    with ex -> raise <| exn(sprintf "Start of process %s failed." proc.StartInfo.FileName, ex)
 
 /// Runs the given process, waits for its completion and returns if it succeeded.
 let directExec configProcessStartInfoF = 
@@ -292,7 +292,7 @@ let directExec configProcessStartInfoF =
     configProcessStartInfoF proc.StartInfo
     try 
         start proc
-    with exn -> failwithf "Start of process %s failed. %s" proc.StartInfo.FileName exn.Message
+    with ex -> raise <| exn(sprintf "Start of process %s failed." proc.StartInfo.FileName, ex)
     proc.WaitForExit()
     proc.ExitCode = 0
 

src/app/FakeLib/FakeLib.fsproj

@@ -286,6 +286,9 @@
     <Compile Include="..\Fake.DotNet.Testing.OpenCover\OpenCover.fs">
       <Link>Fake.DotNet.Testing.OpenCover/OpenCover.fs</Link>
     </Compile>
+    <Compile Include="..\Fake.Api.GitHub\GitHub.fs">
+      <Link>Fake.Api.GitHub/GitHub.fs</Link>
+    </Compile>
     <Compile Include="..\Fake.Api.Slack\SlackNotification.fs">
       <Link>Fake.Api.Slack/SlackNotification.fs</Link>
     </Compile>
@@ -943,6 +946,26 @@
       </ItemGroup>
     </When>
   </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
+      <ItemGroup>
+        <Reference Include="Octokit">
+          <HintPath>..\..\..\packages\Octokit\lib\net45\Octokit.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v7.0' Or $(TargetFrameworkVersion) == 'v7.1' Or $(TargetFrameworkVersion) == 'v8.0')) Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkIdentifier) == 'Xamarin.tvOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.watchOS')">
+      <ItemGroup>
+        <Reference Include="Octokit">
+          <HintPath>..\..\..\packages\Octokit\lib\netstandard1.1\Octokit.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
       <ItemGroup>

src/app/FakeLib/paket.references

@@ -2,6 +2,7 @@ FSharp.Core
 Paket.Core
 Mono.Web.Xdt
 Mono.Cecil
+Octokit
 Nuget.Core
 Newtonsoft.Json
 System.Net.Http