Skip to content
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.

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

Cleanup #1696

Merged
merged 6 commits into from
Oct 2, 2017
Merged

Cleanup #1696

Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 6 additions & 15 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,8 @@ open System.Reflection

#endif

// TODO Remove '#load' once released
#load "src/app/Fake.IO.FileSystem/Path.fs"
#load "src/app/Fake.IO.FileSystem/FileInfo.fs"
#load "src/app/Fake.IO.FileSystem/FileSystemOperators.fs"
#load "src/app/Fake.IO.FileSystem/DirectoryInfo.fs"
#load "src/app/Fake.IO.FileSystem/File.fs"
#load "src/app/Fake.IO.FileSystem/Directory.fs"
#load "src/app/Fake.IO.FileSystem/FileSystemInfo.fs"
#load "src/app/Fake.IO.FileSystem/Shell.fs"

open System.IO
open Fake.Api
open Fake.Core
open Fake.Tools
open Fake.IO
Expand Down Expand Up @@ -670,7 +661,7 @@ Target.Create "DotnetRestore" (fun _ ->
let runtimes =
[ "win7-x86"; "win7-x64"; "osx.10.11-x64"; "ubuntu.14.04-x64"; "ubuntu.16.04-x64" ]

Target.Create "DotnetPackage" (fun _ ->
Target.Create "DotnetPackage_" (fun _ ->
let nugetDir = System.IO.Path.GetFullPath nugetDncDir

Environment.setEnvironVar "Version" release.NugetVersion
Expand Down Expand Up @@ -892,10 +883,6 @@ Target.Create "ReleaseDocs" (fun _ ->
Git.Branches.push "gh-pages"
)

// Remove '#load' once released
#load "src/app/Fake.Api.GitHub/GitHub.fs"
open Fake.Api

Target.Create "FastRelease" (fun _ ->

Git.Staging.StageAll ""
Expand Down Expand Up @@ -950,6 +937,7 @@ Target.Create "Default" ignore
Target.Create "StartDnc" ignore
Target.Create "Release" ignore
Target.Create "BuildSolution" ignore
Target.Create "DotnetPackage" ignore
Target.Create "AfterBuild" ignore

open Fake.Core.TargetOperators
Expand All @@ -960,6 +948,9 @@ open Fake.Core.TargetOperators
?=> "StartDnc"
==> "InstallDotnetCore"
==> "DownloadPaket"
==> "SetAssemblyInfo"
==> "DotnetPackage_"
==> "UnskipAndRevertAssemblyInfo"
==> "DotnetPackage"

// Full framework build
Expand Down
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ group NetcoreBuild
nuget FSharp.Core ~> 4.1.0
nuget System.AppContext prerelease
nuget Paket.Core prerelease
//nuget Fake.Api.GitHub prerelease
nuget Fake.Api.GitHub prerelease
nuget Fake.Core.Target prerelease
nuget Fake.Core.Globbing prerelease
nuget Fake.Core.SemVer prerelease
Expand Down
Loading