F# 9

goswinr · Nov 22, 2024 · 4d98bce · 4d98bce
1 parent e38a0ba
commit 4d98bce
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
+      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
diff --git 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
@@ -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
@@ -62,9 +62,11 @@
 	  <PackageReference Include="FSharp.Compiler.Service" Version="43.9.100" />
     <!-- normally don't include FSharp.Core in a library, but Update to latest version is needed for latest FSharp.Compiler.Service-->
 	  <PackageReference Update="FSharp.Core" Version="9.0.100" />
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />    <!-- warning NU1903: Package 'System.Private.Uri' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-5f2m-466j-3848 -->
+
 
 	  <PackageReference Include="Fittings" Version="0.9.0" />
-	  <PackageReference Include="AvalonLog" Version="0.16.0" />
+	  <PackageReference Include="AvalonLog" Version="0.17.0" />
     <!-- <ProjectReference Include="../AvalonLog/AvalonLog.fsproj" /> -->
   </ItemGroup>
 

diff --git a/FeshStandalone.fsproj b/FeshStandalone.fsproj
@@ -6,7 +6,7 @@
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>    <!--inherited from Avalonedit ?-->
-	  <TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
+	  <TargetFrameworks>net472;net9.0-windows</TargetFrameworks>
     <DefineConstants Condition="'$(TargetFramework)' == 'net472'">NETFRAMEWORK</DefineConstants>
     <!-- <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers> -->
     <!-- <RuntimeIdentifier>win-x64</RuntimeIdentifier> -->
@@ -49,22 +49,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" PrivateAssets="all"  />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="FSharp.Compiler.Service" Version="43.9.100" />
     <PackageReference Update="FSharp.Core" Version="9.0.100"  GeneratePathProperty="true"/>
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />    <!-- warning NU1903: Package 'System.Private.Uri' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-5f2m-466j-3848 -->
 
     <PackageReference Include="Fittings" Version="0.9.0" />
-    <PackageReference Include="AvalonLog" Version="0.16.0" />
+    <PackageReference Include="AvalonLog" Version="0.17.0" />
 
     <!--this reference is needed for tooling only, it might not be installed on host PC. (running the .NET Framework version) see also https://github.com/fsprojects/IfSharp/issues/213 -->
     <PackageReference Include="NETStandard.Library" Version="2.0.3" Condition="'$(TargetFramework)' == 'net472'" GeneratePathProperty="true" /> <!-- Generated PathProperty will be 'PkgNETStandard_Library' -->
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
-    <None Include="Media/logo128.png" Pack="true" PackagePath="\" />    <!--PackagePath = "\" makes the file available to nuget pack tool-->
     <EmbeddedResource Include="Media/logo.res" />    <!--  for Application Icon in explorer-->
     <Resource Include="Media/logo.ico" />            <!--  for Application Icon in primary windows-->
     <Resource Include="Media/logoGray.ico" />        <!--  for Application Icon in secondary PopOut windows-->

diff --git 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<FsxRef>) : string=
+    let getFsxXml (projFolder:string, nameSpace:string, code:string, fsxloads:ResizeArray<FsxRef>) : string=
         seq{
             for load in fsxloads do
                 let niceName = (load.fileName.Replace(".fsx", "") |> toCamelCase  ) + ".fs" /// TODO make case insensitive