switch to BlackFox.CommandLine, first step in fixing #2197

fsprojects · Nov 18, 2018 · b880698 · b880698
1 parent f5788ed
commit b880698
Show file tree

Hide file tree

Showing 41 changed files with 262 additions and 213 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -181,6 +181,7 @@ group netcore
     nuget System.Security.Cryptography.Algorithms
     nuget MSBuild.StructuredLogger
     nuget BlackFox.VsWhere
+    nuget BlackFox.CommandLine
 
     // Testing
     nuget Expecto >= 5.0

diff --git a/paket.lock b/paket.lock
diff --git a/src/app/Fake.Api.HockeyApp/Fake.Api.HockeyApp.fsproj b/src/app/Fake.Api.HockeyApp/Fake.Api.HockeyApp.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.Api.HockeyApp</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj b/src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.Azure.CloudServices</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj b/src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.Azure.Emulators</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj b/src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.Azure.Kudu</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.BuildServer.AppVeyor/Fake.BuildServer.AppVeyor.fsproj b/src/app/Fake.BuildServer.AppVeyor/Fake.BuildServer.AppVeyor.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.BuildServer.AppVeyor</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Core.Process/CmdLineParsing.fs b/src/app/Fake.Core.Process/CmdLineParsing.fs
@@ -128,28 +128,72 @@ module Args =
     /// Read a windows command line string into its arguments
     let fromWindowsCommandLine cmd = CmdLineParsing.windowsCommandLineToArgv cmd
 
+open BlackFox.CommandLine
+
 /// Represents a list of arguments
 type Arguments = 
-    internal { Args : string array }
-    static member Empty = { Args = [||] }
+    internal { Args : CmdLine }
+    static member Empty = { Args = CmdLine.empty }
     /// See https://msdn.microsoft.com/en-us/library/17w5ykft.aspx
     static member OfWindowsCommandLine cmd =
-        { Args = Args.fromWindowsCommandLine cmd }
+        { Args = Args.fromWindowsCommandLine cmd |> Array.toList |> CmdLine.fromList }
 
     /// This is the reverse of https://msdn.microsoft.com/en-us/library/17w5ykft.aspx
-    member x.ToWindowsCommandLine = Args.toWindowsCommandLine x.Args
-    member x.ToLinuxShellCommandLine = Args.toLinuxShellCommandLine x.Args
+    member x.ToWindowsCommandLine = x.Args |> CmdLine.toString
+    member x.ToLinuxShellCommandLine = x.Args |> CmdLine.toList |> Args.toLinuxShellCommandLine
 
     /// Create a new arguments object from the given list of arguments
-    static member OfArgs (args:string seq) = { Args = args |> Seq.toArray }
+    static member OfArgs (args:string seq) = { Args = args |> CmdLine.fromSeq }
     /// Create a new arguments object from a given startinfo-conforming-escaped command line string.
     static member OfStartInfo cmd = Arguments.OfWindowsCommandLine cmd
     /// Create a new command line string which can be used in a ProcessStartInfo object.
-    member x.ToStartInfo = CmdLineParsing.toProcessStartInfo x.Args
+    member x.ToStartInfo = x.Args |> CmdLine.toString // |>  CmdLineParsing.toProcessStartInfo x.Args
 
 module Arguments =
     let withPrefix s (a:Arguments) =
-        Arguments.OfArgs(Seq.append s a.Args)
+        { Args = CmdLine.concat (CmdLine.fromSeq s) a.Args }
+        //Arguments.OfArgs(Seq.append s a.Args)
     let append s (a:Arguments) =
