Update to .NET 8

fslaborg · Nov 15, 2024 · 178cd7f · 178cd7f
1 parent 5735829
commit 178cd7f
Show file tree

Hide file tree

Showing 16 changed files with 482 additions and 672 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,11 +3,11 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.2.1",
+      "version": "9.0.0",
       "commands": ["paket"]
     },
     "fsdocs-tool": {
-      "version": "18.1.0",
+      "version": "21.0.0-beta-003",
       "commands": ["fsdocs"]
     }
   }

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+### 4.2.0
+
+* Update TFMs and packages
+* Bump .NET Interactive dependencies
+
 ### 4.1.0
 
 * some stuff

diff --git a/global.json b/global.json
diff --git a/paket.dependencies b/paket.dependencies
@@ -15,6 +15,6 @@ group Formatting
 
 group Test
     source https://api.nuget.org/v3/index.json
-    frameworks: net7.0
+    frameworks: net8.0
 
     nuget Expecto
diff --git a/paket.lock b/paket.lock
diff --git a/src/XPlot.D3/AssemblyInfo.fs b/src/XPlot.D3/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("XPlot.D3")>]
 [<assembly: AssemblyProductAttribute("XPlot")>]
 [<assembly: AssemblyDescriptionAttribute("Data visualization library for F#")>]
