Updated Fable TFM and build dependencies

fable-compiler · Nov 19, 2024 · 7821ae8 · 7821ae8
1 parent bedfd83
commit 7821ae8
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 36 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/quicktest-dart",
         "--lang",
@@ -29,7 +29,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/quicktest",
         "--exclude",
@@ -45,7 +45,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/quicktest",
         "--lang",
@@ -62,7 +62,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/quicktest-py",
         "--lang",
@@ -82,7 +82,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/quicktest-rust",
         "--lang",
@@ -102,7 +102,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/quicktest-rust",
         "--lang",
@@ -124,7 +124,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/quicktest-rust",
         "--lang",
@@ -191,7 +191,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/fable-library-dart",
         "--outDir", "temp/fable-library-dart",
@@ -207,7 +207,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/fable-library-ts",
         "--outDir", "temp/fable-library-ts",
@@ -225,7 +225,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/fable-library-py/fable_library",
         "--outDir", "temp/fable-library-py/fable_library",
@@ -241,7 +241,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "src/fable-library-rust/src",
         "--outDir", "temp/fable-library-rust/src",
@@ -259,7 +259,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
+      "program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
       "args": [
         "--outDir", "${workspaceRoot}/../fable-test",
         "--fableLib", "${workspaceRoot}/temp/fable-library-rust",

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -3,7 +3,7 @@
         <CodeRoot>$([System.IO.Path]::GetDirectoryName($(DirectoryBuildTargetsPath)))</CodeRoot>
         <FSharpAnalyzersOtherFlags>--analyzers-path &quot;$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
         <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path &quot;$(PkgIonide_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
-        <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path  &quot;$(CodeRoot)/Fable.Analyzers/bin/Release/net6.0&quot;</FSharpAnalyzersOtherFlags>
+        <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path  &quot;$(CodeRoot)/Fable.Analyzers/bin/Release/net8.0&quot;</FSharpAnalyzersOtherFlags>
         <SarifOutput>$(CodeRoot)/reports/</SarifOutput>
         <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --code-root &quot;$(CodeRoot)&quot;</FSharpAnalyzersOtherFlags>
         <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --report &quot;$(SarifOutput)$(MSBuildProjectName)-$(TargetFramework).sarif&quot;</FSharpAnalyzersOtherFlags>

diff --git a/src/Fable.Analyzers/Fable.Analyzers.fsproj b/src/Fable.Analyzers/Fable.Analyzers.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 

diff --git a/src/Fable.Build/Fable.Build.fsproj b/src/Fable.Build/Fable.Build.fsproj
@@ -43,14 +43,11 @@
     <Compile Include="Main.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="8.0.400" />
     <PackageReference Include="BlackFox.CommandLine" Version="1.0.0" />
-    <PackageReference Include="EluciusFTW.SpectreCoff" Version="0.47.28" />
-    <PackageReference Include="Fake.IO.FileSystem" Version="6.1.0" />
+    <PackageReference Include="Fake.IO.FileSystem" Version="6.1.3" />
     <PackageReference Include="SimpleExec" Version="12.0.0" />
-    <PackageReference Include="Spectre.Console" Version="0.47.0" />
     <PackageReference Include="Thoth.Json.Net" Version="12.0.0" />
     <PackageReference Include="Octokit" Version="8.0.0" />
-    <PackageReference Include="Semver" Version="2.3.0" />
+    <PackageReference Include="Semver" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Fable.Build/FableLibrary/Core.fs b/src/Fable.Build/FableLibrary/Core.fs
@@ -7,8 +7,6 @@ open Build.Utils
 open Build.Utils
 open System.Diagnostics
 open SimpleExec
-open Spectre.Console
-open SpectreCoff
 
 /// <summary>
 /// Building fable-library is similar enough for all the targets
@@ -50,19 +48,21 @@ type BuildFableLibrary
     default _.CopyStage() = ()
 
     member this.Run(?skipIfExist: bool) =
+        let toConsole (s: string) = System.Console.WriteLine(s)
+
         let skipIfExist = defaultArg skipIfExist false
 
         if skipIfExist && Directory.Exists outDir then
-            Calm "Skipping Fable build stage" |> toConsole
+            "Skipping Fable build stage" |> toConsole
 
         else
 
-            Calm "Cleaning build directory" |> toConsole
+            "Cleaning build directory" |> toConsole
 
             if Directory.Exists buildDir then
                 Directory.Delete(buildDir, true)
 
-            Calm "Building Fable.Library" |> toConsole
+            "Building Fable.Library" |> toConsole
 
             let args =
                 CmdLine.appendRaw sourceDir
@@ -77,8 +77,8 @@ type BuildFableLibrary
 
             Command.Fable(args)
 
-            Calm "Copy stage" |> toConsole
+            "Copy stage" |> toConsole
             this.CopyStage()
 
-            Calm "Post Fable build stage" |> toConsole
+            "Post Fable build stage" |> toConsole
             this.PostFableBuildStage()
diff --git a/src/Fable.Build/Main.fs b/src/Fable.Build/Main.fs
@@ -1,7 +1,6 @@
 module Build.Main
 
 open Build.FableLibrary
-open Spectre.Console
 
 // This is a basic help message, as the CLI parser is not a "real" CLI parser
 // For now, it is enough as this is just a dev tool
@@ -156,5 +155,5 @@ let main argv =
         0
 
     with e ->
-        AnsiConsole.WriteException(e)
+        System.Console.Write(e.ToString())
         1
diff --git a/src/Fable.Cli/Fable.Cli.fsproj b/src/Fable.Cli/Fable.Cli.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>4.24.0</Version>
     <PackageReleaseNotes>## Added
 
@@ -58,9 +58,9 @@
     <Reference Include="../../lib/fcs/FSharp.Core.dll" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Buildalyzer" Version="5.0.1" />
-    <PackageReference Include="FSharp.SystemTextJson" Version="1.2.42" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Buildalyzer" Version="7.1.0" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="1.3.13" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
     <PackageReference Include="source-map-sharp" Version="1.0.9" />
   </ItemGroup>
 </Project>
diff --git a/src/Fable.Compiler/Fable.Compiler.fsproj b/src/Fable.Compiler/Fable.Compiler.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -40,8 +40,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="FSharp.SystemTextJson" Version="1.2.42" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+        <PackageReference Include="FSharp.SystemTextJson" Version="1.3.13" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Fable.PublishUtils/Fable.PublishUtils.fsproj b/src/Fable.PublishUtils/Fable.PublishUtils.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>Major</RollForward>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Version>2.4.0</Version>