-        Arguments.OfArgs(Seq.append a.Args s)
+        { Args = a.Args |> CmdLine.appendSeq s }
+        //Arguments.OfArgs(Seq.append a.Args s)
+
+/// Forward API from https://github.com/vbfox/FoxSharp/tree/master/src/BlackFox.CommandLine
+module CommandLine =
+    let empty = Arguments.Empty
+    let inline internal liftInternal f x (a:Arguments) =
+        { Args = a.Args |> f x }
+    let inline internal liftInternal2 f x y (a:Arguments) =
+        { Args = a.Args |> f x y }
+    let inline internal liftInternal3 f x y z (a:Arguments) =
+        { Args = a.Args |> f x y z }
+
+    let appendRaw = liftInternal CmdLine.appendRaw
+    let append = liftInternal CmdLine.append
+    let appendf f = liftInternal CmdLine.appendf f
+    let appendPrefix = liftInternal2 CmdLine.appendPrefix
+    let appendPrefixf s f = liftInternal2 CmdLine.appendPrefixf s f
+    let appendIf = liftInternal2 CmdLine.appendIf
+    let appendIff b f = liftInternal2 CmdLine.appendIf b f
+    let appendPrefixIf = liftInternal3 CmdLine.appendPrefixIf
+    let appendPrefixIff b s f = liftInternal3 CmdLine.appendPrefixIff b s f
+    let appendIfSome = liftInternal CmdLine.appendIfSome 
+    let appendIfSomef f o = liftInternal2 CmdLine.appendIfSomef f o
+    let appendPrefixIfSome = liftInternal2 CmdLine.appendPrefixIfSome 
+    let appendPrefixIfSomef s f o = liftInternal3 CmdLine.appendPrefixIfSomef s f o
+    let appendSeq se = liftInternal CmdLine.appendSeq se
+    let appendSeqf f s = liftInternal2 CmdLine.appendSeqf f s
+    let appendPrefixSeq se = liftInternal2 CmdLine.appendPrefixSeq se
+    let appendPrefixSeqf s f se = liftInternal3 CmdLine.appendPrefixSeqf s f se
+    let appendIfNotNullOrEmpty = liftInternal CmdLine.appendIfNotNullOrEmpty
+    let appendIfNotNullOrEmptyf f s = liftInternal2 CmdLine.appendIfNotNullOrEmptyf f s
+    let appendPrefixIfNotNullOrEmpty = liftInternal2 CmdLine.appendPrefixIfNotNullOrEmpty
+    let appendPrefixIfNotNullOrEmptyf s f i = liftInternal3 CmdLine.appendPrefixIfNotNullOrEmptyf s f i
+    let fromSeq s =  { Args = CmdLine.fromSeq s }
+    let fromList s =  { Args = CmdLine.fromList s }
+    let fromArray s =  { Args = CmdLine.fromArray s }
+    let toList (a:Arguments) = CmdLine.toList a.Args
+    let toArray (a:Arguments) = CmdLine.toArray a.Args
+    let toStringForMsvcr e (a:Arguments) = CmdLine.toStringForMsvcr e a.Args
+    let toString (a:Arguments) = CmdLine.toString a.Args
+
 #endif   
diff --git a/src/app/Fake.Core.Process/Fake.Core.Process.fsproj b/src/app/Fake.Core.Process/Fake.Core.Process.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Fake.Core.Process</AssemblyName>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>

diff --git a/src/app/Fake.Core.Process/paket.references b/src/app/Fake.Core.Process/paket.references
@@ -2,4 +2,5 @@ group netcore
 
 FSharp.Core
 System.Diagnostics.Process
-NETStandard.Library
+NETStandard.Library
+BlackFox.CommandLine
diff --git a/src/app/Fake.Documentation.DocFx/Fake.Documentation.DocFx.fsproj b/src/app/Fake.Documentation.DocFx/Fake.Documentation.DocFx.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" 
     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
         <AssemblyName>Fake.Documentation.DocFx</AssemblyName>
         <OutputType>Library</OutputType>
     </PropertyGroup>

diff --git a/src/app/Fake.DotNet.FSFormatting/Fake.DotNet.FSFormatting.fsproj b/src/app/Fake.DotNet.FSFormatting/Fake.DotNet.FSFormatting.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.FSFormatting</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Mage/Fake.DotNet.Mage.fsproj b/src/app/Fake.DotNet.Mage/Fake.DotNet.Mage.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Fake.DotNet.Mage</AssemblyName>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>