-[<assembly: AssemblyVersionAttribute("4.1.0")>]
-[<assembly: AssemblyFileVersionAttribute("4.1.0")>]
+[<assembly: AssemblyVersionAttribute("4.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.2.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "XPlot.D3"
     let [<Literal>] AssemblyProduct = "XPlot"
     let [<Literal>] AssemblyDescription = "Data visualization library for F#"
-    let [<Literal>] AssemblyVersion = "4.1.0"
-    let [<Literal>] AssemblyFileVersion = "4.1.0"
+    let [<Literal>] AssemblyVersion = "4.2.0"
+    let [<Literal>] AssemblyFileVersion = "4.2.0"
diff --git a/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs b/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("XPlot.GoogleCharts.Deedle")>]
 [<assembly: AssemblyProductAttribute("XPlot")>]
 [<assembly: AssemblyDescriptionAttribute("Data visualization library for F#")>]
-[<assembly: AssemblyVersionAttribute("4.1.0")>]
-[<assembly: AssemblyFileVersionAttribute("4.1.0")>]
+[<assembly: AssemblyVersionAttribute("4.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.2.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "XPlot.GoogleCharts.Deedle"
     let [<Literal>] AssemblyProduct = "XPlot"
     let [<Literal>] AssemblyDescription = "Data visualization library for F#"
-    let [<Literal>] AssemblyVersion = "4.1.0"
-    let [<Literal>] AssemblyFileVersion = "4.1.0"
+    let [<Literal>] AssemblyVersion = "4.2.0"
+    let [<Literal>] AssemblyFileVersion = "4.2.0"
diff --git a/src/XPlot.GoogleCharts/AssemblyInfo.fs b/src/XPlot.GoogleCharts/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("XPlot.GoogleCharts")>]
 [<assembly: AssemblyProductAttribute("XPlot")>]
 [<assembly: AssemblyDescriptionAttribute("Data visualization library for F#")>]
-[<assembly: AssemblyVersionAttribute("4.1.0")>]
-[<assembly: AssemblyFileVersionAttribute("4.1.0")>]
+[<assembly: AssemblyVersionAttribute("4.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.2.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "XPlot.GoogleCharts"
     let [<Literal>] AssemblyProduct = "XPlot"
     let [<Literal>] AssemblyDescription = "Data visualization library for F#"
-    let [<Literal>] AssemblyVersion = "4.1.0"
-    let [<Literal>] AssemblyFileVersion = "4.1.0"
+    let [<Literal>] AssemblyVersion = "4.2.0"
+    let [<Literal>] AssemblyFileVersion = "4.2.0"
diff --git a/src/XPlot.Plotly.Interactive/AssemblyInfo.fs b/src/XPlot.Plotly.Interactive/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("XPlot.Plotly.Interactive")>]
 [<assembly: AssemblyProductAttribute("XPlot")>]
 [<assembly: AssemblyDescriptionAttribute("Data visualization library for F#")>]
-[<assembly: AssemblyVersionAttribute("4.1.0")>]
-[<assembly: AssemblyFileVersionAttribute("4.1.0")>]
+[<assembly: AssemblyVersionAttribute("4.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.2.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "XPlot.Plotly.Interactive"
     let [<Literal>] AssemblyProduct = "XPlot"
     let [<Literal>] AssemblyDescription = "Data visualization library for F#"
-    let [<Literal>] AssemblyVersion = "4.1.0"
-    let [<Literal>] AssemblyFileVersion = "4.1.0"
+    let [<Literal>] AssemblyVersion = "4.2.0"
+    let [<Literal>] AssemblyFileVersion = "4.2.0"
diff --git a/src/XPlot.Plotly.Interactive/XPlot.Plotly.Interactive.fsproj b/src/XPlot.Plotly.Interactive/XPlot.Plotly.Interactive.fsproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PackageId>XPlot.Plotly.Interactive</PackageId>
     <IsPackable>true</IsPackable>
-    <PackageVersion>4.1.0</PackageVersion>
+    <PackageVersion>4.2.0</PackageVersion>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <PackageProjectUrl>https://fslab.org/XPlot/</PackageProjectUrl>
@@ -23,9 +23,9 @@
 
   <ItemGroup>
     <PackageReference Include="Giraffe.ViewEngine" Version="1.2.0" />
-    <PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.23258.3" />
-    <PackageReference Include="Microsoft.DotNet.Interactive.PowerShell" Version="1.0.0-beta.23258.3" />
-    <PackageReference Include="Microsoft.Dotnet.Interactive.http" Version="1.0.0-beta.23258.3" />
+    <PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24563.1" />
+    <PackageReference Include="Microsoft.DotNet.Interactive.PowerShell" Version="1.0.0-beta.24563.1" />
+    <PackageReference Include="Microsoft.Dotnet.Interactive.http" Version="1.0.0-beta.24563.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/XPlot.Plotly/AssemblyInfo.fs b/src/XPlot.Plotly/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("XPlot.Plotly")>]
 [<assembly: AssemblyProductAttribute("XPlot")>]
 [<assembly: AssemblyDescriptionAttribute("Data visualization library for F#")>]
-[<assembly: AssemblyVersionAttribute("4.1.0")>]
-[<assembly: AssemblyFileVersionAttribute("4.1.0")>]
+[<assembly: AssemblyVersionAttribute("4.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.2.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "XPlot.Plotly"
     let [<Literal>] AssemblyProduct = "XPlot"
     let [<Literal>] AssemblyDescription = "Data visualization library for F#"
-    let [<Literal>] AssemblyVersion = "4.1.0"
-    let [<Literal>] AssemblyFileVersion = "4.1.0"
+    let [<Literal>] AssemblyVersion = "4.2.0"
+    let [<Literal>] AssemblyFileVersion = "4.2.0"
diff --git a/src/XPlot.Plotly/XPlot.Plotly.fsproj b/src/XPlot.Plotly/XPlot.Plotly.fsproj
@@ -87,6 +87,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="4.7.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 </Project>
diff --git a/tests/XPlot.Plotly.Tests/Program.fs b/tests/XPlot.Plotly.Tests/Program.fs
@@ -5,11 +5,7 @@ open Expecto
 
 [<EntryPoint>]
 let main args =
-    let config =
-        { defaultConfig with
-            verbosity = Logging.LogLevel.Verbose }
     let asmName  = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
     let fileName = sprintf "bin/TestResults-%s-%O.xml" asmName (System.Environment.OSVersion)
     let writeResults = TestResults.writeNUnitSummary fileName
-    let config = config.appendSummaryHandler writeResults
-    runTestsInAssembly config args
+    runTestsInAssemblyWithCLIArgs [] args
diff --git a/tests/XPlot.Plotly.Tests/XPlot.Plotly.Tests.fsproj b/tests/XPlot.Plotly.Tests/XPlot.Plotly.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/tools/BaselineGenerator/BaselineGenerator.fsproj b/tools/BaselineGenerator/BaselineGenerator.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="../../tests/TestData/XPlot.Plotly/Shapes.fs" Link="XPlot.Plotly/Shapes.fs" />

diff --git a/tools/StaticDataGenerator/StaticDataGenerator.fsproj b/tools/StaticDataGenerator/StaticDataGenerator.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />