Release 5.15.4 (#2349)

Release 5.15.4
fsprojects · Jul 16, 2019 · ceb1805 · ceb1805
2 parents 273abd0 + f2b1a4a
commit ceb1805
Show file tree

Hide file tree

Showing 74 changed files with 601 additions and 148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,7 @@ tools/RazorEngine
 !tools/FAKE/tools/FakeLib.dll
 !tools/FAKE/tools/FakeLib.pdb
 .gitignore
+!integrationtests/.gitignore
 _NCrunch_FAKE/
 tools/FSharp.Compiler.Service
 tools/FSharp.Formatting.CommandTool/

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 5.15.4 - 2019-07-16
+
+* BUGFIX: Fix high memory use and slowness with a large number of targets/dependencies - https://github.com/fsharp/FAKE/pull/2354
+
 ## 5.15.3 - 2019-07-03
 
 * BUGFIX: Disable fast restore for MSBuild version < 15.8 - https://github.com/fsprojects/Paket/pull/3611

diff --git a/integrationtests/.gitignore b/integrationtests/.gitignore
@@ -0,0 +1,2 @@
+**/temp
+*.lock
diff --git a/src/app/Fake.Api.GitHub/Fake.Api.GitHub.fsproj b/src/app/Fake.Api.GitHub/Fake.Api.GitHub.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Api.GitHub</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
     <AssemblyName>Fake.Api.HockeyApp</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Api.Slack/Fake.Api.Slack.fsproj b/src/app/Fake.Api.Slack/Fake.Api.Slack.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Api.Slack</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
     <AssemblyName>Fake.Azure.Kudu</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.fsproj b/src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Azure.WebJobs</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
     <AssemblyName>Fake.BuildServer.AppVeyor</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj b/src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.BuildServer.GitLab</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.BuildServer.TeamCity/Fake.BuildServer.TeamCity.fsproj b/src/app/Fake.BuildServer.TeamCity/Fake.BuildServer.TeamCity.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.BuildServer.TeamCity</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

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

diff --git a/src/app/Fake.BuildServer.Travis/Fake.BuildServer.Travis.fsproj b/src/app/Fake.BuildServer.Travis/Fake.BuildServer.Travis.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.BuildServer.Travis</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

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

diff --git a/src/app/Fake.Core.Context/Fake.Core.Context.fsproj b/src/app/Fake.Core.Context/Fake.Core.Context.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Core.Context</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Core.Environment/Fake.Core.Environment.fsproj b/src/app/Fake.Core.Environment/Fake.Core.Environment.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Core.Environment</AssemblyName>
     <OutputType>Library</OutputType>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>

diff --git a/src/app/Fake.Core.FakeVar/Fake.Core.FakeVar.fsproj b/src/app/Fake.Core.FakeVar/Fake.Core.FakeVar.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Core.FakeVar</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>

diff --git a/src/app/Fake.Core.ReleaseNotes/Fake.Core.ReleaseNotes.fsproj b/src/app/Fake.Core.ReleaseNotes/Fake.Core.ReleaseNotes.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Core.ReleaseNotes</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Core.SemVer/Fake.Core.SemVer.fsproj b/src/app/Fake.Core.SemVer/Fake.Core.SemVer.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Core.SemVer</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Core.String/Fake.Core.String.fsproj b/src/app/Fake.Core.String/Fake.Core.String.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
     <AssemblyName>Fake.Core.String</AssemblyName>
     <OutputType>Library</OutputType>

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

diff --git a/src/app/Fake.Core.Target/Target.fs b/src/app/Fake.Core.Target/Target.fs
@@ -632,29 +632,24 @@ module Target =
 
     /// Determines a parallel build order for the given set of targets
     let internal determineBuildOrder (target : string) =
-        let _ = get target
-
-        let rec visitDependenciesAux previousDependencies = function
+        let visited = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        let visitedTargets = new List<Target>()
+        let rec visitDependenciesAux = function
             // NOTE: should be tail recursive
-            | (visited, level, targetName) :: workLeft ->
-                let target = get targetName
-                let isVisited =
-                    visited
-                    |> Seq.exists (fun t -> String.Equals(t, targetName, StringComparison.OrdinalIgnoreCase))
-                if isVisited then
-                    visitDependenciesAux previousDependencies workLeft
+            | targetName :: workLeft ->
+                if visited.Add(targetName)
+                then
+                    let target = get targetName
+                    visitedTargets.Add(target)
+                    let newLeft = target.Dependencies @ workLeft
+                    visitDependenciesAux newLeft
                 else
-                    let deps =
-                        target.Dependencies
-                        |> List.map (fun (t) -> (String.toLower targetName::visited), level + 1, t)
-                    let newVisitedDeps = target :: previousDependencies
-                    visitDependenciesAux newVisitedDeps (deps @ workLeft)
-            | _ ->
-                previousDependencies
-                |> List.distinctBy (fun (t) -> String.toLower t.Name)
+                    visitDependenciesAux workLeft                        
+            | _ -> visitedTargets |> Seq.toList
+
 
         // first find the list of targets we "have" to build
-        let targets = visitDependenciesAux [] [[], 0, target]
+        let targets = visitDependenciesAux [target]
 
         // Try to build the optimal tree by starting with the targets without dependencies and remove them from the list iteratively
         let targetLeftSet = HashSet<_>(StringComparer.OrdinalIgnoreCase)

diff --git a/src/app/Fake.Core.Tasks/Fake.Core.Tasks.fsproj b/src/app/Fake.Core.Tasks/Fake.Core.Tasks.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Core.Tasks</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj b/src/app/Fake.Core.Trace/Fake.Core.Trace.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Core.Trace</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

diff --git a/src/app/Fake.Core.UserInput/Fake.Core.UserInput.fsproj b/src/app/Fake.Core.UserInput/Fake.Core.UserInput.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.Core.UserInput</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

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

diff --git a/src/app/Fake.Core.Xml/Fake.Core.Xml.fsproj b/src/app/Fake.Core.Xml/Fake.Core.Xml.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.Core.Xml</AssemblyName>
     <OutputType>Library</OutputType>

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;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
         <AssemblyName>Fake.Documentation.DocFx</AssemblyName>
         <OutputType>Library</OutputType>
     </PropertyGroup>

diff --git a/src/app/Fake.DotNet.AssemblyInfoFile/Fake.DotNet.AssemblyInfoFile.fsproj b/src/app/Fake.DotNet.AssemblyInfoFile/Fake.DotNet.AssemblyInfoFile.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>netstandard2.0;net46;netstandard1.6</TargetFrameworks>
     <AssemblyName>Fake.DotNet.AssemblyInfoFile</AssemblyName>
     <OutputType>Library</OutputType>
   </PropertyGroup>

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

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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.FSFormatting</AssemblyName>
     <OutputType>Library</OutputType>

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

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

diff --git a/src/app/Fake.DotNet.FxCop/Fake.DotNet.FxCop.fsproj b/src/app/Fake.DotNet.FxCop/Fake.DotNet.FxCop.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <AssemblyName>Fake.DotNet.FxCop</AssemblyName>
     <OutputType>Library</OutputType>    
   </PropertyGroup>

diff --git a/src/app/Fake.DotNet.ILMerge/Fake.DotNet.ILMerge.fsproj b/src/app/Fake.DotNet.ILMerge/Fake.DotNet.ILMerge.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <AssemblyName>Fake.DotNet.ILMerge</AssemblyName>
     <OutputType>Library</OutputType>    
   </PropertyGroup>

diff --git a/src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj b/src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
     <AssemblyName>Fake.DotNet.MSBuild</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</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;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NO_DOTNETCORE_BOOTSTRAP</DefineConstants>
     <AssemblyName>Fake.DotNet.Testing.DotCover</AssemblyName>
     <OutputType>Library</OutputType>

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