Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to net8 and drop net45, fable3, netstandard #604

Merged
merged 5 commits into from
Jul 3, 2024

Conversation

wallymathieu
Copy link
Member

@wallymathieu wallymathieu commented Jun 23, 2024

Drop net45 and bump to net8. Note that in the v1 branches net45 is still one of the target framework.

This is related to #578 and #577

Copy link
Member

@gusty gusty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we remove old Fable versions as well ? Or is that for another PR?
Is TypeLevel missing here?

src/FSharpPlus/Control/Applicative.fs Outdated Show resolved Hide resolved
@@ -199,7 +199,7 @@ type Parse with

static member inline Parse (_: ^R , _: Default2) : string -> ^R = Parse.InvokeOnInstance

#if NET7_0
#if NET7_0_OR_GREATER
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't be net8 or greater ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should

@wallymathieu
Copy link
Member Author

Shouldn't we remove old Fable versions as well ? Or is that for another PR? Is TypeLevel missing here?

We should remove the old fable versions as well.

@wallymathieu wallymathieu changed the title Bump to net8 and drop net45 Bump to net8 and drop net45, fable3 Jul 2, 2024
@wallymathieu wallymathieu changed the title Bump to net8 and drop net45, fable3 Bump to net8 and drop net45, fable3, netstandard Jul 2, 2024
@@ -28,7 +28,7 @@ type Apply =
#if !FABLE_COMPILER
static member ``<*>`` (struct (f: Task<_> , x: Task<'T> ), _output: Task<'U> , [<Optional>]_mthd: Apply) = Task.apply f x : Task<'U>
#endif
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
#if !FABLE_COMPILER
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed since most of the file is excluded for Fable?


static member Map ((x: Lazy<_> , f: 'T->'U), _mthd: Map) = Lazy.map f x
#if !FABLE_COMPILER
static member Map ((x: Task<'T> , f: 'T->'U), _mthd: Map) = Task.map f x : Task<'U>
#endif
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
#if !FABLE_COMPILER
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed since it is in a block that is already excluded from Fable?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can try removing it, once everything is green I guess.

<Platforms>AnyCPU</Platforms>
<LangVersion>8.0</LangVersion>
<LangVersion Condition=" '$(Configuration)' == 'Fable' OR '$(Configuration)' == 'Fable3' ">6.0</LangVersion>
<LangVersion Condition=" '$(Configuration)' == 'Fable' ">6.0</LangVersion>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What should the language level for Fable4 be?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we decided to drop support for Fable 3, but let's do it in another PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already did drop it in this PR. Note the removal of a lot of ifdefs...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can cherry-pick those commits out of this PR though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, don't worry too much on that.

@gusty gusty merged commit 821f164 into master Jul 3, 2024
4 checks passed
@wallymathieu
Copy link
Member Author

Many thanks @cannorin for the help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants