Merge branch 'master' into patch-1

Author: voronoipotato

docs/guide/getting-started.md

@@ -99,7 +99,7 @@ the dependency we specified (FAKE's target module). Paket has a
 After configuring Paket, you are ready to run your script. Enter the following command to do so:
 
 ```shell
-dotnet si build.fsx --compilertool:"~/.nuget/packages/fsharp.dependencymanager.paket/6.0.0-alpha055/lib/netstandard2.0"
+dotnet fsi build.fsx --compilertool:"~/.nuget/packages/fsharp.dependencymanager.paket/6.0.0-alpha055/lib/netstandard2.0"
 ```
 
 

global.json

@@ -1,5 +1,6 @@
 {
     "sdk" : {
-        "version": "6.0.101"
+        "version": "6.0.101",
+        "rollForward": "latestMinor"
     }
 }

paket.dependencies

@@ -25,6 +25,7 @@ group fakerunner
     nuget FSharp.Core
     nuget FSharp.Compiler.Service
     nuget Microsoft.Deployment.DotNet.Releases
+    nuget NuGet.Packaging
     nuget Paket.Core
     nuget Mono.Cecil
     nuget Microsoft.NETCore.App framework: netstandard1.6, netstandard2.0, netcoreapp1.1

paket.lock

@@ -53,10 +53,8 @@ module internal AppVeyorInternal =
                 // because otherwise there might be recursive failure...
                 eprintfn "AppVeyor 'AddMessage' failed: %O" e
 
-    let internal quoteString str =
-        StringBuilder()
-        |> StringBuilder.appendQuotedIfNotNull Some str
-        |> StringBuilder.toText
+    /// quote and escape the single argument, if required.
+    let private quoteString str = Args.toWindowsCommandLine [ str ]
 
     /// Starts the test case.
     let StartTestCase testSuiteName testCaseName =

src/app/Fake.BuildServer.AppVeyor/AppVeyorInternal.fs

@@ -140,7 +140,7 @@ type FilePath = string
 module Args =
     /// <summary>
     /// Convert the given argument list to a conforming windows command line string, escapes parameter in quotes if
-    /// needed (currently always but this might change).
+    /// needed.
     /// </summary>
     ///
     /// <param name="args">The arguments list</param>

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

@@ -66,8 +66,13 @@ module DotNet =
                 let content = File.ReadAllText globalJson.FullName
                 let json = JObject.Parse content
                 let sdk = json.Item("sdk") :?> JObject
-                let version = sdk.Property("version").Value.ToString()
-                Some version
+
+                match sdk.Property("version") with
+                | null -> None
+                | version ->
+                    let versionValue = version.Value.ToString()
+                    let _ = Version.Parse(versionValue)
+                    Some versionValue
             with exn ->
                 failwithf "Could not parse `sdk.version` from global.json at '%s': %s" globalJson.FullName exn.Message
 
@@ -774,6 +779,22 @@ module DotNet =
 
         run cmdArgs options
 
+    /// <summary>
+    ///   Execute raw dotnet cli command.
+    ///   Similar to 'exec' but takes a string list instead of a single string.
+    /// </summary>
+    ///
+    /// <param name="buildOptions">build common execution options</param>
+    /// <param name="command">the sdk command to execute <c>test</c>, <c>new</c>, <c>build</c>, ...</param>
+    /// <param name="args">command arguments</param>
+    let private execArgsList (buildOptions: Options -> Options) (command: string) (args: string list) =
+        let options = setOptions buildOptions
+
+        let cmdArgs =
+            buildCommand (command |> Args.fromWindowsCommandLine |> Seq.toList) args options
+
+        run cmdArgs options
+
     /// <summary>
     /// Replace the current <c>CreateProcess</c> instance to run with dotnet.exe
     /// </summary>
@@ -1130,7 +1151,7 @@ module DotNet =
         // used for detection
         let callMsBuildExe args =
             let result =
-                exec
+                execArgsList
                     (fun _ ->
                         { RedirectOutput = true
                           PrintRedirectedOutput = true
@@ -1153,21 +1174,21 @@ module DotNet =
         MSBuild.addBinaryLogger (common.DotNetCliPath + " msbuild") callMsBuildExe args disableFakeBinLog
 
     let internal execWithBinLog project common command args msBuildArgs =
-        let argString = MSBuild.fromCliArguments msBuildArgs
+        let msbuildArgList = MSBuild.fromCliArguments msBuildArgs
 
         let binLogPath, args =
-            addBinaryLogger msBuildArgs.DisableInternalBinLog (args + " " + argString) common
+            addBinaryLogger msBuildArgs.DisableInternalBinLog (args @ msbuildArgList) common
 
-        let result = exec (fun _ -> common) command args
+        let result = execArgsList (fun _ -> common) command args
         MSBuild.handleAfterRun (sprintf "dotnet %s" command) binLogPath result.ExitCode project
 
     let internal tryExecWithBinLog project common command args msBuildArgs =
-        let argString = MSBuild.fromCliArguments msBuildArgs
+        let msbuildArgList = MSBuild.fromCliArguments msBuildArgs
 
         let binLogPath, args =
-            addBinaryLogger msBuildArgs.DisableInternalBinLog (args + " " + argString) common
+            addBinaryLogger msBuildArgs.DisableInternalBinLog (args @ msbuildArgList) common
 
-        let result = exec (fun _ -> common) command args
+        let result = execArgsList (fun _ -> common) command args
 
         try
             MSBuild.handleAfterRun (sprintf "dotnet %s" command) binLogPath result.ExitCode project
@@ -1209,7 +1230,6 @@ module DotNet =
 
         let param = MSBuildOptions.Create() |> setParams
         let args = [ project ]
-        let args = Args.toWindowsCommandLine args
         execWithBinLog project param.Common "msbuild" args param.MSBuildParams
         __.MarkSuccess()
 
@@ -1219,7 +1239,6 @@ module DotNet =
 
         let param = MSBuildOptions.Create() |> setParams
         let args = [ project ]
-        let args = Args.toWindowsCommandLine args
         let r = tryExecWithBinLog project param.Common "msbuild" args param.MSBuildParams
         //__.MarkSuccess()
         r
@@ -1306,7 +1325,7 @@ module DotNet =
     let restore setParams project =
         use __ = Trace.traceTask "DotNet:restore" project
         let param = RestoreOptions.Create() |> setParams
-        let args = Args.toWindowsCommandLine (project :: buildRestoreArgs param)
+        let args = project :: buildRestoreArgs param
         execWithBinLog project param.Common "restore" args param.MSBuildParams
         __.MarkSuccess()
 
@@ -1443,7 +1462,7 @@ module DotNet =
     let pack setParams project =
         use __ = Trace.traceTask "DotNet:pack" project
         let param = PackOptions.Create() |> setParams
-        let args = Args.toWindowsCommandLine (project :: buildPackArgs param)
+        let args = project :: buildPackArgs param
         execWithBinLog project param.Common "pack" args param.MSBuildParams
         __.MarkSuccess()
 
@@ -1560,7 +1579,7 @@ module DotNet =
     let publish setParams project =
         use __ = Trace.traceTask "DotNet:publish" project
         let param = PublishOptions.Create() |> setParams
-        let args = Args.toWindowsCommandLine (project :: buildPublishArgs param)
+        let args = project :: buildPublishArgs param
         execWithBinLog project param.Common "publish" args param.MSBuildParams
         __.MarkSuccess()
 
@@ -1650,7 +1669,7 @@ module DotNet =
     let build setParams project =
         use __ = Trace.traceTask "DotNet:build" project
         let param = BuildOptions.Create() |> setParams
-        let args = Args.toWindowsCommandLine (project :: buildBuildArgs param)
+        let args = project :: buildBuildArgs param
         execWithBinLog project param.Common "build" args param.MSBuildParams
         __.MarkSuccess()
 
@@ -1801,7 +1820,7 @@ module DotNet =
     let test setParams project =
         use __ = Trace.traceTask "DotNet:test" project
         let param = TestOptions.Create() |> setParams
-        let args = Args.toWindowsCommandLine (project :: buildTestArgs param)
+        let args = project :: buildTestArgs param
         execWithBinLog project param.Common "test" args param.MSBuildParams
         __.MarkSuccess()
 
@@ -1868,8 +1887,8 @@ module DotNet =
         pushParams.SymbolApiKey
         |> Option.iter (fun key -> TraceSecrets.register "<SymbolApiKey>" key)
 
-        let args = Args.toWindowsCommandLine (nupkg :: buildNugetPushArgs pushParams)
-        let result = exec (fun _ -> param.Common) "nuget push" args
+        let args = nupkg :: buildNugetPushArgs pushParams
+        let result = execArgsList (fun _ -> param.Common) "nuget push" args
 
         if result.OK then
             __.MarkSuccess()
@@ -1991,8 +2010,8 @@ module DotNet =
     let newFromTemplate templateName setParams =
         use __ = Trace.traceTask "DotNet:new" "dotnet new command"
         let param = NewOptions.Create() |> setParams
-        let args = Args.toWindowsCommandLine (buildNewArgs param)
-        let result = exec (fun _ -> param.Common) $"new {templateName}" args
+        let args = buildNewArgs param
+        let result = execArgsList (fun _ -> param.Common) $"new {templateName}" args
 
         if not result.OK then
             failwithf $"dotnet new failed with code %i{result.ExitCode}"
@@ -2008,8 +2027,8 @@ module DotNet =
     let installTemplate templateName setParams =
         use __ = Trace.traceTask "DotNet:new" "dotnet new --install command"
         let param = TemplateInstallOptions.Create(templateName) |> setParams
-        let args = Args.toWindowsCommandLine (buildTemplateInstallArgs param)
-        let result = exec (fun _ -> param.Common) "new" args
+        let args = buildTemplateInstallArgs param
+        let result = execArgsList (fun _ -> param.Common) "new" args
 
         if not result.OK then
             failwithf $"dotnet new --install failed with code %i{result.ExitCode}"
@@ -2025,8 +2044,8 @@ module DotNet =
     let uninstallTemplate templateName =
         use __ = Trace.traceTask "DotNet:new" "dotnet new --uninstall command"
         let param = TemplateUninstallOptions.Create(templateName)
-        let args = Args.toWindowsCommandLine (buildTemplateUninstallArgs param)
-        let result = exec (fun _ -> param.Common) "new" args
+        let args = buildTemplateUninstallArgs param
+        let result = execArgsList (fun _ -> param.Common) "new" args
 
         // If the process returns error (exit code != 0) then check to see if a message is
         // that the template was not found.  If this message exists, assume the process

src/app/Fake.DotNet.Cli/DotNet.fs

@@ -686,11 +686,6 @@ module MSBuild =
 
             a, fileName |> Path.getFullName)
 
-    let internal quoteString str =
-        StringBuilder()
-        |> StringBuilder.appendQuotedIfNotNull Some str
-        |> StringBuilder.toText
-
     let rec private getProjectReferences (projectFileName: string) =
         match projectFileName.EndsWith ".sln" with
         | true -> Set.empty
@@ -877,24 +872,31 @@ module MSBuild =
           yield! properties ]
         |> Seq.choose id
         |> Seq.map (fun (k, v) -> "/" + k + (if String.isNullOrEmpty v then "" else ":" + v))
-        |> Args.toWindowsCommandLine
+        |> Seq.toList
 
     /// [omit]
-    let buildArgs (setParams: MSBuildParams -> MSBuildParams) =
+    let buildArgs (setParams: MSBuildParams -> MSBuildParams) : MSBuildParams * string =
+        let p = MSBuildParams.Create() |> setParams
+        p, fromCliArguments p.CliArguments |> Args.toWindowsCommandLine
+
+    /// <summary>
+    ///   similar to 'buildArgs' but returns a string list instead of a single string for the arguments
+    /// </summary>
+    let private buildArgsToList (setParams: MSBuildParams -> MSBuildParams) : MSBuildParams * string list =
         let p = MSBuildParams.Create() |> setParams
         p, fromCliArguments p.CliArguments
 
 
     let internal getVersion =
         let cache = System.Collections.Concurrent.ConcurrentDictionary<string, Version>()
 
-        fun (exePath: string) (callMsbuildExe: string -> string) ->
+        fun (exePath: string) (callMsbuildExe: string list -> string) ->
             let getFromCall () =
                 try
                     let result =
                         match Environment.isUnix with
-                        | true -> callMsbuildExe "--version --nologo"
-                        | false -> callMsbuildExe "/version /nologo"
+                        | true -> callMsbuildExe [ "--version"; "--nologo" ]
+                        | false -> callMsbuildExe [ "/version"; "/nologo" ]
 
                     let line =
                         if result.Contains "DOTNET_CLI_TELEMETRY_OPTOUT" then
@@ -914,23 +916,23 @@ module MSBuild =
 
     let internal addBinaryLogger
         (exePath: string)
-        (callMsbuildExe: string -> string)
-        (args: string)
+        (callMsbuildExe: string list -> string)
+        (args: string list)
         (disableFakeBinLogger: bool)
         =
 #if !NO_MSBUILD_BINLOG
         if disableFakeBinLogger then
             None, args
         else
-            let argList = Args.fromWindowsCommandLine args |> Seq.toList
+            let argList = args |> Seq.toList
             let path = Path.GetTempFileName()
             File.Delete(path)
             let path = path + ".binlog"
             //let path = Path.GetFullPath <| sprintf "fake-msbuild-%s.binlog" (System.Guid.NewGuid().ToString())
             let v = getVersion exePath callMsbuildExe
 
             if v >= versionToUseBinLog then
-                Some path, Args.toWindowsCommandLine (argList @ [ "/bl:" + path ])
+                Some path, (argList @ [ "/bl:" + path ])
             elif v >= versionToUseStructuredLogger then
                 let assemblyPath =
                     let currentPath = MSBuildBinLog.structuredLogAssemblyPath
@@ -941,8 +943,7 @@ module MSBuild =
                     else
                         Path.Combine(libFolder, "net46", "StructuredLogger.dll")
 
-                Some path,
-                Args.toWindowsCommandLine (argList @ [ sprintf "/logger:BinaryLogger,%s;%s" assemblyPath path ])
+                Some path, (argList @ [ sprintf "/logger:BinaryLogger,%s;%s" assemblyPath path ])
             else
                 Trace.traceFAKE
                     "msbuild version '%O' doesn't support binary logger, please set the msbuild argument 'DisableInternalBinLog' to 'true' to disable this warning."
@@ -998,7 +999,7 @@ module MSBuild =
         let messageF msg = results.Add msg
 
         let processResult =
-            CreateProcess.fromRawCommandLine msBuildParams.ToolPath args
+            CreateProcess.fromRawCommand msBuildParams.ToolPath args
             |> CreateProcess.withTimeout TimeSpan.MaxValue
             |> CreateProcess.withEnvironment (msBuildParams.Environment |> Map.toList)
             |> CreateProcess.redirectOutput
@@ -1017,9 +1018,9 @@ module MSBuild =
     /// <param name="setParams">A function that overwrites the default MSBuildParams</param>
     /// <param name="project">A string with the path to the project file to build.</param>
     let buildWithRedirect setParams project =
-        let msBuildParams, argsString = buildArgs setParams
+        let msBuildParams, argsList = buildArgsToList setParams
 
-        let args = quoteString (project + " " + argsString)
+        let args = project :: argsList
 
         let binlogPath, args =
             addBinaryLogger
@@ -1034,7 +1035,7 @@ module MSBuild =
             else
                 sprintf "%s>" msBuildParams.WorkingDirectory
 
-        Trace.tracefn "%s%s %s" wd msBuildParams.ToolPath args
+        Trace.tracefn "%s%s %s" wd msBuildParams.ToolPath (Args.toWindowsCommandLine args)
 
         let results = System.Collections.Generic.List<ConsoleMessage>()
 
@@ -1045,7 +1046,7 @@ module MSBuild =
             results.Add(ConsoleMessage.CreateOut msg)
 
         let processResult =
-            CreateProcess.fromRawCommandLine msBuildParams.ToolPath args
+            CreateProcess.fromRawCommand msBuildParams.ToolPath args
             |> CreateProcess.withTimeout TimeSpan.MaxValue
             |> CreateProcess.withEnvironment (msBuildParams.Environment |> Map.toList)
             |> CreateProcess.withWorkingDirectory msBuildParams.WorkingDirectory
@@ -1086,9 +1087,9 @@ module MSBuild =
     /// </example>
     let build setParams project =
         use __ = Trace.traceTask "MSBuild" project
-        let msBuildParams, argsString = buildArgs setParams
+        let msBuildParams, argsList = buildArgsToList setParams
 
-        let args = quoteString (project + " " + argsString)
+        let args = project :: argsList
 
         let binlogPath, args =
             addBinaryLogger
@@ -1103,10 +1104,10 @@ module MSBuild =
             else
                 sprintf "%s>" msBuildParams.WorkingDirectory
 
-        Trace.tracefn "%s%s %s" wd msBuildParams.ToolPath args
+        Trace.tracefn "%s%s %s" wd msBuildParams.ToolPath (Args.toWindowsCommandLine args)
 
         let processResult =
-            CreateProcess.fromRawCommandLine msBuildParams.ToolPath args
+            CreateProcess.fromRawCommand msBuildParams.ToolPath args
             |> CreateProcess.withWorkingDirectory msBuildParams.WorkingDirectory
             |> CreateProcess.withTimeout TimeSpan.MaxValue
             |> CreateProcess.withEnvironment (msBuildParams.Environment |> Map.toList)