upgraded project to use the new dotnet 3.1 sdk

Author: HoraceGonzalez

.config/dotnet-tools.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "fake-cli": {
+      "version": "5.19.0",
+      "commands": [
+        "fake"
+      ]
+    },
+    "paket": {
+      "version": "5.241.2",
+      "commands": [
+        "paket"
+      ]
+    }
+  }
+}

.gitignore

@@ -186,4 +186,6 @@ docs/content/license.md
 docs/content/release-notes.md
 .svn
 /fragments
-.fake/build.*
+
+.fake
+.ionide

.paket/Paket.Restore.targets

@@ -1,9 +1,4 @@
-@echo off
-cls
+echo Restoring dotnet tools...
+dotnet tool restore
 
-.paket\paket.exe restore
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
-packages\build\FAKE\tools\FAKE.exe build.fsx %*
+dotnet fake build

.paket/paket.exe

@@ -2,78 +2,71 @@
 // FAKE build script
 // --------------------------------------------------------------------------------------
 
-#r "./packages/build/FAKE/tools/FakeLib.dll"
+#load ".fake/build.fsx/intellisense.fsx"
+
+#if !FAKE
+#r "netstandard"
+#endif
 
-open Fake
 open System
 
+open Fake.SystemHelper
+open Fake.Core
+open Fake.DotNet
+open Fake.Tools
+open Fake.IO
+open Fake.IO.FileSystemOperators
+open Fake.IO.Globbing.Operators
+open Fake.Core.TargetOperators
+open Fake.Api
+
 // --------------------------------------------------------------------------------------
 // Build variables
 // --------------------------------------------------------------------------------------
 
 let buildDir  = "./build/"
-let appReferences = !! "/**/*.fsproj"
-let dotnetcliVersion = "2.1.4"
-let mutable dotnetExePath = "dotnet"
-
-// --------------------------------------------------------------------------------------
-// Helpers
-// --------------------------------------------------------------------------------------
-
-let run' timeout cmd args dir =
-    if execProcess (fun info ->
-        info.FileName <- cmd
-        if not (String.IsNullOrWhiteSpace dir) then
-            info.WorkingDirectory <- dir
-        info.Arguments <- args
-    ) timeout |> not then
-        failwithf "Error while running '%s' with args: %s" cmd args
-
-let run = run' System.TimeSpan.MaxValue
-
-let runDotnet workingDir args =
-    let result =
-        ExecProcess (fun info ->
-            info.FileName <- dotnetExePath
-            info.WorkingDirectory <- workingDir
-            info.Arguments <- args) TimeSpan.MaxValue
-    if result <> 0 then failwithf "dotnet %s failed" args
+let dotnetSdkVersion = "3.1.101"
 
 // --------------------------------------------------------------------------------------
 // Targets
 // --------------------------------------------------------------------------------------
 
-Target "Clean" (fun _ ->
-    CleanDirs [buildDir]
+Target.create "Clean" (fun _ ->
+    [buildDir]
+    |> Shell.cleanDirs
 )
 
-Target "InstallDotNetCLI" (fun _ ->
-    dotnetExePath <- DotNetCli.InstallDotNetSDK dotnetcliVersion
+// Lazily install DotNet SDK in the correct version if not available
+let installedSdk =
+    lazy DotNet.install (fun cfg ->
+        { cfg with
+            Version = DotNet.CliVersion.Version dotnetSdkVersion
+        }) 
+
+// Set general properties without arguments
+let inline setDotNetOptions arg = DotNet.Options.lift installedSdk.Value arg
+
+Target.create "InstallDotNetCLI" (fun _ ->
+    installedSdk.Force()
+    |> ignore
 )
 
-Target "Restore" (fun _ ->
-    appReferences
-    |> Seq.iter (fun p ->
-        let dir = System.IO.Path.GetDirectoryName p
-        runDotnet dir "restore"
-    )
+Target.create "Restore" (fun _ ->
+    DotNet.restore setDotNetOptions "DomainModelingMadeFunctional.sln"
 )
 
-Target "Build" (fun _ ->
-    appReferences
-    |> Seq.iter (fun p ->
-        let dir = System.IO.Path.GetDirectoryName p
-        runDotnet dir "build"
-    )
+Target.create "Build" (fun _ -> 
+    DotNet.exec setDotNetOptions "build" "DomainModelingMadeFunctional.sln"
+    |> ignore
 )
 
 // --------------------------------------------------------------------------------------
 // Build order
 // --------------------------------------------------------------------------------------
 
 "Clean"
-  ==> "InstallDotNetCLI"
-  ==> "Restore"
-  ==> "Build"
+   ==> "InstallDotNetCLI"
+   ==> "Restore"
+   ==> "Build"
 
-RunTargetOrDefault "Build"
+Target.runOrDefaultWithArguments "Build"

.paket/paket.targets

@@ -1,21 +1,9 @@
-#!/bin/bash
-if test "$OS" = "Windows_NT"
-then
-  # use .Net
+#!/usr/bin/env bash
 
-  .paket/paket.exe restore
-  exit_code=$?
-  if [ $exit_code -ne 0 ]; then
-  	exit $exit_code
-  fi
+set -eu
+set -o pipefail
 
-  packages/build/FAKE/tools/FAKE.exe $@ --fsiargs build.fsx
-else
-  # use mono
-  mono .paket/paket.exe restore
-  exit_code=$?
-  if [ $exit_code -ne 0 ]; then
-  	exit $exit_code
-  fi
-  mono packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
-fi
+echo "Restoring dotnet tools..."
+dotnet tool restore 
+
+FAKE_DETAILED_ERRORS=true dotnet fake build