Skip to content

Commit 7a34a65

Browse files
committed
fix mono
1 parent c33e72f commit 7a34a65

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

fcs/build.fsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
#I "packages/FAKE/tools"
66
#r "packages/FAKE/tools/FakeLib.dll"
77
open System
8-
open Fake.AppVeyor
8+
open System.IO
99
open Fake
10-
open Fake.Git
10+
open Fake.AppVeyor
1111
open Fake.ReleaseNotesHelper
12-
open Fake.UserInputHelper
1312

1413
#if MONO
1514
// prevent incorrect output encoding (e.g. https://github.com/fsharp/FAKE/issues/1196)
@@ -31,13 +30,12 @@ let runCmdIn workDir (exe:string) = Printf.ksprintf (fun (args:string) ->
3130
#endif
3231
|> assertExitCodeZero
3332
)
34-
let run exe = runCmdIn "." exe
3533

3634
// --------------------------------------------------------------------------------------
3735
// The rest of the code is standard F# build script
3836
// --------------------------------------------------------------------------------------
3937

40-
let releaseDir = "../Release"
38+
let releaseDir = Path.Combine(__SOURCE_DIRECTORY__, "../Release")
4139

4240

4341
// Read release notes & version info from RELEASE_NOTES.md
@@ -99,9 +97,9 @@ Target "Test.NetFx" (fun _ ->
9997
// --------------------------------------------------------------------------------------
10098
// Build a NuGet package
10199
Target "NuGet.NetFx" (fun _ ->
102-
run @"..\.nuget\nuget.exe" @"pack nuget\FSharp.Compiler.Service.nuspec -OutputDirectory %s" releaseDir
103-
run @"..\.nuget\nuget.exe" @"pack nuget\FSharp.Compiler.Service.MSBuild.v12.nuspec -OutputDirectory %s" releaseDir
104-
run @"..\.nuget\nuget.exe" @"pack nuget\FSharp.Compiler.Service.ProjectCracker.nuspec -OutputDirectory %s" releaseDir
100+
runCmdIn __SOURCE_DIRECTORY__ @"..\.nuget\nuget.exe" @"pack nuget\FSharp.Compiler.Service.nuspec -OutputDirectory %s" releaseDir
101+
runCmdIn __SOURCE_DIRECTORY__ @"..\.nuget\nuget.exe" @"pack nuget\FSharp.Compiler.Service.MSBuild.v12.nuspec -OutputDirectory %s" releaseDir
102+
runCmdIn __SOURCE_DIRECTORY__ @"..\.nuget\nuget.exe" @"pack nuget\FSharp.Compiler.Service.ProjectCracker.nuspec -OutputDirectory %s" releaseDir
105103
)
106104

107105

@@ -123,20 +121,20 @@ let isDotnetSDKInstalled =
123121

124122

125123
Target "Build.NetStd" (fun _ ->
126-
run "dotnet" "pack %s -v n -c Release" "FSharp.Compiler.Service.netstandard.sln"
124+
runCmdIn __SOURCE_DIRECTORY__ "dotnet" "pack %s -v n -c Release" "FSharp.Compiler.Service.netstandard.sln"
127125
)
128126

129127

130128
Target "Test.NetStd" (fun _ ->
131-
run "dotnet" "run -p FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj -c Release -- --result:TestResults.NetStd.xml;format=nunit3"
129+
runCmdIn __SOURCE_DIRECTORY__ "dotnet" "run -p FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj -c Release -- --result:TestResults.NetStd.xml;format=nunit3"
132130
)
133131

134132

135133
//use dotnet-mergenupkg to merge the .NETstandard nuget package into the default one
136134
Target "Nuget.AddNetStd" (fun _ ->
137135
let nupkg = sprintf "%s/FSharp.Compiler.Service.%s.nupkg" releaseDir release.AssemblyVersion
138136
let netcoreNupkg = sprintf "FSharp.Compiler.Service.netstandard/bin/Release/FSharp.Compiler.Service.%s.nupkg" release.AssemblyVersion
139-
runCmdIn "." "dotnet" "mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
137+
runCmdIn __SOURCE_DIRECTORY__ "dotnet" "mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
140138
)
141139

142140

0 commit comments

Comments
 (0)