From dfe09bb77806f85e2ea1199c6bdcb1eb9635eff2 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 1 May 2023 10:41:34 -0500 Subject: [PATCH 1/4] use new terminal logger in .net 8 preview 4 --- build/Program.fs | 12 +++++------- global.json | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build/Program.fs b/build/Program.fs index 719dfccbc..8c0a6c763 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 /tl" + |> 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/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 } } From 4a16c68ae78a22f9f7e4104b595d12c514c32865 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 1 May 2023 10:45:38 -0500 Subject: [PATCH 2/4] allow build project to run on newer runtimes --- .github/workflows/build.yml | 2 +- build/build.fsproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 557a2cb50..61d0a8502 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,7 +79,7 @@ jobs: run: dotnet tool restore - name: Check format - run: dotnet build -t:CheckFormat + run: dotnet build -t:CheckFormat /tl - name: Run Build run: dotnet run --project build -t Build 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 From ad79c56f6c7745f656e903ea52c7cfc22dd1a04f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 1 May 2023 10:51:17 -0500 Subject: [PATCH 3/4] use terminal logger for all msbuild invocations --- .github/workflows/build.yml | 3 ++- build/Program.fs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61d0a8502..b1501d021 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: true timeout-minutes: 30 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc strategy: matrix: @@ -79,7 +80,7 @@ jobs: run: dotnet tool restore - name: Check format - run: dotnet build -t:CheckFormat /tl + run: dotnet build -t:CheckFormat - name: Run Build run: dotnet run --project build -t Build diff --git a/build/Program.fs b/build/Program.fs index 8c0a6c763..ab8783695 100644 --- a/build/Program.fs +++ b/build/Program.fs @@ -95,7 +95,7 @@ let init args = Target.create "Clean" (fun _ -> Shell.cleanDirs [ buildDir; buildReleaseDir; pkgsDir ]) Target.create "Build" (fun _ -> - DotNet.exec id "build" "-c Release FsAutoComplete.sln /tl" + DotNet.exec id "build" "-c Release FsAutoComplete.sln" |> fun r -> if not r.OK then failwithf "Errors while building: %A" r.Errors From 158886674a1ce1c7801136dec7c9402d9cec8f10 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 1 May 2023 10:52:55 -0500 Subject: [PATCH 4/4] use terminal logger for all msbuild invocations if possible --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1501d021..c4e02ab97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: env: TEST_TIMEOUT_MINUTES: 30 FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts - MSBUILDLIVELOGGER: true + 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: