From a61e69055b197f2717371e2365fabe6e19425207 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Mon, 2 Sep 2024 15:42:56 +0800 Subject: [PATCH 01/19] CI: upgrade fsxc to 0.6.0 It is the last stable version that will work in dotnet v6.x runtime (next versions will be for 7.x and/or 8.x). --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 80dbad177..47c78d7d8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.5.9.1 + FSXC_VERSION: 0.6.0 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 96b667f4e7b126f75b55620b43820a335095bf64 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Mon, 2 Sep 2024 17:20:22 +0800 Subject: [PATCH 02/19] 0.5.9.5 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 47c78d7d8..d86733cdf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0 + FSXC_VERSION: 0.5.9.5 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 864a6dcdac7d71637b55b9a2e04be473eddaf22f Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Mon, 2 Sep 2024 17:48:27 +0800 Subject: [PATCH 03/19] 0.5.9.10 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d86733cdf..b7633bdbe 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.5.9.5 + FSXC_VERSION: 0.5.9.10 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 536c24a35d7de4900d6f43fca19ccb021655cd92 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Mon, 2 Sep 2024 17:59:05 +0800 Subject: [PATCH 04/19] Last before 0.6.0 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b7633bdbe..44b7e3d19 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.5.9.10 + FSXC_VERSION: 0.6.0--date20240508-0331.git-e21c92b # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 1fdf1f7a717e3cccb73daab6fd95c7e17d286797 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Mon, 2 Sep 2024 18:16:52 +0800 Subject: [PATCH 05/19] Next one after 0.5.9.10 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 44b7e3d19..93f3b8c7c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20240508-0331.git-e21c92b + FSXC_VERSION: 0.6.0--date20230214-0422.git-1ea6f62 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 9b919556845bc42d93f577f939eb63f58acb09ab Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Mon, 2 Sep 2024 18:34:06 +0800 Subject: [PATCH 06/19] Start bisecting 0.6.0-* versions, this is middle --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 93f3b8c7c..e03ebb7db 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230214-0422.git-1ea6f62 + FSXC_VERSION: 0.6.0--date20230610-0601.git-9ec0efc # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 2bbd9d5c1c570dde13979f5c0bb7382501f85fa5 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 11:10:40 +0800 Subject: [PATCH 07/19] Middle of middle up --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e03ebb7db..deeac6499 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230610-0601.git-9ec0efc + FSXC_VERSION: 0.6.0--date20230822-0935.git-527ed29 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 1ffaaa552b4b02312d99a72e7ff78a5c3619ad59 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 11:23:37 +0800 Subject: [PATCH 08/19] Older --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index deeac6499..23c2cc054 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230822-0935.git-527ed29 + FSXC_VERSION: 0.6.0--date20230818-0412.git-2cc3227 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 6c6e27563550bd7d42c8a92094ad8e43eee578e1 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 11:35:02 +0800 Subject: [PATCH 09/19] Newer --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 23c2cc054..fcc79231f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230818-0412.git-2cc3227 + FSXC_VERSION: 0.6.0--date20230821-0554.git-304fc20 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From f6b716a7e4c3101d14836b9d24eecb4e32eecaa6 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 11:41:44 +0800 Subject: [PATCH 10/19] Olderr --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fcc79231f..b2af6683e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230821-0554.git-304fc20 + FSXC_VERSION: 0.6.0--date20230821-0454.git-40bb3e3 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 93c81d50898b09e661906562ea52b7e1bc654d04 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 11:51:06 +0800 Subject: [PATCH 11/19] 20th August --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b2af6683e..da59a7dec 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230821-0454.git-40bb3e3 + FSXC_VERSION: 0.6.0--date20230820-0145.git-dd66eb3 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From ab0058b004277551e6eb0e1de763f7735198d24a Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 11:58:58 +0800 Subject: [PATCH 12/19] 18th Aug, 7:46 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index da59a7dec..3e1d55a1e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230820-0145.git-dd66eb3 + FSXC_VERSION: 0.6.0--date20230818-0746.git-7bd612a # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From cc687a4e0d301620290455e72c5215c63e002215 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 12:13:26 +0800 Subject: [PATCH 13/19] Last 18th Aug --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3e1d55a1e..221c56171 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230818-0746.git-7bd612a + FSXC_VERSION: 0.6.0--date20230818-1152.git-83d671b # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From ea67e6118ec54e369af3e9ce73125c1a153c9727 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 14:46:27 +0800 Subject: [PATCH 14/19] 0.6.1 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 221c56171..538f260b2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20230818-1152.git-83d671b + FSXC_VERSION: 0.6.1--date20240903-0639.git-b235ee8 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 0b79165ba4ba8b894ee27747531fb704e9611d75 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 15:01:11 +0800 Subject: [PATCH 15/19] Fixup --- scripts/downgradeMono.fsx | 1 - scripts/downloadUbuntuDeps.fsx | 1 - 2 files changed, 2 deletions(-) diff --git a/scripts/downgradeMono.fsx b/scripts/downgradeMono.fsx index e8a20130d..01f123bef 100755 --- a/scripts/downgradeMono.fsx +++ b/scripts/downgradeMono.fsx @@ -5,7 +5,6 @@ open System.IO #if !LEGACY_FRAMEWORK failwith "This script is not prepared yet for dotnet6 or higher, it assumes old mono is installed. If you intended to use this for mono, then run it with fsharpi --define:LEGACY_FRAMEWORK instead of dotnet fsi." -0 #else #r "System.Configuration" open System.Configuration diff --git a/scripts/downloadUbuntuDeps.fsx b/scripts/downloadUbuntuDeps.fsx index c3288e1e8..fa9053347 100755 --- a/scripts/downloadUbuntuDeps.fsx +++ b/scripts/downloadUbuntuDeps.fsx @@ -5,7 +5,6 @@ open System.IO #if !LEGACY_FRAMEWORK failwith "This script is not prepared yet for dotnet6 or higher, it uses old mono packages such as 'fsharp'. If you intended to use this for mono, then run it with fsharpi --define:LEGACY_FRAMEWORK instead of dotnet fsi." -0 #else #r "System.Configuration" open System.Configuration From 35562a3c884927c2e66079d12333256755ca15ce Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 18:51:29 +0800 Subject: [PATCH 16/19] DOWN --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 538f260b2..52b94fc51 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.1--date20240903-0639.git-b235ee8 + FSXC_VERSION: 0.6.0--date20240903-1047.git-101d063 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From 3aec4b94348b93b6afec0143f5403ea1ef78996c Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Tue, 3 Sep 2024 21:25:46 +0800 Subject: [PATCH 17/19] Last? --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 52b94fc51..538f260b2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.0--date20240903-1047.git-101d063 + FSXC_VERSION: 0.6.1--date20240903-0639.git-b235ee8 # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From f62caedb02dc7e7504af35c43a53a2288c001e59 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Thu, 5 Sep 2024 16:17:12 +0800 Subject: [PATCH 18/19] LineNumbers --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 538f260b2..be204d573 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ on: env: # we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037 - FSXC_VERSION: 0.6.1--date20240903-0639.git-b235ee8 + FSXC_VERSION: 0.6.1--date20240905-0811.git-6158a3a # FIXME: figure out why we need to clean after make if we # want 'make strict' target to really happen without From ea9622d4fb34192e10f87c4fb6118c3a11cd277c Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Thu, 5 Sep 2024 16:29:45 +0800 Subject: [PATCH 19/19] Fix warnings --- scripts/sanitycheck.fsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/sanitycheck.fsx b/scripts/sanitycheck.fsx index 3506ba182..e82ca7758 100755 --- a/scripts/sanitycheck.fsx +++ b/scripts/sanitycheck.fsx @@ -41,11 +41,11 @@ module MapHelper = map |> Map.toSeq |> Seq.map fst let MergeIntoMap<'K,'V when 'K: comparison> (from: seq<'K*'V>): Map<'K,seq<'V>> = - let keys = from.Select (fun (k, v) -> k) + let keys = from.Select (fun (k, _v) -> k) let keyValuePairs = seq { for key in keys do - let valsForKey = (from.Where (fun (k, v) -> key = k)).Select (fun (k, v) -> v) |> seq + let valsForKey = (from.Where (fun (k, _v) -> key = k)).Select (fun (_k, v) -> v) |> seq yield key,valsForKey } keyValuePairs |> Map.ofSeq @@ -288,7 +288,8 @@ let SanityCheckNugetPackages () = yield packageDirNameThatShouldExist, prjs } |> Map.ofSeq - let findExcessPackageDirs (solDir: DirectoryInfo) (idealPackageDirs: Map>): seq = + // unused for now, we might use it later + let _findExcessPackageDirs (solDir: DirectoryInfo) (idealPackageDirs: Map>): seq = solDir.Refresh () if not (FsxHelper.NugetSolutionPackagesDir.Exists) then failwithf "'%s' subdir under solution dir %s doesn't exist, run `make` first"