@@ -54,14 +54,14 @@ Target.create "Clean" (fun _ ->
54
54
Target.create " Restore" ( fun _ ->
55
55
// We assume a paket restore has already been run
56
56
runDotnet __ SOURCE_ DIRECTORY__ " restore" " ../src/buildtools/buildtools.proj -v n"
57
- runDotnet __ SOURCE_ DIRECTORY__ " restore" " FSharp.Compiler.Service.sln -v n"
57
+ runDotnet __ SOURCE_ DIRECTORY__ " restore" " FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj -v n"
58
58
)
59
59
60
60
Target.create " Build" ( fun _ ->
61
61
runDotnet __ SOURCE_ DIRECTORY__ " build" " ../src/buildtools/buildtools.proj -v n -c Proto"
62
62
let fslexPath = __ SOURCE_ DIRECTORY__ + " /../artifacts/bin/fslex/Proto/netcoreapp3.1/fslex.dll"
63
63
let fsyaccPath = __ SOURCE_ DIRECTORY__ + " /../artifacts/bin/fsyacc/Proto/netcoreapp3.1/fsyacc.dll"
64
- runDotnet __ SOURCE_ DIRECTORY__ " build" ( sprintf " FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s " fslexPath fsyaccPath)
64
+ runDotnet ( Path.Combine ( __ SOURCE_ DIRECTORY__, " FSharp.Compiler.Service " )) " build" ( sprintf " FSharp.Compiler.Service.fsproj -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s " fslexPath fsyaccPath)
65
65
)
66
66
67
67
Target.create " Test" ( fun _ ->
@@ -70,7 +70,7 @@ Target.create "Test" (fun _ ->
70
70
71
71
// Now run the tests (different output files per TFM)
72
72
let logFilePath = Path.Combine(__ SOURCE_ DIRECTORY__, " .." , " artifacts" , " TestResults" , " Release" , " FSharp.Compiler.Service.Test.{framework}.xml" )
73
- runDotnet __ SOURCE_ DIRECTORY__ " test " ( sprintf " FSharp.Compiler.Service.Tests/ FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -nodereuse:false -v n -c Release --logger \" nunit;LogFilePath=%s \" " logFilePath)
73
+ runDotnet ( Path.Combine ( __ SOURCE_ DIRECTORY__, " FSharp.Compiler.Service.Tests" )) " test " ( sprintf " FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -nodereuse:false -v n -c Release --logger \" nunit;LogFilePath=%s \" " logFilePath)
74
74
)
75
75
76
76
Target.create " NuGet" ( fun _ ->
@@ -80,7 +80,7 @@ Target.create "NuGet" (fun _ ->
80
80
Common = packOpts.Common |> withDotnetExe |> DotNet.Options.withVerbosity ( Some DotNet.Verbosity.Normal)
81
81
MSBuildParams = { packOpts.MSBuildParams with
82
82
Properties = packOpts.MSBuildParams.Properties @ [ " Version" , assemblyVersion; " VersionPrefix" , assemblyVersion; " PackageReleaseNotes" , release.Notes |> String.concat " \n " ] }
83
- }) " FSharp.Compiler.Service.sln "
83
+ }) " FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj "
84
84
)
85
85
86
86
Target.create " GenerateDocs" ( fun _ ->
0 commit comments