From 4d98bce65bec846a835a8916b7ca83b7b65b06ef Mon Sep 17 00:00:00 2001 From: Goswin Rothenthal Date: Fri, 22 Nov 2024 23:02:33 +0100 Subject: [PATCH] F# 9 --- .github/workflows/buildHosting.yml | 2 +- .github/workflows/buildStandalone.yml | 6 +++--- .github/workflows/releaseHosting.yml | 6 +++--- .github/workflows/releaseStandalone.yml | 10 +++++----- CHANGELOG.md | 3 +++ FeshHosting.fsproj | 4 +++- FeshStandalone.fsproj | 8 +++----- Src/CompileScript.fs | 2 +- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/buildHosting.yml b/.github/workflows/buildHosting.yml index 28cfc8a..3c2b713 100644 --- a/.github/workflows/buildHosting.yml +++ b/.github/workflows/buildHosting.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - name: Build FeshHosting.fsproj run: dotnet build FeshHosting.fsproj --configuration Release diff --git a/.github/workflows/buildStandalone.yml b/.github/workflows/buildStandalone.yml index 1f0a3c3..eb1db41 100644 --- a/.github/workflows/buildStandalone.yml +++ b/.github/workflows/buildStandalone.yml @@ -19,9 +19,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - - name: Test FeshStandalone.fsproj - run: dotnet test FeshStandalone.fsproj --configuration Release + - name: Build FeshStandalone.fsproj + run: dotnet build FeshStandalone.fsproj --configuration Release diff --git a/.github/workflows/releaseHosting.yml b/.github/workflows/releaseHosting.yml index e7c5d65..7d146a4 100644 --- a/.github/workflows/releaseHosting.yml +++ b/.github/workflows/releaseHosting.yml @@ -16,10 +16,10 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - name: Build - run: dotnet test FeshStandalone.fsproj --configuration Release + run: dotnet build FeshHosting.fsproj --configuration Release - name: Publish NuGet package - run: dotnet nuget push ./bin/hosting/Fesh.${{ github.ref }}.symbols.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json \ No newline at end of file + run: dotnet nuget push ./bin/hosting/Fesh.${{ github.ref_name }}.symbols.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json \ No newline at end of file diff --git a/.github/workflows/releaseStandalone.yml b/.github/workflows/releaseStandalone.yml index 3393ef2..18129a5 100644 --- a/.github/workflows/releaseStandalone.yml +++ b/.github/workflows/releaseStandalone.yml @@ -1,4 +1,4 @@ -name: Build and Release Stanadalone +name: Build and Release Standalone on: push: @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - name: Build run: dotnet test FeshStandalone.fsproj --configuration Release @@ -31,14 +31,14 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token with: - tag_name: ${{ github.ref }} - release_name: Fesh ${{ github.ref }} + tag_name: ${{ github.ref_name}} + release_name: Fesh ${{ github.ref_name }} draft: false prerelease: false body: | Don't forget to **unblock** the zip file before extracting. Changes: - [View Changelog](https://github.com/${{ github.repository }}/blob/${{ github.ref }}/CHANGELOG.md) + [View Changelog](https://github.com/goswinr/Fesh/blob/main/CHANGELOG.md) - name: Upload Release Asset diff --git a/CHANGELOG.md b/CHANGELOG.md index e6e7b84..8aa9f33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.15.0] - 2024-11-22 +### Added +- Support for F# 9.0 ## [0.14.3] - 2024-11-10 ### Added diff --git a/FeshHosting.fsproj b/FeshHosting.fsproj index 96657e0..7b38c4d 100644 --- a/FeshHosting.fsproj +++ b/FeshHosting.fsproj @@ -62,9 +62,11 @@ + + - + diff --git a/FeshStandalone.fsproj b/FeshStandalone.fsproj index 904ce7d..166e365 100644 --- a/FeshStandalone.fsproj +++ b/FeshStandalone.fsproj @@ -6,7 +6,7 @@ WinExe true true - net472;net8.0-windows + net472;net9.0-windows NETFRAMEWORK @@ -49,22 +49,20 @@ - + - + - - diff --git a/Src/CompileScript.fs b/Src/CompileScript.fs index 775bc62..18058ea 100644 --- a/Src/CompileScript.fs +++ b/Src/CompileScript.fs @@ -136,7 +136,7 @@ module CompileScript = } |> String.concat (Environment.NewLine + String(' ',4) ) - let getFsxXml (projFolder:string, nameSpace, code, fsxloads:ResizeArray) : string= + let getFsxXml (projFolder:string, nameSpace:string, code:string, fsxloads:ResizeArray) : string= seq{ for load in fsxloads do let niceName = (load.fileName.Replace(".fsx", "") |> toCamelCase ) + ".fs" /// TODO make case insensitive