Merge pull request #622 from ncave/netcore

Updated Dotnet Core targets and references

Author: dsyme

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,20 +284,26 @@ 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"
+  ==> "AssemblyInfo"
+  ==> "CodeGen.NetCore"
+  ==> "Build.NetCore"
+  ==> "RunTests.NetCore"
+  ==> "All.NetCore"
 
 "Clean"
   =?> ("BuildVersion", isAppVeyorBuild)
   ==> "AssemblyInfo"
   ==> "GenerateFSIStrings"
   ==> "Prepare"
   ==> "Build"
-  =?> ("DotnetCoreCodeGen", isDotnetSDKInstalled)
-  =?> ("Build.NetCore", isDotnetSDKInstalled)
   ==> "RunTests"
-  =?> ("RunTests.NetCore", isDotnetSDKInstalled)
+  =?> ("All.NetCore", isDotnetSDKInstalled)
   ==> "All"
 
 "All"

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"
     }
   },

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": {