From fb9d67643359c60c0e6ba62f8c4d990651a06d80 Mon Sep 17 00:00:00 2001 From: Dag Brattli Date: Mon, 8 Dec 2025 18:30:32 +0100 Subject: [PATCH 1/2] fix: relax FSharp.Core dependency to >= 5.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use lowest_matching: true to resolve FSharp.Core to the minimum version (5.0.0) instead of the latest (10.0.100). This fixes NU1605 version conflicts for users on .NET 6, 8, or 9. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .github/workflows/build-and-test.yml | 4 +++- examples/fastapi/FastApi.fsproj | 2 +- justfile | 10 ++++++---- paket.dependencies | 1 + paket.lock | 2 +- release-please-config.json | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 823d3c8..b98d303 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -28,7 +28,9 @@ jobs: uses: extractions/setup-just@v3 - name: Restore dependencies - run: just restore + run: | + just setup + just restore - name: Install Python dependencies run: | diff --git a/examples/fastapi/FastApi.fsproj b/examples/fastapi/FastApi.fsproj index f5a4e6b..c679405 100644 --- a/examples/fastapi/FastApi.fsproj +++ b/examples/fastapi/FastApi.fsproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 Exe diff --git a/justfile b/justfile index 42bff4c..5e9ece2 100644 --- a/justfile +++ b/justfile @@ -35,6 +35,7 @@ clean-all: clean # Build F# source to Python using Fable build: clean mkdir -p {{build_path}} + dotnet build {{src_path}} {{fable}} {{src_path}} --lang Python --outDir {{build_path}} # Compile F# source using dotnet (without Fable transpilation) @@ -79,9 +80,13 @@ format-check: dotnet fantomas {{src_path}} -r --check dotnet fantomas {{test_path}} -r --check +# Install .NET tools (Fable, Fantomas) and Python dependencies +setup: + dotnet tool restore + uv sync + # Restore all dependencies restore: - dotnet tool restore dotnet paket install dotnet restore {{src_path}} dotnet restore {{test_path}} @@ -90,9 +95,6 @@ restore: install-python: uv sync -# Full setup: restore .NET and Python dependencies -setup: restore install-python - # Watch for changes and rebuild (useful during development) watch: {{fable}} watch {{src_path}} --lang Python --outDir {{build_path}} diff --git a/paket.dependencies b/paket.dependencies index deb83d0..4cdd47d 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -4,6 +4,7 @@ source https://api.nuget.org/v3/index.json storage: none framework: netstandard2.0, netstandard2.1, net6.0, net8.0, net9.0, net10.0 +nuget FSharp.Core >= 5.0.0 lowest_matching: true nuget Fable.Core 5.0.0-beta.4 group Test diff --git a/paket.lock b/paket.lock index 86b6474..854d1c7 100644 --- a/paket.lock +++ b/paket.lock @@ -4,7 +4,7 @@ NUGET remote: https://api.nuget.org/v3/index.json Fable.Core (5.0.0-beta.4) FSharp.Core (>= 4.7.2) - FSharp.Core (10.0.100) + FSharp.Core (5.0) GROUP Examples STORAGE: NONE diff --git a/release-please-config.json b/release-please-config.json index f89c008..71d870c 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -3,7 +3,7 @@ "packages": { ".": { "release-type": "simple", - "release-as": "5.0.0-alpha.20", + "release-as": "5.0.0-alpha.20.1", "bump-minor-pre-major": true, "bump-patch-for-minor-pre-major": true, "include-component-in-tag": false, From e722a5f54fc97ac3de7a97c862a39cab618010f9 Mon Sep 17 00:00:00 2001 From: Dag Brattli Date: Mon, 8 Dec 2025 18:34:27 +0100 Subject: [PATCH 2/2] ci: Fix uv install --- .github/workflows/build-and-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b98d303..14e28ff 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -27,6 +27,9 @@ jobs: - name: Install just uses: extractions/setup-just@v3 + - name: Install uv + run: pipx install uv + - name: Restore dependencies run: | just setup @@ -34,7 +37,6 @@ jobs: - name: Install Python dependencies run: | - pipx install uv just install-python #- name: Check formatting