Skip to content

Updated Dotnet Core targets and references #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2016
Merged

Updated Dotnet Core targets and references #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0936c6
Reorder build target dependencies
ncave Aug 2, 2016
d0a8844
Reorder build target dependencies
ncave Aug 3, 2016
e62d4d8
Updated references
ncave Aug 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down