From d0936c639959d3371c6c87cdd5db1809343c75ea Mon Sep 17 00:00:00 2001 From: ncave Date: Tue, 2 Aug 2016 03:29:14 -0700 Subject: [PATCH 1/3] Reorder build target dependencies --- build.fsx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build.fsx b/build.fsx index 5632b5721a..17101662be 100644 --- a/build.fsx +++ b/build.fsx @@ -226,7 +226,7 @@ let assertExitCodeZero x = if x = 0 then () else failwithf "Command failed with let runCmdIn workDir exe = Printf.ksprintf (fun args -> Shell.Exec(exe, args, workDir) |> assertExitCodeZero) let run exe = runCmdIn "." exe -Target "DotnetCoreCodeGen" (fun _ -> +Target "CodeGen.NetCore" (fun _ -> let lexArgs = "--lexlib Internal.Utilities.Text.Lexing" let yaccArgs = "--internal --parslib Internal.Utilities.Text.Parsing" let module1 = "--module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser" @@ -284,9 +284,16 @@ Target "Nuget.AddNetCore" (fun _ -> Target "Prepare" DoNothing Target "PrepareRelease" DoNothing -Target "All" DoNothing Target "Release" DoNothing Target "CreatePackage" DoNothing +Target "All" DoNothing +Target "All.NetCore" DoNothing + +"Clean" + ==> "CodeGen.NetCore" + ==> "Build.NetCore" + ==> "RunTests.NetCore" + ==> "All.NetCore" "Clean" =?> ("BuildVersion", isAppVeyorBuild) @@ -294,10 +301,8 @@ Target "CreatePackage" DoNothing ==> "GenerateFSIStrings" ==> "Prepare" ==> "Build" - =?> ("DotnetCoreCodeGen", isDotnetSDKInstalled) - =?> ("Build.NetCore", isDotnetSDKInstalled) ==> "RunTests" - =?> ("RunTests.NetCore", isDotnetSDKInstalled) + =?> ("All.NetCore", isDotnetSDKInstalled) ==> "All" "All" From d0a8844d00cc5f41be5269d886468d61b19abeb4 Mon Sep 17 00:00:00 2001 From: ncave Date: Wed, 3 Aug 2016 01:38:33 -0700 Subject: [PATCH 2/3] Reorder build target dependencies --- build.fsx | 1 + 1 file changed, 1 insertion(+) diff --git a/build.fsx b/build.fsx index 17101662be..7693e6b440 100644 --- a/build.fsx +++ b/build.fsx @@ -290,6 +290,7 @@ Target "All" DoNothing Target "All.NetCore" DoNothing "Clean" + ==> "AssemblyInfo" ==> "CodeGen.NetCore" ==> "Build.NetCore" ==> "RunTests.NetCore" From e62d4d8f3a08e15818bfdaec9b86b2eea41ae404 Mon Sep 17 00:00:00 2001 From: ncave Date: Mon, 8 Aug 2016 02:50:44 -0700 Subject: [PATCH 3/3] Updated references --- .../project.json | 12 ++++++------ .../project.json | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json b/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json index a92bb98204..a0d28dc878 100644 --- a/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json +++ b/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json @@ -29,14 +29,14 @@ ] }, "dependencies": { - "Microsoft.Build": "0.1.0-preview-00028-160627", - "Microsoft.Build.Framework": "0.1.0-preview-00028-160627", - "Microsoft.Build.Tasks.Core": "0.1.0-preview-00028-160627", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-160627", - "System.Runtime.Serialization.Json": "4.0.2", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*", + "Microsoft.Build": "0.1.0-preview-00029-160805", + "Microsoft.Build.Framework": "0.1.0-preview-00029-160805", + "Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805", + "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", + "System.Runtime.Serialization.Json": "4.0.2", "FSharp.Compiler.Service": { - "version": "1.0.0-alpha-*", + "version": "6.0.1", "target": "project" } }, diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/project.json b/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/project.json index df02ee5edb..48c31026f0 100644 --- a/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/project.json +++ b/src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/project.json @@ -18,10 +18,10 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*", - "Microsoft.Build": "0.1.0-preview-00028-160627", - "Microsoft.Build.Framework": "0.1.0-preview-00028-160627", - "Microsoft.Build.Tasks.Core": "0.1.0-preview-00028-160627", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-160627", + "Microsoft.Build": "0.1.0-preview-00029-160805", + "Microsoft.Build.Framework": "0.1.0-preview-00029-160805", + "Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805", + "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", "System.Runtime.Serialization.Json": "4.0.2" }, "frameworks": {