Skip to content

Commit

Permalink
Bump to net8 and drop net45, fable3, netstandard (#604)
Browse files Browse the repository at this point in the history
Co-authored-by: Oskar Gewalli <wallymathieu@users.noreply.github.com>
Co-authored-by: cannorin <cannorin@users.noreply.github.com>
  • Loading branch information
3 people authored Jul 3, 2024
1 parent 2622c03 commit 821f164
Show file tree
Hide file tree
Showing 155 changed files with 271 additions and 365 deletions.
65 changes: 0 additions & 65 deletions .github/workflows/fable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,6 @@ on:


jobs:
testfable3:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Restore
run: git submodule update --init --recursive
- name: Remove global json
run: rm global.json
- name: Set target framework to net6 instead of net8
uses: Mudlet/xmlstarlet-action@master
with:
args: edit --inplace --update "/Project/PropertyGroup/TargetFrameworks" --value "netstandard2.0;netstandard2.1;net6.0" ./src/FSharpPlus/FSharpPlus.fsproj
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
- name: Restore tools
run: dotnet tool restore
- name: Create global.json
working-directory: tests/FSharpPlusFable.Tests
run: mv fable3-global.json global.json
- name: Install fable
run: dotnet tool install --global Fable --version 3.7.22
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
- name: Install npm dependencies
working-directory: tests/FSharpPlusFable.Tests
run: npm install
- name: Run Fable tests
working-directory: tests/FSharpPlusFable.Tests
run: fable . --outDir bin --runScript ./bin

testfable4:
runs-on: ubuntu-latest

Expand Down Expand Up @@ -81,30 +43,3 @@ jobs:
working-directory: tests/FSharpPlusFable.Tests
run: fable . --outDir bin --runScript ./bin

testFable3SubsetOnCore:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Restore
run: git submodule update --init --recursive
- name: Remove global json
run: rm global.json
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
- name: Restore tools
run: dotnet tool restore
# - name: Run tests (Fable2 subset but on .net)
# working-directory: tests/FSharpPlusFable.Tests
# run: dotnet run -c Fable
- name: Run tests (Fable3 subset but on .net)
working-directory: tests/FSharpPlusFable.Tests
run: dotnet run -c Fable3
- name: Run tests (Full subset for of tests .net)
working-directory: tests/FSharpPlusFable.Tests
run: dotnet run -c Release
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-alternative.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Alternative
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-applicative.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Applicative
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-bifoldable.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Examples
--------
*)

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

open FSharpPlus
open FSharpPlus.Control
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-bifunctor.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
(**
Bifunctor
=======
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-bitraversable.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Bitraversable
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-comonad.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Comonad
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-contravariant.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Contravariant
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-foldable.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Examples



#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

open FSharpPlus
open FSharpPlus.Data
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-functor.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Functor
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-misc.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Here are some other abstractions, not present in the diagram.



#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

open System
open FSharpPlus
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-monad.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Monad
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-monoid.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Monoid
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-profunctor.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Profunctor
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-traversable.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Traversable
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/abstraction-zipapplicative.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Zip Applicative (aka Non-sequential Applicative)
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/applicative-functors.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Functors and Applicatives
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/computation-expressions.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
open FSharpPlus
open FSharpPlus.Data

Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/extension-methods.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
open FSharpPlus

(**
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/extensions.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Extensions
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/generic-doc.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
open FSharpPlus

(**
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/index.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
FSharpPlus
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/lens.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Lens
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/numerics.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
open FSharpPlus

(**
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/operators-common.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
open FSharpPlus

(**
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/parsing.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
open System
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
open FSharpPlus
(**
# Parsing
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/tutorial.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Introducing FSharpPlus
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-all.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
All
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-any.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Any
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-choicet.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Examples
*)


#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

open FSharpPlus
2 changes: 1 addition & 1 deletion docsrc/content/type-compose.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Compose
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-const.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
(**
Const<'T,'U>
============
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-cont.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
Cont<'R,'U>
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-contt.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
TO-DO Add some docs here !
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-coproduct.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
TO-DO Add some docs here !
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-dlist.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.

#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"

(**
DList
Expand Down
2 changes: 1 addition & 1 deletion docsrc/content/type-dual.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(*** hide ***)
// This block of code is omitted in the generated HTML documentation. Use
// it to define helpers that you do not want to show in the documentation.
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
#r @"../../src/FSharpPlus/bin/Release/net8.0/FSharpPlus.dll"
(**
TO-DO Add some docs here !
=========================
Expand Down
Loading

0 comments on commit 821f164

Please sign in to comment.