diff --git a/src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj b/src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.NuGet</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Paket/Fake.DotNet.Paket.fsproj b/src/app/Fake.DotNet.Paket/Fake.DotNet.Paket.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Paket</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.DotCover/Fake.DotNet.Testing.DotCover.fsproj b/src/app/Fake.DotNet.Testing.DotCover/Fake.DotNet.Testing.DotCover.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.DotCover</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.MSTest/Fake.DotNet.Testing.MSTest.fsproj b/src/app/Fake.DotNet.Testing.MSTest/Fake.DotNet.Testing.MSTest.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.MSTest</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj b/src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.MSpec</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj b/src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.NUnit</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.OpenCover/Fake.DotNet.Testing.OpenCover.fsproj b/src/app/Fake.DotNet.Testing.OpenCover/Fake.DotNet.Testing.OpenCover.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.OpenCover</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.SpecFlow/Fake.DotNet.Testing.SpecFlow.fsproj b/src/app/Fake.DotNet.Testing.SpecFlow/Fake.DotNet.Testing.SpecFlow.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.SpecFlow</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.VSTest/Fake.DotNet.Testing.VSTest.fsproj b/src/app/Fake.DotNet.Testing.VSTest/Fake.DotNet.Testing.VSTest.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.VSTest</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.DotNet.Testing.XUnit2/Fake.DotNet.Testing.XUnit2.fsproj b/src/app/Fake.DotNet.Testing.XUnit2/Fake.DotNet.Testing.XUnit2.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.XUnit2</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Installer.InnoSetup/Fake.Installer.InnoSetup.fsproj b/src/app/Fake.Installer.InnoSetup/Fake.Installer.InnoSetup.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" 
     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
         <AssemblyName>Fake.Installer.InnoSetup</AssemblyName>
         <OutputType>Library</OutputType>
     </PropertyGroup>

diff --git a/src/app/Fake.Installer.Squirrel/Fake.Installer.Squirrel.fsproj b/src/app/Fake.Installer.Squirrel/Fake.Installer.Squirrel.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Installer.Squirrel</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Installer.Wix/Fake.Installer.Wix.fsproj b/src/app/Fake.Installer.Wix/Fake.Installer.Wix.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.Installer.Wix</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.JavaScript.Npm/Fake.JavaScript.Npm.fsproj b/src/app/Fake.JavaScript.Npm/Fake.JavaScript.Npm.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.JavaScript.Npm</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.JavaScript.Yarn/Fake.JavaScript.Yarn.fsproj b/src/app/Fake.JavaScript.Yarn/Fake.JavaScript.Yarn.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.JavaScript.Yarn</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Sql.DacPac/Fake.Sql.DacPac.fsproj b/src/app/Fake.Sql.DacPac/Fake.Sql.DacPac.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
     <AssemblyName>Fake.Sql.DacPac</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Testing.ReportGenerator/Fake.Testing.ReportGenerator.fsproj b/src/app/Fake.Testing.ReportGenerator/Fake.Testing.ReportGenerator.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Testing.ReportGenerator</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Testing.SonarQube/Fake.Testing.SonarQube.fsproj b/src/app/Fake.Testing.SonarQube/Fake.Testing.SonarQube.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Testing.SonarQube</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Tools.Git/Fake.Tools.Git.fsproj b/src/app/Fake.Tools.Git/Fake.Tools.Git.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Tools.Git</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Tools.GitVersion/Fake.Tools.GitVersion.fsproj b/src/app/Fake.Tools.GitVersion/Fake.Tools.GitVersion.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Tools.GitVersion</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Tools.Octo/Fake.Tools.Octo.fsproj b/src/app/Fake.Tools.Octo/Fake.Tools.Octo.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Tools.Octo</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Tools.Pickles/Fake.Tools.Pickles.fsproj b/src/app/Fake.Tools.Pickles/Fake.Tools.Pickles.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Tools.Pickles</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Tools.Rsync/Fake.Tools.Rsync.fsproj b/src/app/Fake.Tools.Rsync/Fake.Tools.Rsync.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <AssemblyName>Fake.Tools.Rsync</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Windows.Chocolatey/Fake.Windows.Chocolatey.fsproj b/src/app/Fake.Windows.Chocolatey/Fake.Windows.Chocolatey.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Windows.Chocolatey</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/test/Fake.Core.UnitTests/Fake.Core.Process.fs b/src/test/Fake.Core.UnitTests/Fake.Core.Process.fs
@@ -41,7 +41,7 @@ let tests =
             | ShellCommand cmd -> failwithf "Expected RawCommand"
             | RawCommand (f, a) -> f, a
         Expect.equal file "cmd" "Expected correct command"
-        Expect.sequenceEqual ["/C"; "echo 1&& echo 2"] args.Args "Expected correct args"
+        Expect.sequenceEqual ["/C"; "echo 1&& echo 2"] (args |> CommandLine.toList) "Expected correct args"
         Expect.equal args.ToStartInfo command "Expect proper command (cmd is strange with regards to escaping)"
 
     yield testCase "Test that we can read messages correctly" <| fun _ ->