Skip to content

Commit

Permalink
Use Net8.0 (#97)
Browse files Browse the repository at this point in the history
* Use Net8.0

* Fix ci version for .net
  • Loading branch information
dbrattli authored Nov 30, 2023
1 parent c8145d7 commit f20e9b5
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 44 deletions.
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
dotnet-version: |
6.x
7.x
8.x
- name: Setup dotnet tools
run: dotnet tool restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
dotnet-version: |
6.x
7.x
8.x
- name: Setup tools
run: dotnet tool restore
Expand Down
2 changes: 1 addition & 1 deletion Build.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Helpers.fs" />
Expand Down
2 changes: 1 addition & 1 deletion examples/timeflies/TimeFlies.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
</PropertyGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

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

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
Expand All @@ -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
Expand Down
61 changes: 29 additions & 32 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/Fable.Python.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Author>Dag Brattli</Author>
<Copyright>Dag Brattli</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion test/Fable.Python.Test.fsproj
Original file line number Diff line number Diff line change
@@ -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>
<IsPackable>false</IsPackable>
<GenerateProgramFile>false</GenerateProgramFile>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
Expand Down

0 comments on commit f20e9b5

Please sign in to comment.