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

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
Show file tree
Hide file tree
Changes from 11 commits
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
73 changes: 33 additions & 40 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,34 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.3",
"commands": [
"paket"
],
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.3.8",
"commands": [
"reportgenerator"
],
"rollForward": false
},
"fantomas": {
"version": "6.3.11",
"commands": [
"fantomas"
],
"rollForward": false
},
"fsharp-analyzers": {
"version": "0.27.0",
"commands": [
"fsharp-analyzers"
],
"rollForward": false
},
"telplin": {
"version": "0.9.6",
"commands": [
"telplin"
],
"rollForward": false
}
}
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "9.0.2",
"commands": [
"paket"
],
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.3.8",
"commands": [
"reportgenerator"
],
"rollForward": false
},
"fsharp-analyzers": {
"version": "0.28.0",
"commands": [
"fsharp-analyzers"
],
"rollForward": false
},
"telplin": {
"version": "0.9.6",
"commands": [
"telplin"
],
"rollForward": false
}
}
}
40 changes: 16 additions & 24 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
env:
TEST_TIMEOUT_MINUTES: 40
FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1 # needed to allow .NET 8 RCs to participate in rollforward as expected.
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1 # needed to allow .NET RCs to participate in rollforward as expected.
timeout-minutes: 40 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
strategy:
matrix:
os:
- windows-latest
- macos-13 # using 13 because it's a bigger machine, and latest is still pointing to 12
- ubuntu-latest
dotnet-version: ["", "6.0.x", "7.0.x", "8.0.x"]
dotnet-version: ["", "8.0.x", "9.0.x"]
use-transparent-compiler:
- "TransparentCompiler"
- "BackgroundCompiler"
Expand All @@ -40,29 +40,22 @@ jobs:
dotnet-version: ""
include-prerelease: false
label: "repo global.json"
build_net7: false
test_tfm: net6.0
# latest 6.0
- global-json-file: "global.json"
dotnet-version: "6.0.x"
include-prerelease: false
label: "6.0"
build_net7: false
test_tfm: net6.0
# latest 7.0
- global-json-file: "global.json"
dotnet-version: "7.0.x"
include-prerelease: true
label: "7.0"
build_net7: true
test_tfm: net7.0
build_net9: false
test_tfm: net8.0
# latest 8.0
- global-json-file: "global.json"
dotnet-version: "8.0.x"
include-prerelease: true
include-prerelease: false
label: "8.0"
build_net8: true
build_net9: false
test_tfm: net8.0
# latest 9.0
- global-json-file: "global.json"
dotnet-version: "9.0.x"
include-prerelease: true
label: "9.0"
build_net9: true
test_tfm: net9.0
fail-fast: false # we have timing issues on some OS, so we want them all to run

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -96,6 +89,7 @@ jobs:
run: dotnet tool restore

- name: Check format
continue-on-error: true
run: dotnet fantomas --check build.fsx src
env:
DOTNET_ROLL_FORWARD: LatestMajor
Expand All @@ -108,15 +102,13 @@ jobs:
- name: Run Build
run: dotnet build -c Release
env:
BuildNet7: ${{ matrix.build_net7 }}
BuildNet8: ${{ matrix.build_net8 }}
BuildNet9: ${{ matrix.build_net9 }}

- name: Run and report tests
run: dotnet test -c Release -f ${{ matrix.test_tfm }} --no-restore --no-build --logger "console;verbosity=normal" --logger GitHubActions /p:AltCover=true /p:AltCoverAssemblyExcludeFilter="System.Reactive|FSharp.Compiler.Service|Ionide.ProjInfo|FSharp.Analyzers|Analyzer|Humanizer|FSharp.Core|FSharp.DependencyManager" -- Expecto.fail-on-focused-tests=true --blame-hang --blame-hang-timeout 1m
working-directory: test/FsAutoComplete.Tests.Lsp
env:
BuildNet7: ${{ matrix.build_net7 }}
BuildNet8: ${{ matrix.build_net8 }}
BuildNet9: ${{ matrix.build_net9 }}
USE_TRANSPARENT_COMPILER: ${{ matrix.use-transparent-compiler }}
USE_WORKSPACE_LOADER: ${{ matrix.workspace-loader }}

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ jobs:
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
9.0.x
include-prerelease: true

- name: remove global.json so that 7.0 builds
Expand All @@ -30,7 +29,7 @@ jobs:
- name: Run Build
run: dotnet pack -c Release -o ./bin
env:
BuildNet8: true
BuildNet9: true

- name: Get Changelog Entry
id: changelog_reader
Expand Down
9 changes: 7 additions & 2 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,15 @@
<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
</PaketReferencesFileLinesInfo>
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
Expand All @@ -252,6 +253,10 @@
<AllowExplicitVersion>true</AllowExplicitVersion>

</PackageReference>

<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
</PackageVersion>
</ItemGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>
<!-- Only the tool package is packable -->
<IsPackable>false</IsPackable>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>

</Project>
3 changes: 2 additions & 1 deletion benchmarks/benchmarks.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="SourceTextBenchmarks.fs" />
Expand Down
4 changes: 2 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version 7.2.1

framework: netstandard2.0, netstandard2.1, net6.0, net7.0, net8.0
framework: netstandard2.0, netstandard2.1, net6.0, net7.0, net8.0, net9.0

source https://api.nuget.org/v3/index.json
# this is the FCS nightly feed, re-enable at your own risk!
Expand All @@ -10,7 +10,7 @@ storage: none

nuget BenchmarkDotNet
nuget Fantomas.Client >= 0.9
nuget FSharp.Compiler.Service >= 43.8.300
nuget FSharp.Compiler.Service >= 43.9
nuget Ionide.Analyzers
nuget FSharp.Analyzers.Build
nuget Ionide.ProjInfo >= 0.65.0
Expand Down
Loading
Loading