From f20e9b538a25a2c8b52d0f3e1d81f04f64cbb4ff Mon Sep 17 00:00:00 2001 From: Dag Brattli Date: Thu, 30 Nov 2023 10:52:45 +0100 Subject: [PATCH] Use Net8.0 (#97) * Use Net8.0 * Fix ci version for .net --- .config/dotnet-tools.json | 6 +-- .github/workflows/build-and-test.yml | 2 +- .github/workflows/publish.yml | 2 +- Build.fsproj | 2 +- examples/timeflies/TimeFlies.fsproj | 2 +- paket.dependencies | 6 +-- paket.lock | 61 +++++++++++++--------------- src/Fable.Python.fsproj | 2 +- test/Fable.Python.Test.fsproj | 2 +- 9 files changed, 41 insertions(+), 44 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0e20827..8763d7c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,19 +3,19 @@ "isRoot": true, "tools": { "paket": { - "version": "7.2.1", + "version": "8.0.0", "commands": [ "paket" ] }, "fable": { - "version": "4.3.0", + "version": "4.6.0", "commands": [ "fable" ] }, "fantomas": { - "version": "6.2.1", + "version": "6.2.3", "commands": [ "fantomas" ] diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7269d83..e99e93d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -21,7 +21,7 @@ jobs: with: dotnet-version: | 6.x - 7.x + 8.x - name: Setup dotnet tools run: dotnet tool restore diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9350e94..d030b1d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,7 @@ jobs: with: dotnet-version: | 6.x - 7.x + 8.x - name: Setup tools run: dotnet tool restore diff --git a/Build.fsproj b/Build.fsproj index 5c22519..8f02151 100644 --- a/Build.fsproj +++ b/Build.fsproj @@ -1,7 +1,7 @@ Exe - net7.0 + net8.0 diff --git a/examples/timeflies/TimeFlies.fsproj b/examples/timeflies/TimeFlies.fsproj index 478deea..68f18c8 100644 --- a/examples/timeflies/TimeFlies.fsproj +++ b/examples/timeflies/TimeFlies.fsproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 3390;$(WarnOn) diff --git a/paket.dependencies b/paket.dependencies index b70081a..467c1d2 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -2,7 +2,7 @@ source https://api.nuget.org/v3/index.json storage: none -framework: netstandard2.0, netstandard2.1, net6.0, net7.0 +framework: netstandard2.0, netstandard2.1, net6.0, net8.0 nuget FSharp.Core >= 4.7.2 lowest_matching: true nuget Fable.Core ~> 4.1 @@ -10,7 +10,7 @@ nuget Fable.Core ~> 4.1 group Test source https://api.nuget.org/v3/index.json storage: none - framework: net6.0 + framework: net8.0 nuget FSharp.Core nuget Fable.Core ~> 4.1 @@ -22,7 +22,7 @@ group Test group Build source https://api.nuget.org/v3/index.json storage: none - framework: net7.0 + framework: net8.0 nuget System.Collections.Immutable nuget Fake.Core.Target diff --git a/paket.lock b/paket.lock index 42f6d31..0db96fb 100644 --- a/paket.lock +++ b/paket.lock @@ -1,13 +1,13 @@ STORAGE: NONE -RESTRICTION: || (== net6.0) (== net7.0) (== netstandard2.0) (== netstandard2.1) +RESTRICTION: || (== net6.0) (== net8.0) (== netstandard2.0) (== netstandard2.1) NUGET remote: https://api.nuget.org/v3/index.json - Fable.Core (4.1) + Fable.Core (4.2) FSharp.Core (4.7.2) GROUP Build STORAGE: NONE -RESTRICTION: == net7.0 +RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json Fake.Core.CommandLineParsing (6.0) @@ -53,52 +53,49 @@ NUGET FSharp.Control.Reactive (5.0.5) FSharp.Core (>= 4.7.2) System.Reactive (>= 5.0 < 6.0) - FSharp.Core (7.0.400) - System.Collections.Immutable (7.0) + FSharp.Core (8.0.100) + System.Collections.Immutable (8.0) System.Reactive (5.0) GROUP Test STORAGE: NONE -RESTRICTION: == net6.0 +RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - Fable.Core (4.1) - FSharp.Core (7.0.400) - Microsoft.CodeCoverage (17.7.2) + Fable.Core (4.2) + FSharp.Core (8.0.100) + Microsoft.CodeCoverage (17.8) Microsoft.NET.Test.Sdk (16.11) Microsoft.CodeCoverage (>= 16.11) Microsoft.TestPlatform.TestHost (>= 16.11) Microsoft.NETCore.Platforms (7.0.4) - Microsoft.TestPlatform.ObjectModel (17.7.2) + Microsoft.TestPlatform.ObjectModel (17.8) NuGet.Frameworks (>= 6.5) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.7.2) - Microsoft.TestPlatform.ObjectModel (>= 17.7.2) + Microsoft.TestPlatform.TestHost (17.8) + Microsoft.TestPlatform.ObjectModel (>= 17.8) Newtonsoft.Json (>= 13.0.1) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.3) - NuGet.Frameworks (6.7) - System.Collections.Immutable (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Reflection.Metadata (7.0.2) - System.Collections.Immutable (>= 7.0) - System.Runtime.CompilerServices.Unsafe (6.0) - XUnit (2.5.2) - xunit.analyzers (>= 1.4) - xunit.assert (>= 2.5.2) - xunit.core (2.5.2) + NuGet.Frameworks (6.8) + System.Collections.Immutable (8.0) + System.Reflection.Metadata (8.0) + System.Collections.Immutable (>= 8.0) + XUnit (2.6.2) + xunit.analyzers (>= 1.6) + xunit.assert (>= 2.6.2) + xunit.core (2.6.2) xunit.abstractions (2.0.3) - xunit.analyzers (1.4) - xunit.assert (2.5.2) - NETStandard.Library (>= 1.6.1) - xunit.core (2.5.2) - xunit.extensibility.core (2.5.2) - xunit.extensibility.execution (2.5.2) - xunit.extensibility.core (2.5.2) + xunit.analyzers (1.6) + xunit.assert (2.6.2) + xunit.core (2.6.2) + xunit.extensibility.core (2.6.2) + xunit.extensibility.execution (2.6.2) + xunit.extensibility.core (2.6.2) NETStandard.Library (>= 1.6.1) xunit.abstractions (>= 2.0.3) - xunit.extensibility.execution (2.5.2) + xunit.extensibility.execution (2.6.2) NETStandard.Library (>= 1.6.1) - xunit.extensibility.core (2.5.2) - xunit.runner.visualstudio (2.5.3) + xunit.extensibility.core (2.6.2) + xunit.runner.visualstudio (2.5.4) diff --git a/src/Fable.Python.fsproj b/src/Fable.Python.fsproj index f83188f..02f7387 100644 --- a/src/Fable.Python.fsproj +++ b/src/Fable.Python.fsproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;net6.0;net7.0 + netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 true Dag Brattli Dag Brattli diff --git a/test/Fable.Python.Test.fsproj b/test/Fable.Python.Test.fsproj index 7c258bb..8d5fabd 100644 --- a/test/Fable.Python.Test.fsproj +++ b/test/Fable.Python.Test.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false false true