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.

Sign up for GitHub

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

Update FSAC to use FCS and FSharp.Core from 9.0.100, as well as updated Analyzer SDK #1324

Merged
merged 28 commits into from
Nov 24, 2024
Merged

Update FSAC to use FCS and FSharp.Core from 9.0.100, as well as updated Analyzer SDK #1324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
997d5e8
First Pass F# 9 support
TheAngryByrd Nov 16, 2024
8f62814
update analyzers and proj-info dependencies
baronfel Nov 19, 2024
161c46e
remove fantomas due to .NET CLI bug in .NET 9 GA release
baronfel Nov 19, 2024
6a0632f
temporarily allow fantomas formatting to fail
baronfel Nov 19, 2024
e5ef107
safely add benchmarks net9.0 TFM
baronfel Nov 19, 2024
1350577
update CI workflow to test 8+9 SDKs now
baronfel Nov 19, 2024
213798c
bump analyzer SDK CLI
baronfel Nov 19, 2024
013d47c
make release pipeline build 8+9
baronfel Nov 19, 2024
dc653b1
.NET TFM 9 versions of all of our deps in paket.lock
baronfel Nov 19, 2024
d5b4e21
fix unused value warning
baronfel Nov 19, 2024
97e2e8b
multi-target, fixup direct project references to other projects, and …
baronfel Nov 19, 2024
aa9d2e2
TrySetFromTask properly
TheAngryByrd Nov 23, 2024
0c90213
Fix tooltip tests
TheAngryByrd Nov 23, 2024
52d1df2
Fix private access codefix
TheAngryByrd Nov 23, 2024
31a3501
Fix stub generation tests
TheAngryByrd Nov 23, 2024
ff11414
fix ifdef
TheAngryByrd Nov 23, 2024
cac135a
fix analyzers
TheAngryByrd Nov 23, 2024
11d1927
ifdef objnull
TheAngryByrd Nov 23, 2024
81b7ea9
add expected files to editorconfig
TheAngryByrd Nov 23, 2024
ebb9c5d
generatestubtests take2
TheAngryByrd Nov 23, 2024
d91cd0c
revert LinkDotNet.StringBuilder
TheAngryByrd Nov 23, 2024
e22823e
fix expected eol
TheAngryByrd Nov 23, 2024
2044443
fix freamework restriction
TheAngryByrd Nov 23, 2024
b794214
damn SDK
TheAngryByrd Nov 23, 2024
9791109
fix globaljson nonsense
TheAngryByrd Nov 24, 2024
e54da8b
DLL Hell is still real
TheAngryByrd Nov 24, 2024
c3dd707
Simple fix is the best
TheAngryByrd Nov 24, 2024
6cb5d61
idk
TheAngryByrd Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/benchmarks.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="SourceTextBenchmarks.fs" />
Expand Down
5 changes: 5 additions & 0 deletions src/FsAutoComplete.Core/AdaptiveExtensions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,12 @@ and AdaptiveCancellableTask<'a>(cancel: unit -> unit, real: Task<'a>) =
real
else
cachedTcs <- new TaskCompletionSource<'a>()
#if NET8_0
cachedTcs.TrySetFromTask real
#if NET9_0_OR_GREATER
cachedTcs.TrySetFromTask real |> ignore<bool>
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 think we have to call this from within the current TrySetFromTask as it needs to be a completed task.

#endif
#endif
cachedTcs.Task

cached <-
Expand Down
8 changes: 1 addition & 7 deletions src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);FS0057</NoWarn> <!-- Allows using experimental FCS APIs -->
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\FsAutoComplete.Logging\FsAutoComplete.Logging.fsproj" />
<TrimmerRootAssembly Include="FsAutoComplete.Core" />
</ItemGroup>
<ItemGroup>
<!-- Set of projects to compile against locally -->
<ProjectReference Include="..\..\..\proj-info\src\Ionide.ProjInfo.ProjectSystem\Ionide.ProjInfo.ProjectSystem.fsproj" />
<ProjectReference Include="..\..\..\FSharp.Analyzers.SDK\src\FSharp.Analyzers.SDK\FSharp.Analyzers.SDK.fsproj" />

</ItemGroup>
<ItemGroup>
<Compile Include="SemaphoreSlimLocks.fsi" />
<Compile Include="SemaphoreSlimLocks.fs" />
Expand Down
2 changes: 1 addition & 1 deletion src/FsAutoComplete/FsAutoComplete.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
<AssemblyName>fsautocomplete</AssemblyName>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
Expand Down
2 changes: 1 addition & 1 deletion test/FsAutoComplete.Tests.Lsp/FsAutoComplete.Tests.Lsp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<RollForward>LatestMajor</RollForward>
<IsTestProject>true</IsTestProject>
Expand Down
Loading