diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 557a2cb50..c4e02ab97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,7 @@ jobs: env: TEST_TIMEOUT_MINUTES: 30 FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts + MSBUILDLIVELOGGER: auto timeout-minutes: 30 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc strategy: matrix: diff --git a/build/Program.fs b/build/Program.fs index 719dfccbc..ab8783695 100644 --- a/build/Program.fs +++ b/build/Program.fs @@ -94,12 +94,12 @@ let init args = Target.create "Clean" (fun _ -> Shell.cleanDirs [ buildDir; buildReleaseDir; pkgsDir ]) - Target.create "Restore" (fun _ -> DotNet.restore id "") - Target.create "Build" (fun _ -> - DotNet.build - (fun p -> { p with Configuration = DotNet.BuildConfiguration.fromString configuration }) - "FsAutoComplete.sln") + DotNet.exec id "build" "-c Release FsAutoComplete.sln" + |> fun r -> + if not r.OK then + failwithf "Errors while building: %A" r.Errors + ) Target.create "EnsureRepoConfig" (fun _ -> // Configure custom git hooks @@ -173,8 +173,6 @@ let init args = "PromoteUnreleasedToVersion" ==> "CreateVersionTag" ==> "Promote" |> ignore - "Restore" ==> "Build" |> ignore - "Build" ==> "LspTest" ==> "Coverage" ==> "Test" ==> "All" |> ignore diff --git a/build/build.fsproj b/build/build.fsproj index 5525ec55c..602eccc70 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -3,6 +3,7 @@ Exe net7.0 + Major diff --git a/global.json b/global.json index 9b810c8b0..49d62079e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.400-preview.23226.4", + "version": "8.0.100-preview.4.23228.11", "allowPrerelease": true } }