Merge branch 'master' into paket-helper/push-files

.paket/Paket.Restore.targets

@@ -2,6 +2,9 @@
   <!-- Prevent dotnet template engine to parse this file -->
   <!--/-:cnd:noEmit-->
   <PropertyGroup>
+    <!-- make MSBuild track this file for incremental builds. -->
+    <!-- ref https://blogs.msdn.microsoft.com/msbuild/2005/09/26/how-to-ensure-changes-to-a-custom-target-file-prompt-a-rebuild/ -->
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <!-- Mark that this target file has been loaded.  -->
     <IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>
     <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
@@ -236,4 +239,4 @@
               NuspecProperties="$(NuspecProperties)"/>
   </Target>
   <!--/+:cnd:noEmit-->
-</Project>
+</Project>

Samples/ContinuousDeploymentWebsite/src/test/Fake_WebSite.Tests/Fake_WebSite.Tests.csproj

@@ -84,7 +84,7 @@
         </Reference>
       </ItemGroup>
     </When>
-    <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')">
+    <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="Machine.Specifications">
           <HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>

build.fsx

@@ -220,7 +220,8 @@ let common = [
 
 // New FAKE libraries
 let dotnetAssemblyInfos =
-    [ "Fake.Core.BuildServer", "Buildserver Support"
+    [ "Fake.Api.Slack", "Slack Integration Support"
+      "Fake.Core.BuildServer", "Buildserver Support"
       "Fake.Core.Context", "Core Context Infrastructure"
       "Fake.Core.Environment", "Environment Detection"
       "Fake.Core.Globbing", "Filesystem Globbing Support and Operators"
@@ -758,7 +759,7 @@ Target "DotnetPackage" (fun _ ->
     let outDir = nugetDir @@ "Fake.netcore" @@ "portable"
     DotnetPublish (fun c ->
         { c with
-            Framework = Some "netcoreapp1.0"
+            Framework = Some "netcoreapp1.1"
             OutputPath = Some outDir
         }) netcoreFsproj
 )

help/content/assets/css/style.css

@@ -42,6 +42,9 @@ div.tip {
 	display:none;
   color:#d1d1d1;
 }
+div.tip strong {
+  color:#d1d1d1;
+}
 table.pre pre {
   padding:0px;
   margin:0px;
@@ -70,6 +73,7 @@ table.pre td {
   padding:0px;
   white-space:normal;
   margin:0px;
+  border:none;
 }
 table.pre td.lines {
   width:30px;
@@ -142,7 +146,7 @@ hr {
 }
 
 /* Make table headings and td.title bold */
-td.title, thead {
+td.title, thead tr td {
   font-weight:bold;
 }
 
@@ -204,6 +208,57 @@ td.title, thead {
 .github-link .normal { display: block; }
 .github-link:hover .normal { display: none; }
 
+#content .member-list .xmldoc h2 {
+  margin-top: 0;
+  font-size: 1em;
+}
+
+.member-list td > code,
+.member-list li > code {
+  padding: 2px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+  font-family: Monaco,Menlo,Consolas,'Courier New', monospace;
+  font-size: 12px;
+  border-radius: 3px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-spacing: 0;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  border-left: 0;
+  border-radius: 4px;
+}
+
+.table caption+thead tr:first-child th,
+.table caption+thead tr:first-child td,
+.table colgroup+thead tr:first-child th,
+.table colgroup+thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table th, .table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table-bordered th, .table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+
 /*-------------------------------------------------------------------------- 
   Additional formatting for the homepage 
 /*--------------------------------------------------------------------------*/

help/content/assets/js/tips.js

@@ -33,14 +33,8 @@ function showTip(evt, name, unique, owner) {
     currentTip = unique;
     currentTipElement = name;
 
-    var pos = findPos(owner ? owner : (evt.srcElement ? evt.srcElement : evt.target));
-    var posx = pos[0];
-    var posy = pos[1];
-
     var el = document.getElementById(name);
     var parent = (document.documentElement == null) ? document.body : document.documentElement;
     el.style.position = "absolute";
-    el.style.left = posx + "px";
-    el.style.top = posy + "px";
     el.style.display = "block";
 }

help/markdown/contributing.md

@@ -4,7 +4,9 @@ This page should provide you with some basic information if you're thinking abou
 
  * This page can be edited by sending a pull request to the FAKE project on GitHub, so if you learn something when playing with FAKE please record your [findings here](https://github.com/fsharp/FAKE/blob/master/help/markdown/contributing.md)!
 
- * If you want to discuss a feature (a good idea!), or if you want to look at suggestions how you might contribute, check out the [Issue list](https://github.com/fsharp/FAKE/issues) on GitHub or send an email to the [FAKE mailing list](http://groups.google.com/group/fsharpMake).
+ * If you want to discuss a feature (a good idea!), or if you want to look at suggestions how you might contribute, check out:
+    - the [Issue list](https://github.com/fsharp/FAKE/issues) on GitHub,
+    - [Gitter room](https://gitter.im/fsharp/FAKE)
 
  * Unless you explicitly state otherwise, any contribution intentionally 
 submitted for inclusion in the Project shall be under the terms and 

help/markdown/fake-fake5-modules.md

@@ -18,18 +18,18 @@ group NetcoreBuild
     nuget Fake.Core.Targets prerelease
 ```
 
-Now you can directly use `open Fake.Core.Targets` and use the [targets module](core-targets.html).
+Now you can directly use `open Fake.Core` and use the [Target module](core-targets.html).
 
 For example create a new file `build.fsx` with
 
 ```fsharp
 // Use this for IDE support. Not required by FAKE 5. Change "build.fsx" to the name of your script.
 #load ".fake/build.fsx/intellisense.fsx"
 
-open Fake.Core.Targets
+open Fake.Core
 
 Target.Create "MyBuild" (fun _ ->
-    printfn "MyBuild"
+    printfn "message from MyBuild target"
 )
 
 Target.RunOrDefault "MyBuild"

paket-files/matthid/Yaaf.FSharp.Scripting/src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs

@@ -277,7 +277,7 @@ module internal CompilerServiceExtensions =
 
           let results = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
           let mapError (err:FSharpErrorInfo) =
-            sprintf "**** %s: %s" (if err.Severity = Microsoft.FSharp.Compiler.FSharpErrorSeverity.Error then "error" else "warning") err.Message
+            sprintf "**** %s: %s" (if err.Severity = FSharpErrorSeverity.Error then "error" else "warning") err.Message
           if results.HasCriticalErrors then
               let errors = results.Errors |> Seq.map mapError
               let errorMsg = sprintf "Parsing and checking project failed: \n\t%s" (System.String.Join("\n\t", errors))
@@ -726,9 +726,31 @@ module internal Extensions =
           x.EvalInteraction (sprintf "open %s" ns)
       member x.Reference file =
           x.EvalInteraction (sprintf "#r @\"%s\"" file)
+      member x.Include dir =
+          x.EvalInteraction (sprintf "#I @\"%s\"" dir)
       member x.Load file =
           x.EvalInteraction (sprintf "#load @\"%s\" " file)
 
+      /// Change the current directory (so that relative paths within scripts work properly).
+      /// Returns a handle to change the current directory back to it's initial state
+      /// (Because this will change the current directory of the currently running code as well!).
+      member x.Cd dir =
+          let oldDir = System.IO.Directory.GetCurrentDirectory()
+          let cd dir =
+            x.EvalInteraction (sprintf "#cd @\"%s\"" dir)
+          cd dir
+          let isDisposed = ref false
+          { new System.IDisposable with
+              member __.Dispose() =
+                if not !isDisposed then
+                  cd oldDir
+                  isDisposed := true }
+
+      /// Same as Cd but takes a function for the scope.
+      member x.WithCd dir f =
+          use __ = x.ChangeCurrentDirectory dir
+          f ()
+
       /// Change the current directory (so that relative paths within scripts work properly).
       /// Returns a handle to change the current directory back to it's initial state
       /// (Because this will change the current directory of the currently running code as well!).

paket-files/matthid/Yaaf.FSharp.Scripting/src/source/Yaaf.FSharp.Scripting/paket.version

@@ -1 +1 @@
-40ef4e32a115962436809666b6868693be6444c2
+cb0ca0f74e3f7356b88c5fd4246b0a4dbd2624eb

paket.dependencies

@@ -1,16 +1,16 @@
-version 5.92.3
+version 5.96.4
 content: none
 // just in case we need some special nuget feature again...
 //source https://ci.appveyor.com/nuget/paket
-source http://nuget.org/api/v2
+source https://api.nuget.org/v3/index.json
 
 nuget FSharp.Core ~> 4.1.0 redirects: force
 nuget Knockout
 nuget NuGet.CommandLine
 nuget Paket.Core prerelease
 nuget RavenDB.Server
 nuget serilog.sinks.nlog 1.5.4
-nuget Argu 3.3.0
+nuget Argu >= 3.3.0
 nuget FsCheck
 nuget FsCheck.Xunit
 nuget Unquote
@@ -26,7 +26,7 @@ nuget SSH.NET
 // Because of net45 support
 nuget Microsoft.Web.Administration 7.0.0
 nuget Mono.Web.Xdt
-nuget Mono.Cecil
+nuget Mono.Cecil prerelease
 nuget Nuget.Core
 nuget bootstrap
 nuget Knockout.Mapping
@@ -47,14 +47,14 @@ nuget FluentMigrator.Runner
 nuget HashLib
 nuget FSharp.Compiler.Service content: none
 nuget Octokit
-nuget Microsoft.Net.Http
+nuget System.Net.Http
 nuget Microsoft.DotNet.PlatformAbstractions
 
 github matthid/Yaaf.FSharp.Scripting src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs
 
 group Build
     content: none
-    source http://nuget.org/api/v2
+    source https://api.nuget.org/v3/index.json
     source https://ci.appveyor.com/nuget/fake
     source https://ci.appveyor.com/nuget/fsharp-formatting
 
@@ -70,7 +70,7 @@ group Build
 
 // [ FAKE GROUP ]
 group NetcoreBuild
-    source https://nuget.org/api/v2
+    source https://api.nuget.org/v3/index.json
     storage: none
     //source https://ci.appveyor.com/nuget/fake
 
@@ -94,22 +94,31 @@ group NetcoreBuild
     nuget Fake.DotNet.Testing.NUnit prerelease
     nuget Fake.Windows.Chocolatey prerelease
     nuget Fake.Tools.Git prerelease
-    nuget Mono.Cecil ~> 0.10.0 prerelease
+    nuget Mono.Cecil prerelease
 
 group netcore
     //source https://ci.appveyor.com/nuget/paket
-    source http://nuget.org/api/v2
+    source https://api.nuget.org/v3/index.json
     storage: none
-    framework: netstandard1.6, netcoreapp1.0
+    framework: netstandard1.6, netcoreapp1.1
 
-    nuget FSharp.Compiler.Service content: none
-    nuget Microsoft.DotNet.PlatformAbstractions
+    nuget Microsoft.NETCore.App !~> 1.1
+    nuget FSharp.Compiler.Service storage: packages, content: none
+    nuget Microsoft.DotNet.PlatformAbstractions !~> 1
+    // START _ REMOVE ME ONCE PAKET WORKS https://github.com/fsprojects/Paket/issues/2715
+    nuget Microsoft.NETCore.DotNetHostPolicy !~> 1.1
+    nuget Microsoft.NETCore.Platforms !~> 1.1
+    nuget Microsoft.NETCore.DotNetHostResolver !~> 1.1
+    nuget Microsoft.NETCore.Runtime.CoreCLR !~> 1.1
+    nuget Microsoft.NETCore.Jit !~> 1.1
+    nuget Microsoft.NETCore.Targets !~> 1.1
+    // END _ REMOVE ME ONCE PAKET WORKS
+
+    nuget NETStandard.Library !~> 1.0
     nuget FSharp.Core ~> 4.1.2
-    nuget Microsoft.NETCore.App ~> 1.0
-    nuget NETStandard.Library ~> 1.0
     nuget Argu
     nuget Paket.Core prerelease
-    nuget Mono.Cecil ~> 0.10.0 prerelease
+    nuget Mono.Cecil prerelease
 
     nuget System.Linq.Parallel
     nuget System.Diagnostics.FileVersionInfo